aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-atm.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2011-10-12 18:57:50 +0000
committerAnders Broman <anders.broman@ericsson.com>2011-10-12 18:57:50 +0000
commit62ba07a8fcdfedfe7c86115f2a8b45dc53a165e9 (patch)
tree65de0dc603baf9fdb4fa2147c619d718d46e8a94 /epan/dissectors/packet-atm.c
parent92e7adcfc9d1576059ff01d54097bcdf6605ecbe (diff)
From Tobias Witek:
This patch extends the ATM parser so as to allow GPRS NS traffic encapsulated in ATM AAL5. Additionally, added support for this into the 'Meta' dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6447 svn path=/trunk/; revision=39394
Diffstat (limited to 'epan/dissectors/packet-atm.c')
-rw-r--r--epan/dissectors/packet-atm.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index 79f8198120..8ef142beea 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -74,6 +74,7 @@ static dissector_handle_t ppp_handle;
static dissector_handle_t eth_handle;
static dissector_handle_t ip_handle;
static dissector_handle_t data_handle;
+static dissector_handle_t gprs_ns_handle;
static gboolean dissect_lanesscop = FALSE;
@@ -726,6 +727,7 @@ static const value_string aal5_hltype_vals[] = {
{ TRAF_FR, "Frame Relay" },
{ TRAF_SPANS, "FORE SPANS" },
{ TRAF_IPSILON, "Ipsilon" },
+ { TRAF_GPRS_NS, "GPRS NS" },
{ 0, NULL }
};
@@ -1110,6 +1112,10 @@ dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
call_dissector(ilmi_handle, next_tvb, pinfo, tree);
break;
+ case TRAF_GPRS_NS:
+ call_dissector(gprs_ns_handle, next_tvb, pinfo, tree);
+ break;
+
default:
{
gboolean decoded = FALSE;
@@ -2007,6 +2013,7 @@ proto_reg_handoff_atm(void)
ip_handle = find_dissector("ip");
data_handle = find_dissector("data");
fp_handle = find_dissector("fp");
+ gprs_ns_handle = find_dissector("gprs_ns");
atm_handle = create_dissector_handle(dissect_atm, proto_atm);
dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS, atm_handle);