diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-09-08 11:29:48 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-09-08 18:41:57 +0000 |
| commit | 64335ba72878bf023bc48d29a698e4619b762ab5 (patch) | |
| tree | e40f31f6e457220e2c622867170a6a8fba810f9f /epan/dissectors/packet-epl.c | |
| parent | 97c9dca72eca2d683088883ad3b65e412e13ed59 (diff) | |
Initialize epl_placeholder_mac at compile time.
Change-Id: I01d48dd34d4377c40d101446cdb3ceb82cc2c3e2
Reviewed-on: https://code.wireshark.org/review/29491
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-epl.c')
| -rw-r--r-- | epan/dissectors/packet-epl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index cb94e2afc9..7da8c42018 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -2128,7 +2128,8 @@ dissect_epl_pdo(struct epl_convo *convo, proto_tree *epl_tree, tvbuff_t *tvb, pa return offset + payload_len; } -static address epl_placeholder_mac; +static guint8 epl_placeholder_mac_addr[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; +static address epl_placeholder_mac = ADDRESS_INIT(AT_ETHER, 6, epl_placeholder_mac_addr); static struct epl_convo * epl_get_convo(packet_info *pinfo, int opts) @@ -6179,8 +6180,6 @@ proto_register_epl(void) epl_profiles_by_nodeid = wmem_map_new(wmem_epan_scope(), g_direct_hash, g_direct_equal); epl_profiles_by_address = wmem_map_new(wmem_epan_scope(), epl_address_hash, epl_address_equal); - set_address(&epl_placeholder_mac, AT_ETHER, 6, "\xFF\xFF\xFF\xFF\xFF\xFF"); - #ifdef HAVE_LIBXML2 epl_xdd_init(); #endif |