diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-05-20 18:41:46 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-05-20 18:41:46 +0000 |
| commit | 9327da8ffa0001ce618c2b47dd860fa7c0fa786c (patch) | |
| tree | e30d5fbdab2597fde57e5fa2a363e285c0f1f54b /epan/dissectors/packet-ieee17221.c | |
| parent | 631b77e47a59a5aae37a8fd36eb2aa772a6984f9 (diff) | |
From Tom Bottom:
Addition of STREAM_VLAN_ID field to GET_STREAM_INFO and SET_STREAM_INFO pdu in packet-ieee17221.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8698
svn path=/trunk/; revision=49450
Diffstat (limited to 'epan/dissectors/packet-ieee17221.c')
| -rw-r--r-- | epan/dissectors/packet-ieee17221.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c index ee5732f3fd..13e21a55c4 100644 --- a/epan/dissectors/packet-ieee17221.c +++ b/epan/dissectors/packet-ieee17221.c @@ -1,6 +1,6 @@ /* packet-ieee17221.c * Dissector for IEEE P1722.1 - * Copyright 2011-2012, Thomas Bottom <tom.bottom@labxtechnologies.com> + * Copyright 2011-2013, Thomas Bottom <tom.bottom@labxtechnologies.com> * Chris Pane <chris.pane@labxtechnologies.com> * Chris Wulff <chris.wulff@labxtechnologies.com> * @@ -32,7 +32,6 @@ * This file uses 3 space indentation */ - #include "config.h" /* #include <stdio.h> */ @@ -275,6 +274,7 @@ #define AECP_OFFSET_STREAM_INFO_STREAM_DEST_MAC 52 #define AECP_OFFSET_STREAM_INFO_MSRP_FAILURE_CODE 58 #define AECP_OFFSET_STREAM_INFO_MSRP_FAILURE_BRIDGE_ID 60 +#define AECP_OFFSET_STREAM_INFO_STREAM_VLAN_ID 68 /* GET/SET_NAME */ #define AECP_OFFSET_NAME_DESCRIPTOR_TYPE 24 @@ -2014,6 +2014,7 @@ static int hf_aecp_msrp_acc_lat_valid_flag = -1; static int hf_aecp_msrp_accumulated_latency = -1; static int hf_aecp_msrp_failure_bridge_id = -1; static int hf_aecp_msrp_failure_code = -1; +static int hf_aecp_stream_vlan_id = -1; static int hf_aecp_name = -1; static int hf_aecp_name_index = -1; static int hf_aecp_number_of_maps = -1; @@ -3886,6 +3887,7 @@ dissect_17221_aecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aecp_tree) proto_tree_add_item(aecp_tree, hf_aecp_descriptor_index, tvb, AECP_OFFSET_STREAM_INFO_DESCRIPTOR_INDEX, 2, ENC_BIG_ENDIAN); if ((mess_type == AECP_AEM_RESPONSE_MESSAGE) || (c_type == AECP_COMMAND_SET_STREAM_INFO)) { + /* FLAGS */ proto_tree_add_item(aecp_tree, hf_acmp_flags_class_b, tvb, AECP_OFFSET_STREAM_INFO_FLAGS, 4, ENC_BIG_ENDIAN); proto_tree_add_item(aecp_tree, hf_acmp_flags_fast_connect, tvb, @@ -3916,6 +3918,9 @@ dissect_17221_aecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aecp_tree) AECP_OFFSET_STREAM_INFO_MSRP_FAILURE_CODE, 1, ENC_NA); proto_tree_add_item(aecp_tree, hf_aecp_msrp_failure_bridge_id, tvb, AECP_OFFSET_STREAM_INFO_MSRP_FAILURE_BRIDGE_ID, 8, ENC_NA); + + proto_tree_add_item(aecp_tree, hf_aecp_stream_vlan_id, tvb, + AECP_OFFSET_STREAM_INFO_STREAM_VLAN_ID, 2, ENC_BIG_ENDIAN); } break; case AECP_COMMAND_SET_NAME: @@ -5206,6 +5211,10 @@ proto_register_17221(void) {"MSRP Failure Bridge ID", "ieee17221.msrp_failure_bridge_id", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + { &hf_aecp_stream_vlan_id, + {"Stream VLAN ID", "ieee17221.stream_vlan_id", + FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } + }, { &hf_aecp_connected_flag, {"Connected Flag", "ieee17221.flags.connected", FT_BOOLEAN, 32, NULL, AECP_CONNECTED_FLAG_MASK, NULL, HFILL } |