aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-11-24 22:16:53 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-11-24 22:16:53 +0000
commitf0313f98647b194b9177b4a2bb9e9efcb81d314c (patch)
tree9e0a0bbb2d4445ed6c94504139385e7902bc1be7
parent28f7b7f6cc77d6f15d19dfde8561fe9b3eb31c18 (diff)
NAS PDU:s are different in LTE.
svn path=/trunk/; revision=26837
-rw-r--r--asn1/s1ap/packet-s1ap-template.c4
-rw-r--r--asn1/s1ap/s1ap.cnf2
-rw-r--r--epan/dissectors/packet-s1ap.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index 5912d3cb9f..bbd4a76df8 100644
--- 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 5c566909e7..8c3e7873e4 100644
--- 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 04c09e064a..0ef9853186 100644
--- 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 -------------------------------------------*/