Update to 1.4.0. See

http://www.wireshark.org/docs/relnotes/wireshark-1.4.0.html for a list of
changes in this release.

Note: Wireless mesh support has not been updated for 1.4.0.

7 files changed, 101 insertions, 918 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 00eddcf37de0..ba91bb129c1b 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	wireshark
-PORTVERSION=	1.2.10
+PORTVERSION=	1.4.0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
     		http://wireshark.osmirror.nl/download/src/ \
@@ -41,7 +41,7 @@ CFLAGS+=	-funit-at-a-time
 
 WIRESHARK_LIBS=
 
-.for x in capinfos editcap idl2wrs mergecap rawshark text2pcap
+.for x in capinfos editcap idl2wrs mergecap rawshark text2pcap dftest randpkt
 .if defined(LITE)
 PLIST_SUB+=		${x:U}="@comment $x not installed"
 CONFIGURE_ARGS+=	--enable-$x=no
@@ -51,15 +51,6 @@ MAN1+=			$x.1
 .endif
 .endfor
 
-.for x in dftest randpkt
-.if defined(LITE)
-PLIST_SUB+=	${x:U}="@comment $x not installed"
-CONFIGURE_ARGS+=	--enable-$x=no
-.else
-PLIST_SUB+=	${x:U}=bin/$x
-.endif
-.endfor
-
 .if !defined(WITHOUT_X11)
 USE_XORG=	x11
 .endif
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 162ce7559167..eafd076161f1 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,3 +1,3 @@
-MD5 (wireshark-1.2.10.tar.bz2) = f8bc926956c13fcddb4df0601011ceef
-SHA256 (wireshark-1.2.10.tar.bz2) = 37d6977eedb174225dcf8e940cfcaa4341a142afef34da4eb61a72cc27c47d21
-SIZE (wireshark-1.2.10.tar.bz2) = 15401498
+MD5 (wireshark-1.4.0.tar.bz2) = 13b188baea23cdad40b7a55921384a77
+SHA256 (wireshark-1.4.0.tar.bz2) = 1c0df77d11c643b1142b6ed3fd21e0c79b3f05f1749fe10e9ba5fd3beee8b743
+SIZE (wireshark-1.4.0.tar.bz2) = 20481773
diff --git a/net/wireshark/files/patch-Makefile.in b/net/wireshark/files/patch-Makefile.in
index 38553c5e4dc5..8c5f811bb124 100644
--- a/net/wireshark/files/patch-Makefile.in
+++ b/net/wireshark/files/patch-Makefile.in
@@ -1,10 +1,10 @@
---- Makefile.in.orig	2009-10-11 01:36:04.000000000 -0400
-+++ Makefile.in	2009-10-11 01:36:22.000000000 -0400
-@@ -570,6 +570,7 @@ wireshark_man = @wireshark_man@
- wiresharkfilter_man = @wiresharkfilter_man@
- ACLOCAL_AMFLAGS = `./aclocal-flags`
- INCLUDES = @LUA_INCLUDES@
+--- Makefile.in.orig	2010-08-29 18:20:27.000000000 -0400
++++ Makefile.in	2010-09-04 17:17:43.000000000 -0400
+@@ -444,6 +444,7 @@ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ LUA_INCLUDES = @LUA_INCLUDES@
 +LIBS = @LUA_LIBS@
- @HAVE_WARNINGS_AS_ERRORS_TRUE@AM_CLEAN_CFLAGS = -Werror
- 
- #
+ LUA_LIBS = @LUA_LIBS@
+ LYNX = @LYNX@
+ MAKEINFO = @MAKEINFO@
diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure
index 32b92d11c60c..c7eca24bc610 100644
--- a/net/wireshark/files/patch-configure
+++ b/net/wireshark/files/patch-configure
@@ -1,33 +1,33 @@
---- configure.orig	2009-06-20 18:39:36.000000000 -0400
-+++ configure	2009-06-20 18:39:40.000000000 -0400
-@@ -23392,7 +23392,7 @@ echo $ECHO_N "checking whether we should
+--- configure.orig	2010-08-29 18:20:30.000000000 -0400
++++ configure	2010-09-04 17:19:07.000000000 -0400
+@@ -18072,7 +18072,7 @@ $as_echo_n "checking whether we should t
  # Check whether --enable-warnings-as-errors was given.
- if test "${enable_warnings_as_errors+set}" = set; then
+ if test "${enable_warnings_as_errors+set}" = set; then :
    enableval=$enable_warnings_as_errors;
 -  if test "x$GCC" = "xyes" -a "x$enableval" == "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then
 +  if test "x$GCC" = "xyes" -a "x$enableval" = "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then
      with_warnings_as_errors="yes"
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -25128,7 +25128,7 @@ _ACEOF
- fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -19660,7 +19660,7 @@ fi
  
+ 	fi
  
 -	if test x$have_ige_mac == x
 +	if test x$have_ige_mac = x
  	then
- 		{ echo "$as_me:$LINENO: checking for ige_mac_menu_set_menu_bar in -ligemacintegration" >&5
- echo $ECHO_N "checking for ige_mac_menu_set_menu_bar in -ligemacintegration... $ECHO_C" >&6; }
-@@ -30490,7 +30490,7 @@ echo "${ECHO_T}yes" >&6; }
+ 		#
+ 		# Not found - check for the old integration functions in
+@@ -22487,7 +22487,7 @@ $as_echo "yes" >&6; }
  	  #
  	  CFLAGS="$CFLAGS -I$krb5_dir/include"
  	  CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
 -	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
 +	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'`
- 	  ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
- 	  ac_krb5_version="$ac_heimdal_version$ac_mit_version"
- 	  if test "x$ac_krb5_version" = "xHEIMDAL"
-@@ -30549,7 +30549,7 @@ fi
+ 	  # MIT Kerberos moved krb5.h to krb5/krb5.h starting with release 1.5
+ 	  ac_mit_version_olddir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
+ 	  ac_mit_version_newdir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
+@@ -22546,7 +22546,7 @@ fi
  
  	  if test -x "$KRB5_CONFIG"
  	  then
