diff options
author | Anders Broman <anders.broman@ericsson.com> | 2011-10-23 18:05:07 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2011-10-23 18:05:07 +0000 |
commit | a18ab9b8703ad9a2f3aa019109f14ad188719f54 (patch) | |
tree | 6ac958842c1cdf624aa90a910f5c92926e23dcaa /asn1/s1ap | |
parent | 4dcd0ff1e3f008c39e26b87678b4440f2b899773 (diff) | |
download | wireshark-a18ab9b8703ad9a2f3aa019109f14ad188719f54.tar.gz wireshark-a18ab9b8703ad9a2f3aa019109f14ad188719f54.tar.bz2 wireshark-a18ab9b8703ad9a2f3aa019109f14ad188719f54.zip |
From Pascal Quantin.
The attached patch adds the LPPa (LTE Positioning Protocol A) dissector as
specified in 3GPP 36.455 release 9.4.1.
(Part 2)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6478
svn path=/trunk/; revision=39516
Diffstat (limited to 'asn1/s1ap')
-rw-r--r-- | asn1/s1ap/packet-s1ap-template.c | 2 | ||||
-rw-r--r-- | asn1/s1ap/s1ap.cnf | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c index d2b3042876..5710258f03 100644 --- a/asn1/s1ap/packet-s1ap-template.c +++ b/asn1/s1ap/packet-s1ap-template.c @@ -59,6 +59,7 @@ #define SCTP_PORT_S1AP 36412 static dissector_handle_t nas_eps_handle; +static dissector_handle_t lppa_handle; #include "packet-s1ap-val.h" @@ -186,6 +187,7 @@ proto_reg_handoff_s1ap(void) if (!Initialized) { nas_eps_handle = find_dissector("nas-eps"); + lppa_handle = find_dissector("lppa"); dissector_add_handle("sctp.port", s1ap_handle); /* for "decode-as" */ dissector_add_uint("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID, s1ap_handle); Initialized=TRUE; diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index 00fbadc5f8..09dc7daecd 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -237,6 +237,15 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") if ((tvb_length(parameter_tvb)>0)&&(nas_eps_handle)) call_dissector(nas_eps_handle,parameter_tvb,%(ACTX)s->pinfo, tree); +#.FN_BODY LPPa-PDU VAL_PTR = ¶meter_tvb + + tvbuff_t *parameter_tvb=NULL; + +%(DEFAULT_BODY)s + + if ((tvb_length(parameter_tvb)>0)&&(lppa_handle)) + call_dissector(lppa_handle, parameter_tvb, %(ACTX)s->pinfo, tree); + #.FN_BODY TransportLayerAddress VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb=NULL; proto_tree *subtree; |