Commit Graph

437 Commits

Author SHA1 Message Date
Michael Tüxen 83aa6f473f From Aaron Turner: Use wtap_wtap_encap_to_pcap_encap() instead of
fixed mapping for ethernet only.

svn path=/trunk/; revision=28443
2009-05-22 07:33:58 +00:00
Michael Tüxen 21fcdad106 One more debug output.
svn path=/trunk/; revision=28274
2009-05-05 05:58:21 +00:00
Michael Tüxen cd369fcbf8 Use a dynamic glib array instead of a static C array for
storing the interface specific data.

svn path=/trunk/; revision=28264
2009-05-03 17:43:41 +00:00
Michael Tüxen 9366841f60 Add support for multiple IDBs. They can used different encapsulations.
svn path=/trunk/; revision=28262
2009-05-03 15:47:41 +00:00
Michael Tüxen 2d894fdd24 Improve handling of if_tsresol option.
svn path=/trunk/; revision=28261
2009-05-03 15:09:23 +00:00
Michael Tüxen 6d0211be52 Use WTAP_FILE_TSPREC_NSEC as tsprecision. This makes it independent from the
interfaces. Convert other times appropriately.

svn path=/trunk/; revision=28257
2009-05-03 11:46:40 +00:00
Michael Tüxen 9447c434e9 Remove code that should have been removed by my last commit.
svn path=/trunk/; revision=28256
2009-05-03 10:38:41 +00:00
Michael Tüxen b9d34749e6 Use WTAP_ENCAP_PER_PACKET. This is an intermediate step towards supporting
multiple IDBs.

svn path=/trunk/; revision=28255
2009-05-03 09:56:53 +00:00
Michael Tüxen accb3a9207 Fix the handling of non PB/EPB blocks after the initial SDB/IDB.
svn path=/trunk/; revision=28251
2009-05-02 17:10:01 +00:00
Michael Tüxen fa8bb35715 Use named constant.
svn path=/trunk/; revision=28176
2009-04-27 11:52:14 +00:00
Guy Harris 18a3b0659c Have the libpcap and pcap-NG code share the LINKTYPE_-to-WTAP_ENCAP_
mapping table - they should be using the same values.  Share the mapping
routines as well.

svn path=/trunk/; revision=28173
2009-04-27 09:28:28 +00:00
Michael Tüxen c68e344284 Clean up some comments I forgot to remove.
svn path=/trunk/; revision=28154
2009-04-26 07:46:03 +00:00
Guy Harris a043d8482f Don't do pointer casting - some version of GCC complain about that.
svn path=/trunk/; revision=28153
2009-04-26 02:59:16 +00:00
Guy Harris f71921252e There's no guarantee that "ll" is the right modifier to use for
gint64/guint64 with GLib's formatting routines; use G_GINT64_MODIFIER
instead.

svn path=/trunk/; revision=28152
2009-04-25 21:06:09 +00:00
Michael Tüxen 94fc2641e7 - add support for interface statistic block
- distinguish between packet block and enhanced packet block
- fix a bug regarding the handling of unknown blocks

svn path=/trunk/; revision=28151
2009-04-25 19:11:35 +00:00
Guy Harris ad33ca6c2f Clean up some 64-bit issues.
svn path=/trunk/; revision=28117
2009-04-22 03:07:37 +00:00
Stephen Fisher b380da2559 Patch from bug #2986: "Fixes and enhancements in pcapng reader"
svn path=/trunk/; revision=26556
2008-10-26 08:20:26 +00:00
Jeff Morriss 9bd70e0d1d Don't cast a char[] into a guint32/64: the array may not be aligned correctly. This fixes a warning on Solaris/SPARC.
svn path=/trunk/; revision=25692
2008-07-09 20:16:24 +00:00
Jeff Morriss 34e3e26d07 Reindent some to get things a bit more consistent/readable.
svn path=/trunk/; revision=25691
2008-07-09 20:09:23 +00:00
Stephen Fisher 831d85448a Really fix pcapng timestamp reading and writing this time.
svn path=/trunk/; revision=24398
2008-02-20 04:41:31 +00:00
Stig Bjørlykke 7f32e1b7d3 Cast secs and nsecs correct.
Fixed some indentation.

svn path=/trunk/; revision=24353
2008-02-16 11:52:56 +00:00
Stephen Fisher ee56c90fd0 Change if_tsaccur to if_tsresol and change timestamp reading/writing
routines to correctly follow the clarified PcapNg standard document.


svn path=/trunk/; revision=24349
2008-02-16 08:07:07 +00:00
Stig Bjørlykke c6af1bfdd4 Removed some "statement not reached" warnings.
svn path=/trunk/; revision=24282
2008-02-07 12:14:40 +00:00
Ulf Lamping 79fbb2a272 g_warning -> pcapng_debug and "switch it off" as default, so normal users won't be annoyed by debug messages
svn path=/trunk/; revision=24198
2008-01-26 14:08:51 +00:00
Stephen Fisher a3c2114fba Use WTAP_MAX_PACKET_SIZE in place of 65535 in sanity check for snap len
(although they are the same value right now)


svn path=/trunk/; revision=24159
2008-01-22 01:05:32 +00:00
Ulf Lamping 7c59586e56 as we have BSWAP64() now, at least read 64bit section_length (but currently unused)
svn path=/trunk/; revision=24149
2008-01-21 01:54:28 +00:00
Stephen Fisher 1cf84f3d27 Introduce BSWAP64() and use it in the pcapng code
svn path=/trunk/; revision=24142
2008-01-20 02:31:34 +00:00
Ulf Lamping 65a4daed1a Make it compile on Win32 ;-)
svn path=/trunk/; revision=24141
2008-01-19 12:34:43 +00:00
Stig Bjørlykke 75804cec1a Make it compile on OSX.
svn path=/trunk/; revision=24140
2008-01-19 12:22:44 +00:00
Ulf Lamping 39114205fe various enhancements:
- read simple packet block
- read various options
- jump over unknown block types
- more sanity checks

svn path=/trunk/; revision=24139
2008-01-19 12:09:00 +00:00
Ulf Lamping 31be5fa705 decode IDB options (if_tsaccur and if_fcslen)
svn path=/trunk/; revision=24133
2008-01-18 10:29:23 +00:00
Stephen Fisher 9a1c52db82 Add link to pcap-ng format specification and use #defines for hex values of
block types.


svn path=/trunk/; revision=24128
2008-01-18 00:59:30 +00:00
Stephen Fisher 1caef26fa4 Fix seek reading by adding the size of the block length at the end of the
block to the data offset.


svn path=/trunk/; revision=24083
2008-01-14 05:31:38 +00:00
Ulf Lamping 105a6009bd some minor updates
svn path=/trunk/; revision=24082
2008-01-13 22:26:11 +00:00
Stephen Fisher a98ff5a017 Add svn:eol-style native and svn:keywords Id
svn path=/trunk/; revision=24081
2008-01-13 21:10:09 +00:00
Stephen Fisher c352fb3832 Make pcapng.c compile on Unix (with gcc)
svn path=/trunk/; revision=24080
2008-01-13 20:48:36 +00:00
Ulf Lamping 4f565d1a4d add very experimental support for pcapng "PCAP Next Generation Dump File Format" - this is incomplete and buggy, be careful!
svn path=/trunk/; revision=24079
2008-01-13 20:05:07 +00:00