--- a/components/wireshark/patches/Bug12279.patch Thu Sep 29 15:31:04 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-From 5ca557c31e3e799068c4531deaed78792845027d Mon Sep 17 00:00:00 2001
-From: Petr Sumbera <[email protected]>
-Date: Wed, 23 Mar 2016 02:02:34 -0700
-Subject: [PATCH] support for IP-over-Infiniband - pcap encapsulation
-
-Bug: 12279
-Change-Id: Ib6c54f8b86d95c5546bc800749f124cd0dbb8ff0
-Reviewed-on: https://code.wireshark.org/review/14585
-Petri-Dish: Alexis La Goutte <[email protected]>
-Tested-by: Petri Dish Buildbot <[email protected]>
-Reviewed-by: Alexis La Goutte <[email protected]>
----
- epan/dissectors/packet-ipoib.c | 97 +++++++++++++++++++++++++++++++++++-----
- wiretap/pcap-common.c | 2 +-
- wiretap/snoop.c | 2 +-
- wiretap/wtap.h | 3 +-
- 4 files changed, 91 insertions(+), 13 deletions(-)
-
-diff --git a/epan/dissectors/packet-ipoib.c b/epan/dissectors/packet-ipoib.c
-index 7d8c527..91af43a 100644
---- epan/dissectors/packet-ipoib.c
-+++ epan/dissectors/packet-ipoib.c
-@@ -30,11 +30,21 @@
- void proto_register_ipoib(void);
- void proto_reg_handoff_ipoib(void);
-
--static int proto_ipoib = -1;
--static int hf_type = -1;
--static int hf_reserved = -1;
-+static int proto_ipoib = -1;
-+static int hf_dgid = -1;
-+static int hf_daddr = -1;
-+static int hf_daddr_qpn = -1;
-+static int hf_grh = -1;
-+static int hf_grh_ip_version = -1;
-+static int hf_grh_traffic_class = -1;
-+static int hf_grh_flow_label = -1;
-+static int hf_grh_sqpn = -1;
-+static int hf_grh_sgid = -1;
-+static int hf_type = -1;
-+static int hf_reserved = -1;
-
- static gint ett_raw = -1;
-+static gint ett_hdr = -1;
-
- static dissector_handle_t arp_handle;
- static dissector_handle_t ip_handle;
-@@ -44,9 +54,14 @@
- dissect_ipoib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
- {
- proto_tree *fh_tree;
-+ proto_tree *fh_subtree;
- proto_item *ti;
- tvbuff_t *next_tvb;
- guint16 type;
-+ int grh_size = 0;
-+
-+ if (pinfo->phdr->pkt_encap == WTAP_ENCAP_IP_OVER_IB_PCAP)
-+ grh_size = 40;
-
- /* load the top pane info. This should be overwritten by
- the next protocol in the stack */
-@@ -55,16 +70,40 @@ dissect_ipoib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
-
- /* populate a tree in the second pane with the IPoIB header data */
- if (tree) {
-- ti = proto_tree_add_item (tree, proto_ipoib, tvb, 0, 4, ENC_NA);
-+ ti = proto_tree_add_item (tree, proto_ipoib, tvb, 0, grh_size + 4, ENC_NA);
- fh_tree = proto_item_add_subtree(ti, ett_raw);
-
-- proto_tree_add_item(fh_tree, hf_type, tvb, 0, 2, ENC_BIG_ENDIAN);
-- proto_tree_add_item(fh_tree, hf_reserved, tvb, 2, 2, ENC_BIG_ENDIAN);
-+ /* for PCAP data populate subtree with GRH pseudo header data */
-+ if (pinfo->phdr->pkt_encap == WTAP_ENCAP_IP_OVER_IB_PCAP) {
-+
-+ /* Zero means GRH is not valid (unicast). Only destination
-+ address is set. */
-+ if (tvb_get_ntohs(tvb, 0) == 0) {
-+ ti = proto_tree_add_item (fh_tree, hf_daddr, tvb, 20, 20, ENC_NA);
-+ fh_subtree = proto_item_add_subtree(ti, ett_hdr);
-+
-+ proto_tree_add_item(fh_subtree, hf_daddr_qpn, tvb, 21, 3, ENC_BIG_ENDIAN);
-+ proto_tree_add_item(fh_subtree, hf_dgid, tvb, 24, 16, ENC_NA);
-+ } else {
-+ ti = proto_tree_add_item (fh_tree, hf_grh, tvb, 0, 40, ENC_NA);
-+ fh_subtree = proto_item_add_subtree(ti, ett_hdr);
-+
-+ proto_tree_add_item(fh_subtree, hf_grh_ip_version, tvb, 0, 1, ENC_BIG_ENDIAN);
-+ proto_tree_add_item(fh_subtree, hf_grh_traffic_class, tvb, 0, 2, ENC_BIG_ENDIAN);
-+ proto_tree_add_item(fh_subtree, hf_grh_flow_label,tvb, 0, 4, ENC_BIG_ENDIAN);
-+ proto_tree_add_item(fh_subtree, hf_grh_sqpn, tvb, 5, 3, ENC_BIG_ENDIAN);
-+ proto_tree_add_item(fh_subtree, hf_grh_sgid, tvb, 8, 16, ENC_NA);
-+ proto_tree_add_item(fh_subtree, hf_dgid, tvb, 24, 16, ENC_NA);
-+ }
-+ }
-+
-+ proto_tree_add_item(fh_tree, hf_type, tvb, grh_size + 0, 2, ENC_BIG_ENDIAN);
-+ proto_tree_add_item(fh_tree, hf_reserved, tvb, grh_size + 2, 2, ENC_BIG_ENDIAN);
- }
-
-- next_tvb = tvb_new_subset_remaining(tvb, 4);
-+ next_tvb = tvb_new_subset_remaining(tvb, grh_size + 4);
-
-- type = tvb_get_ntohs(tvb, 0);
-+ type = tvb_get_ntohs(tvb, grh_size + 0);
- switch (type) {
- case ETHERTYPE_IP:
- call_dissector(ip_handle, next_tvb, pinfo, tree);
-@@ -85,6 +124,42 @@ void
- proto_register_ipoib(void)
- {
- static hf_register_info hf[] = {
-+ { &hf_daddr,
-+ { "Destination address", "ipoib.daddr",
-+ FT_NONE, BASE_NONE, NULL, 0x0,
-+ NULL, HFILL}},
-+ { &hf_daddr_qpn,
-+ { "Destination QPN", "ipoib.daddr.qpn",
-+ FT_UINT24, BASE_HEX, NULL, 0x0,
-+ NULL, HFILL}},
-+ { &hf_dgid,
-+ { "Destination GID", "ipoib.dgid",
-+ FT_IPv6, BASE_NONE, NULL, 0x0,
-+ NULL, HFILL }},
-+ { &hf_grh,
-+ { "Global Route Header", "ipoib.grh",
-+ FT_NONE, BASE_NONE, NULL, 0x0,
-+ NULL, HFILL}},
-+ { &hf_grh_ip_version, {
-+ "IP Version", "ipoib.grh.ipver",
-+ FT_UINT8, BASE_DEC, NULL, 0xF0,
-+ NULL, HFILL}},
-+ { &hf_grh_traffic_class, {
-+ "Traffic Class", "ipoib.grh.tclass",
-+ FT_UINT16, BASE_DEC, NULL, 0x0FF0,
-+ NULL, HFILL}},
-+ { &hf_grh_flow_label, {
-+ "Flow Label", "ipoib.grh.flowlabel",
-+ FT_UINT32, BASE_DEC, NULL, 0x000FFFFF,
-+ NULL, HFILL}},
-+ { &hf_grh_sqpn,
-+ { "Source QPN", "ipoib.grh.sqpn",
-+ FT_UINT24, BASE_HEX, NULL, 0x0,
-+ NULL, HFILL}},
-+ { &hf_grh_sgid,
-+ { "Source GID", "ipoib.grh.sgid",
-+ FT_IPv6, BASE_NONE, NULL, 0x0,
-+ NULL, HFILL }},
- { &hf_type,
- { "Type", "ipoib.type",
- FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
-@@ -96,7 +171,8 @@ proto_register_ipoib(void)
- };
-
- static gint *ett[] = {
-- &ett_raw
-+ &ett_raw,
-+ &ett_hdr
- };
-
- proto_ipoib = proto_register_protocol("IP over Infiniband", "IPoIB", "ipoib");
-@@ -117,7 +193,8 @@
- ipv6_handle = find_dissector("ipv6");
-
- ipoib_handle = create_dissector_handle(dissect_ipoib, proto_ipoib);
-- dissector_add_uint("wtap_encap", WTAP_ENCAP_IP_OVER_IB, ipoib_handle);
-+ dissector_add_uint("wtap_encap", WTAP_ENCAP_IP_OVER_IB_SNOOP, ipoib_handle);
-+ dissector_add_uint("wtap_encap", WTAP_ENCAP_IP_OVER_IB_PCAP, ipoib_handle);
- }
-
- /*
-diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
-index 9d6826b..297387a 100644
---- wiretap/pcap-common.c
-+++ wiretap/pcap-common.c
-@@ -400,7 +400,7 @@ static const struct {
- /* netANALYZER pseudo-header in transparent mode */
- { 241, WTAP_ENCAP_NETANALYZER_TRANSPARENT },
- /* IP-over-Infiniband, as specified by RFC 4391 section 6 */
-- { 242, WTAP_ENCAP_IP_OVER_IB },
-+ { 242, WTAP_ENCAP_IP_OVER_IB_PCAP },
- /* ISO/IEC 13818-1 MPEG2-TS packets */
- { 243, WTAP_ENCAP_MPEG_2_TS },
- /* NFC LLCP */
-diff --git a/wiretap/snoop.c b/wiretap/snoop.c
-index da88bb4..3a7cc9e 100644
---- wiretap/snoop.c
-+++ wiretap/snoop.c
-@@ -210,7 +210,7 @@ wtap_open_return_val snoop_open(wtap *wth, int *err, gchar **err_info)
- WTAP_ENCAP_UNKNOWN, /* 100VG-AnyLAN Token Ring */
- WTAP_ENCAP_UNKNOWN, /* "ISO 8802/3 and Ethernet" */
- WTAP_ENCAP_UNKNOWN, /* 100BaseT (but that's just Ethernet) */
-- WTAP_ENCAP_IP_OVER_IB, /* Infiniband */
-+ WTAP_ENCAP_IP_OVER_IB_SNOOP, /* Infiniband */
- };
- #define NUM_SNOOP_ENCAPS (sizeof snoop_encap / sizeof snoop_encap[0])
- #define SNOOP_PRIVATE_BIT 0x80000000
-diff --git a/wiretap/wtap.h b/wiretap/wtap.h
-index 169f26c..3e10101 100644
---- wiretap/wtap.h
-+++ wiretap/wtap.h
-@@ -223,7 +223,7 @@
- #define WTAP_ENCAP_MIME 134
- #define WTAP_ENCAP_NETANALYZER 135
- #define WTAP_ENCAP_NETANALYZER_TRANSPARENT 136
--#define WTAP_ENCAP_IP_OVER_IB 137
-+#define WTAP_ENCAP_IP_OVER_IB_SNOOP 137
- #define WTAP_ENCAP_MPEG_2_TS 138
- #define WTAP_ENCAP_PPP_ETHER 139
- #define WTAP_ENCAP_NFC_LLCP 140
-@@ -264,6 +264,7 @@
- #define WTAP_ENCAP_LOOP 175
- #define WTAP_ENCAP_JSON 176
- #define WTAP_ENCAP_NSTRACE_3_5 177
-+#define WTAP_ENCAP_IP_OVER_IB_PCAP 180
- /* After adding new item here, please also add new item to encap_table_base array */
-
- #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types()
--- a/components/wireshark/patches/evb.patch Thu Sep 29 15:31:04 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,673 +0,0 @@
-Patch origin: in-house
-Patch status: Will be sent to upstream.
-
-Oracle Solaris ECP/VDP dissection based on IEEE 802.1Qbg Draft 2.1.
-
-Index: epan/oui.h
-===================================================================
---- epan/oui.h (revision 41973)
-+++ epan/oui.h (working copy)
-@@ -45,6 +45,7 @@
- #define OUI_ERICSSON 0x0001EC /* Ericsson Group */
- #define OUI_CATENA 0x00025A /* Catena Networks */
- #define OUI_ATHEROS 0x00037F /* Atheros Communications */
-+#define OUI_ORACLE 0x0003BA /* Oracle */
- #define OUI_SONY_ERICSSON 0x000AD9 /* Sony Ericsson Mobile Communications AB */
- #define OUI_ARUBA 0x000B86 /* Aruba Networks */
- #define OUI_SONY_ERICSSON_2 0x000E07 /* Sony Ericsson Mobile Communications AB */
-Index: epan/etypes.h
-===================================================================
---- epan/etypes.h (revision 41973)
-+++ epan/etypes.h (working copy)
-@@ -538,6 +538,10 @@
- #define ETHERTYPE_HSR 0x892F /* High-availability Seamless Redundancy (IEC62439 Part 3) */
- #endif
-
-+#ifndef ETHERTYPE_ECP
-+#define ETHERTYPE_ECP 0x8940 /* Edge Control Protocol */
-+#endif
-+
- #ifndef ETHERTYPE_LOOP
- #define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */
- #endif
-Index: epan/dissectors/packet-ecp.c
-===================================================================
---- epan/dissectors/packet-ecp.c (revision 0)
-+++ epan/dissectors/packet-ecp.c (revision 0)
-@@ -0,0 +1,624 @@
-+/* packet-ecp.c
-+ * Routines for Solaris ECP/VDP dissection based on IEEE 802.1Qbg Draft 2.1
-+ *
-+ * Wireshark - Network traffic analyzer
-+ * By Gerald Combs <[email protected]>
-+ * Copyright 1998 Gerald Combs
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
-+#include <stdio.h>
-+#include <epan/packet.h>
-+#include <epan/etypes.h>
-+#include <epan/to_str.h>
-+#include <epan/oui.h>
-+
-+static int proto_ecp = -1;
-+static int hf_ecp_version = -1;
-+static int hf_ecp_op = -1;
-+static int hf_ecp_subtype = -1;
-+static int hf_ecp_seqno = -1;
-+
-+static int proto_vdp = -1;
-+static int hf_vdp_tlv_type = -1;
-+static int hf_vdp_tlv_len = -1;
-+static int hf_vdp_tlv_len_invalid = -1;
-+static int hf_vdp_tlv_assoc_reason = -1;
-+static int hf_vdp_tlv_org_oui = -1;
-+static int hf_vdp_vidstr = -1;
-+static int hf_vdp_vsitypeid = -1;
-+static int hf_vdp_vsiversion = -1;
-+static int hf_vdp_vsiid_format = -1;
-+static int hf_vdp_vsiid = -1;
-+static int hf_vdp_filter_format = -1;
-+
-+static int hf_oui_oracle_subtype = -1;
-+static int hf_oui_oracle_encoding = -1;
-+
-+static gint ett_ecp = -1;
-+static gint ett_vdp_tlv = -1;
-+static gint ett_vdp_tlv_mgrid = -1;
-+static gint ett_vdp_tlv_assoc = -1;
-+static gint ett_vdp_tlv_org = -1;
-+
-+static dissector_handle_t data_handle;
-+
-+#define ECP_OP_REQ 0x0
-+#define ECP_OP_ACK 0x1
-+
-+#define ECP_SUBTYPE_VDP 0x0001
-+#define ECP_SUBTYPE_PECSP 0x0002
-+
-+#define VDP_TLV_PREASSOC 0x01
-+#define VDP_TLV_PREASSOCRR 0x02
-+#define VDP_TLV_ASSOC 0x03
-+#define VDP_TLV_DEASSOC 0x04
-+#define VDP_TLV_MGRID 0x05
-+#define VDP_TLV_ORG 0x7F
-+
-+#define VSI_FMT_IPv4 0x01
-+#define VSI_FMT_IPv6 0x02
-+#define VSI_FMT_MAC 0x03
-+#define VSI_FMT_LOCAL 0x04
-+#define VSI_FMT_UUID 0x05
-+
-+#define VDP_FILTER_VID 0x01
-+#define VDP_FILTER_MACVID 0x02
-+#define VDP_FILTER_GRPVID 0x03
-+#define VDP_FILTER_GRPMACVID 0x04
-+
-+/* Masks - from packet-lldp.c */
-+#define TLV_TYPE_MASK 0xFE00
-+#define TLV_TYPE(value) (((value) & TLV_TYPE_MASK) >> 9)
-+#define TLV_INFO_LEN_MASK 0x01FF
-+#define TLV_INFO_LEN(value) ((value) & TLV_INFO_LEN_MASK)
-+
-+#define ECP_VERSION_MASK 0xF000
-+#define ECP_OP_MASK 0x0C00
-+#define ECP_SUBTYPE_MASK 0x03FF
-+
-+#define ECP_VERSION(value) (((value) & ECP_VERSION_MASK) >> 12)
-+#define ECP_OP(value) (((value) & ECP_OP_MASK) >> 10)
-+#define ECP_SUBTYPE(value) (((value) & ECP_SUBTYPE_MASK))
-+
-+#define OUI_ORACLE_VSIMGR_SUBTYPE 0x01
-+
-+/*
-+ * Hash table for translating OUIs to a dissector table/field info pair;
-+ * the dissector table maps PID values to dissectors, and the field
-+ * corresponds to the PID for that OUI.
-+ */
-+typedef struct {
-+ dissector_table_t table;
-+ hf_register_info *field_info;
-+} oui_info_t;
-+
-+static GHashTable *oui_info_table = NULL;
-+
-+static const value_string ecp_op_vals[] = {
-+ { ECP_OP_REQ, "ECP request" },
-+ { ECP_OP_ACK, "ECP acknowledgement" },
-+ { 0, NULL }
-+};
-+
-+static const value_string ecp_subtype_vals[] = {
-+ { ECP_SUBTYPE_VDP, "VDP" },
-+ { 0, NULL }
-+};
-+
-+static const value_string vdp_tlv_type_vals[] = {
-+ { VDP_TLV_PREASSOC, "PreAssociate" },
-+ { VDP_TLV_PREASSOCRR, "PreAssociate with RR" },
-+ { VDP_TLV_ASSOC, "Associate" },
-+ { VDP_TLV_DEASSOC, "DeAssociate" },
-+ { VDP_TLV_MGRID, "VSI Manager ID" },
-+ { VDP_TLV_ORG, "Orgnaizationally defined TLV" },
-+ { 0x0, NULL }
-+};
-+
-+static const value_string vdp_tlv_oui_vals[] = {
-+ { OUI_ORACLE, "Oracle" },
-+ { 0x0, NULL }
-+};
-+
-+static const value_string oui_oracle_subtype_vals[] = {
-+ { OUI_ORACLE_VSIMGR_SUBTYPE, "VSI Manager Subtype" },
-+ { 0x0, NULL }
-+};
-+
-+static const value_string oui_oracle_encoding_vals[] = {
-+ { 0x1, "oracle_vsi_v1" },
-+ { 0x0, NULL }
-+};
-+
-+static const value_string vdp_response_error_type_vals[] = {
-+ { 0x0, "Success" },
-+ { 0x1, "Invalid Format" },
-+ { 0x2, "Insufficient Resource" },
-+ { 0x3, "Unable to Contact VSI Manager" },
-+ { 0x4, "Other Failure" },
-+ { 0x5, "Invalid VID, GroupID, or Mac address" },
-+ { 0x0, NULL }
-+};
-+
-+static const value_string vdp_vsiid_format_vals[] = {
-+ { VSI_FMT_IPv4, "IPv4" },
-+ { VSI_FMT_IPv6, "IPv6" },
-+ { VSI_FMT_MAC, "MAC" },
-+ { VSI_FMT_LOCAL, "Local" },
-+ { VSI_FMT_UUID, "UUID" },
-+ { 0x0, NULL }
-+};
-+
-+static const value_string vdp_filter_format_vals[] = {
-+ { VDP_FILTER_VID, "VID" },
-+ { VDP_FILTER_MACVID, "MAC/VID" },
-+ { VDP_FILTER_GRPVID, "GroupID/VID" },
-+ { VDP_FILTER_GRPMACVID, "GroupID/MAC/VID" },
-+ { 0x0, NULL }
-+};
-+
-+static const true_false_string tfs_tlv_len_invalid = {
-+ "",
-+ ""
-+};
-+
-+
-+static void
-+vdp_add_vidstr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, proto_item *ti)
-+{
-+ guint16 val;
-+ guint ps, pcp, vid;
-+
-+ val = tvb_get_ntohs(tvb, offset);
-+ ps = (val >> 12) & 0x8;
-+ pcp = (val >> 12) & 0x7;
-+ vid = val & 0x0FFF;
-+ if (tree) {
-+ if (ti == NULL)
-+ proto_tree_add_bytes_format_value(tree, hf_vdp_vidstr, tvb, offset, 2, NULL,
-+ "PS %u, PCP %u, VID %u", ps, pcp, vid);
-+ else
-+ proto_item_append_text(ti,
-+ "PS %u, PCP %u, VID %u", ps, pcp, vid);
-+ }
-+}
-+
-+static gint32
-+dissect_vdp_tlv_assoc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset, guint8 tlvtype)
-+{
-+ proto_tree *vdp_tlv_assoc_tree;
-+ proto_item *ti;
-+ guint16 tlvhdr;
-+ guint32 tlvlen = 0;
-+ guint8 reason, flags;
-+ gboolean request;
-+
-+ if (tree) {
-+ if (tlvtype == VDP_TLV_ASSOC)
-+ vdp_tlv_assoc_tree = proto_tree_add_subtree(tree, tvb, offset, 2,
-+ ett_vdp_tlv_assoc, &ti, "VDP Associate");
-+ else
-+ vdp_tlv_assoc_tree = proto_tree_add_subtree(tree, tvb, offset, 2,
-+ ett_vdp_tlv_assoc, &ti, "VDP DeAssociate");
-+ }
-+
-+ tlvhdr = tvb_get_ntohs(tvb, offset);
-+ tlvlen = TLV_INFO_LEN(tlvhdr);
-+ offset += 2;
-+
-+ /* Reason */
-+ reason = tvb_get_bits8(tvb, offset, 8);
-+ flags = reason >> 4;
-+ request = !(flags & 0x4);
-+ if (tree) {
-+ ti = proto_tree_add_item(vdp_tlv_assoc_tree,
-+ hf_vdp_tlv_assoc_reason, tvb, offset, 1, ENC_BIG_ENDIAN);
-+ if (request) {
-+ proto_item_append_text(ti, " Request");
-+ if (flags != 0) {
-+ proto_item_append_text(ti, "; Flags (%x)",
-+ flags);
-+ if (flags & 0x1)
-+ proto_item_append_text(ti, " M-Bit");
-+ if (flags & 0x2)
-+ proto_item_append_text(ti, " S-Bit");
-+ }
-+ } else {
-+ guint8 error = reason & 0x0F;
-+ const char *errorstr;
-+
-+ proto_item_append_text(ti, " Response");
-+ errorstr = val_to_str(error,
-+ vdp_response_error_type_vals, "Unknown error");
-+ proto_item_append_text(ti, "%s", errorstr);
-+ if ((flags & 0x0F) != 0) {
-+ proto_item_append_text(ti, "; Flags (%x)",
-+ flags);
-+ if (flags & 0x1)
-+ proto_item_append_text(ti,
-+ " Hard Error");
-+ if (flags & 0x2)
-+ proto_item_append_text(ti, " Keep");
-+ }
-+ }
-+ }
-+ offset++;
-+
-+ if (tree) {
-+ guint8 filter_format;
-+ const char *str;
-+
-+ /* VSITYPEID/VERSION */
-+ proto_tree_add_item(vdp_tlv_assoc_tree,
-+ hf_vdp_vsitypeid, tvb, offset, 3, ENC_BIG_ENDIAN);
-+ offset += 3;
-+ proto_tree_add_item(vdp_tlv_assoc_tree,
-+ hf_vdp_vsiversion, tvb, offset, 1, ENC_BIG_ENDIAN);
-+ offset++;
-+
-+ /* VSIID Format */
-+ proto_tree_add_item(vdp_tlv_assoc_tree,
-+ hf_vdp_vsiid_format, tvb, offset, 1, ENC_BIG_ENDIAN);
-+ offset++;
-+
-+ /* VSIID */
-+ str = tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, offset, 16, ':');
-+ proto_tree_add_string(vdp_tlv_assoc_tree, hf_vdp_vsiid, tvb, offset, 16,
-+ str);
-+ offset += 16;
-+
-+ /* Filter Format */
-+ proto_tree_add_item(vdp_tlv_assoc_tree,
-+ hf_vdp_filter_format, tvb, offset, 1, ENC_BIG_ENDIAN);
-+ filter_format = tvb_get_guint8(tvb, offset);
-+ offset++;
-+
-+ switch (filter_format) {
-+ case VDP_FILTER_VID:
-+ vdp_add_vidstr(tvb, vdp_tlv_assoc_tree, offset, NULL);
-+ offset += 2;
-+ break;
-+ case VDP_FILTER_MACVID:
-+ str = tvb_ether_to_str(tvb, offset);
-+ proto_tree_add_subtree_format(vdp_tlv_assoc_tree, tvb,
-+ offset, 6, ett_vdp_tlv_assoc, &ti, "MAC %s. ", str);
-+ offset += 6;
-+ vdp_add_vidstr(tvb, vdp_tlv_assoc_tree, offset, ti);
-+ offset += 2;
-+ break;
-+ }
-+ } else {
-+ offset += 30;
-+ }
-+
-+ return offset;
-+}
-+
-+static gint32
-+dissect_vdp_tlv_mgrid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset)
-+{
-+ proto_tree *vdp_tlv_mgrid_tree = NULL;
-+ proto_item *ti = NULL;
-+ guint16 tlvhdr;
-+ guint32 tlvlen = 0;
-+ const char *str;
-+
-+ if (tree) {
-+ vdp_tlv_mgrid_tree = proto_tree_add_subtree(tree, tvb, offset, 2,
-+ ett_vdp_tlv_mgrid, &ti, "VDP Manager ID");
-+ }
-+
-+ tlvhdr = tvb_get_ntohs(tvb, offset);
-+ tlvlen = TLV_INFO_LEN(tlvhdr);
-+ if (tlvlen != 16) {
-+ if (tree) {
-+ proto_tree_add_boolean(vdp_tlv_mgrid_tree, hf_vdp_tlv_len_invalid, tvb, offset, 2, tlvlen);
-+ }
-+ return -1;
-+ }
-+ offset += 2;
-+
-+ str = tvb_ip6_to_str(tvb, offset);
-+ if (ti != NULL) {
-+ proto_item_append_text(ti, ": %s", str);
-+ }
-+ offset += 16;
-+ return offset;
-+}
-+
-+static gint32
-+dissect_oracle_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset)
-+{
-+ if (tree) {
-+ proto_tree_add_item(tree, hf_oui_oracle_encoding, tvb,
-+ offset, 1, ENC_BIG_ENDIAN);
-+ }
-+
-+ return offset + 1;
-+}
-+
-+static gint32
-+dissect_vdp_tlv_org(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset)
-+{
-+ guint16 tlvhdr;
-+ guint32 tlvlen = 0;
-+ guint32 oui;
-+ guint8 subtype;
-+ const char *ouistr;
-+ const char *subtypestr;
-+
-+ /* TLV header */
-+ tlvhdr = tvb_get_ntohs(tvb, offset);
-+ tlvlen = TLV_INFO_LEN(tlvhdr);
-+ if (tlvlen < 3) {
-+ if (tree) {
-+ proto_tree_add_boolean(tree, hf_vdp_tlv_len_invalid, tvb, offset, 2, tlvlen);
-+ }
-+ return -1;
-+ }
-+ offset += 2;
-+
-+ oui = tvb_get_ntoh24(tvb, offset);
-+ ouistr = val_to_str(oui, vdp_tlv_oui_vals, "Unknown");
-+
-+ /* XXX only support Oracle OUI for now */
-+ if (oui != OUI_ORACLE)
-+ return -1;
-+ offset += 3;
-+
-+ subtype = tvb_get_guint8(tvb, offset);
-+ subtypestr = val_to_str(subtype, oui_oracle_subtype_vals,
-+ "Unknown subtype 0x%x");
-+ offset++;
-+
-+ if (tree) {
-+ proto_tree_add_subtree_format(tree, tvb, offset, 0, ett_vdp_tlv_org, NULL, "%s - %s",
-+ ouistr, subtypestr);
-+ /* XXX create a org tlv tree if neccessary */
-+ }
-+ switch (subtype) {
-+ case OUI_ORACLE_VSIMGR_SUBTYPE:
-+ offset = dissect_oracle_tlv(tvb, pinfo, tree, offset);
-+ break;
-+ default:
-+ return -1;
-+ }
-+ return offset;
-+}
-+
-+static void
-+dissect_vdp_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint32 offset)
-+{
-+ proto_tree *vdp_tlv_tree = NULL;
-+ proto_item *ti;
-+ guint8 tlvtype;
-+ guint16 tlvhdr;
-+ guint32 tlvlen = 0;
-+
-+ while (offset > 0) {
-+ tlvhdr = tvb_get_ntohs(tvb, offset);
-+ tlvtype = TLV_TYPE(tlvhdr);
-+ tlvlen = TLV_INFO_LEN(tlvhdr);
-+
-+ if (tlvtype == 0) /* XXX most likely it's padding */
-+ break;
-+ if (tree) {
-+ vdp_tlv_tree = proto_tree_add_subtree(tree, tvb, offset,
-+ tlvlen + 2, ett_vdp_tlv, &ti, "VDP TLV");
-+ proto_tree_add_item(vdp_tlv_tree, hf_vdp_tlv_type, tvb,
-+ offset, 2, ENC_BIG_ENDIAN);
-+ proto_tree_add_item(vdp_tlv_tree, hf_vdp_tlv_len, tvb,
-+ offset, 2, ENC_BIG_ENDIAN);
-+ }
-+
-+ switch (tlvtype) {
-+ case VDP_TLV_PREASSOC:
-+ break;
-+ case VDP_TLV_PREASSOCRR:
-+ break;
-+ case VDP_TLV_ASSOC:
-+ case VDP_TLV_DEASSOC:
-+ offset = dissect_vdp_tlv_assoc(tvb, pinfo, vdp_tlv_tree,
-+ offset, tlvtype);
-+ break;
-+ case VDP_TLV_MGRID:
-+ offset = dissect_vdp_tlv_mgrid(tvb, pinfo, vdp_tlv_tree,
-+ offset);
-+ break;
-+ case VDP_TLV_ORG:
-+ offset = dissect_vdp_tlv_org(tvb, pinfo, vdp_tlv_tree,
-+ offset);
-+ break;
-+ default:
-+ /* unknown type */
-+ goto done;
-+ }
-+ }
-+done: ;
-+}
-+
-+static void
-+dissect_ecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-+{
-+ proto_item *ti;
-+ proto_tree *ecp_tree = NULL;
-+ int offset = 0;
-+ guint16 hdr, ver, op, subtype, seqno;
-+
-+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECP");
-+ col_clear(pinfo->cinfo, COL_INFO);
-+
-+ /* Version/OP/Subtype */
-+ hdr = tvb_get_ntohs(tvb, offset);
-+ ver = ECP_VERSION(hdr);
-+ op = ECP_OP(hdr);
-+ subtype = ECP_SUBTYPE(hdr);
-+ col_append_fstr(pinfo->cinfo, COL_INFO,
-+ "PDU Version = %x OP = %x"
-+ " Subtype = %x", ver, op, subtype);
-+
-+ if (tree) {
-+ /* details */
-+ ti = proto_tree_add_item(tree, proto_ecp, tvb, 0, -1, ENC_NA);
-+ ecp_tree = proto_item_add_subtree(ti, ett_ecp);
-+
-+ proto_tree_add_item(ecp_tree, hf_ecp_version, tvb, offset, 2,
-+ ENC_BIG_ENDIAN);
-+ proto_tree_add_item(ecp_tree, hf_ecp_op, tvb, offset, 2,
-+ ENC_BIG_ENDIAN);
-+ proto_tree_add_item(ecp_tree, hf_ecp_subtype, tvb, offset, 2,
-+ ENC_BIG_ENDIAN);
-+ }
-+ offset += 2;
-+
-+ /* Seqno */
-+ if (tree) {
-+ proto_tree_add_item(ecp_tree, hf_ecp_seqno, tvb, offset, 2,
-+ ENC_BIG_ENDIAN);
-+ }
-+ seqno = tvb_get_ntohs(tvb, offset);
-+ switch (op) {
-+ case ECP_OP_REQ:
-+ col_append_fstr(pinfo->cinfo, COL_INFO,
-+ " SEQ = 0x%x", seqno);
-+ break;
-+ case ECP_OP_ACK:
-+ col_append_fstr(pinfo->cinfo, COL_INFO,
-+ " ACK = 0x%x", seqno);
-+ break;
-+ }
-+ offset += 2;
-+
-+ /* XXX todo: use sub-dissector */
-+ if (subtype == ECP_SUBTYPE_VDP) {
-+ dissect_vdp_tlv(tvb, pinfo, ecp_tree, offset);
-+ }
-+}
-+
-+void
-+proto_register_ecp(void)
-+{
-+ static hf_register_info hf_ecp[] = {
-+ { &hf_ecp_version,
-+ { "Version", "ecp.ver", FT_UINT16, BASE_DEC,
-+ NULL, ECP_VERSION_MASK, NULL, HFILL }},
-+ { &hf_ecp_op,
-+ { "Operation", "ecp.op", FT_UINT16, BASE_HEX,
-+ VALS(ecp_op_vals), ECP_OP_MASK, NULL, HFILL }},
-+ { &hf_ecp_subtype,
-+ { "Subtype", "ecp.subtype", FT_UINT16, BASE_HEX,
-+ VALS(ecp_subtype_vals), ECP_SUBTYPE_MASK, NULL, HFILL }},
-+ { &hf_ecp_seqno,
-+ { "Sequence number", "ecp.seqno", FT_UINT16, BASE_DEC,
-+ NULL, 0x0, NULL, HFILL }},
-+ };
-+
-+ static hf_register_info hf_vdp[] = {
-+ { &hf_vdp_tlv_type,
-+ { "VDP TLV Type", "vdp.tlvtype", FT_UINT16, BASE_DEC,
-+ VALS(vdp_tlv_type_vals), TLV_TYPE_MASK, NULL, HFILL }},
-+ { &hf_vdp_tlv_len,
-+ { "VDP TLV Length", "vdp.tlvlen", FT_UINT16, BASE_DEC,
-+ NULL, TLV_INFO_LEN_MASK, NULL, HFILL }},
-+ { &hf_vdp_tlv_len_invalid,
-+ { "VDP TLV Invalid Length", "vdp.tlvlen_invalid", FT_BOOLEAN,
-+ 16, TFS(&tfs_tlv_len_invalid), TLV_INFO_LEN_MASK,
-+ NULL, HFILL}},
-+ { &hf_vdp_tlv_assoc_reason,
-+ { "Reason/Status", "vdp.assoc.reason", FT_UINT8, BASE_HEX,
-+ NULL, 0x0, NULL, HFILL }},
-+ { &hf_vdp_tlv_org_oui,
-+ { "Org OUI", "vdp.org.oui", FT_UINT24, BASE_HEX,
-+ VALS(vdp_tlv_oui_vals), 0x0, NULL, HFILL}},
-+ { &hf_oui_oracle_subtype,
-+ { "Oracle Subtype", "vdp.oracle.subtype", FT_UINT8, BASE_HEX,
-+ VALS(oui_oracle_subtype_vals), 0x0, NULL, HFILL}},
-+ { &hf_oui_oracle_encoding,
-+ { "VSI Manager ID Encoding", "vdp.oracle.encoding", FT_UINT8,
-+ BASE_HEX, VALS(oui_oracle_encoding_vals),
-+ 0x0, NULL, HFILL}},
-+ { &hf_vdp_vsitypeid,
-+ { "VSI Type ID", "vdp.vsitypeid", FT_UINT24,
-+ BASE_HEX, NULL, 0x0, NULL, HFILL}},
-+ { &hf_vdp_vsiversion,
-+ { "VSI Version", "vdp.vsiversion", FT_UINT8,
-+ BASE_HEX, NULL, 0x0, NULL, HFILL}},
-+ { &hf_vdp_vsiid_format,
-+ { "VSIID Format ", "vdp.vsiidformat", FT_UINT8,
-+ BASE_HEX, VALS(vdp_vsiid_format_vals), 0x0,
-+ NULL, HFILL}},
-+ { &hf_vdp_filter_format,
-+ { "VDP Filter Format ", "vdp.filterformat", FT_UINT8,
-+ BASE_HEX, VALS(vdp_filter_format_vals), 0x0,
-+ NULL, HFILL}},
-+ { &hf_vdp_vsiid,
-+ { "VSIID", "vdp.VSIID", FT_STRING, BASE_NONE,
-+ NULL, 0x0, NULL, HFILL }},
-+ { &hf_vdp_vidstr,
-+ { "VIDSTR", "vdp.vidstr", FT_BYTES, BASE_NONE,
-+ NULL, 0x0, NULL, HFILL }},
-+
-+
-+ };
-+
-+ static gint *ett[] = {
-+ &ett_ecp,
-+ &ett_vdp_tlv,
-+ &ett_vdp_tlv_assoc,
-+ &ett_vdp_tlv_mgrid,
-+ &ett_vdp_tlv_org,
-+ };
-+
-+ proto_ecp = proto_register_protocol("Edge Control Protocol",
-+ "ECP21", "ecp21");
-+ proto_register_field_array(proto_ecp, hf_ecp, array_length(hf_ecp));
-+
-+ proto_vdp = proto_register_protocol("VSI protocol",
-+ "VDP21", "vdp21");
-+ proto_register_field_array(proto_vdp, hf_vdp, array_length(hf_vdp));
-+
-+ proto_register_subtree_array(ett, array_length(ett));
-+}
-+
-+static void
-+register_hf(gpointer key _U_, gpointer value, gpointer user_data _U_)
-+{
-+ oui_info_t *info = value;
-+
-+ proto_register_field_array(proto_ecp, info->field_info, 1);
-+}
-+
-+void
-+proto_reg_handoff_ecp_21(void)
-+{
-+ dissector_handle_t ecp_handle;
-+
-+ data_handle = find_dissector("data");
-+
-+ ecp_handle = create_dissector_handle(dissect_ecp, proto_ecp);
-+ dissector_add_uint("ethertype", ETHERTYPE_ECP, ecp_handle);
-+
-+ /*
-+ * Register all the fields for PIDs for various OUIs.
-+ */
-+ if (oui_info_table != NULL)
-+ g_hash_table_foreach(oui_info_table, register_hf, NULL);
-+}
-Index: epan/dissectors/Makefile.common
-===================================================================
---- epan/dissectors/Makefile.common (revision 41973)
-+++ epan/dissectors/Makefile.common (working copy)
-@@ -114,6 +114,7 @@
- packet-dop.c \
- packet-dsp.c \
- packet-ess.c \
-+ packet-ecp.c \
- packet-ftam.c \
- packet-goose.c \
- packet-gsm_map.c \