aboutsummaryrefslogtreecommitdiffstats
path: root/epan/sminmpec.h
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2010-12-07 03:46:10 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2010-12-07 03:46:10 +0000
commit2993d4aa54cb9134110ea7f59f8dcfc6547a1909 (patch)
tree5b258e729179943dd4d3bc0945810012876ac49a /epan/sminmpec.h
parent7c39ab9934210b4648eb9a49372e2f0c49ba78e2 (diff)
From Andrew Feren via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5377 :
Add a bunch of NetFlow/IPFIX extensions from Plixer and ntop. A little cleanup as well. From me: remove duplicate blurbs. svn path=/trunk/; revision=35142
Diffstat (limited to 'epan/sminmpec.h')
-rw-r--r--epan/sminmpec.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/sminmpec.h b/epan/sminmpec.h
index ebfbbdb65b..ed29bdc99e 100644
--- a/epan/sminmpec.h
+++ b/epan/sminmpec.h
@@ -75,10 +75,12 @@
#define VENDOR_THE3GPP 10415
#define VENDOR_GEMTEK_SYSTEMS 10529
#define VENDOR_VERIZON 12951
+#define VENDOR_PLIXER 13745
#define VENDOR_WIFI_ALLIANCE 14122
#define VENDOR_T_SYSTEMS_NOVA 16787
#define VENDOR_CACE 32622
-
+/* Greater than 32,767 need to be tagged unsigned. */
+#define VENDOR_NTOP 35632u
WS_VAR_IMPORT value_string_ext sminmpec_values_ext;