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

pcapng: add missing file format interpretation of EPB options 

Add the file format interpretations of Enhanced Packet Block options which
are being read by wiretap, but missing from the file format dissector.


(cherry picked from commit c657a6f5e7)
This commit is contained in:
Jaap Keuter 2020-12-28 15:41:44 +00:00
parent 92cea416e7
commit b67f9a2f26
1 changed files with 83 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
epan/dissectors/file-pcapng.c
View File

@ -73,6 +73,10 @@ static int hf_pcapng_option_data_interface_os = -1;
static int hf_pcapng_option_data_interface_hardware = -1;
static int hf_pcapng_option_data_interface_fcs_length = -1;
static int hf_pcapng_option_data_interface_timestamp_offset = -1;
static int hf_pcapng_option_data_packet_verdict_type = -1;
static int hf_pcapng_option_data_packet_verdict_data = -1;
static int hf_pcapng_option_data_packet_queue = -1;
static int hf_pcapng_option_data_packet_id = -1;
static int hf_pcapng_option_data_packet_drop_count = -1;
static int hf_pcapng_option_data_packet_hash_algorithm = -1;
static int hf_pcapng_option_data_packet_hash_data = -1;
@ -485,6 +489,9 @@ static const value_string option_code_enhanced_packet_vals[] = {
{ 2, "Flags" },
{ 3, "Hash" },
{ 4, "Drop Count" },
{ 5, "Packet ID" },
{ 6, "Queue" },
{ 7, "Verdict" },
{ 32769, "Darwin DPEB ID" },
{ 32770, "Darwin Service Class" },
{ 32771, "Darwin Effective DPEB ID" },
@ -561,6 +568,13 @@ static const value_string timestamp_resolution_base_vals[] = {
{ 0, NULL }
};
static const value_string packet_verdict_type_vals[] = {
{ 0, "Hardware" },
{ 1, "Linux eBPF TC" },
{ 2, "Linux eBPF XDP" },
{ 0, NULL }
};
static const value_string packet_hash_algorithm_vals[] = {
{ 0, "2's complement" },
{ 1, "XOR" },
@ -1201,6 +1215,55 @@ static gint dissect_options(proto_tree *tree, packet_info *pinfo,
str = (const guint8*)wmem_strdup_printf(wmem_packet_scope(), "%"G_GUINT64_FORMAT, value.u64);
offset += 8;
break;
case 5:
if (option_length != 8) {
expert_add_info(pinfo, option_length_item, &ei_invalid_option_length);
offset += option_length;
break;
}
proto_tree_add_item(option_tree, hf_pcapng_option_data_packet_id, tvb, offset, 8, encoding);
value.u64 = tvb_get_guint64(tvb, offset, encoding);
str = (const guint8*)wmem_strdup_printf(wmem_packet_scope(), "0x%016"G_GINT64_MODIFIER"x", value.u64);
offset += 8;
break;
case 6:
if (option_length != 4) {
expert_add_info(pinfo, option_length_item, &ei_invalid_option_length);
offset += option_length;
break;
}
proto_tree_add_item(option_tree, hf_pcapng_option_data_packet_queue, tvb, offset, 4, encoding);
value.u32 = tvb_get_guint32(tvb, offset, encoding);
str = (const guint8*)wmem_strdup_printf(wmem_packet_scope(), "%u", value.u32);
offset += 4;
break;
case 7:
if (option_length < 1) {
expert_add_info(pinfo, option_length_item, &ei_invalid_option_length);
break;
}
switch (tvb_get_guint8(tvb, offset)) {
case 1:
case 2:
if (option_length != 9) {
expert_add_info(pinfo, option_length_item, &ei_invalid_option_length);
}
break;
default:
break;
}
proto_tree_add_item(option_tree, hf_pcapng_option_data_packet_verdict_type, tvb, offset, 1, ENC_NA);
if (option_length > 1)
proto_tree_add_item(option_tree, hf_pcapng_option_data_packet_verdict_data, tvb, offset + 1, option_length - 1, ENC_NA);
offset += option_length;
break;
case 32769: /* Darwin DPEB ID */
proto_tree_add_item(option_tree, hf_pcapng_option_data_packet_darwin_dpeb_id, tvb, offset, option_length, encoding);
@ -2097,6 +2160,26 @@ proto_register_pcapng(void)
FT_UINT64, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_pcapng_option_data_packet_verdict_type,
{ "Verdict type", "pcapng.options.option.data.packet.verdict.type",
FT_UINT8, BASE_DEC, VALS(packet_verdict_type_vals), 0x00,
NULL, HFILL }
},
{ &hf_pcapng_option_data_packet_verdict_data,
{ "Verdict data", "pcapng.options.option.data.packet.verdict.data",
FT_BYTES, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_pcapng_option_data_packet_queue,
{ "Queue", "pcapng.options.option.data.packet.queue",
FT_UINT32, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_pcapng_option_data_packet_id,
{ "Packet ID", "pcapng.options.option.data.packet.id",
FT_UINT64, BASE_HEX, NULL, 0x00,
NULL, HFILL }
},
{ &hf_pcapng_option_data_packet_drop_count,
{ "Drop Count", "pcapng.options.option.data.packet.drop_count",
FT_UINT64, BASE_DEC, NULL, 0x00,