diff --git a/net/wireshark/files/patch-epan_Makefile.in b/net/wireshark/files/patch-epan_Makefile.in
index c651a82049d5..4281e1d35469 100644
--- a/net/wireshark/files/patch-epan_Makefile.in
+++ b/net/wireshark/files/patch-epan_Makefile.in
@@ -1,6 +1,6 @@
---- epan/Makefile.in.orig	2009-09-14 21:51:20.000000000 -0400
-+++ epan/Makefile.in	2009-10-11 01:37:24.000000000 -0400
-@@ -694,6 +694,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(
+--- epan/Makefile.in.orig	2010-08-29 18:19:28.000000000 -0400
++++ epan/Makefile.in	2010-09-04 17:19:36.000000000 -0400
+@@ -746,6 +746,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(
  	$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) \
  	$(LIBGEOIP_CFLAGS)
  
@@ -9,21 +9,3 @@
  @HAVE_WARNINGS_AS_ERRORS_TRUE@AM_NON_GENERATED_CFLAGS = -Werror
  
  #Since code generated by lex may trigger gcc warnings, we are now generating two
-@@ -766,7 +768,7 @@ MAINTAINERCLEANFILES = \
- # Add the object files for missing routines, if any.
- #
- libwireshark_la_LIBADD = \
--	@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
-+	@INET_ATON_LO@ @INET_PTON_LO@ libwireshark_generated.la \
- 	libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
- 	ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
- 	dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
-@@ -775,7 +777,7 @@ libwireshark_la_LIBADD = \
- 	${top_builddir}/wsutil/libwsutil.la -lm
- 
- libwireshark_la_DEPENDENCIES = \
--	@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
-+	@INET_ATON_LO@ @INET_PTON_LO@ libwireshark_generated.la \
- 	libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
- 	ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
- 	dissectors/libdirtydissectors.la $(wslua_lib) \
diff --git a/net/wireshark/files/patch-mesh b/net/wireshark/files/patch-mesh
deleted file mode 100644
index 2885a8ff0187..000000000000
--- a/net/wireshark/files/patch-mesh
+++ /dev/null
@@ -1,858 +0,0 @@
---- epan/dissectors/packet-ieee80211.c.orig	2009-09-14 21:50:07.000000000 -0400
-+++ epan/dissectors/packet-ieee80211.c	2009-09-16 00:50:44.000000000 -0400
-@@ -48,6 +48,9 @@
-  * Dutin Johnson - 802.11n and portions of 802.11k and 802.11ma
-  * dustin@dustinj.us & dustin.johnson@cacetech.com
-  *
-+ * 01/31/2008 - Added dissection of 802.11s
-+ * Javier Cardona <javier@cozybit.com>
-+ *
-  * 04/21/2008 - Added dissection for 802.11p 
-  * Arada Systems <http://www.aradasystems.com>
-  */
-@@ -336,6 +339,11 @@ int add_mimo_compressed_beamforming_feed
- #define KEY_EXTIV    0x20
- #define EXTIV_LEN    8
- 
-+/*
-+ * Bits from the Mesh Flags field
-+ */
-+#define MESH_FLAGS_ADDRESS_EXTENSION  0x3
-+
- 
- /* ************************************************************************* */
- /*              Constants used to identify cooked frame types                */
-@@ -460,6 +468,10 @@ int add_mimo_compressed_beamforming_feed
- #define FIELD_EXTENDED_CHANNEL_SWITCH_ANNOUNCEMENT 0x2E
- #define FIELD_HT_INFORMATION            0x2F
- #define FIELD_HT_ACTION_CODE            0x30
-+#define FIELD_MESH_MGT_ACTION_PS_CODE   0x31    /* Mesh Management action peer link code */
-+#define FIELD_MESH_MGT_ACTION_PL_CODE   0x32    /* Mesh Management action peer link code */
-+
-+
- 
- /* ************************************************************************* */
- /*        Logical field codes (IEEE 802.11 encoding of tags)                 */
-@@ -485,12 +497,6 @@ int add_mimo_compressed_beamforming_feed
- #define TAG_POWER_CAPABILITY      0x21
- #define TAG_TPC_REQUEST           0x22
- #define TAG_TPC_REPORT            0x23
--#define TAG_SUPPORTED_CHANNELS    0x24
--#define TAG_CHANNEL_SWITCH_ANN    0x25
--#define TAG_MEASURE_REQ           0x26
--#define TAG_MEASURE_REP           0x27
--#define TAG_QUIET                 0x28
--#define TAG_IBSS_DFS              0x29
- #define TAG_ERP_INFO              0x2A
- #define TAG_TS_DELAY              0x2B
- #define TAG_TCLAS_PROCESS         0x2C
-@@ -500,10 +506,37 @@ int add_mimo_compressed_beamforming_feed
- #define TAG_RSN_IE                0x30
- /* Reserved 49 */
- #define TAG_EXT_SUPP_RATES        0x32
--#define TAG_NEIGHBOR_REPORT       0x34
-+//#define TAG_NEIGHBOR_REPORT       0x34
-+
-+#define MESH_OVERRIDES
-+#ifndef MESH_OVERRIDES
-+#define TAG_SUPPORTED_CHANNELS    0x24
-+#define TAG_CHANNEL_SWITCH_ANN    0x25
-+#define TAG_MEASURE_REQ           0x26
-+#define TAG_MEASURE_REP           0x27
-+#define TAG_QUIET                 0x28
-+#define TAG_IBSS_DFS              0x29
-+#else
-+#define TAG_SUPPORTED_CHANNELS    0xE0
-+#define TAG_CHANNEL_SWITCH_ANN    0xE1
-+#define TAG_MEASURE_REQ           0xE2
-+#define TAG_MEASURE_REP           0xE3
-+#define TAG_QUIET                 0xE4
-+#define TAG_IBSS_DFS              0xE5
-+/* Not yet assigned by ANA */
-+#define TAG_MESH_CONFIGURATION    51  /* 36 */
-+#define TAG_MESH_ID               52  /* 37 */
-+#define TAG_MESH_PEER_LINK_MGMT   55  /* 40 */
-+#define TAG_MESH_PREQ             68  /* 53 */
-+#define TAG_MESH_PREP             69  /* 54 */
-+#define TAG_MESH_PERR             70  /* 55 */
-+#endif
-+
- #define TAG_HT_INFO               0x3D  /* IEEE Stc 802.11n/D2.0 */
- #define TAG_SECONDARY_CHANNEL_OFFSET 0x3E  /* IEEE Stc 802.11n/D1.10/D2.0 */
-+#ifdef WAVE_SUPPORT
- #define TAG_WSIE	                 0x45   /* tag of the Wave Service Information (802.11p) */
-+#endif
- #define TAG_20_40_BSS_CO_EX          0x48   /* IEEE P802.11n/D6.0 */
- #define TAG_20_40_BSS_INTOL_CH_REP   0x49   /* IEEE P802.11n/D6.0 */
- #define TAG_OVERLAP_BSS_SCAN_PAR     0x49   /* IEEE P802.11n/D6.0 */
-@@ -653,6 +686,13 @@ static const value_string aruba_mgt_type
- #define CAT_DLS                2
- #define CAT_BLOCK_ACK          3
- 
-+#define CAT_MESH_PEER_LINK                 30 /* Per 802.11s draft 1.08.  ANA will probably revise this */
-+#define CAT_MESH_LINK_METRIC               31  
-+#define CAT_MESH_PATH_SELECTION            32 
-+#define CAT_MESH_INTERWORKING              33
-+#define CAT_MESH_RESOURCE_COORDINATION     34 
-+#define CAT_MESH_SECURITY_ARCHITECTURE     35
-+
- #define CAT_RADIO_MEASUREMENT   6
- #define CAT_HT                  7
- #define CAT_MGMT_NOTIFICATION   17
-@@ -688,6 +728,30 @@ static const value_string aruba_mgt_type
- #define HT_ACTION_ANT_SEL_FEEDBACK            7
- #define HT_ACTION_HT_INFO_EXCHANGE            8
- 
-+#define MESH_PL_PEER_LINK_OPEN                      0
-+#define MESH_PL_PEER_LINK_CONFIRM                   1
-+#define MESH_PL_PEER_LINK_CLOSE                     2
-+
-+#define MESH_PS_PATH_REQUEST                        0
-+#define MESH_PS_PATH_REPLY                          1
-+#define MESH_PS_PATH_ERROR                          2
-+#define MESH_PS_ROOT_ANNOUNCEMENT                   3
-+
-+/* 11s draft, table 7-22 */
-+#define MESH_LINK_CANCELLED                     2 
-+#define MESH_MAX_NEIGHBORS                      3 
-+#define MESH_CONFIG_POLICY_VIOLATION            4 
-+#define MESH_CLOSE_RCVD                         5 
-+#define MESH_MAX_RETRIES                        6 
-+#define MESH_CONFIRM_TIMEOUT                    7 
-+
-+#define MESH_MGMT_IE_CONFIGURATION       36
-+#define MESH_MGMT_IE_ID                  37
-+#define MESH_MGMT_IE_PEER_LINK           40 
-+#define MESH_MGMT_IE_PREQ                53 
-+#define MESH_MGMT_IE_PREP                54 
-+#define MESH_MGMT_IE_PERR                55 
-+
- /* Vendor actions */
- /* MARVELL */
- #define MRVL_ACTION_MESH_MANAGEMENT     1
-@@ -859,6 +923,16 @@ static int hf_fcs_good = -1;
- static int hf_fcs_bad = -1;
- 
- /* ************************************************************************* */
-+/*                   Header values for Mesh Header field                     */
-+/* ************************************************************************* */
-+static int hf_mesh_ttl = -1;
-+static int hf_mesh_seq = -1;
-+static int hf_mesh_flags = -1;
-+static int hf_mesh_ae1 = -1;
-+static int hf_mesh_ae2 = -1;
-+static int hf_mesh_ae3 = -1;
-+
-+/* ************************************************************************* */
- /*                   Header values for reassembly                            */
- /* ************************************************************************* */
- static int hf_fragments = -1;
-@@ -1093,6 +1167,34 @@ static int ff_psmp_sta_info_psmp_multica
- static int ff_mimo_csi_snr = -1;
- /*** End: MIMO CSI Matrices Report - Dustin Johnson ***/
- 
-+
-+/*** Begin: Mesh Frame Format ***/
-+static int ff_mesh_mgt_action_ps_code = -1;/* Mesh Management path selection action code */
-+static int ff_mesh_mgt_action_pl_code = -1;/* Mesh Management peer link action code */
-+static int ff_mesh_mgt_ie_id = -1;                /* Mesh Management ID */
-+/* NB: see above for more items */
-+static int ff_mesh_mgt_dest_flags= -1;     /* Mesh Management destination flags */
-+static int ff_mesh_mgt_srccount = -1;  /* Mesh Management src count */
-+static int ff_mesh_mgt_dest_do_flags = -1;  /* Mesh Management Destination Only flag */
-+static int ff_mesh_mgt_dest_rf_flags = -1;  /* Mesh Management Reply and Forward flag */
-+
-+
-+/* variable header fields */
-+static int hf_mesh_mgt_pl_subtype = -1;/* Mesh Management peer link frame subtype */
-+static int hf_mesh_mgt_pl_local_link_id = -1;/* Mesh Management local link id */
-+static int hf_mesh_mgt_pl_peer_link_id = -1;/* Mesh Management peer link id */
-+static int hf_mesh_mgt_pl_reason_code = -1;/* Mesh Management peer link reason code */
-+static int hf_mesh_config_version = -1;
-+static int hf_mesh_config_path_sel_protocol = -1;
-+static int hf_mesh_config_path_sel_metric = -1;
-+static int hf_mesh_config_congestion_control = -1;
-+static int hf_mesh_config_channel_prec = -1;
-+static int hf_mesh_config_capability = -1;
-+
-+
-+/*** End: Mesh Frame Format ***/
-+
-+
- /* ************************************************************************* */
- /*            Flags found in the capability field (fixed field)              */
- /* ************************************************************************* */
-@@ -1522,6 +1624,8 @@ static gint ett_tagged_parameters = -1;
- static gint ett_qos_parameters = -1;
- static gint ett_qos_ps_buf_state = -1;
- static gint ett_wep_parameters = -1;
-+static gint ett_msh_parameters = -1;
-+static gint ett_msh_dest_flags_tree = -1;
- 
- static gint ett_rsn_cap_tree = -1;
- 
-@@ -1724,6 +1828,42 @@ find_header_length (guint16 fcf, guint16
-   }
- }
- 
-+/* ************************************************************************* */
-+/*            Return the length of the mesh header if any (in bytes)         
-+ *
-+ * Per IEEE 802.11-07/0799r8:
-+ * 7.1.3.5a.1 The Mesh Header field (...) is present in Data frames if and
-+ * only if they are transmitted between peer MPs with an established peer
-+ * link.  Data frames including the Mesh Header field are referred to as
-+ * Mesh Data frames.
-+ *
-+ * We need a stateful sniffer for that.  For now, use heuristics:  If we
-+ * find valid mesh flags (currently, only MESH_FLAGS_ADDRESS_EXTENSION) at the
-+ * offset where mesh flags should be, assume we're dealing with a mesh header.
-+ * ************************************************************************* */
-+static int
-+find_mesh_header_length(const guchar * pd, int offset, guint16 fcf)
-+{
-+  guint8 mesh_flags;
-+
-+  switch (FCF_FRAME_TYPE (fcf)) {
-+
-+  case MGT_FRAME:
-+    /* TODO: Multihop Action Frames */
-+    return 0;
-+
-+  case DATA_FRAME:
-+    mesh_flags = pd[offset];
-+
-+    /* heuristics:                                                      */
-+    /* asume mesh if all reserved bits in the mesh_flags field are zero */
-+    if ((mesh_flags & ~MESH_FLAGS_ADDRESS_EXTENSION) == 0)
-+      return 6 + 6*(mesh_flags & MESH_FLAGS_ADDRESS_EXTENSION);
-+    break;
-+  }
-+  return 0;  
-+}
-+
- mimo_control_t get_mimo_control (tvbuff_t *tvb, int offset)
- {
-   guint16 mimo;
-@@ -1944,7 +2084,7 @@ capture_ieee80211_common (const guchar *
-         packet_counts * ld, gboolean fixed_length_header,
-         gboolean datapad, gboolean is_ht)
- {
--  guint16 fcf, hdr_length;
-+  guint16 fcf, hdr_length, meshdr_length;
- 
-   if (!BYTES_ARE_IN_FRAME(offset, len, 2)) {
-     ld->other++;
-@@ -1966,12 +2106,19 @@ capture_ieee80211_common (const guchar *
-     case DATA_CF_ACK_POLL:
-     case DATA_QOS_DATA:
-     {
--      if (fixed_length_header)
-+      if (fixed_length_header) {
-         hdr_length = DATA_LONG_HDR_LEN;
--      else
-+	meshdr_length = 0;
-+      } else {
-         hdr_length = find_header_length (fcf, 0, is_ht);
--      if (datapad)
--        hdr_length = roundup2(hdr_length, 4);
-+        if (datapad)
-+          hdr_length = roundup2(hdr_length, 4);
-+        meshdr_length = find_mesh_header_length(pd, offset + hdr_length, fcf);
-+#if 1
-+        g_warning("mesh hdr_length %d hdr_length %d\n", meshdr_length, hdr_length);
-+#endif
-+        hdr_length += meshdr_length;
-+      }
-       /* I guess some bridges take Netware Ethernet_802_3 frames,
-          which are 802.3 frames (with a length field rather than
-          a type field, but with no 802.2 header in the payload),
-@@ -2574,6 +2721,17 @@ add_fixed_field(proto_tree * tree, tvbuf
-         break;
-       }
- 
-+    /* Mesh Management */
-+    case FIELD_MESH_MGT_ACTION_PS_CODE:
-+      proto_tree_add_item (tree, ff_mesh_mgt_action_ps_code, tvb, offset, 1, TRUE);
-+      length += 1;
-+      break;
-+
-+    case FIELD_MESH_MGT_ACTION_PL_CODE:
-+      proto_tree_add_item (tree, ff_mesh_mgt_action_pl_code, tvb, offset, 1, TRUE);
-+      length += 1;
-+      break;
-+
-     case FIELD_DLS_ACTION_CODE:
-       proto_tree_add_item (tree, ff_dls_action_code, tvb, offset, 1, TRUE);
-       length += 1;
-@@ -3118,6 +3276,88 @@ add_fixed_field(proto_tree * tree, tvbuf
-                   }
-                 break;
-               }
-+            case CAT_MESH_PEER_LINK:
-+              /* Non-IE fixed fields here.  edit TAG_MESH_* for IE fields */
-+              switch (tvb_get_guint8(tvb, 1))
-+                {
-+                guint offset;
-+                case MESH_PL_PEER_LINK_OPEN:
-+                  offset = 0;
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PL_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_CAP_INFO);
-+                  length = offset;
-+                  break;
-+
-+                case MESH_PL_PEER_LINK_CONFIRM:
-+                  offset = 0;
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PL_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_CAP_INFO);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_STATUS_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_ASSOC_ID);
-+                  length = offset;
-+                  break;
-+
-+                case MESH_PL_PEER_LINK_CLOSE:
-+                  offset = 0;
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PL_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_REASON_CODE);
-+                  length = offset;   /* Size of fixed fields */
-+                  break;
-+
-+                default:
-+                  offset = 0;
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PL_CODE);
-+                  length = offset;   /* Size of fixed fields */
-+                  break;
-+                }
-+              break;
-+
-+            case CAT_MESH_PATH_SELECTION:
-+              switch (tvb_get_guint8(tvb, 1))
-+                {
-+                guint offset;
-+                /* defined values */
-+                case MESH_PS_PATH_REQUEST:
-+                  offset = 0;
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PS_CODE);
-+                  length = offset;
-+                  break;
-+
-+                case MESH_PS_PATH_REPLY:
-+                  offset = 0;
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PS_CODE);
-+                  length = offset;
-+                  break;
-+
-+                case MESH_PS_PATH_ERROR:
-+                  offset = 0;
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_CATEGORY_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, offset, FIELD_MESH_MGT_ACTION_PS_CODE);
-+                  length = offset;
-+                  break;
-+
-+                case MESH_PS_ROOT_ANNOUNCEMENT:
-+                  offset = 0;
-+                  offset += add_fixed_field (action_tree, tvb, 0, FIELD_CATEGORY_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, 1, FIELD_MESH_MGT_ACTION_PS_CODE);
-+                  length = offset; 
-+                  break;
-+
-+                /* undefined values */
-+                default:
-+                  offset = 0;
-+                  offset += add_fixed_field (action_tree, tvb, 0, FIELD_CATEGORY_CODE);
-+                  offset += add_fixed_field (action_tree, tvb, 1, FIELD_MESH_MGT_ACTION_PS_CODE);
-+                  length = offset; 
-+                  break;
-+                }
-+              break;
- 
-             case CAT_MGMT_NOTIFICATION:  /* Management notification frame */
-               {
-@@ -3838,6 +4078,7 @@ dissect_ht_info_ie_1_1(proto_tree * tree
-   }
- }
- 
-+#ifdef WAVE_SUPPORT
- /***  WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
- static void
- dissect_wsie_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len _U_)
-@@ -3932,6 +4173,7 @@ dissect_wsie_ie(proto_tree * tree, tvbuf
- 		}
- 	}
- }
-+#endif /* WAVE_SUPPORT */
- 
- /*** Begin: Secondary Channel Offset Tag - Dustin Johnson ***/
- static void secondary_channel_offset_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len)
-@@ -4428,10 +4670,14 @@ static const value_string tag_num_vals[]
-   { TAG_TS_DELAY,             "TS Delay"},
-   { TAG_TCLAS_PROCESS,        "TCLAS Processing"},
-   { TAG_HT_CAPABILITY,        "HT Capabilities (802.11n D1.10)"},
-+#if 0
-   { TAG_NEIGHBOR_REPORT,      "Neighbor Report"},
-+#endif
-   { TAG_HT_INFO,              "HT Information (802.11n D1.10)"},
-   { TAG_SECONDARY_CHANNEL_OFFSET, "Secondary Channel Offset (802.11n D1.10)"},
-+#ifdef WAVE_SUPPORT
-   { TAG_WSIE,                     "Wave Service Information"}, /* www.aradasystems.com */
-+#endif
-   { TAG_20_40_BSS_CO_EX,          "20/40 BSS Coexistence"},
-   { TAG_20_40_BSS_INTOL_CH_REP,   "20/40 BSS Intolerant Channel Report"},   /* IEEE P802.11n/D6.0 */
-   { TAG_OVERLAP_BSS_SCAN_PAR,     "Overlapping BSS Scan Parameters"},       /* IEEE P802.11n/D6.0 */
-@@ -4447,6 +4693,12 @@ static const value_string tag_num_vals[]
-   { TAG_QUIET,                    "Quiet"},
-   { TAG_IBSS_DFS,                 "IBSS DFS"},
-   { TAG_EXTENDED_CAPABILITIES,    "Extended Capabilities"},
-+  { TAG_MESH_ID,    "Mesh ID"},
-+  { TAG_MESH_CONFIGURATION,    "Mesh Configuration"},
-+  { TAG_MESH_PEER_LINK_MGMT,    "Mesh Peer Link Management"},
-+  { TAG_MESH_PREQ,    "Mesh Path Request"},
-+  { TAG_MESH_PREP,    "Mesh Path Response"},
-+  { TAG_MESH_PERR,    "Mesh Path Error"},
-   #if 0 /*Not yet assigned tag numbers by ANA */
-   { TAG_EXTENDED_CHANNEL_SWITCH_ANNOUNCEMENT, "Extended Channel Switch Announcement"},
-   { TAG_SUPPORTED_REGULATORY_CLASSES, "Supported Regulatory Classes"},
-@@ -4478,10 +4730,13 @@ add_tagged_field (packet_info * pinfo, p
-   guint8 tag_len_len; /* The length of the length parameter in bytes*/
- 
-   tag_no = tvb_get_guint8(tvb, offset);
-+#ifdef WAVE_SUPPORT
-   if(tag_no == TAG_WSIE){
- 	  tag_len_len = 2;
- 	  tag_len = tvb_get_letohl(tvb, offset + 1);
--  }else{
-+  }else
-+#endif
-+  {
- 	  tag_len_len = 1;
- 	  tag_len = tvb_get_guint8(tvb, offset + 1);
-   }
-@@ -5059,12 +5314,13 @@ add_tagged_field (packet_info * pinfo, p
-       break;
-     /*** End: Secondary Channel Offset Tag - Dustin Johnson ***/
- 
-+#ifdef WAVE_SUPPORT
-     /***  Begin: WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
- 	case TAG_WSIE:
- 		dissect_wsie_ie(tree, tvb, offset + 3, tag_len);
- 		break;
-     /***  End: WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
--
-+#endif
- 	/*** Begin: Power Capability Tag - Dustin Johnson ***/
-     case TAG_POWER_CAPABILITY:
-       {
-@@ -5098,6 +5354,118 @@ add_tagged_field (packet_info * pinfo, p
- 		proto_tree_add_item(tree, hf_tag_tpc_report_link_mrg, tvb, offset, 1, TRUE);
- 		offset++;
- 		break;
-+
-+    case TAG_MESH_PEER_LINK_MGMT:
-+      {
-+        offset += 2;
-+        proto_tree_add_item (tree, hf_mesh_mgt_pl_subtype, tvb, offset, 1, TRUE);
-+        offset += 1;
-+        switch (tvb_get_guint8(tvb, 1))
-+          {                                         /* IE subtype */
-+          case MESH_PL_PEER_LINK_OPEN:
-+            proto_tree_add_item (tree, hf_mesh_mgt_pl_local_link_id, tvb, offset, 2, TRUE);
-+            break;
-+
-+          case MESH_PL_PEER_LINK_CONFIRM:
-+            proto_tree_add_item (tree, hf_mesh_mgt_pl_local_link_id, tvb, offset, 2, TRUE);
-+            proto_tree_add_item (tree, hf_mesh_mgt_pl_peer_link_id, tvb, offset + 2, 2, TRUE);
-+            break;
-+
-+          case MESH_PL_PEER_LINK_CLOSE:
-+            proto_tree_add_item (tree, hf_mesh_mgt_pl_local_link_id, tvb, offset, 2, TRUE);
-+            proto_tree_add_item (tree, hf_mesh_mgt_pl_peer_link_id, tvb, offset + 2, 2, TRUE);
-+            proto_tree_add_item (tree, hf_mesh_mgt_pl_reason_code, tvb, offset + 4, 2, TRUE);
-+            break;
-+
-+          /* undefined values */
-+          default:
-+            proto_tree_add_text (tree, tvb, offset, tag_len, "Unknown Peer Link Message Subtype");
-+            break;
-+          }
-+        break;
-+      }
-+
-+    case TAG_MESH_CONFIGURATION:
-+      {
-+        offset += 2;
-+        proto_tree_add_item (tree, hf_mesh_config_version, tvb, offset, 1, TRUE);
-+        proto_tree_add_item (tree, hf_mesh_config_path_sel_protocol, tvb, offset + 1, 4, TRUE);
-+        proto_tree_add_item (tree, hf_mesh_config_path_sel_metric, tvb, offset + 5, 4, TRUE);
-+        proto_tree_add_item (tree, hf_mesh_config_congestion_control, tvb, offset + 9, 4, TRUE);
-+        proto_tree_add_item (tree, hf_mesh_config_channel_prec, tvb, offset + 13, 4, TRUE);
-+        proto_tree_add_item (tree, hf_mesh_config_capability, tvb, offset + 17, 2, TRUE);
-+        break;
-+      }
-+
-+    case TAG_MESH_ID:
-+      {
-+        guint8 *id;
-+        offset += 2;
-+
-+        id = tvb_get_ephemeral_string(tvb, offset, tag_len);
-+        proto_tree_add_string (tree, tag_interpretation, tvb, offset, tag_len, (char *) id);
-+        if (check_col (pinfo->cinfo, COL_INFO)) {
-+          if (tag_len > 0) {
-+            col_append_fstr(pinfo->cinfo, COL_INFO, ", MESHID=\"%s\"",
-+                            format_text(id, tag_len));
-+          } 
-+        }
-+      break;
-+      }
-+
-+    case TAG_MESH_PREQ:
-+      {
-+        guint8 flags; 
-+        proto_item *item;
-+        proto_tree *subtree;
-+
-+        offset += 2;
-+        proto_tree_add_item (tree, ff_mesh_mgt_flags, tvb, offset, 1, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_hopcount, tvb, offset + 1, 1, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_ttl, tvb, offset + 2, 1, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_rreqid, tvb, offset + 3, 4, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_sa, tvb, offset + 7, 6, FALSE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_ssn, tvb, offset + 13, 4, TRUE);
-+        /* TODO: display proxied address if present */
-+        proto_tree_add_item (tree, ff_mesh_mgt_lifetime, tvb, offset + 17, 4, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_metric, tvb, offset + 21, 4, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_dstcount, tvb, offset + 25, 1, TRUE);
-+        flags = tvb_get_letohs (tvb, offset + 26);
-+        item = proto_tree_add_item (tree, ff_mesh_mgt_dest_flags, tvb, offset + 26, 1, TRUE);
-+        subtree = proto_item_add_subtree(item, ett_msh_dest_flags_tree);
-+        proto_tree_add_boolean(subtree, ff_mesh_mgt_dest_do_flags, tvb, offset + 26, 1, flags);
-+        proto_tree_add_boolean(subtree, ff_mesh_mgt_dest_rf_flags, tvb, offset + 26, 1, flags);
-+        proto_tree_add_item (tree, ff_mesh_mgt_da, tvb, offset + 27, 6, FALSE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_dsn, tvb, offset + 33, 4, TRUE);
-+        break;
-+      }
-+
-+    case TAG_MESH_PREP:
-+      {
-+        offset += 2;
-+        proto_tree_add_item (tree, ff_mesh_mgt_flags, tvb, offset, 1, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_hopcount, tvb, offset + 1, 1, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_ttl, tvb, offset + 2, 1, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_da, tvb, offset + 3, 6, FALSE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_dsn, tvb, offset + 9, 4, TRUE);
-+        /* TODO: display proxied address if present */
-+        proto_tree_add_item (tree, ff_mesh_mgt_lifetime, tvb, offset + 13, 4, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_metric, tvb, offset + 17, 4, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_sa, tvb, offset + 21, 6, FALSE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_ssn, tvb, offset + 27, 4, TRUE);
-+        break;
-+      }
-+
-+    case TAG_MESH_PERR:
-+      {
-+        offset += 2;
-+        proto_tree_add_item (tree, ff_mesh_mgt_flags, tvb, offset, 1, TRUE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_srccount, tvb, offset + 1, 1, FALSE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_sa, tvb, offset + 2, 6, FALSE);
-+        proto_tree_add_item (tree, ff_mesh_mgt_ssn, tvb, offset + 8, 4, TRUE);
-+        break;
-+      }
-+
-     /*** Begin: Supported Channels Tag - Dustin Johnson ***/
-     case TAG_SUPPORTED_CHANNELS:
-       {
-@@ -5572,6 +5940,7 @@ add_tagged_field (packet_info * pinfo, p
-     }
-     /*** End: Extended Capabilities Tag - Dustin Johnson ***/
-     /*** Begin: Neighbor Report Tag - Dustin Johnson ***/
-+#if 0
-     case TAG_NEIGHBOR_REPORT:
-     {
-       #define SUB_TAG_TSF_INFO                 0x01
-@@ -5678,6 +6047,7 @@ add_tagged_field (packet_info * pinfo, p
-       }
-       break;
-     }
-+#endif
-     /*** End: Neighbor Report Tag - Dustin Johnson ***/
- #if 0 /*Not yet assigned tag numbers by ANA */
-     /*** Begin: Extended Channel Switch Announcement Tag - Dustin Johnson ***/
-@@ -7009,6 +7379,61 @@ dissect_ieee80211_common (tvbuff_t * tvb
-         }
-       }
- 
-+      if (tree &&
-+	  (FCF_ADDR_SELECTOR(fcf) == DATA_ADDR_T4 ||
-+	   FCF_ADDR_SELECTOR(fcf) == DATA_ADDR_T2))
-+      {
-+        proto_item *msh_fields;
-+        proto_tree *msh_tree;
-+
-+        guint16 mshoff;
-+        guint8 mesh_flags;
-+        guint8 mesh_ttl;
-+        guint32 mesh_seq_number;
-+        guint8 mesh_hdr_len;
-+        const guint8 *ptr;
-+
-+        mshoff = hdr_len;
-+        mesh_flags = tvb_get_guint8(tvb, mshoff + 0);
-+        /* heuristic method to determine if this is a mesh frame */
-+        if (mesh_flags & ~MESH_FLAGS_ADDRESS_EXTENSION) {
-+#if 0
-+          g_warning("Invalid mesh flags: %x.  Interpreting as WDS frame.\n",  mesh_flags);
-+#endif
-+          break;
-+        }
-+        ptr = tvb_get_ptr(tvb, mshoff, len);
-+        mesh_hdr_len = find_mesh_header_length(ptr, 0, fcf);
-+        mesh_ttl = tvb_get_guint8(tvb, mshoff + 1);
-+        mesh_seq_number = 0xffffff & tvb_get_letohl(tvb, mshoff + 2);
-+
-+        msh_fields = proto_tree_add_text(hdr_tree, tvb, mshoff, mesh_hdr_len, "Mesh Header");
-+        msh_tree = proto_item_add_subtree (msh_fields, ett_msh_parameters);
-+
-+        proto_tree_add_boolean_format (msh_tree, hf_mesh_flags,
-+              tvb, mshoff, 1, mesh_flags, "Address Extension %x", mesh_flags & MESH_FLAGS_ADDRESS_EXTENSION);
-+        proto_tree_add_uint (msh_tree, hf_mesh_ttl, tvb, mshoff + 1, 1, mesh_ttl);
-+        proto_tree_add_uint (msh_tree, hf_mesh_seq, tvb, mshoff + 2, 4, mesh_seq_number);
-+        switch (mesh_hdr_len) {
-+          case 24:
-+            ptr = tvb_get_ptr (tvb, mshoff + 18, 6);
-+            proto_tree_add_ether(msh_tree, hf_mesh_ae3, tvb, mshoff + 18, 6, ptr);
-+          case 18:
-+            ptr = tvb_get_ptr (tvb, mshoff + 12, 6);
-+            proto_tree_add_ether(msh_tree, hf_mesh_ae2, tvb, mshoff + 12, 6, ptr);
-+          case 12:
-+            ptr = tvb_get_ptr (tvb, mshoff + 6, 6);
-+            proto_tree_add_ether(msh_tree, hf_mesh_ae1, tvb, mshoff + 6, 6, ptr);
-+          case 6:
-+            break;
-+          default:
-+            g_error("Invalid mesh header length (%d)\n", mesh_hdr_len);
-+        }
-+        hdr_len += mesh_hdr_len;
-+        len -= mesh_hdr_len;
-+        reported_len -= mesh_hdr_len;
-+      }
-+
-       break;
- 
-     case CONTROL_FRAME:
-@@ -8318,8 +8743,8 @@ proto_register_ieee80211 (void)
-       "From DS: 0)"},
-     {FLAG_FROM_DS,            "Frame from DS to a STA via AP(To DS: 0 "
-       "From DS: 1)"},
--    {FLAG_TO_DS|FLAG_FROM_DS, "Frame part of WDS from one AP to another "
--      "AP (To DS: 1 From DS: 1)"},
-+    {FLAG_TO_DS|FLAG_FROM_DS, "WDS (AP to AP) or Mesh (MP to MP) Frame "
-+      "(To DS: 1 From DS: 1)"},
-     {0, NULL}
-   };
- 
-@@ -8761,6 +9186,12 @@ proto_register_ieee80211 (void)
-     {CAT_QOS, "Quality of Service (QoS)"},
-     {CAT_DLS, "Direct-Link Setup (DLS)"},
-     {CAT_BLOCK_ACK, "Block Ack"},
-+    {CAT_MESH_PEER_LINK, "Mesh Peer Link"},
-+    {CAT_MESH_LINK_METRIC, "Mesh Link Metric"},
-+    {CAT_MESH_PATH_SELECTION, "Mesh Path Selection"},
-+    {CAT_MESH_INTERWORKING, "Mesh Internetworking"},
-+    {CAT_MESH_RESOURCE_COORDINATION, "Mesh Resource Coordination"},
-+    {CAT_MESH_SECURITY_ARCHITECTURE, "Mesh Security Arch"},
-     {CAT_RADIO_MEASUREMENT, "Radio Measurement"},
-     {CAT_HT, "High Throughput"},
-     {CAT_MGMT_NOTIFICATION, "Management Notification"},
-@@ -8814,6 +9245,52 @@ proto_register_ieee80211 (void)
-     {0x00, NULL}
-   };
- 
-+  static const value_string mesh_mgt_action_ps_codes[] ={
-+    {MESH_PS_PATH_REQUEST, "Path Request"},
-+    {MESH_PS_PATH_REPLY, "Path Reply"},
-+    {MESH_PS_PATH_ERROR, "Path Error"},
-+    {MESH_PS_ROOT_ANNOUNCEMENT, "Root Announcement"},
-+    {0, NULL}
-+  };
-+
-+  static const value_string mesh_mgt_action_pl_codes[] ={
-+    {MESH_PL_PEER_LINK_OPEN, "Peer Link Open"},
-+    {MESH_PL_PEER_LINK_CONFIRM, "Peer Link Confirm"},
-+    {MESH_PL_PEER_LINK_CLOSE, "Peer Link Close"},
-+    {0, NULL}
-+  };
-+
-+  static const value_string mesh_mgt_pl_reason_codes[] = {
-+    {MESH_LINK_CANCELLED, "Link Cancelled"},
-+    {MESH_MAX_NEIGHBORS, "Maximum Number of Peers Reached"},
-+    {MESH_CONFIG_POLICY_VIOLATION, "Policy Violation"},
-+    {MESH_CLOSE_RCVD, "Close Received"},
-+    {MESH_MAX_RETRIES, "Maximum Retries"},
-+    {MESH_CONFIRM_TIMEOUT, "Confirm Timeout"},
-+    {0x00, NULL}
-+  };
-+
-+  static const value_string mesh_mgt_ie_codes[] ={
-+    /* TODO: incomplete */
-+    {MESH_MGMT_IE_CONFIGURATION, "Mesh Configuration"}, 
-+    {MESH_MGMT_IE_ID, "Mesh ID"}, 
-+    {MESH_MGMT_IE_PEER_LINK, "Peer Link Management"}, 
-+    {MESH_MGMT_IE_PREQ, "Path Request"}, 
-+    {MESH_MGMT_IE_PREP, "Path Response"}, 
-+    {MESH_MGMT_IE_PERR, "Path Error"}, 
-+    {0, NULL}
-+  };
-+
-+  static const true_false_string mesh_dest_rf_flags ={
-+    "[RF = 1] Intermediate Nodes That Respond Will Also Forward", 
-+    "[RF = 0] Intermediate Nodes That Respond Will Not Forward"
-+  };
-+
-+  static const true_false_string mesh_dest_do_flags ={
-+    "[DO = 1] Only Destination Will Respond", 
-+    "[DO = 0] Intermediate Nodes May Respond" 
-+  };
-+
-   static const value_string ack_policy[] = {
-     {0x00, "Normal Ack"},
-     {0x01, "No Ack"},
-@@ -9389,8 +9866,33 @@ proto_register_ieee80211 (void)
- 
-     {&hf_block_ack_bitmap,
-      {"Block Ack Bitmap", "wlan.ba.bm",
--      FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}
-+      FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-     /*** End: Block Ack Request/Block Ack  - Dustin Johnson***/
-+
-+    {&hf_mesh_flags,
-+      {"Mesh Flags", "wlan.mesh.flags",
-+       FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-+       "Mesh flags", HFILL }},
-+
-+    {&hf_mesh_seq,
-+      {"Mesh Seq", "wlan.mesh.seq", FT_UINT32, BASE_DEC, NULL, 0,
-+       "Mesh End-to-End sequence number", HFILL }},
-+
-+    {&hf_mesh_ttl,
-+      {"Mesh TTL", "wlan.mesh.ttl", FT_UINT8, BASE_DEC, NULL, 0,
-+       "Mesh TTL", HFILL }},
-+
-+    {&hf_mesh_ae1,
-+      {"Mesh A4", "wlan.mesh.a4", FT_ETHER, BASE_NONE, NULL, 0,
-+       "Mesh Address4", HFILL }},
-+
-+    {&hf_mesh_ae2,
-+      {"Mesh A5", "wlan.mesh.a5", FT_ETHER, BASE_NONE, NULL, 0,
-+       "Mesh Address5", HFILL }},
-+
-+    {&hf_mesh_ae3,
-+      {"Mesh A6", "wlan.mesh.a6", FT_ETHER, BASE_NONE, NULL, 0,
-+       "Mesh Address6", HFILL }}
-   };
- 
-   static hf_register_info hf_prism[] = {
-@@ -10505,6 +11007,89 @@ proto_register_ieee80211 (void)
-       FT_UINT16, BASE_HEX, VALS (&wme_status_codes), 0,
-       "Management notification setup response status code", HFILL }},
- 
-+    {&ff_mesh_mgt_action_ps_code,
-+     {"Action code", "wlan_mgt.fixed.action_code",
-+      FT_UINT16, BASE_HEX, VALS (&mesh_mgt_action_ps_codes), 0,
-+      "Mesh Management Path Selection action code", HFILL }},
-+
-+    {&ff_mesh_mgt_action_pl_code,
-+     {"Action code", "wlan_mgt.fixed.action_code",
-+      FT_UINT16, BASE_HEX, VALS (&mesh_mgt_action_pl_codes), 0,
-+      "Mesh Management Peer Link action code", HFILL }},
-+
-+    {&hf_mesh_mgt_pl_local_link_id,
-+     {"Local Link ID", "wlan.pl.local_id",
-+      FT_UINT16, BASE_HEX, NULL, 0,
-+      "Mesh Management Local Link ID", HFILL }},
-+
-+    {&hf_mesh_mgt_pl_subtype,
-+     {"Peer Link Subtype", "wlan.pl.subtype",
-+      FT_UINT16, BASE_HEX, VALS (&mesh_mgt_action_pl_codes), 0,
-+      "Mesh Management Peer Link Subtype", HFILL }},
-+
-+    {&hf_mesh_mgt_pl_reason_code,
-+     {"Reason Code", "wlan.pl.reason_code",
-+      FT_UINT16, BASE_HEX, VALS (&mesh_mgt_pl_reason_codes), 0,
-+      "Mesh Management Reason Code", HFILL }},
-+
-+    {&hf_mesh_mgt_pl_peer_link_id,
-+     {"Peer Link ID", "wlan.pl.peer_id",
-+      FT_UINT16, BASE_HEX, NULL, 0,
-+      "Mesh Management Peer Link ID", HFILL }},
-+
-+    {&hf_mesh_config_version,
-+     {"Version", "wlan.mesh.config.version",
-+      FT_UINT16, BASE_HEX, NULL, 0,
-+      "Mesh Configuration Version", HFILL }},
-+
-+    {&hf_mesh_config_path_sel_protocol,
-+     {"Path Selection Protocol", "wlan.mesh.config.ps_protocol",
-+      FT_UINT16, BASE_HEX, NULL, 0,
-+      "Mesh Configuration Path Selection Protocol", HFILL }},
-+
-+    {&hf_mesh_config_path_sel_metric,
-+     {"Path Selection Metric", "wlan.mesh.config.ps_metric",
-+      FT_UINT16, BASE_HEX, NULL, 0,
-+      "Mesh Configuration Path Selection Metric", HFILL }},
-+
-+    {&hf_mesh_config_congestion_control,
-+     {"Congestion Control", "wlan.mesh.config.cong_ctl",
-+      FT_UINT16, BASE_HEX, NULL, 0,
-+      "Mesh Configuration Congestion Control", HFILL }},
-+
-+    {&hf_mesh_config_channel_prec,
-+     {"Channel Precedence", "wlan.mesh.config.chan_prec",
-+      FT_UINT16, BASE_HEX, NULL, 0,
-+      "Mesh Configuration Channel Precedence", HFILL }},
-+
-+    {&hf_mesh_config_capability,
-+     {"Capability", "wlan.mesh.config.cap",
-+      FT_UINT16, BASE_HEX, NULL, 0,
-+      "Mesh Configuration Capability", HFILL }},
-+
-+    {&ff_mesh_mgt_ie_id,
-+     {"Mesh Managment IE ID", "wlan.mesh_ie",
-+      FT_UINT8, BASE_HEX, VALS (&mesh_mgt_ie_codes), 0, 
-+      "Information Element ID", HFILL }},
-+
-+    {&ff_mesh_mgt_dest_flags,
-+     {"Destination Flags", "wlan.preq.dest_flags",
-+      FT_UINT8, BASE_HEX, NULL, 0, "Destination Flags", HFILL }},
-+
-+    {&ff_mesh_mgt_dest_do_flags,
-+     {"Destination Flags", "wlan.preq.dest_flags.do",
-+      FT_BOOLEAN, 8, TFS (&mesh_dest_do_flags), 0x01,
-+      "Dest Flags", HFILL }},
-+
-+    {&ff_mesh_mgt_dest_rf_flags,
-+     {"Destination Flags", "wlan.preq.dest_flags.rf",
-+      FT_BOOLEAN, 8, TFS (&mesh_dest_rf_flags), 0x02,
-+      "Dest Flags", HFILL }},
-+
-+    {&ff_mesh_mgt_srccount,
-+     {"Source Count", "wlan.mesh.srccount",
-+      FT_UINT8, BASE_DEC, NULL, 0, "Source Count", HFILL }},
-+
-     {&ff_qos_action_code,
-      {"Action code", "wlan_mgt.fixed.action_code",
-       FT_UINT16, BASE_HEX, VALS (&qos_action_codes), 0,
-@@ -11854,6 +12439,8 @@ proto_register_ieee80211 (void)
-     &ett_qos_parameters,
-     &ett_qos_ps_buf_state,
-     &ett_wep_parameters,
-+    &ett_msh_parameters,
-+    &ett_msh_dest_flags_tree,
-     &ett_cap_tree,
-     &ett_rsn_cap_tree,
-     &ett_ht_cap_tree,
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index 4aac48a262ff..1c9f1648d7d1 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -30,6 +30,8 @@ lib/wireshark/plugins/%%PORTVERSION%%/ethercat.la
 lib/wireshark/plugins/%%PORTVERSION%%/ethercat.so
 lib/wireshark/plugins/%%PORTVERSION%%/gryphon.la
 lib/wireshark/plugins/%%PORTVERSION%%/gryphon.so
+lib/wireshark/plugins/%%PORTVERSION%%/interlink.la
+lib/wireshark/plugins/%%PORTVERSION%%/interlink.so
 lib/wireshark/plugins/%%PORTVERSION%%/irda.la
 lib/wireshark/plugins/%%PORTVERSION%%/irda.so
 lib/wireshark/plugins/%%PORTVERSION%%/m2m.la
@@ -61,6 +63,7 @@ lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so
 %%DATADIR%%/colorfilters
 %%LUA%%%%DATADIR%%/console.lua
 %%DATADIR%%/dfilters
+%%DATADIR%%/dftest.html
 %%LUA%%%%DATADIR%%/dtd_gen.lua
 %%DATADIR%%/dumpcap.html
 %%DATADIR%%/diameter/Ericsson.xml
@@ -111,71 +114,136 @@ lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so
 %%DATADIR%%/ipmap.html
 %%DATADIR%%/manuf
 %%DATADIR%%/mergecap.html
+%%DATADIR%%/radius/README.radius_dictionary
 %%DATADIR%%/radius/dictionary
 %%DATADIR%%/radius/dictionary.3com
 %%DATADIR%%/radius/dictionary.3gpp
 %%DATADIR%%/radius/dictionary.3gpp2
 %%DATADIR%%/radius/dictionary.acc
+%%DATADIR%%/radius/dictionary.airespace
 %%DATADIR%%/radius/dictionary.alcatel
 %%DATADIR%%/radius/dictionary.alteon
 %%DATADIR%%/radius/dictionary.altiga
+%%DATADIR%%/radius/dictionary.alvarion
+%%DATADIR%%/radius/dictionary.apc
 %%DATADIR%%/radius/dictionary.aptis
 %%DATADIR%%/radius/dictionary.aruba
 %%DATADIR%%/radius/dictionary.ascend
+%%DATADIR%%/radius/dictionary.asn
+%%DATADIR%%/radius/dictionary.avaya
+%%DATADIR%%/radius/dictionary.azaire
 %%DATADIR%%/radius/dictionary.bay
 %%DATADIR%%/radius/dictionary.bintec
 %%DATADIR%%/radius/dictionary.bristol
 %%DATADIR%%/radius/dictionary.cablelabs
 %%DATADIR%%/radius/dictionary.cabletron
+%%DATADIR%%/radius/dictionary.chillispot
 %%DATADIR%%/radius/dictionary.cisco
 %%DATADIR%%/radius/dictionary.cisco.bbsm
 %%DATADIR%%/radius/dictionary.cisco.vpn3000
 %%DATADIR%%/radius/dictionary.cisco.vpn5000
+%%DATADIR%%/radius/dictionary.clavister
 %%DATADIR%%/radius/dictionary.colubris
 %%DATADIR%%/radius/dictionary.columbia_university
 %%DATADIR%%/radius/dictionary.compat
 %%DATADIR%%/radius/dictionary.cosine
+%%DATADIR%%/radius/dictionary.dhcp
+%%DATADIR%%/radius/dictionary.digium
+%%DATADIR%%/radius/dictionary.epygi
 %%DATADIR%%/radius/dictionary.ericsson
 %%DATADIR%%/radius/dictionary.erx
 %%DATADIR%%/radius/dictionary.extreme
+%%DATADIR%%/radius/dictionary.fortinet
 %%DATADIR%%/radius/dictionary.foundry
 %%DATADIR%%/radius/dictionary.freeradius
+%%DATADIR%%/radius/dictionary.freeradius.internal
+%%DATADIR%%/radius/dictionary.freeswitch
 %%DATADIR%%/radius/dictionary.gandalf
 %%DATADIR%%/radius/dictionary.garderos
 %%DATADIR%%/radius/dictionary.gemtek
+%%DATADIR%%/radius/dictionary.h3c
+%%DATADIR%%/radius/dictionary.hp
+%%DATADIR%%/radius/dictionary.huawei
+%%DATADIR%%/radius/dictionary.infonet
+%%DATADIR%%/radius/dictionary.ipunplugged
+%%DATADIR%%/radius/dictionary.issanni
 %%DATADIR%%/radius/dictionary.itk
+%%DATADIR%%/radius/dictionary.jradius
 %%DATADIR%%/radius/dictionary.juniper
 %%DATADIR%%/radius/dictionary.karlnet
+%%DATADIR%%/radius/dictionary.lancom
 %%DATADIR%%/radius/dictionary.livingston
 %%DATADIR%%/radius/dictionary.localweb
+%%DATADIR%%/radius/dictionary.lucent
+%%DATADIR%%/radius/dictionary.manzara
 %%DATADIR%%/radius/dictionary.merit
 %%DATADIR%%/radius/dictionary.microsoft
 %%DATADIR%%/radius/dictionary.mikrotik
+%%DATADIR%%/radius/dictionary.motorola
 %%DATADIR%%/radius/dictionary.navini
 %%DATADIR%%/radius/dictionary.netscreen
+%%DATADIR%%/radius/dictionary.networkphysics
+%%DATADIR%%/radius/dictionary.nexans
 %%DATADIR%%/radius/dictionary.nokia
+%%DATADIR%%/radius/dictionary.nokia.conflict
 %%DATADIR%%/radius/dictionary.nomadix
+%%DATADIR%%/radius/dictionary.nortel
+%%DATADIR%%/radius/dictionary.ntua
+%%DATADIR%%/radius/dictionary.openser
+%%DATADIR%%/radius/dictionary.packeteer
+%%DATADIR%%/radius/dictionary.patton
 %%DATADIR%%/radius/dictionary.propel
+%%DATADIR%%/radius/dictionary.prosoft
+%%DATADIR%%/radius/dictionary.quiconnect
 %%DATADIR%%/radius/dictionary.quintum
 %%DATADIR%%/radius/dictionary.redback
 %%DATADIR%%/radius/dictionary.redcreek
+%%DATADIR%%/radius/dictionary.rfc2865
+%%DATADIR%%/radius/dictionary.rfc2866
+%%DATADIR%%/radius/dictionary.rfc2867
+%%DATADIR%%/radius/dictionary.rfc2868
+%%DATADIR%%/radius/dictionary.rfc2869
+%%DATADIR%%/radius/dictionary.rfc3162
+%%DATADIR%%/radius/dictionary.rfc3576
+%%DATADIR%%/radius/dictionary.rfc3580
+%%DATADIR%%/radius/dictionary.rfc4072
+%%DATADIR%%/radius/dictionary.rfc4372
+%%DATADIR%%/radius/dictionary.rfc4675
+%%DATADIR%%/radius/dictionary.rfc4679
+%%DATADIR%%/radius/dictionary.rfc4818
+%%DATADIR%%/radius/dictionary.rfc4849
+%%DATADIR%%/radius/dictionary.rfc5090
+%%DATADIR%%/radius/dictionary.rfc5176
+%%DATADIR%%/radius/dictionary.riverstone
+%%DATADIR%%/radius/dictionary.roaringpenguin
 %%DATADIR%%/radius/dictionary.shasta
 %%DATADIR%%/radius/dictionary.shiva
+%%DATADIR%%/radius/dictionary.slipstream
+%%DATADIR%%/radius/dictionary.sofaware
 %%DATADIR%%/radius/dictionary.sonicwall
 %%DATADIR%%/radius/dictionary.springtide
 %%DATADIR%%/radius/dictionary.starent
 %%DATADIR%%/radius/dictionary.t_systems_nova
 %%DATADIR%%/radius/dictionary.telebit
+%%DATADIR%%/radius/dictionary.telkom
 %%DATADIR%%/radius/dictionary.trapeze
+%%DATADIR%%/radius/dictionary.tropos
 %%DATADIR%%/radius/dictionary.tunnel
 %%DATADIR%%/radius/dictionary.unisphere
 %%DATADIR%%/radius/dictionary.unix
 %%DATADIR%%/radius/dictionary.usr
+%%DATADIR%%/radius/dictionary.utstarcom
 %%DATADIR%%/radius/dictionary.valemount
 %%DATADIR%%/radius/dictionary.versanet
+%%DATADIR%%/radius/dictionary.vqp
+%%DATADIR%%/radius/dictionary.walabi
+%%DATADIR%%/radius/dictionary.waverider
+%%DATADIR%%/radius/dictionary.wimax
 %%DATADIR%%/radius/dictionary.wispr
 %%DATADIR%%/radius/dictionary.xedia
-%%DATADIR%%/radius/dictionary.wimax
+%%DATADIR%%/radius/dictionary.xylan
+%%DATADIR%%/radius/dictionary.zyxel
+%%DATADIR%%/randpkt.html
 %%DATADIR%%/rawshark.html
 %%DATADIR%%/tshark.html
 %%DATADIR%%/text2pcap.html