diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-08-03 01:58:12 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-08-03 01:58:12 +0000 |
| commit | 307e13d9f2aefaa968f89d0bd065dbae5c992b64 (patch) | |
| tree | 317ebe993472042cb8f010ad24276da1be0c5e98 /epan/dissectors/packet-flexnet.c | |
| parent | ad3c303f16673438e94223dda25ec5be5e46408d (diff) | |
Move the list of AX.25 protocol IDs to epan/ax25_pids.h. Use it in
packet-ax25.c and packet-arp.c.
Add an "ax25.pid" dissector table for those protocol IDs, use it in the
AX.25 dissector, and have dissectors register in that table with their
protocol IDs.
Get rid of some unneeded includes.
Clean up some "AX25"s in user-visible strings - say "AX.25" instead.
Clean up some indentation.
svn path=/trunk/; revision=44235
Diffstat (limited to 'epan/dissectors/packet-flexnet.c')
| -rw-r--r-- | epan/dissectors/packet-flexnet.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-flexnet.c b/epan/dissectors/packet-flexnet.c index fce657bd3f..7b7ec4e07d 100644 --- a/epan/dissectors/packet-flexnet.c +++ b/epan/dissectors/packet-flexnet.c @@ -49,8 +49,7 @@ #include <epan/strutil.h> #include <epan/packet.h> #include <epan/emem.h> -#include <epan/xdlc.h> -#include <packet-ip.h> +#include <epan/ax25_pids.h> #define FLEXNET_ADRLEN 15 #define FLEXNET_CTLLEN 15 @@ -147,9 +146,6 @@ proto_register_flexnet(void) /* Register the protocol name and description */ proto_flexnet = proto_register_protocol("FlexNet", "FLEXNET", "flexnet"); - /* Register the dissector */ - register_dissector( "flexnet", dissect_flexnet, proto_flexnet ); - /* Required function calls to register the header fields and subtrees used */ proto_register_field_array( proto_flexnet, hf, array_length( hf ) ); proto_register_subtree_array( ett, array_length( ett ) ); @@ -161,6 +157,7 @@ proto_reg_handoff_flexnet(void) static gboolean inited = FALSE; if( !inited ) { + dissector_add_uint( "ax25.pid", AX25_P_FLEXNET, create_dissector_handle( dissect_flexnet, proto_flexnet ) ); /* */ |