osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

No need for 'if (...initialized) {...}' in proto_reg_handoff...() 

svn path=/trunk/; revision=47890
This commit is contained in:
Bill Meier 2013-02-26 01:00:25 +00:00
parent 162817ad33
commit 88a5865b64
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/packet-adwin-config.c
View File

@ -449,7 +449,7 @@ dissect_adwin_config(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
|| pinfo->destport == ADWIN_CONFIGURATION_PORT))
return 0;
if (pinfo->ipproto != IP_PROTO_UDP && pinfo->ipproto != IP_PROTO_TCP)
if ((pinfo->ipproto != IP_PROTO_UDP) && (pinfo->ipproto != IP_PROTO_TCP))
return 0;
if (! (is_adwin_mac_or_broadcast(pinfo->dl_src) || is_adwin_mac_or_broadcast(pinfo->dl_dst)))
@ -760,11 +760,6 @@ proto_register_adwin_config(void)
void
proto_reg_handoff_adwin_config(void)
{
static int adwin_config_prefs_initialized = FALSE;
if ( ! adwin_config_prefs_initialized ) {
heur_dissector_add("udp", dissect_adwin_config, proto_adwin_config);
heur_dissector_add("tcp", dissect_adwin_config, proto_adwin_config);
adwin_config_prefs_initialized = TRUE;
}
heur_dissector_add("udp", dissect_adwin_config, proto_adwin_config);
heur_dissector_add("tcp", dissect_adwin_config, proto_adwin_config);
}