diff options
author | Bill Meier <wmeier@newsguy.com> | 2010-04-26 22:12:48 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2010-04-26 22:12:48 +0000 |
commit | 505f5463b84052afe2242ebb274720918c351101 (patch) | |
tree | 323dae7ea9c405b48ad402acad7fd2e9897784cc /epan/dissectors/packet-dhcp-failover.c | |
parent | 98d0f9d17a40d649ddbae9c4f4095d83726642a3 (diff) | |
download | wireshark-505f5463b84052afe2242ebb274720918c351101.tar.gz |
Move proto_reg_handoff... to the end of the file.
svn path=/trunk/; revision=32568
Diffstat (limited to 'epan/dissectors/packet-dhcp-failover.c')
-rw-r--r-- | epan/dissectors/packet-dhcp-failover.c | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 31ce0561dd..18432e641e 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -948,24 +948,10 @@ dissect_dhcpfo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) get_dhcpfo_pdu_len, dissect_dhcpfo_pdu); } -void -proto_reg_handoff_dhcpfo(void) -{ - static gboolean initialized = FALSE; - static dissector_handle_t dhcpfo_handle; - static guint saved_tcp_port; +/* Register the protocol with Wireshark */ - if (!initialized) { - dhcpfo_handle = create_dissector_handle(dissect_dhcpfo, proto_dhcpfo); - initialized = TRUE; - } else { - dissector_delete("tcp.port", saved_tcp_port, dhcpfo_handle); - } - dissector_add("tcp.port", tcp_port_pref, dhcpfo_handle); - saved_tcp_port = tcp_port_pref; -} +void proto_reg_handoff_dhcpfo(void); -/* Register the protocol with Wireshark */ void proto_register_dhcpfo(void) { @@ -1207,3 +1193,21 @@ proto_register_dhcpfo(void) " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &dhcpfo_desegment); } + +void +proto_reg_handoff_dhcpfo(void) +{ + static gboolean initialized = FALSE; + static dissector_handle_t dhcpfo_handle; + static guint saved_tcp_port; + + if (!initialized) { + dhcpfo_handle = create_dissector_handle(dissect_dhcpfo, proto_dhcpfo); + initialized = TRUE; + } else { + dissector_delete("tcp.port", saved_tcp_port, dhcpfo_handle); + } + dissector_add("tcp.port", tcp_port_pref, dhcpfo_handle); + saved_tcp_port = tcp_port_pref; +} + |