osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

O-RAN fronthaul UC-plane dissector 

Also modified eCPRI dissector to call it for payloads.  This dissector will
claim the "IQ Data" and "Real-Time Control Data" message types - others
are still handled by eCPRI.
This commit is contained in:
Martin Mathieson 2020-12-11 11:17:24 +00:00
parent 7304487462
commit 5a36793c84
4 changed files with 2020 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docbook/release-notes.adoc
View File

@ -57,6 +57,7 @@ The following features are new (or have been significantly updated) since versio
// Add one protocol per line between the -- delimiters in the format
// "Full protocol name (Abbreviation)"
O-RAN fronthaul UC-plane (O-RAN)
[commaize]
--
--

1
epan/dissectors/CMakeLists.txt
View File

@ -1548,6 +1548,7 @@ set(DISSECTOR_SRC
${CMAKE_CURRENT_SOURCE_DIR}/packet-openwire.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-opsi.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-optommp.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-oran.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-osc.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-oscore.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-osi-options.c

103
epan/dissectors/packet-ecpri.c
View File

@ -162,24 +162,38 @@ static expert_field ei_ecpri_not_dis_yet = EI_INIT;
/**************************************************************************************************/
/* Field Encoding of Message Types */
/**************************************************************************************************/
#define ECPRI_MT_IQ_DATA 0
#define ECPRI_MT_BIT_SEQ 1
#define ECPRI_MT_RT_CTRL_DATA 2
#define ECPRI_MT_GEN_DATA_TFER 3
#define ECPRI_MT_REM_MEM_ACC 4
#define ECPRI_MT_1WAY_DELAY 5
#define ECPRI_MT_REM_RST 6
#define ECPRI_MT_EVT_IND 7
#define ECPRI_MT_IWF_STARTUP 8
#define ECRPI_MT_IWF_OP 9
#define ECRPI_MT_IWF_MAPPING 10
#define ECRPI_MT_IWF_DELAY_CONTROL 11
static const range_string ecpri_msg_types[] = {
/* Message Types 0 - 7 */
{ 0x0, 0x0, "IQ Data" },
{ 0x1, 0x1, "Bit Sequence" },
{ 0x2, 0x2, "Real-Time Control Data" },
{ 0x3, 0x3, "Generic Data Transfer" },
{ 0x4, 0x4, "Remote Memory Access" },
{ 0x5, 0x5, "One-Way Delay Measurement" },
{ 0x6, 0x6, "Remote Reset" },
{ 0x7, 0x7, "Event Indication" },
{ 0x8, 0x8, "IWF Start-Up" },
{ 0x9, 0x9, "IWF Operation" },
{ 0xa, 0xa, "IWF Mapping" },
{ 0xb, 0xb, "IWF Delay Control" },
/* Message Types (3.2.4) */
{ ECPRI_MT_IQ_DATA, ECPRI_MT_IQ_DATA, "IQ Data" },
{ ECPRI_MT_BIT_SEQ, ECPRI_MT_BIT_SEQ, "Bit Sequence" },
{ ECPRI_MT_RT_CTRL_DATA, ECPRI_MT_RT_CTRL_DATA, "Real-Time Control Data" },
{ ECPRI_MT_GEN_DATA_TFER, ECPRI_MT_GEN_DATA_TFER, "Generic Data Transfer" },
{ ECPRI_MT_REM_MEM_ACC, ECPRI_MT_REM_MEM_ACC, "Remote Memory Access" },
{ ECPRI_MT_1WAY_DELAY, ECPRI_MT_1WAY_DELAY, "One-Way Delay Measurement" },
{ ECPRI_MT_REM_RST, ECPRI_MT_REM_RST, "Remote Reset" },
{ ECPRI_MT_EVT_IND, ECPRI_MT_EVT_IND, "Event Indication" },
{ ECPRI_MT_IWF_STARTUP, ECPRI_MT_IWF_STARTUP, "IWF Start-Up" },
{ ECRPI_MT_IWF_OP, ECRPI_MT_IWF_OP, "IWF Operation" },
{ ECRPI_MT_IWF_MAPPING, ECRPI_MT_IWF_MAPPING, "IWF Mapping" },
{ ECRPI_MT_IWF_DELAY_CONTROL, ECRPI_MT_IWF_DELAY_CONTROL, "IWF Delay Control" },
/* Message Types 12 - 63*/
{ 0xc, 0x3F, "Reserved" },
{ 12, 63, "Reserved" },
/* Message Types 64 - 255 */
{ 0x40, 0xFF, "Vendor Specific" },
{ 64, 255, "Vendor Specific" },
{ 0, 0, NULL }
};
@ -404,8 +418,9 @@ static int dissect_ecpri(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
ti_c_bit = proto_tree_add_item(header_tree, hf_c_bit, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item_ret_uint(header_tree, hf_msg_type, tvb, offset, 1, ENC_NA, &msg_type);
/* Append Message Type into info column */
/* Append Message Type into info column & header item */
col_append_sep_fstr(pinfo->cinfo, COL_INFO, ",", "Message Type: %s", try_rval_to_str(msg_type, ecpri_msg_types));
proto_item_append_text(header_item, " MessageType: %s", try_rval_to_str(msg_type, ecpri_msg_types));
offset += 1;
ti_payload_size = proto_tree_add_item(header_tree, hf_payload_size, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
@ -426,12 +441,21 @@ static int dissect_ecpri(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
remaining_length = reported_length - offset;
if (message_type_decoding)
{
tvbuff_t *fh_tvb = tvb_new_subset_length_caplen(tvb, offset, payload_size, payload_size);
/* See whether we have an O-RAN fronthaul sub-dissector that handles this, otherwise decode vanilla eCPRI */
dissector_handle_t oran_handle = find_dissector("oran_fh_cus");
int ret = call_dissector_only(oran_handle, fh_tvb, pinfo, tree, &msg_type);
if (ret) {
/* Assume that it has claimed the entire tvb */
offset = tvb_reported_length(tvb);
}
else {
switch (msg_type)
{
case 0x00:
/* IQ Data */
case 0x01:
/* Bit Sequence */
case ECPRI_MT_IQ_DATA:
/* 3.2.4.1 IQ Data */
case ECPRI_MT_BIT_SEQ:
/* 3.2.4.2 Bit Sequence */
if (payload_size >= ECPRI_MSG_TYPE_0_1_PAYLOAD_MIN_LENGTH)
{
if (remaining_length >= ECPRI_MSG_TYPE_0_1_PAYLOAD_MIN_LENGTH)
@ -453,8 +477,9 @@ static int dissect_ecpri(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
expert_add_info_format(pinfo, ti_payload_size, &ei_payload_size, "Payload Size %d is too small for encoding Message Type %d. Should be min. %d", payload_size, msg_type, ECPRI_MSG_TYPE_0_1_PAYLOAD_MIN_LENGTH);
}
break;
case 0x02:
/* Real-Time Control Data */
case ECPRI_MT_RT_CTRL_DATA:
/* 3.2.4.3 Real-Time Control Data */
/* N.B. if ORAN dissector is enabled, it will handle this type instead! */
if (payload_size >= ECPRI_MSG_TYPE_2_PAYLOAD_MIN_LENGTH)
{
if (remaining_length >= ECPRI_MSG_TYPE_2_PAYLOAD_MIN_LENGTH)
@ -476,8 +501,8 @@ static int dissect_ecpri(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
expert_add_info_format(pinfo, ti_payload_size, &ei_payload_size, "Payload Size %d is too small for encoding Message Type %d. Should be min. %d", payload_size, msg_type, ECPRI_MSG_TYPE_2_PAYLOAD_MIN_LENGTH);
}
break;
case 0x03:
/* Generic Data Transfer */
case ECPRI_MT_GEN_DATA_TFER:
/* 3.2.4.4 Generic Data Transfer */
if (payload_size >= ECPRI_MSG_TYPE_3_PAYLOAD_MIN_LENGTH)
{
if (remaining_length >= ECPRI_MSG_TYPE_3_PAYLOAD_MIN_LENGTH)
@ -499,8 +524,8 @@ static int dissect_ecpri(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
expert_add_info_format(pinfo, ti_payload_size, &ei_payload_size, "Payload Size %d is too small for encoding Message Type %d. Should be min. %d", payload_size, msg_type, ECPRI_MSG_TYPE_3_PAYLOAD_MIN_LENGTH);
}
break;
case 0x04:
/* Remote Memory Access */
case ECPRI_MT_REM_MEM_ACC:
/* 3.2.4.5 Remote Memory Access */
if (payload_size >= ECPRI_MSG_TYPE_4_PAYLOAD_MIN_LENGTH)
{
if (remaining_length >= ECPRI_MSG_TYPE_4_PAYLOAD_MIN_LENGTH)
@ -540,8 +565,8 @@ static int dissect_ecpri(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
expert_add_info_format(pinfo, ti_payload_size, &ei_payload_size, "Payload Size %d is too small for encoding Message Type %d. Should be min. %d", payload_size, msg_type, ECPRI_MSG_TYPE_4_PAYLOAD_MIN_LENGTH);
}
break;
case 0x05:
/* One-way Delay Measurement */
case ECPRI_MT_1WAY_DELAY:
/* 3.2.4.6 One-way Delay Measurement */
if (payload_size >= ECPRI_MSG_TYPE_5_PAYLOAD_MIN_LENGTH)
{
if (remaining_length >= ECPRI_MSG_TYPE_5_PAYLOAD_MIN_LENGTH)
@ -590,7 +615,7 @@ static int dissect_ecpri(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
expert_add_info_format(pinfo, ti_payload_size, &ei_payload_size, "Payload Size %d is too small for encoding Message Type %d. Should be min. %d", payload_size, msg_type, ECPRI_MSG_TYPE_5_PAYLOAD_MIN_LENGTH);
}
break;
case 0x06:
case ECPRI_MT_REM_RST:
/* Remote Reset */
if (payload_size >= ECPRI_MSG_TYPE_6_PAYLOAD_MIN_LENGTH)
{
@ -613,7 +638,7 @@ static int dissect_ecpri(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
expert_add_info_format(pinfo, ti_payload_size, &ei_payload_size, "Payload Size %d is too small for encoding Message Type %d. Should be min. %d", payload_size, msg_type, ECPRI_MSG_TYPE_6_PAYLOAD_MIN_LENGTH);
}
break;
case 0x07:
case ECPRI_MT_EVT_IND:
/* Event Indication */
if (payload_size >= ECPRI_MSG_TYPE_7_PAYLOAD_MIN_LENGTH)
{
@ -706,21 +731,23 @@ static int dissect_ecpri(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
expert_add_info_format(pinfo, ti_payload_size, &ei_payload_size, "Payload Size %d is too small for encoding Message Type %d. Should be min. %d", payload_size, msg_type, ECPRI_MSG_TYPE_7_PAYLOAD_MIN_LENGTH);
}
break;
case 8:
/* IWF Start-Up 3.2.4.9 */
case 9:
/* IWF Operation 3.2.4.10 */
case 10:
/* IWF Mapping 3.2.4.11 */
case 11:
/* IWF Delay Control 3.2.4.12 */
case ECPRI_MT_IWF_STARTUP:
/* 3.2.4.9 IWF Start-Up */
case ECRPI_MT_IWF_OP:
/* 3.2.4.10 IWF Operation */
case ECRPI_MT_IWF_MAPPING:
/* 3.2.4.11 IWF Mapping */
case ECRPI_MT_IWF_DELAY_CONTROL:
/* 3.2.4.12 IWF Delay Control */
proto_tree_add_expert(payload_tree, pinfo, &ei_ecpri_not_dis_yet, tvb, offset, -1);
break;
default:
/* Reserved or Vendor Specific */
break;
}
}
}
/* If Preference not chosen, Payload will be not decoded */
else
{

1707
epan/dissectors/packet-oran.c Executable file
View File

File diff suppressed because it is too large Load Diff