NAS PDU:s are different in LTE.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26837 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index 5912d3cb9f5b4b94b0d32b17970ca5bc4d4e5de5..bbd4a76df8c1d074c54bab92e14f053061afb334 100644 (file)
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -60,7 +60,7 @@
 /* No SCTP port registered with IANA for S1AP yet */
 #define SCTP_PORT_S1AP 0
 
-static dissector_handle_t gsm_a_dtap_handle;
+static dissector_handle_t nas_eps_handle;
 
 #include "packet-s1ap-val.h"
 
@@ -179,7 +179,7 @@ proto_reg_handoff_s1ap(void)
                dissector_add("sctp.port", SctpPort, s1ap_handle);
        }
 
-       gsm_a_dtap_handle = find_dissector("gsm_a_dtap");
+       nas_eps_handle = find_dissector("nas_eps");
 }
 
 /*--- proto_register_s1ap -------------------------------------------*/

diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index 5c566909e75b81976671cd157cd4bce361702952..8c3e7873e446bf94f7db13d9fd1b143501bdca06 100644 (file)
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -202,7 +202,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 %(DEFAULT_BODY)s
 
   if (parameter_tvb)
-    call_dissector(gsm_a_dtap_handle,parameter_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
+    call_dissector(nas_eps_handle,parameter_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
 
 #.TYPE_ATTR
 ProtocolExtensionID TYPE = FT_UINT8  DISPLAY = BASE_DEC STRINGS = VALS(s1ap_ProtocolIE_ID_vals)

diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 04c09e064a5faeb9aa9285e0028b63e4f86dcd8d..0ef9853186309c2ead7a49105b37018c16c89ad0 100644 (file)
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -68,7 +68,7 @@
 /* No SCTP port registered with IANA for S1AP yet */
 #define SCTP_PORT_S1AP 0
 
-static dissector_handle_t gsm_a_dtap_handle;
+static dissector_handle_t nas_eps_handle;
 
 
 /*--- Included file: packet-s1ap-val.h ---*/
@@ -2097,7 +2097,7 @@ dissect_s1ap_NAS_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
 
 
   if (parameter_tvb)
-    call_dissector(gsm_a_dtap_handle,parameter_tvb,actx->pinfo, proto_tree_get_root(tree));
+    call_dissector(nas_eps_handle,parameter_tvb,actx->pinfo, proto_tree_get_root(tree));
 
 
 
@@ -5672,7 +5672,7 @@ proto_reg_handoff_s1ap(void)
                dissector_add("sctp.port", SctpPort, s1ap_handle);
        }
 
-       gsm_a_dtap_handle = find_dissector("gsm_a_dtap");
+       nas_eps_handle = find_dissector("nas_eps");
 }
 
 /*--- proto_register_s1ap -------------------------------------------*/