diff options
-rw-r--r-- | asn1/m3ap/m3ap.cnf | 39 | ||||
-rw-r--r-- | epan/dissectors/packet-m3ap.c | 56 |
2 files changed, 95 insertions, 0 deletions
diff --git a/asn1/m3ap/m3ap.cnf b/asn1/m3ap/m3ap.cnf index 7ec47d5b38..a4061b9951 100644 --- a/asn1/m3ap/m3ap.cnf +++ b/asn1/m3ap/m3ap.cnf @@ -201,6 +201,45 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") dissect_gtpv2_mbms_time_to_data_xfer(parameter_tvb, actx->pinfo, tree, actx->created_item, tvb_len, 0, 0); #.END +#------ Pretify info column ----- +#.FN_HDR MBMSSessionStartRequest + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Start Request "); +#.FN_HDR MBMSSessionStartResponse + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Start Response "); +#.FN_HDR MBMSSessionStartFailure + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Start Failure "); +#.FN_HDR MBMSSessionStopRequest + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Stop Request "); +#.FN_HDR MBMSSessionStopResponse + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Stop Response "); +#.FN_HDR MBMSSessionUpdateRequest + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Update Request "); +#.FN_HDR MBMSSessionUpdateResponse + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Update Response "); +#.FN_HDR MBMSSessionUpdateFailure + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Update Failure "); +#.FN_HDR ErrorIndication + col_set_str(actx->pinfo->cinfo, COL_INFO,"Error Indication "); +#.FN_HDR Reset + col_set_str(actx->pinfo->cinfo, COL_INFO,"Reset "); +#.FN_HDR ResetAcknowledge + col_set_str(actx->pinfo->cinfo, COL_INFO,"Reset Acknowledge "); +#.FN_HDR PrivateMessage + col_set_str(actx->pinfo->cinfo, COL_INFO,"Private Message "); +#.FN_HDR MCEConfigurationUpdate + col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update "); +#.FN_HDR MCEConfigurationUpdateAcknowledge + col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update Acknowledge "); +#.FN_HDR MCEConfigurationUpdateFailure + col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update Failure "); +#.FN_HDR M3SetupRequest + col_set_str(actx->pinfo->cinfo, COL_INFO,"M3 Setup Request "); +#.FN_HDR M3SetupResponse + col_set_str(actx->pinfo->cinfo, COL_INFO,"M3 Setup Response "); +#.FN_HDR M3SetupFailure + col_set_str(actx->pinfo->cinfo, COL_INFO,"M3 Setup Failure "); + + #.ASSIGN_VALUE_TO_TYPE # M3AP does not have constants assigned to types, they are pure INTEGER # ProcedureCode id-mBMSsessionStart ProcedureCode diff --git a/epan/dissectors/packet-m3ap.c b/epan/dissectors/packet-m3ap.c index 3af02845e5..ae9d41ed8b 100644 --- a/epan/dissectors/packet-m3ap.c +++ b/epan/dissectors/packet-m3ap.c @@ -1219,6 +1219,9 @@ static const per_sequence_t MBMSSessionStartRequest_sequence[] = { static int dissect_m3ap_MBMSSessionStartRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 206 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Start Request "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_MBMSSessionStartRequest, MBMSSessionStartRequest_sequence); @@ -1233,6 +1236,9 @@ static const per_sequence_t MBMSSessionStartResponse_sequence[] = { static int dissect_m3ap_MBMSSessionStartResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 208 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Start Response "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_MBMSSessionStartResponse, MBMSSessionStartResponse_sequence); @@ -1247,6 +1253,9 @@ static const per_sequence_t MBMSSessionStartFailure_sequence[] = { static int dissect_m3ap_MBMSSessionStartFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 210 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Start Failure "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_MBMSSessionStartFailure, MBMSSessionStartFailure_sequence); @@ -1261,6 +1270,9 @@ static const per_sequence_t MBMSSessionStopRequest_sequence[] = { static int dissect_m3ap_MBMSSessionStopRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 212 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Stop Request "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_MBMSSessionStopRequest, MBMSSessionStopRequest_sequence); @@ -1275,6 +1287,9 @@ static const per_sequence_t MBMSSessionStopResponse_sequence[] = { static int dissect_m3ap_MBMSSessionStopResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 214 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Stop Response "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_MBMSSessionStopResponse, MBMSSessionStopResponse_sequence); @@ -1289,6 +1304,9 @@ static const per_sequence_t MBMSSessionUpdateRequest_sequence[] = { static int dissect_m3ap_MBMSSessionUpdateRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 216 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Update Request "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_MBMSSessionUpdateRequest, MBMSSessionUpdateRequest_sequence); @@ -1303,6 +1321,9 @@ static const per_sequence_t MBMSSessionUpdateResponse_sequence[] = { static int dissect_m3ap_MBMSSessionUpdateResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 218 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Update Response "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_MBMSSessionUpdateResponse, MBMSSessionUpdateResponse_sequence); @@ -1317,6 +1338,9 @@ static const per_sequence_t MBMSSessionUpdateFailure_sequence[] = { static int dissect_m3ap_MBMSSessionUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 220 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMS Session Update Failure "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_MBMSSessionUpdateFailure, MBMSSessionUpdateFailure_sequence); @@ -1331,6 +1355,9 @@ static const per_sequence_t ErrorIndication_sequence[] = { static int dissect_m3ap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 222 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"Error Indication "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_ErrorIndication, ErrorIndication_sequence); @@ -1345,6 +1372,9 @@ static const per_sequence_t Reset_sequence[] = { static int dissect_m3ap_Reset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 224 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"Reset "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_Reset, Reset_sequence); @@ -1410,6 +1440,9 @@ static const per_sequence_t ResetAcknowledge_sequence[] = { static int dissect_m3ap_ResetAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 226 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"Reset Acknowledge "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_ResetAcknowledge, ResetAcknowledge_sequence); @@ -1438,6 +1471,9 @@ static const per_sequence_t PrivateMessage_sequence[] = { static int dissect_m3ap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 228 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"Private Message "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_PrivateMessage, PrivateMessage_sequence); @@ -1452,6 +1488,9 @@ static const per_sequence_t M3SetupRequest_sequence[] = { static int dissect_m3ap_M3SetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 236 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"M3 Setup Request "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_M3SetupRequest, M3SetupRequest_sequence); @@ -1480,6 +1519,9 @@ static const per_sequence_t M3SetupResponse_sequence[] = { static int dissect_m3ap_M3SetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 238 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"M3 Setup Response "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_M3SetupResponse, M3SetupResponse_sequence); @@ -1494,6 +1536,11 @@ static const per_sequence_t M3SetupFailure_sequence[] = { static int dissect_m3ap_M3SetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 240 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"M3 Setup Failure "); + + + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_M3SetupFailure, M3SetupFailure_sequence); @@ -1508,6 +1555,9 @@ static const per_sequence_t MCEConfigurationUpdate_sequence[] = { static int dissect_m3ap_MCEConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 230 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_MCEConfigurationUpdate, MCEConfigurationUpdate_sequence); @@ -1522,6 +1572,9 @@ static const per_sequence_t MCEConfigurationUpdateAcknowledge_sequence[] = { static int dissect_m3ap_MCEConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 232 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update Acknowledge "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_MCEConfigurationUpdateAcknowledge, MCEConfigurationUpdateAcknowledge_sequence); @@ -1536,6 +1589,9 @@ static const per_sequence_t MCEConfigurationUpdateFailure_sequence[] = { static int dissect_m3ap_MCEConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 234 "../../asn1/m3ap/m3ap.cnf" + col_set_str(actx->pinfo->cinfo, COL_INFO,"MCE Configuration Update Failure "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_m3ap_MCEConfigurationUpdateFailure, MCEConfigurationUpdateFailure_sequence); |