Commit Graph

10 Commits

Author SHA1 Message Date
Guy Harris 2e64b81928 Not all platforms define "u_short", and "tvb_length_remaining()+4" isn't
guaranteed to fit into a "u_short" in any case.  Use "gint" instead.

Squelch some compiler warnings.

svn path=/trunk/; revision=19225
2006-09-13 01:28:07 +00:00
Anders Broman 5dd7a4e7f9 From: Luca Deri via Andrew Feren:
> please find enclosed a patch to the CFlow dissector (packet-netflow.c) 
> that enables it to decode IPFIX packet traces.

svn path=/trunk/; revision=19221
2006-09-12 19:11:45 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Anders Broman 441d892b13 From Motonori Shindo:
find attached the patch that reflects this interpretation of 
> this field accordingly. It also fixes a few minor bugs associated with 
> the handling of 'UNIX Secs' field and two field types
> (LAST_SWITCHED(21) and FIRST_SWITCHED(22)) in case of NetFlow V9.

svn path=/trunk/; revision=17698
2006-03-22 17:19:56 +00:00
Anders Broman 38d4e1d0c8 From Motonori Shindo:
The code assumes Template FlowSet contains only one Template Record, which is not necessarily true. Please find attached the patch to fix it.

svn path=/trunk/; revision=17630
2006-03-15 06:19:15 +00:00
Jörg Mayer caad611a07 Olivier Montanuy:
This is a simple patch to the Netflow v9 dissector, that let it decode
Netflow v9 MPLS-Aware, a feature of Cisco 12000 IOS 12.0.24S and above
on Cisco 12000, 7500 and 7200 that is very useful for MPLS-VPN networks.


svn path=/trunk/; revision=17225
2006-02-09 09:11:06 +00:00
Guy Harris 25c4bc9379 Replace tvb_memcpy() calls that extract IPv4 addresses into a guint32,
and that extract IPv6 addresses into a "struct e_in6_addr", with
tvb_get_ipv4() and tvb_get_ipv6() calls - except for some that we
remove, by using proto_tree_add_item(), rather than replacing.

Have epan/tvbuff.h include epan/ipv6-utils.h, to define "struct
e_in6_addr" (not necessary to declare the tvbuff routines, but including
it there means "struct e_in6_addr" is guaranteed to be defined before
those declarations, so we don't get compiler complaints if we define it
*after* those declarations).

svn path=/trunk/; revision=15758
2005-09-11 21:25:37 +00:00
Guy Harris bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
Guy Harris a8d0f1d31f From Luca Deri: NetFlow v9 enhancements.
svn path=/trunk/; revision=11947
2004-09-09 06:27:43 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00