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

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
This commit is contained in:
Jeff Morriss 2010-12-07 03:46:10 +00:00
parent 7c39ab9934
commit 2993d4aa54
3 changed files with 1307 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -1066,6 +1066,7 @@ Andrew C. Feren <acferen[AT]yahoo.com> {
Put all of Cisco's OUIs into manuf.tmpl
Put human-readable descriptions in the combo box entries for
"Interface:" on Windows
ntop nProbe and Plixer Mailinizer extensions for the Netflow dissector
}
Tomas Kukosa <tomas.kukosa [AT] siemens.com> {

1324
epan/dissectors/packet-netflow.c
View File

File diff suppressed because it is too large Load Diff

4
epan/sminmpec.h
View File

@ -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;