diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-05 18:09:43 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-05 18:09:43 +0000 |
| commit | 5fa2a99087bc56ea57ff31a7abf1d17f6bf8a2ca (patch) | |
| tree | d7066597386b650b9f4b82cf5ea9c8e22c36a980 /epan/dissectors/packet-ax25-kiss.c | |
| parent | 9999016855a210f7b0417592c7543c19abf76d41 (diff) | |
Keep result of [new_]register_dissector in some dissectors.
svn path=/trunk/; revision=51156
Diffstat (limited to 'epan/dissectors/packet-ax25-kiss.c')
| -rw-r--r-- | epan/dissectors/packet-ax25-kiss.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ax25-kiss.c b/epan/dissectors/packet-ax25-kiss.c index 8038bcd1e1..50b97fcce5 100644 --- a/epan/dissectors/packet-ax25-kiss.c +++ b/epan/dissectors/packet-ax25-kiss.c @@ -131,10 +131,6 @@ void proto_register_ax25_kiss(void); void proto_reg_handoff_ax25_kiss(void); -/* Dissector handles - all the possibles are listed */ -static dissector_handle_t ax25_handle; - - /* Initialize the protocol and registered fields */ static int proto_ax25_kiss = -1; @@ -150,6 +146,11 @@ static int hf_ax25_kiss_sethardware = -1; /* Initialize the subtree pointers */ static gint ett_ax25_kiss = -1; +static dissector_handle_t kiss_handle; + +/* Dissector handles - all the possibles are listed */ +static dissector_handle_t ax25_handle; + static const value_string kiss_frame_types[] = { { KISS_DATA_FRAME, "Data frame" }, { KISS_TXDELAY, "Tx Delay" }, @@ -368,7 +369,7 @@ proto_register_ax25_kiss(void) proto_ax25_kiss = proto_register_protocol( "AX.25 KISS", "AX.25 KISS", "ax25_kiss" ); /* Register the dissector */ - register_dissector( "ax25_kiss", dissect_ax25_kiss, proto_ax25_kiss ); + kiss_handle = register_dissector( "ax25_kiss", dissect_ax25_kiss, proto_ax25_kiss ); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array( proto_ax25_kiss, hf, array_length( hf ) ); @@ -378,9 +379,6 @@ proto_register_ax25_kiss(void) void proto_reg_handoff_ax25_kiss(void) { - dissector_handle_t kiss_handle; - - kiss_handle = create_dissector_handle( dissect_ax25_kiss, proto_ax25_kiss ); dissector_add_uint( "wtap_encap", WTAP_ENCAP_AX25_KISS, kiss_handle ); /* only currently implemented for AX.25 */ |