diff options
| -rw-r--r-- | asn1/s1ap/s1ap.cnf | 16 | ||||
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 4 |
3 files changed, 19 insertions, 3 deletions
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index a658d31dde..1328ce5cab 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -176,6 +176,22 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") return offset; dissect_e212_mcc_mnc(parameter_tvb, tree, 0); #.END +#.FN_BODY MME-UE-S1AP-ID VAL_PTR = mme_ue_s1ap_id + +guint32 mme_ue_s1ap_id + +%(DEFAULT_BODY)s + +#.FN_BODY MME-UE-S1AP-ID VAL_PTR = mme_ue_s1ap_id + +guint32 mme_ue_s1ap_id + +%(DEFAULT_BODY)s +#.FN_BODY ENB-UE-S1AP-ID VAL_PTR = enb_ue_s1ap_id + +guint32 enb_ue_s1ap_id + +%(DEFAULT_BODY)s #.FN_BODY ENBname VAL_PTR = parameter_tvb tvbuff_t *parameter_tvb=NULL; diff --git a/config.nmake b/config.nmake index 56c8175a4c..6f02c6bd8d 100644 --- a/config.nmake +++ b/config.nmake @@ -142,7 +142,7 @@ GLIB_DIR=$(WIRESHARK_LIBS)\glib ##### To Use new packet list uncomment this line #### ### Warning Experimental - work in progress -#NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1 +NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1 # # Mandatory: GTK (& related libs) settings diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index a441e3fe7e..ac6c956598 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -559,7 +559,7 @@ check_ndmp_rm(tvbuff_t *tvb, packet_info *pinfo) } gboolean -check_ndmp_hdr(tvbuff_t *tvb, packet_info *pinfo) +check_ndmp_hdr(tvbuff_t *tvb ) { guint len; guint32 tmp; @@ -3201,7 +3201,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * If it doesn't look like a valid NDMP header at this point, there is * no reason to move forward */ - if (!check_ndmp_hdr(new_tvb, pinfo)) + if (!check_ndmp_hdr(new_tvb)) { return; } |