osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

E2AP CCC: Clarify that V1 has been added

This commit is contained in:
Martin Mathieson 2024-01-23 14:12:21 +00:00
parent b05def7a50
commit b6a9c48eb5
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/e2ap/e2ap.cnf
View File

@ -314,6 +314,8 @@ SuccessfulOutcome/value successfulOutcome_value
# TODO: for these IEs, report as expert info if have RAN Function dissector, but it lacks that IE!
#.FN_BODY RICcontrolHeader VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb;
%(DEFAULT_BODY)s

14
epan/dissectors/asn1/e2ap/packet-e2ap-template.c
View File

@ -51,6 +51,7 @@ static int proto_e2ap;
static int hf_e2ap_unmapped_ran_function_id;
static int hf_e2ap_ran_function_name_not_recognised;
static int hf_e2ap_ran_function_setup_frame;
/* TODO: for each RAN Function, also link forward to where setup is referenced (if at all?). Maybe just first usage? */
static int hf_e2ap_dissector_version;
static int hf_e2ap_frame_version;
@ -871,16 +872,17 @@ proto_reg_handoff_e2ap(void)
}
};
static ran_function_dissector_t ccc_v2 =
static ran_function_dissector_t ccc_v1 =
{ "{", /*"ORAN-E2SM-CCC",*/ "1.3.6.1.4.1.53148.1.1.2.4", 1, 0,
/* See table 5.1 */
{ dissect_E2SM_NI_JSON_PDU,
/* TODO: are these all possible? */
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
NULL,
NULL,
NULL,
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
@ -896,7 +898,7 @@ proto_reg_handoff_e2ap(void)
register_e2ap_ran_function_dissector(KPM_RANFUNCTIONS, &kpm_v3);
register_e2ap_ran_function_dissector(RC_RANFUNCTIONS, &rc_v1);
register_e2ap_ran_function_dissector(NI_RANFUNCTIONS, &ni_v1);
register_e2ap_ran_function_dissector(CCC_RANFUNCTIONS, &ccc_v2);
register_e2ap_ran_function_dissector(CCC_RANFUNCTIONS, &ccc_v1);
/* Cache JSON dissector */
json_handle = find_dissector("json");

15
epan/dissectors/packet-e2ap.c
View File

@ -1070,6 +1070,7 @@ static int hf_e2ap_ric_ReportRanParameterDef_List_item; /* RANparameterDef_Item
static int hf_e2ap_unmapped_ran_function_id;
static int hf_e2ap_ran_function_name_not_recognised;
static int hf_e2ap_ran_function_setup_frame;
/* TODO: for each RAN Function, also link forward to where setup is referenced (if at all?). Maybe just first usage? */
static int hf_e2ap_dissector_version;
static int hf_e2ap_frame_version;
@ -3495,6 +3496,7 @@ dissect_e2ap_RANfunctionOID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
return offset;
}
@ -14874,16 +14876,17 @@ proto_reg_handoff_e2ap(void)
}
};
static ran_function_dissector_t ccc_v2 =
static ran_function_dissector_t ccc_v1 =
{ "{", /*"ORAN-E2SM-CCC",*/ "1.3.6.1.4.1.53148.1.1.2.4", 1, 0,
/* See table 5.1 */
{ dissect_E2SM_NI_JSON_PDU,
/* TODO: are these all possible? */
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
NULL,
NULL,
NULL,
dissect_E2SM_NI_JSON_PDU,
dissect_E2SM_NI_JSON_PDU,
@ -14899,7 +14902,7 @@ proto_reg_handoff_e2ap(void)
register_e2ap_ran_function_dissector(KPM_RANFUNCTIONS, &kpm_v3);
register_e2ap_ran_function_dissector(RC_RANFUNCTIONS, &rc_v1);
register_e2ap_ran_function_dissector(NI_RANFUNCTIONS, &ni_v1);
register_e2ap_ran_function_dissector(CCC_RANFUNCTIONS, &ccc_v2);
register_e2ap_ran_function_dissector(CCC_RANFUNCTIONS, &ccc_v1);
/* Cache JSON dissector */
json_handle = find_dissector("json");