aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ax25.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-08-02 20:41:50 +0000
committerGuy Harris <guy@alum.mit.edu>2012-08-02 20:41:50 +0000
commit94eb487df6898d0e28f72ce1a4602e15ac3825cc (patch)
treecfed85ae88be25660fffac80320e6b34a88dafe3 /epan/dissectors/packet-ax25.c
parentbb78da2687309a9c11733b9ad20266ec147cf8cc (diff)
From Richard Stearn: Rose (X.25 Packet Layer Protocol atop AX.25's
link-layer protocol) support. Rename rose_handle to x25_handle, as it's not a handle for a protocol named "Rose" or "ROSE", it's a handle for X.25's Packet Layer Protocol (which we just call "x.25"). svn path=/trunk/; revision=44226
Diffstat (limited to 'epan/dissectors/packet-ax25.c')
-rw-r--r--epan/dissectors/packet-ax25.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c
index c9e4c35d9b..0ed2a6bb13 100644
--- a/epan/dissectors/packet-ax25.c
+++ b/epan/dissectors/packet-ax25.c
@@ -90,7 +90,7 @@
void proto_reg_handoff_ax25(void);
/* Dissector handles - all the possibles are listed */
-static dissector_handle_t rose_handle;
+static dissector_handle_t x25_handle;
static dissector_handle_t rfc1144c_handle;
static dissector_handle_t rfc1144_handle;
static dissector_handle_t segment_handle;
@@ -367,7 +367,7 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree )
switch ( pid )
{
- case AX25_P_ROSE : call_dissector( rose_handle , next_tvb, pinfo, parent_tree ); break;
+ case AX25_P_ROSE : call_dissector( x25_handle , next_tvb, pinfo, parent_tree ); break;
case AX25_P_RFC1144C : call_dissector( rfc1144c_handle, next_tvb, pinfo, parent_tree ); break;
case AX25_P_RFC1144 : call_dissector( rfc1144_handle , next_tvb, pinfo, parent_tree ); break;
case AX25_P_SEGMENT : call_dissector( segment_handle , next_tvb, pinfo, parent_tree ); break;
@@ -543,7 +543,7 @@ proto_reg_handoff_ax25(void)
When a new dissector is available all that needs to be done is to
replace the current dissector name "data" with the new dissector name.
*/
- rose_handle = find_dissector( "data" /* "x.25" */ );
+ x25_handle = find_dissector( "x.25" );
rfc1144c_handle = find_dissector( "data" /* "rfc1144c" */ );
rfc1144_handle = find_dissector( "data" /* "rfc1144" */ );
segment_handle = find_dissector( "data" /* "segment" */ );