aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-x25.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-08-03 01:58:12 +0000
committerGuy Harris <guy@alum.mit.edu>2012-08-03 01:58:12 +0000
commit307e13d9f2aefaa968f89d0bd065dbae5c992b64 (patch)
tree317ebe993472042cb8f010ad24276da1be0c5e98 /epan/dissectors/packet-x25.c
parentad3c303f16673438e94223dda25ec5be5e46408d (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-x25.c')
-rw-r--r--epan/dissectors/packet-x25.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index e239d225eb..1bc94dc610 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -32,6 +32,7 @@
#include <glib.h>
#include <epan/packet.h>
+#include <epan/ax25_pids.h>
#include <epan/llcsaps.h>
#include <epan/circuit.h>
#include <epan/reassemble.h>
@@ -2770,4 +2771,5 @@ proto_reg_handoff_x25(void)
x25_handle = find_dissector("x.25");
dissector_add_uint("llc.dsap", SAP_X25, x25_handle);
dissector_add_uint("lapd.sapi", LAPD_SAPI_X25, x25_handle);
+ dissector_add_uint("ax25.pid", AX25_P_ROSE, x25_handle);
}