aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
AgeCommit message (Collapse)AuthorFilesLines
2010-11-29Fix typos.Chris Maynard1-2/+2
svn path=/trunk/; revision=35063
2010-11-24Add support for USB isochronous. From Marton Nemeth via bug #5370.Chris Maynard1-11/+73
svn path=/trunk/; revision=35025
2010-11-13Try to fix the build for text_import_scanner.Anders Broman1-0/+1
Please check if the compile flags are OK... 3:d time lucky ? svn path=/trunk/; revision=34862
2010-11-05From Robert Bullen:Anders Broman1-39/+60
Network Instruments' trace files sometimes cannot be read with an error message of "Observer: bad record: Invalid magic number" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5330 svn path=/trunk/; revision=34783
2010-11-04From Alexis La Goutte:Jaap Keuter2-9/+2
Replace all *_min()/*_max() by MIN() and MAX(). svn path=/trunk/; revision=34770
2010-10-28From Stephen Donnelly:Anders Broman1-7/+11
Wireshark tools do not detect and read some ERF files correctly https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5344 svn path=/trunk/; revision=34665
2010-10-21Fix a cut-n-pasteo in a comment.Jeff Morriss1-1/+1
svn path=/trunk/; revision=34603
2010-10-20From Jeff Morriss: Fix crash: WTAP_ERR_BAD_RECORD error return needs to fill ↵Bill Meier2-8/+15
in *err_info. From me: For ipfix_open() don't actually return with *err=WTAP_ERR_BAD_RECORD. Also: Move #define RECORDS_FOR_IPFIX_CHECK to ipfix.c from ipfix.h since the definition is only used in ipfix.c. svn path=/trunk/; revision=34589
2010-10-20Fix bug which caused ascend_open() to return "I/O error" (instead of "not me").Bill Meier1-0/+1
(This happened if ascend_open was called with *err != 0). svn path=/trunk/; revision=34588
2010-10-20Fix a typo in a commentBill Meier1-1/+1
svn path=/trunk/; revision=34586
2010-10-20From Hadriel Kaplan: Update wiretap/README.developerBill Meier1-1/+7
svn path=/trunk/; revision=34578
2010-10-20From Hadriel Kaplan: IPFIX file format support.Bill Meier8-9/+378
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5242 svn path=/trunk/; revision=34576
2010-10-02Make it a bit clearer what's going on - ASCII '0' has the decimal valueGuy Harris1-1/+1
48, and that's converting '0'-'9' to 0-9. svn path=/trunk/; revision=34326
2010-09-25- FindGLIB2.cmake updates fromJörg Mayer1-0/+1
http://www.opensync.org/browser/branches/3rd-party-cmake-modules/modules + split out FindGMODULE2.cmake + contains /sw/... by default + supposedly tested on OSX - Disable pcre for cmake builds by default, gregex should be picked up automatically if glib2 is not too old. Should you have trouble linking due to some libgmodule... stuff undefined, please add "${GMODULE2_LIBRARIES}" after "${GLIB2_LIBRARIES}" an report back. svn path=/trunk/; revision=34248
2010-09-23H.sivank:Jörg Mayer1-1/+1
Cmake fixes. svn path=/trunk/; revision=34225
2010-09-23H. Sivank <hsivank@gmail.com>Jörg Mayer1-1/+1
I try to configure Wireshark with cmake on macosx 10.6. It fails with : set_target_properties called with incorrect number of arguments. Attached a patch to fix this issue. svn path=/trunk/; revision=34201
2010-09-22Very old versions of libz (such as the one that comes with Solaris 10) don't ↵Jeff Morriss1-0/+2
have gzclearerr(). Check for that function and only use it if we have it. svn path=/trunk/; revision=34187
2010-08-24Fix issue which causes daintree-sna frames to be rejected with "capture ↵Bill Meier1-0/+2
length > packet length". This fix adds back two lines of code removed in SVN #33678. "Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't include the FCS, and use it for the Daintree SNA file format. [...]" This fix just restores the discarding of two end-of-frame "pad" bytes as each frame is read from the capture file; This seems to me to be the correct behaviour. svn path=/trunk/; revision=33909
2010-08-24From Hamish Moffatt:Anders Broman1-0/+1
daintree-sna.c doesn't initialise capture_file snapshot_length. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5128 svn path=/trunk/; revision=33904
2010-08-08Add a note.Guy Harris1-0/+4
svn path=/trunk/; revision=33741
2010-08-07From Jon Smirl:Stig Bjørlykke1-1/+2
Added "IEEE 802.15.4 Wireless PAN no fcs". svn path=/trunk/; revision=33728
2010-07-30Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don'tGuy Harris3-11/+21
include the FCS, and use it for the Daintree SNA file format. While we're at it, explicitly check to make sure the purported packet length gives it at least one byte of packet data, and fix some print formats to use %u for unsigned values. svn path=/trunk/; revision=33678
2010-07-23At least in some NetMon 3.4 VPN captures, the per-packet link-layer typeGuy Harris1-1/+7
is 0, but the packets have Ethernet headers. We handle this by mapping 0 to WTAP_ENCAP_ETHERNET. (XXX - should we, instead, use the per-file link-layer type?) svn path=/trunk/; revision=33620
2010-07-21The 32-bit unsigned time offset in version 1.x files should be convertedGuy Harris1-1/+5
to a gint64 (which won't sign-extend it) before multiplying by 1000, so that the product is 64-bit and won't overflow. svn path=/trunk/; revision=33609
2010-07-21According to mail from Paul Long at Microsoft, in the 1.x NetMon fileGuy Harris1-1/+7
format, the time offset from the start of the capture always had a positive value, so it's an unsigned value. (In newer versions of NetMon 3.x, the capture can start before the "capture start" time stamp is set, so packets can have a *negative* offset from the capture start time stamp. Those captures are in the 2.x file format.) svn path=/trunk/; revision=33607
2010-07-19Initial support for Network Monitor 802.11 radio header.Guy Harris3-2/+7
svn path=/trunk/; revision=33583
2010-07-18Add an entry in encap_table_base for SocketCAN.Guy Harris1-1/+3
svn path=/trunk/; revision=33578
2010-07-18The time delta in a NetMon frame header is signed - it can be negative.Guy Harris1-3/+5
svn path=/trunk/; revision=33576
2010-07-18NetMon per-packet link-layer types with 0xE000 in the upper 4 bits areGuy Harris1-8/+37
converted pcap files; the LINKTYPE_ value is in the lower 12 bits. svn path=/trunk/; revision=33574
2010-07-18Initial support for the trailer information in versions 2.1 and later ofGuy Harris1-19/+135
the NetMon file format. Currently, we just use the network type field, and we ignore all the special record types and don't try to handle any of the other special network types. We also catch bogus frame tables where the record is bigger than the frame table says it is. svn path=/trunk/; revision=33572
2010-07-16It makes (slightly) more sense for comments to be "sent" by the context than ↵Martin Mathieson1-1/+1
"received". svn path=/trunk/; revision=33552
2010-07-14Don't pass tvb data to col_set_str(), as it will not stay around.Stig Bjørlykke1-1/+1
Added support for Note (dumping as text). Renamed Info to Power (as used in PacketLogger). svn path=/trunk/; revision=33526
2010-06-30Add Visual C++ project files to the distribution.Gerald Combs1-0/+1
svn path=/trunk/; revision=33386
2010-06-06Clean up indentation.Guy Harris1-5/+5
svn path=/trunk/; revision=33118
2010-06-06Get rid of file_write(); nobody uses it, and file writers should useGuy Harris1-3/+1
wtap_dump_file_write() (it does the right error checking for you, and returns FALSE on failure and gives you the right error code). svn path=/trunk/; revision=33117
2010-06-06Don't use fwrite directly when writing a dump file; call it throughGuy Harris15-722/+262
wtap_dump_file_write(). Replace various wrappers around fwrite() with wtap_dump_file_write(), or at least make the wrappers call wtap_dump_file_write(). svn path=/trunk/; revision=33116
2010-06-06Move the seekback stuff out of esc_read() to the one place where it'sGuy Harris2-253/+273
done. Use the wtap_dump_file_ routines to write out capture files, and check for errors. Use the phton macros, when available, to translate to big-endian byte order. Add a new phton24() macro. Clean up indentation. svn path=/trunk/; revision=33114
2010-06-06Rename wtap_dump_file_write_all() to wtap_dump_file_write(), and haveGuy Harris6-204/+76
everybody use it; the places using the old wtap_dump_file_write() were using it in the same way the old wtap_dump_file_write_all() did. That also lets us get rid of wtap_dump_file_ferror(). Also, have the new wtap_dump_file_write() check for errors from gzwrite() and fwrite() differently - the former returns 0 on error, the latter can return a short write on error. svn path=/trunk/; revision=33113
2010-06-05From Rolf Fiedler: support for writing EyeSDN trace files.Guy Harris3-2/+145
svn path=/trunk/; revision=33107
2010-05-16Attempt to handle isochronous descriptors between the 64-byte header andGuy Harris2-117/+142
the payload. Should fix bug 4401. svn path=/trunk/; revision=32828
2010-05-10Fix non-libz build.Martin Mathieson1-1/+1
svn path=/trunk/; revision=32734
2010-05-08Add wtap_cleareof().Guy Harris1-0/+1
svn path=/trunk/; revision=32719
2010-05-07Zlib has an officially-sanctioned way of clearing EOF when we're tailingGerald Combs2-9/+17
a file. Use it. svn path=/trunk/; revision=32716
2010-05-07EOF in zlib 1.2.5 seems to be sticky. When we're tailing a file and weGerald Combs1-0/+12
reach EOF, zlib's file handle seems to stay at EOF even when more data is appended to the file. Add a check for 1.2.5 which calls gzseek in order to unset EOF. Fixes bugs 4708 and 4748. svn path=/trunk/; revision=32715
2010-04-27Whitespace changes.Anders Broman1-23/+23
svn path=/trunk/; revision=32575
2010-04-26Clean up properly if we get an error after allocating the private dataGuy Harris1-1/+7
structure. svn path=/trunk/; revision=32563
2010-04-22A bit more information.Guy Harris1-0/+6
svn path=/trunk/; revision=32537
2010-04-22More updates to reflect all the hairy details of Linux USB capture.Guy Harris1-30/+70
svn path=/trunk/; revision=32536
2010-04-22Update a comment to reflect recent changes and to reflect behavior ofGuy Harris1-3/+17
later Linux kernels. svn path=/trunk/; revision=32535
2010-04-21From Chris Maynard:Guy Harris6-84/+92
Support PPP-over-USB. Don't remove the USB pseudo-header from the packet data for Linux USB packets, just byte-swap it if necessary and have the USB dissector fetch the pseudo-header from the raw packet data. Update USB language ID values. svn path=/trunk/; revision=32534