aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sll.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-sll.c')
-rw-r--r--epan/dissectors/packet-sll.c235
1 files changed, 115 insertions, 120 deletions
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
index a32d565314..3c1485d14e 100644
--- a/epan/dissectors/packet-sll.c
+++ b/epan/dissectors/packet-sll.c
@@ -7,9 +7,6 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-
-#define NEW_PROTO_TREE_API
-
#include "config.h"
#include <epan/packet.h>
@@ -77,6 +74,7 @@ static const value_string ltype_vals[] = {
{ LINUX_SLL_P_IRDA_LAP, "IrDA LAP" },
{ LINUX_SLL_P_ISI, "ISI" },
{ LINUX_SLL_P_IEEE802154, "IEEE 802.15.4" },
+ { LINUX_SLL_P_MCTP, "MCTP" },
{ 0, NULL }
};
@@ -86,72 +84,23 @@ static dissector_handle_t sll2_handle;
static dissector_handle_t ethertype_handle;
static dissector_handle_t netlink_handle;
-static header_field_info *hfi_sll = NULL;
-
static int proto_sll;
-static int sll_tap = -1;
-
-#define SLL_HFI_INIT HFI_INIT(proto_sll)
-
-static header_field_info hfi_sll_pkttype SLL_HFI_INIT =
- { "Packet type", "sll.pkttype", FT_UINT16, BASE_DEC,
- VALS(packet_type_vals), 0x0, NULL, HFILL };
-
-/* ARP hardware type? With Linux extensions? */
-static header_field_info hfi_sll_hatype SLL_HFI_INIT =
- { "Link-layer address type", "sll.hatype", FT_UINT16, BASE_DEC,
- VALS(arp_hrd_vals), 0x0, NULL, HFILL };
-
-static header_field_info hfi_sll_halen SLL_HFI_INIT =
- { "Link-layer address length", "sll.halen", FT_UINT16, BASE_DEC,
- NULL, 0x0, NULL, HFILL };
-
-/* Source address if it's an Ethernet-type address */
-static header_field_info hfi_sll_src_eth SLL_HFI_INIT =
- { "Source", "sll.src.eth", FT_ETHER, BASE_NONE,
- NULL, 0x0, "Source link-layer address", HFILL };
-
-/* Source address if it's an IPv4 address */
-static header_field_info hfi_sll_src_ipv4 SLL_HFI_INIT =
- { "Source", "sll.src.ipv4", FT_IPv4, BASE_NONE,
- NULL, 0x0, "Source link-layer address", HFILL };
-
-/* Source address if it's not an Ethernet-type address */
-static header_field_info hfi_sll_src_other SLL_HFI_INIT =
- { "Source", "sll.src.other", FT_BYTES, BASE_NONE,
- NULL, 0x0, "Source link-layer address", HFILL };
-
-/* Unused remaining bytes */
-static header_field_info hfi_sll_unused SLL_HFI_INIT =
- { "Unused", "sll.unused", FT_BYTES, BASE_NONE,
- NULL, 0x0, "Unused bytes", HFILL };
-
-/* if the protocol field is an internal Linux protocol type */
-static header_field_info hfi_sll_ltype SLL_HFI_INIT =
- { "Protocol", "sll.ltype", FT_UINT16, BASE_HEX,
- VALS(ltype_vals), 0x0, "Linux protocol type", HFILL };
-
-/* if the protocol field is a GRE protocol type */
-static header_field_info hfi_sll_gretype SLL_HFI_INIT =
- { "Protocol", "sll.gretype", FT_UINT16, BASE_HEX,
- VALS(gre_typevals), 0x0, "GRE protocol type", HFILL };
-
-/* registered here but handled in ethertype.c */
-static header_field_info hfi_sll_etype SLL_HFI_INIT =
- { "Protocol", "sll.etype", FT_UINT16, BASE_HEX,
- VALS(etype_vals), 0x0, "Ethernet protocol type", HFILL };
-
-static header_field_info hfi_sll_trailer SLL_HFI_INIT =
- { "Trailer", "sll.trailer", FT_BYTES, BASE_NONE,
- NULL, 0x0, NULL, HFILL };
-
-/* SLL2 only */
-static header_field_info hfi_sll_ifindex SLL_HFI_INIT =
- { "Interface index", "sll.ifindex", FT_UINT16, BASE_DEC,
- NULL, 0x0, NULL, HFILL };
-
-
-static gint ett_sll = -1;
+static int sll_tap;
+
+static int hf_sll_etype;
+static int hf_sll_gretype;
+static int hf_sll_halen;
+static int hf_sll_hatype;
+static int hf_sll_ifindex;
+static int hf_sll_ltype;
+static int hf_sll_pkttype;
+static int hf_sll_src_eth;
+static int hf_sll_src_ipv4;
+static int hf_sll_src_other;
+static int hf_sll_trailer;
+static int hf_sll_unused;
+
+static gint ett_sll;
static dissector_table_t sll_hatype_dissector_table;
static dissector_table_t sll_ltype_dissector_table;
@@ -159,7 +108,7 @@ static dissector_table_t gre_dissector_table;
static void sll_prompt(packet_info *pinfo, gchar* result)
{
- g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "SLL protocol type 0x%04x as",
+ snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "SLL protocol type 0x%04x as",
GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_sll, 0)));
}
@@ -186,45 +135,49 @@ static const char* sll_conv_get_filter_type(conv_item_t* conv, conv_filter_type_
}
static ct_dissector_info_t sll_ct_dissector_info = {&sll_conv_get_filter_type};
-static address no_dst = {AT_NONE, 0, NULL, NULL};
+static address no_dst = ADDRESS_INIT_NONE;
static tap_packet_status
-sll_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
+sll_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags)
{
conv_hash_t *hash = (conv_hash_t*) pct;
+ hash->flags = flags;
+
const sll_tap_data *tap_data = (const sll_tap_data*)vip;
- add_conversation_table_data(hash, &tap_data->src_address, &no_dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &sll_ct_dissector_info, ENDPOINT_NONE);
+ add_conversation_table_data(hash, &tap_data->src_address, &no_dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &sll_ct_dissector_info, CONVERSATION_NONE);
return TAP_PACKET_REDRAW;
}
-static const char* sll_host_get_filter_type(hostlist_talker_t* host, conv_filter_type_e filter)
+static const char* sll_endpoint_get_filter_type(endpoint_item_t* endpoint, conv_filter_type_e filter)
{
- if ((filter == CONV_FT_SRC_ADDRESS) && (host->myaddress.type == AT_ETHER))
+ if ((filter == CONV_FT_SRC_ADDRESS) && (endpoint->myaddress.type == AT_ETHER))
return "sll.src.eth";
- if ((filter == CONV_FT_ANY_ADDRESS) && (host->myaddress.type == AT_ETHER))
+ if ((filter == CONV_FT_ANY_ADDRESS) && (endpoint->myaddress.type == AT_ETHER))
return "sll.src.eth";
- if ((filter == CONV_FT_SRC_ADDRESS) && (host->myaddress.type == AT_IPv4))
+ if ((filter == CONV_FT_SRC_ADDRESS) && (endpoint->myaddress.type == AT_IPv4))
return "sll.src.ipv4";
- if ((filter == CONV_FT_ANY_ADDRESS) && (host->myaddress.type == AT_IPv4))
+ if ((filter == CONV_FT_ANY_ADDRESS) && (endpoint->myaddress.type == AT_IPv4))
return "sll.src.ipv4";
return CONV_FILTER_INVALID;
}
-static hostlist_dissector_info_t sll_host_dissector_info = {&sll_host_get_filter_type};
+static et_dissector_info_t sll_endpoint_dissector_info = {&sll_endpoint_get_filter_type};
static tap_packet_status
-sll_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
+sll_endpoint_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags)
{
conv_hash_t *hash = (conv_hash_t*) pit;
+ hash->flags = flags;
+
const sll_tap_data *tap_data = (const sll_tap_data*)vip;
- add_hostlist_table_data(hash, &tap_data->src_address, 0, TRUE, 1, pinfo->fd->pkt_len, &sll_host_dissector_info, ENDPOINT_NONE);
+ add_endpoint_table_data(hash, &tap_data->src_address, 0, TRUE, 1, pinfo->fd->pkt_len, &sll_endpoint_dissector_info, ENDPOINT_NONE);
return TAP_PACKET_REDRAW;
}
@@ -293,33 +246,33 @@ add_ll_address(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
* For now, we just assume ha_len 4 is IPv4 and ha_len 6
* is Ethernet.
*/
- proto_tree_add_item_ret_uint(tree, &hfi_sll_halen, tvb, halen_offset, halen_len, ENC_BIG_ENDIAN, &ha_len);
+ proto_tree_add_item_ret_uint(tree, hf_sll_halen, tvb, halen_offset, halen_len, ENC_BIG_ENDIAN, &ha_len);
switch (ha_len) {
case 4:
set_address_tvb(&pinfo->dl_src, AT_IPv4, 4, tvb, ha_offset);
copy_address_shallow(&pinfo->src, &pinfo->dl_src);
copy_address_wmem(wmem_file_scope(), &tap_data->src_address, &pinfo->src);
- proto_tree_add_item(tree, &hfi_sll_src_ipv4, tvb, ha_offset, 4, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_sll_src_ipv4, tvb, ha_offset, 4, ENC_BIG_ENDIAN);
break;
case 6:
set_address_tvb(&pinfo->dl_src, AT_ETHER, 6, tvb, ha_offset);
copy_address_shallow(&pinfo->src, &pinfo->dl_src);
copy_address_wmem(wmem_file_scope(), &tap_data->src_address, &pinfo->src);
- proto_tree_add_item(tree, &hfi_sll_src_eth, tvb, ha_offset, 6, ENC_NA);
+ proto_tree_add_item(tree, hf_sll_src_eth, tvb, ha_offset, 6, ENC_NA);
break;
case 0:
break;
default:
- proto_tree_add_item(tree, &hfi_sll_src_other, tvb,
+ proto_tree_add_item(tree, hf_sll_src_other, tvb,
ha_offset, ha_len > 8 ? 8 : ha_len, ENC_NA);
break;
}
/* Not all bytes of SLL_ADDRLEN have been used. Add remaining as unused */
if (ha_len < SLL_ADDRLEN)
- proto_tree_add_item(tree, &hfi_sll_unused, tvb, ha_offset + ha_len,
- SLL_ADDRLEN - ha_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_sll_unused, tvb, ha_offset + ha_len,
+ SLL_ADDRLEN - ha_len, ENC_NA);
}
static guint16
@@ -337,7 +290,7 @@ add_protocol_type(proto_tree *fh_tree, tvbuff_t *tvb, int protocol_offset,
* be trailer data.
* XXX - do the same thing we do for packets with Ethertypes?
*/
- proto_tree_add_uint(fh_tree, &hfi_sll_ltype, tvb,
+ proto_tree_add_uint(fh_tree, hf_sll_ltype, tvb,
protocol_offset, 2, protocol);
} else {
switch (hatype) {
@@ -351,12 +304,12 @@ add_protocol_type(proto_tree *fh_tree, tvbuff_t *tvb, int protocol_offset,
* so we can't provide the flags and version to
* the dissector.
*/
- proto_tree_add_uint(fh_tree, &hfi_sll_gretype, tvb,
+ proto_tree_add_uint(fh_tree, hf_sll_gretype, tvb,
protocol_offset, 2, protocol);
break;
default:
- proto_tree_add_uint(fh_tree, &hfi_sll_etype, tvb,
+ proto_tree_add_uint(fh_tree, hf_sll_etype, tvb,
protocol_offset, 2, protocol);
break;
}
@@ -408,7 +361,7 @@ dissect_payload(proto_tree *tree, packet_info *pinfo, proto_tree *fh_tree,
ethertype_data.etype = protocol;
ethertype_data.payload_offset = header_size;
ethertype_data.fh_tree = fh_tree;
- ethertype_data.trailer_id = hfi_sll_trailer.id;
+ ethertype_data.trailer_id = hf_sll_trailer;
ethertype_data.fcs_len = 0;
call_dissector_with_data(ethertype_handle, tvb, pinfo, tree, &ethertype_data);
@@ -499,7 +452,7 @@ dissect_sll_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int enca
col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(pkttype, packet_type_vals, "Unknown (%u)"));
- ti = proto_tree_add_protocol_format(tree, hfi_sll->id, tvb, 0,
+ ti = proto_tree_add_protocol_format(tree, proto_sll, tvb, 0,
header_size, "Linux cooked capture v%d", version);
fh_tree = proto_item_add_subtree(ti, ett_sll);
tap_data = wmem_new0(wmem_file_scope(), sll_tap_data);
@@ -507,9 +460,9 @@ dissect_sll_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int enca
switch (encap) {
case WTAP_ENCAP_SLL:
- proto_tree_add_item(fh_tree, &hfi_sll_pkttype, tvb, 0, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(fh_tree, hf_sll_pkttype, tvb, 0, 2, ENC_BIG_ENDIAN);
- proto_tree_add_uint(fh_tree, &hfi_sll_hatype, tvb, 2, 2, hatype);
+ proto_tree_add_uint(fh_tree, hf_sll_hatype, tvb, 2, 2, hatype);
add_ll_address(fh_tree, pinfo, tvb, 4, 2, tap_data);
@@ -521,11 +474,11 @@ dissect_sll_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int enca
case WTAP_ENCAP_SLL2:
protocol = add_protocol_type(fh_tree, tvb, 0, hatype);
- proto_tree_add_item(fh_tree, &hfi_sll_ifindex, tvb, 4, 4, ENC_BIG_ENDIAN);
+ proto_tree_add_item(fh_tree, hf_sll_ifindex, tvb, 4, 4, ENC_BIG_ENDIAN);
- proto_tree_add_uint(fh_tree, &hfi_sll_hatype, tvb, 8, 2, hatype);
+ proto_tree_add_uint(fh_tree, hf_sll_hatype, tvb, 8, 2, hatype);
- proto_tree_add_item(fh_tree, &hfi_sll_pkttype, tvb, 10, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(fh_tree, hf_sll_pkttype, tvb, 10, 1, ENC_BIG_ENDIAN);
add_ll_address(fh_tree, pinfo, tvb, 11, 1, tap_data);
@@ -556,23 +509,68 @@ dissect_sll_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
void
proto_register_sll(void)
{
-#ifndef HAVE_HFI_SECTION_INIT
- static header_field_info *hfi[] = {
- &hfi_sll_pkttype,
- /* ARP hardware type? With Linux extensions? */
- &hfi_sll_hatype,
- &hfi_sll_halen,
- &hfi_sll_src_eth,
- &hfi_sll_src_ipv4,
- &hfi_sll_src_other,
- &hfi_sll_unused,
- &hfi_sll_ltype,
- &hfi_sll_gretype,
- &hfi_sll_etype,
- &hfi_sll_trailer,
- &hfi_sll_ifindex,
+ static hf_register_info hf[] = {
+ { &hf_sll_pkttype,
+ { "Packet type", "sll.pkttype",
+ FT_UINT16, BASE_DEC, VALS(packet_type_vals), 0x0,
+ NULL, HFILL }
+ },
+ { &hf_sll_hatype,
+ { "Link-layer address type", "sll.hatype",
+ FT_UINT16, BASE_DEC, VALS(arp_hrd_vals), 0x0,
+ NULL, HFILL }
+ },
+ { &hf_sll_halen,
+ { "Link-layer address length", "sll.halen",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }
+ },
+ { &hf_sll_src_eth,
+ { "Source", "sll.src.eth",
+ FT_ETHER, BASE_NONE, NULL, 0x0,
+ "Source link-layer address", HFILL }
+ },
+ { &hf_sll_src_ipv4,
+ { "Source", "sll.src.ipv4",
+ FT_IPv4, BASE_NONE, NULL, 0x0,
+ "Source link-layer address", HFILL }
+ },
+ { &hf_sll_src_other,
+ { "Source", "sll.src.other",
+ FT_BYTES, BASE_NONE, NULL, 0x0,
+ "Source link-layer address", HFILL }
+ },
+ { &hf_sll_unused,
+ { "Unused", "sll.unused",
+ FT_BYTES, BASE_NONE, NULL, 0x0,
+ "Unused bytes", HFILL }
+ },
+ { &hf_sll_ltype,
+ { "Protocol", "sll.ltype",
+ FT_UINT16, BASE_HEX, VALS(ltype_vals), 0x0,
+ "Linux protocol type", HFILL }
+ },
+ { &hf_sll_gretype,
+ { "Protocol", "sll.gretype",
+ FT_UINT16, BASE_HEX, VALS(gre_typevals), 0x0,
+ "GRE protocol type", HFILL }
+ },
+ { &hf_sll_etype,
+ { "Protocol", "sll.etype",
+ FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
+ "Ethernet protocol type", HFILL }
+ },
+ { &hf_sll_trailer,
+ { "Trailer", "sll.trailer",
+ FT_BYTES, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }
+ },
+ { &hf_sll_ifindex,
+ { "Interface index", "sll.ifindex",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }
+ },
};
-#endif
static gint *ett[] = {
&ett_sll
@@ -584,15 +582,12 @@ proto_register_sll(void)
static decode_as_t sll_da = {"sll.ltype", "sll.ltype", 1, 0, &sll_da_values, NULL, NULL,
decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL};
- proto_sll = proto_register_protocol("Linux cooked-mode capture",
- "SLL", "sll" );
- hfi_sll = proto_registrar_get_nth(proto_sll);
-
- proto_register_fields(proto_sll, hfi, array_length(hfi));
+ proto_sll = proto_register_protocol("Linux cooked-mode capture", "SLL", "sll" );
+ proto_register_field_array(proto_sll, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- sll_handle = create_dissector_handle(dissect_sll_v1, proto_sll);
- sll2_handle = create_dissector_handle(dissect_sll_v2, proto_sll);
+ sll_handle = register_dissector("sll_v1", dissect_sll_v1, proto_sll);
+ sll2_handle = register_dissector("sll_v2", dissect_sll_v2, proto_sll);
sll_tap = register_tap("sll");
/*
@@ -623,7 +618,7 @@ proto_register_sll(void)
);
register_capture_dissector_table("sll.ltype", "Linux SLL protocol");
- register_conversation_table(proto_sll, TRUE, sll_conversation_packet, sll_hostlist_packet);
+ register_conversation_table(proto_sll, TRUE, sll_conversation_packet, sll_endpoint_packet);
register_decode_as(&sll_da);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 19:37:30 +0000