osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2018-09-08 11:29:48 -07:00
parent 97c9dca72e
commit 64335ba728
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/dissectors/packet-epl.c
View File

@ -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