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

Handle CMD over GRE. 

Bug: 13804
Change-Id: I0d96122a0c7f39315316e4da32c29977e147d3d6
Reviewed-on: https://code.wireshark.org/review/22183
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2017-06-16 20:43:51 -07:00
parent 6cc5655e27
commit e2efa82811
2 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
epan/dissectors/packet-cisco-metadata.c
View File

@ -35,6 +35,8 @@ void proto_reg_handoff_cmd(void);
static dissector_handle_t ethertype_handle;
static dissector_table_t gre_dissector_table;
static int proto_cmd = -1;
static int hf_cmd_version = -1;
@ -48,7 +50,7 @@ static int hf_cmd_trailer = -1;
static gint ett_cmd = -1;
static int
dissect_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
dissect_cmd_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
guint16 encap_proto;
ethertype_data_t ethertype_data;
@ -103,6 +105,41 @@ dissect_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
return tvb_captured_length(tvb);
}
static int
dissect_cmd_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
proto_item *ti = NULL;
proto_tree *cmd_tree = NULL;
guint16 encap_proto;
tvbuff_t *next_tvb;
gint offset = 0;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMD");
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {
ti = proto_tree_add_item(tree, proto_cmd, tvb, 0, 6, ENC_NA);
cmd_tree = proto_item_add_subtree(ti, ett_cmd);
}
encap_proto = tvb_get_ntohs(tvb, 0);
proto_tree_add_item(cmd_tree, hf_eth_type, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(cmd_tree, hf_cmd_version, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cmd_tree, hf_cmd_length, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cmd_tree, hf_cmd_options, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(cmd_tree, hf_cmd_sgt, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
next_tvb = tvb_new_subset_remaining(tvb, offset);
if (!dissector_try_uint(gre_dissector_table, encap_proto, next_tvb, pinfo, tree))
call_data_dissector(next_tvb, pinfo, tree);
return tvb_captured_length(tvb);
}
void
proto_register_cmd(void)
{
@ -139,12 +176,17 @@ proto_register_cmd(void)
void
proto_reg_handoff_cmd(void)
{
dissector_handle_t cmd_handle;
dissector_handle_t cmd_eth_handle;
dissector_handle_t cmd_gre_handle;
ethertype_handle = find_dissector_add_dependency("ethertype", proto_cmd);
cmd_handle = create_dissector_handle(dissect_cmd, proto_cmd);
dissector_add_uint("ethertype", ETHERTYPE_CMD, cmd_handle);
gre_dissector_table = find_dissector_table("gre.proto");
cmd_eth_handle = create_dissector_handle(dissect_cmd_eth, proto_cmd);
cmd_gre_handle = create_dissector_handle(dissect_cmd_gre, proto_cmd);
dissector_add_uint("ethertype", ETHERTYPE_CMD, cmd_eth_handle);
dissector_add_uint("gre.proto", ETHERTYPE_CMD, cmd_gre_handle);
}
/*

1
epan/dissectors/packet-gre.c
View File

@ -140,6 +140,7 @@ const value_string gre_typevals[] = {
{ ETHERTYPE_NSH, "Network Service Header" },
{ ETHERTYPE_CDMA2000_A10_UBS,"CDMA2000 A10 Unstructured byte stream" },
{ ETHERTYPE_3GPP2, "CDMA2000 A10 3GPP2 Packet" },
{ ETHERTYPE_CMD, "CiscoMetaData" },
{ GRE_ARUBA_8200, "ARUBA WLAN" },
{ GRE_ARUBA_8210, "ARUBA WLAN" },
{ GRE_ARUBA_8220, "ARUBA WLAN" },