aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/ipfix.c
AgeCommit message (Collapse)AuthorFilesLines
2013-06-17Merge "read record header" and "read packet data" routines into a singleGuy Harris1-22/+13
routine, used both by read and seek-read routines. svn path=/trunk/; revision=49988
2013-06-16Have the seek-read routines take a Buffer rather than a guint8 pointerGuy Harris1-9/+5
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-05-17IPFIX records have a time stamp (and, according to RFC 5101, it's UNIXGuy Harris1-2/+2
time, i.e. seconds since January 1, 1970, 00:00:00 UTC). svn path=/trunk/; revision=49370
2013-05-17We need ipfix_read_message_header() for the open routine; haveGuy Harris1-29/+46
ipfix_read_and_process_message_header() call it and then fill in the wtap_pkthdr structure, and use the latter routine in the read and seek-read routines. Expand a comment, and fix indentation. svn path=/trunk/; revision=49369
2013-05-17Pull the code that fills in a wtap_pkthdr structure intoGuy Harris1-37/+34
ipfix_read_message_header() and rename it ipfix_process_message_header(). Use it in the read and seek-read routines. svn path=/trunk/; revision=49368
2012-12-27Do not call wtap_file_read_unknown_bytes() orGuy Harris1-1/+1
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-19Mark unused variable with _U_Jakub Zawadzki1-4/+1
svn path=/trunk/; revision=45656
2012-10-16Add wtap_pseudo_header union to wtap_pkthdr structure.Jakub Zawadzki1-2/+3
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-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-05-04file_seek() used to be a wrapper around fseek() or gzseek(), both ofGuy Harris1-4/+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-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
2011-12-13Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports anyGuy Harris1-4/+4
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-09-01Use guint8 rather than guchar for raw octets and pointers to arrays ofGuy Harris1-2/+2
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-04-21Add a new WTAP_ERR_DECOMPRESS error, and use that for errors discoveredGuy Harris1-4/+4
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-02-04Set *err before *err_info - that's how it's done in most other modules.Guy Harris1-1/+1
svn path=/trunk/; revision=35805
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 Meier1-6/+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-20From Hadriel Kaplan: IPFIX file format support.Bill Meier1-0/+326
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5242 svn path=/trunk/; revision=34576
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 19:10:28 +0000