aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/netmon.c
AgeCommit message (Collapse)AuthorFilesLines
2014-05-24Allow wtap_read() and wtap_seek_read() to return records other than packets.Guy Harris1-0/+8
Add a "record type" field to "struct wtap_pkthdr"; currently, it can be REC_TYPE_PACKET, for a record containing a packet, or REC_TYPE_FILE_TYPE_SPECIFIC, for records containing file-type-specific data. Modify code that reads packets to be able to handle non-packet records, even if that just means ignoring them. Rename some routines to indicate that they handle more than just packets. We don't yet have any libwiretap code that supplies records other than REC_TYPE_PACKET or that supporting writing records other than REC_TYPE_PACKET, or any code to support plugins for handling REC_TYPE_FILE_TYPE_SPECIFIC records; this is just the first step for bug 8590. Change-Id: Idb40b78f17c2c3aea72031bcd252abf9bc11c813 Reviewed-on: https://code.wireshark.org/review/1773 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-23Revert "Allow wtap_read() and wtap_seek_read() to return non-packet records."Guy Harris1-16/+16
This reverts commit c0c480d08c175eed4524ea9e73ec86298f468cf4. A better way to do this is to have the record type be part of struct wtap_pkthdr; that keeps the metadata for the record together and requires fewer API changes. That is in-progress. Change-Id: Ic558f163a48e2c6d0df7f55e81a35a5e24b53bc6 Reviewed-on: https://code.wireshark.org/review/1741 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-23Allow wtap_read() and wtap_seek_read() to return non-packet records.Guy Harris1-16/+16
This is the first step towards implementing the mechanisms requestd in bug 8590; currently, we don't return any records other than packet records from libwiretap, and just ignore non-packet records in the rest of Wireshark, but this at least gets the ball rolling. Change-Id: I34a45b54dd361f69fdad1a758d8ca4f42d67d574 Reviewed-on: https://code.wireshark.org/review/1736 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-09Revert "Refactor Wiretap"Guy Harris1-60/+57
This reverts commit 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a. This isn't building, and looks as if it requires significant work to fix. Change-Id: I622b1bb243e353e874883a302ab419532b7601f2 Reviewed-on: https://code.wireshark.org/review/1568 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-09Refactor WiretapMichael Mann1-57/+60
Start of refactoring Wiretap and breaking structures down into "generally useful fields for dissection" and "capture specific". Since this in intended as a "base" for Wiretap and Filetap, the "wft" prefix is used for "common" functionality. The "architectural" changes can be found in cfile.h, wtap.h, wtap-int.h and (new file) wftap-int.h. Most of the other (painstaking) changes were really just the result of compiling those new architecture changes. bug:9607 Change-Id: Ife858a61760d7a8a03be073546c0e7e582cab2ae Reviewed-on: https://code.wireshark.org/review/1485 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-06Make some routines take a struct wtap_pkthdr * as an argument.Guy Harris1-11/+10
For some routines that take multiple arguments that come from a struct wtap_pkthdr, pass a pointer to the struct wtap_pkthdr in question, rather than the separate arguments. Do this even if we're passing expressions that were earlier assigned to the struct wtap_pkthdr fields in question. This simplifies the calling sequences and ensures that the right values are picked up by the called routine; in at least one case we were *not* passing the right values (the code to handle Simple Packet Blocks in pcap-ng files). Also, call the byte-swapping routines for pseudo-header fields only if we need to do byte-swapping. Change-Id: I3a8badfcfeb0237dfc1d1014185a67f18c0f2ebe Reviewed-on: https://code.wireshark.org/review/119 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-01-22Don't write out packets that have a "captured length" bigger than we'reGuy Harris1-0/+28
willing to read or that's bigger than will fit in the file format; instead, report an error. For the "I can't write a packet of that type in that file type" error, report the file type in question. svn path=/trunk/; revision=54882
2014-01-02No seek-read routines use the length argument, so eliminate it fromGuy Harris1-4/+2
wtap_seek_read(). svn path=/trunk/; revision=54570
2013-12-31Use the packet length read from the packet header when reading packetsGuy Harris1-2/+3
randomly. svn path=/trunk/; revision=54519
2013-12-03wiretap: start using <wsutil/pint.h>Jakub Zawadzki1-19/+19
svn path=/trunk/; revision=53764
2013-11-29Expand macros: htoles(), htolel(), htolell()Jakub Zawadzki1-26/+26
svn path=/trunk/; revision=53651
2013-11-09Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec.Jakub Zawadzki1-1/+1
After r50154 nstime_t is inside wsutil/ so wiretap don't need it's own copy. svn path=/trunk/; revision=53184
2013-11-08(Trivial) whitespace cleanup (mostly trailing whitespace).Bill Meier1-1/+1
svn path=/trunk/; revision=53172
2013-11-08The "file types" we have are actually combinations of types andGuy Harris1-9/+9
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2 are separate "file types", even though they both come from Network Monitor. Rename various functions, #defines, and variables appropriately. svn path=/trunk/; revision=53166
2013-06-16Have the seek-read routines take a Buffer rather than a guint8 pointerGuy Harris1-31/+10
as the "where to put the packet data" argument. This lets more of the libwiretap code be common between the read and seek-read code paths, and also allows for more flexibility in the "fill in the data" path - we can expand the buffer as needed in both cases. svn path=/trunk/; revision=49949
2013-06-02Initialize the frame_table_size field of the private data to 0 and theGuy Harris1-0/+9
frame_table field to NULL before trying to allocate the frame table, so that if we fail before we allocate the frame table, the attempt to free the private data doesn't crash due to the frame_table field containing a bogus pointer. svn path=/trunk/; revision=49697
2013-06-01When allocating the frame table for a NetMon file, use g_try_malloc(),Guy Harris1-1/+5
and fail with ENOMEM if that fails (and the frame table is not empty - g_try_malloc() will return NULL if you ask it to allocate zero bytes). Have an error message for ENOMEM on an open that attempts to tell the user what the problem is without making their head explode. svn path=/trunk/; revision=49673
2013-06-01Move the record header processing code into a common routine, and readGuy Harris1-101/+123
that header in both the read and seek-read routines. svn path=/trunk/; revision=49671
2013-03-25Wiretap file open routines should not free wth->priv on error, since thatEvan Huus1-5/+0
leads to a double-free in wtap_close. Fix all the instances I found via manual code review, and add a brief comment to the list of open routines in file_access.c Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8518 svn path=/trunk/; revision=48552
2013-03-17From beroset:Anders Broman1-4/+3
implemented wtap_dump_file_seek() and _tell() implemented the previously declared but unimplemented wtap_dump_file_seek() and wtap_dump_file_tell() functions and used them in the seven files that had previously used a plain ftell or fseek and added error checking as appropriate. I also added a new error WTAP_ERR_CANT_SEEK_COMPRESSED and put it next to WTAP_ERR_CANT_SEEK causing renumbering of two of the existing error codes. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48348
2012-12-27OK, fine, how about 4 characters initializing a 4-character array?Guy Harris1-2/+2
svn path=/trunk/; revision=46804
2012-12-27Do not call wtap_file_read_unknown_bytes() orGuy Harris1-13/+16
wtap_file_read_expected_bytes() from an open routine - open routines are supposed to return -1 on error, 0 if the file doesn't appear to be a file of the specified type, or 1 if the file does appear to be a file of the specified type, but those macros will cause the caller to return FALSE on errors (so that, even if there's an I/O error, it reports "the file isn't a file of the specified type" rather than "we got an error trying to read the file"). When doing reads in an open routine before we've concluded that the file is probably of the right type, return 0, rather than -1, if we get WTAP_ERR_SHORT_READ - if we don't have enough data to check whether a file is of a given type, we should keep trying other types, not give up. For reads done *after* we've concluded the file is probably of the right type, if a read doesn't return the number of bytes we asked for, but returns an error of 0, return WTAP_ERR_SHORT_READ - the file is apparently cut short. For NetMon and NetXRay/Windows Sniffer files, use a #define for the magic number size, and use that for both magic numbers. svn path=/trunk/; revision=46803
2012-10-16Add wtap_pseudo_header union to wtap_pkthdr structure.Jakub Zawadzki1-7/+9
Use pkthdr instead of pseudo_header as argument for dissecting. svn path=/trunk/; revision=45601
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-2/+0
svn path=/trunk/; revision=45015
2012-07-18Set the 802.11 "already decrypted" flag to FALSE for file formats otherGuy Harris1-0/+1
than Network Instruments Observer files, as we don't know whether they are already decrypted. svn path=/trunk/; revision=43796
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-02Try to squelch warningsAnders Broman1-3/+3
svn path=/trunk/; revision=42998
2012-05-04file_seek() used to be a wrapper around fseek() or gzseek(), both ofGuy Harris1-8/+3
which could use lseek() and were thus expensive due to system call overhead. To avoid making a system call for every packet on a sequential read, we maintained a data_offset field in the wtap structure for sequential reads. It's now a routine that just returns information from the FILE_T data structure, so it's cheap. Use it, rather than maintaining the data_offset field. Readers for some file formats need to maintain file offset themselves; have them do so in their private data structures. svn path=/trunk/; revision=42423
2012-05-02Use WTAP_ENCAP_IEEE_802_11_xxx for all the "802.11 plus radio header"Guy Harris1-2/+2
encapsulations. For pre-V9 AiroPeek captures, leave the radio information in the packet data, just as we do with the Prism, AVS, radiotap, and NetMon headers. Add a dissector for it. svn path=/trunk/; revision=42379
2012-02-25Add a presence flag field to the packet information structure filled inGuy Harris1-0/+1
by Wiretap, to indicate whether certain fields in that structure actually have data in them. Use the "time stamp present" flag to omit showing time stamp information for packets (and "packets") that don't have time stamps; don't bother working very hard to "fake" a time stamp for data files. Use the "interface ID present" flag to omit the interface ID for packets that don't have an interface ID. We don't use the "captured length, separate from packet length, present" flag to omit the captured length; that flag might be present but equal to the packet length, and if you want to know if a packet was cut short by a snapshot length, comparing the values would be the way to do that. More work is needed to have wiretap/pcapng.c properly report the flags, e.g. reporting no time stamp being present for a Simple Packet Block. svn path=/trunk/; revision=41185
2012-01-14NetMon 1.x format does *not* support per-packet encapsulation.Guy Harris1-1/+13
svn path=/trunk/; revision=40495
2011-12-22The encapsulation following WTAP_ENCAP_ARCNET isGuy Harris1-1/+1
WTAP_ENCAP_ARCNET_LINUX; update various tables mapping Wiretap encapsulations to file-type encapsulations. Get rid of some trailing "sorry, that's not supported" entries while we're at it. svn path=/trunk/; revision=40274
2011-12-13Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports anyGuy Harris1-6/+6
form of corruption/bogosity in a file, including in a file header as well as in records in the file. Change the error message wtap_strerror() returns for it to reflect that. Use it for some file header problems for which it wasn't already being used - WTAP_ERR_UNSUPPORTED shouldn't be used for that, it should only be used for files that we have no reason to believe are invalid but that have a version number we don't know about or some other non-link-layer-encapsulation-type value we don't know about. svn path=/trunk/; revision=40175
2011-12-13Crank up the maximum frame table size to 512*2^20 packets, that being aGuy Harris1-3/+10
small amount bigger than the maximum possible number of packets in a NetMon file. svn path=/trunk/; revision=40174
2011-12-13Add an arbitrary limit on the maximum size of the frame table, so thatGuy Harris1-0/+13
we don't crash. Fixes bug 6669. svn path=/trunk/; revision=40168
2011-11-17Add checks to make sure we don't overflow the maximum 32-bit fileGuy Harris1-0/+37
offset. svn path=/trunk/; revision=39915
2011-11-17Add support for writing WTAP_ENCAP_PER_PACKET files; they are writtenGuy Harris1-13/+77
out in version 2.1 of the file format (the minimum version to support that). Change some data types to avoid having file offsets that are before the beginning of the file. Clean up some other data types and some comments. svn path=/trunk/; revision=39898
2011-11-16Support nanosecond-resolution time for NetMon 2.x format (it's onlyGuy Harris1-41/+125
100-nanosecond resolution, but that's still better than microsecond resolution). For NetMon 1.x format, only claim to support millisecond resolution, as that's all you get. Fix handling of negative time deltas in NetMon 2.x format. When writing a NetMon file, trim the time of the first packet to millisecond precision to get the capture start time, so that the start time written to the file (which has millisecond precision) is the same as the start time used to calculate the deltas written to the packet headers. svn path=/trunk/; revision=39886
2011-09-01Use guint8 rather than guchar for raw octets and pointers to arrays ofGuy Harris1-7/+7
same. Add to wiretap/pcap-common.c a routine to fill in the pseudo-header for ATM (by looking at the VPI, VCI, and packet data, and guessing) and Ethernet (setting the FCS length appropriately). Use it for both pcap and pcap-ng files. svn path=/trunk/; revision=38840
2011-05-03Note what NetMon 3 actually uses various types for.Guy Harris1-5/+5
For the ones that are used for raw IP, use WTAP_ENCAP_RAW_IP. (Yes, NetMon checks for v4 vs. v6 for all of them.) svn path=/trunk/; revision=36975
2011-05-03Set the pseudo-header regardless of whether we have a trailer or not.Guy Harris1-42/+47
svn path=/trunk/; revision=36974
2011-05-03It appears that, in NetMon 802.11 captures, management frames have anGuy Harris1-104/+176
FCS and data frames don't have an FCS; I don't know about control frames. svn path=/trunk/; revision=36973
2011-04-21Add a new WTAP_ERR_DECOMPRESS error, and use that for errors discoveredGuy Harris1-16/+18
by the gunzipping code. Have it also supply a err_info string, and report it. Have file_error() supply an err_info string. Put "the file" - or, for WTAP_ERR_DECOMPRESS, "the compressed file", to suggest a decompression error - into the rawshark and tshark errors, along the lines of what other programs print. Fix a case in the Netscaler code where we weren't fetching the error code on a read failure. svn path=/trunk/; revision=36748
2011-04-12"This file format can't be written to a pipe" and "this file formatGuy Harris1-9/+1
can't be saved in compress form" are both equivalent to "this file file format requires seeking when writing it". Change the "can compress" Boolean in the file format table to "writing requires seeking", give all the entries the proper value, and do the checks for attempting to write a file format to a pipe or write it in compressed format to common code. This means we don't need to pass the "can't seek" flag to the dump open routines. svn path=/trunk/; revision=36575
2011-04-06From Jakub Zawadzki:Guy Harris1-7/+7
file_read(buf, bsize, count, file) macro is compilant with fread function and takes elements count+ size of each element, however to make it compilant with gzread() it always returns number of bytes. In wiretap file_read() this is not really used, file_read is called either with bsize set to 1 or count to 1. Attached patch remove bsize argument from macro. svn path=/trunk/; revision=36491
2010-12-28It is not guaranteed that the records in numerical (frame table) orderGuy Harris1-7/+5
will be in sequential (byte offset) order in the file; don't treat the record offset going backwards as an error. svn path=/trunk/; revision=35291
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 07:30:36 +0000