aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/nettl.c
AgeCommit message (Collapse)AuthorFilesLines
2010-06-06Don't use fwrite directly when writing a dump file; call it throughGuy Harris1-44/+6
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-04-26Clean up properly if we get an error after allocating the private dataGuy Harris1-1/+7
structure. svn path=/trunk/; revision=32563
2010-02-26Move the definitions of all the private data structures out ofGuy Harris1-13/+13
wtap-int.h, and change the unions of pointers to those private data structures into just void *'s. Have the generic wtap close routine free up the private data, rather than the type-specific close routine, just as the wtap_dumper close routine does for its private data. Get rid of close routines that don't do anything any more. svn path=/trunk/; revision=32015
2009-04-24[Trivial] Constify a few thingsBill Meier1-2/+2
svn path=/trunk/; revision=28144
2009-02-25From Mark C. Brown:Jaap Keuter1-6/+7
Added support for HPVM (Integrity Virtual Machines) guest AVIO (Accelerated Virtual IO) driver IGSSN. Cleaned up the trace record checks. Made the default ethernet if the nettl subsystem is not recognized. svn path=/trunk/; revision=27549
2008-05-08From Anders: Checkapi enabled for wiretap and more functions converted.Martin Mathieson1-6/+7
svn path=/trunk/; revision=25257
2008-04-12From Mark C. Brown:Jaap Keuter1-0/+2
Added support for HPVM (Integrity Virtual Machines) guest AVIO (Accelerated Virtual IO) driver IGSSN and 2nd generation 10 Gigabit Ethernet adapter AD386A driver ICXGBE. svn path=/trunk/; revision=24926
2007-10-27From Mark C. Brown:Anders Broman1-1/+27
Add support for the new NS_LS_SCTP tracing subsystem. svn path=/trunk/; revision=23290
2007-01-01From Mark C. Brown:Jaap Keuter1-36/+44
HP-UX 11.31 will add a new nettl trace subsystem, NS_LS_TELNET (ID=267). NS_LS_TELNET is just raw telnet data. There is no layer 2/3/4 headers, so there's just the HP-UX nettl record header followed directly by the TCP payload for a telnet connection. Thus the need for a new wiretap encapsulation type... svn path=/trunk/; revision=20253
2007-01-01From Mark C. Brown:Jaap Keuter1-37/+39
Fix some nettl encap types and size checks svn path=/trunk/; revision=20252
2006-11-05change all file offsets from long to gint64 so we can - theoretically - ↵Ulf Lamping1-4/+4
handle files > 2GB correct. Please distclean Win32 builds! svn path=/trunk/; revision=19814
2006-08-18Rework some of the header processing, to handle some additional nettlGuy Harris1-238/+239
files, and to clean the code up a bit - and incorporate some fixes to the rework, and other fixes, from Mark C. Brown. svn path=/trunk/; revision=18945
2006-07-26The nettl_file_hdr structure has a fixed format, as it's an on-disk dataGuy Harris1-19/+16
structure. Instead of making the host_name field bigger, make the thing we put in it smaller. Use that structure when reading files as well as when writing them. svn path=/trunk/; revision=18796
2006-07-26postadal@suse.cz:Jörg Mayer1-1/+1
Bufferoverflow caused by ethereal->wireshark rename (ws is 1 char longer). http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1015 svn path=/trunk/; revision=18794
2006-06-06Ethereal -> WiresharkGerald Combs1-2/+2
svn path=/trunk/; revision=18369
2006-05-31Tethereal/tethereal -> TShark/tshark.Gerald Combs1-1/+1
svn path=/trunk/; revision=18268
2005-08-25timestamp display precision:Ulf Lamping1-0/+1
- automatic adjustment depending on file format - manual adjustment through menu items save the setting in the recent file svn path=/trunk/; revision=15534
2005-08-24EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry! Ulf Lamping1-10/+10
I've done more than a day to change the timestamp resolution from microseconds to nanoseconds. As I really don't want to loose those changes, I'm going to check in the changes I've done so far. Hopefully someone else will give me a helping hand with the things left ... What's done: I've changed the timestamp resolution from usec to nsec in almost any place in the sources. I've changed parts of the implementation in nstime.s/.h and a lot of places elsewhere. As I don't understand the editcap source (well, I'm maybe just too tired right now), hopefully someone else might be able to fix this soon. Doing all those changes, we get native nanosecond timestamp resolution in Ethereal. After fixing all the remaining issues, I'll take a look how to display this in a convenient way... As I've also changed the wiretap timestamp resolution from usec to nsec we might want to change the wiretap version number... svn path=/trunk/; revision=15520
2005-07-08Make nettl file header items containing strings "gchar", to squelchGuy Harris1-5/+5
signed vs. unsigned compiler warnings. svn path=/trunk/; revision=14873
2005-06-04Fix some more leaks in error returns from open routines (if the open canGuy Harris1-14/+23
fail after the private data is allocated, you have to free the private data). The file header in nettl files is 128 bytes - use a #define for it, and also a #define for the magic number size. svn path=/trunk/; revision=14553
2005-05-17From Mark C Brown,:Anders Broman1-132/+76
Fixes for LAP-B (SX25L2) and X.25 (SX25L3) nettl trace records. svn path=/trunk/; revision=14385
2005-04-07updating Mark C Browns informationRonnie Sahlberg1-0/+3
svn path=/trunk/; revision=14025
2005-04-01From Mark C Brown NETTL updatesRonnie Sahlberg1-44/+94
svn path=/trunk/; revision=13999
2005-02-03Mark C. Brown: Added support for new ixgbe cardJörg Mayer1-25/+28
svn path=/trunk/; revision=13267
2004-10-19From Mark C. Brown:Guy Harris1-4/+44
fix FDDI to use correct bit swapped encap; tweak file open code to guess at file encap so merge works better. svn path=/trunk/; revision=12351
2004-10-14From Mark C. Brown: add 100VG support.Guy Harris1-0/+1
svn path=/trunk/; revision=12299
2004-10-12From Mark C. Brown: support dumping files with the raw ICMP and rawGuy Harris1-0/+10
ICMPv6 encapsulations. svn path=/trunk/; revision=12279
2004-10-12Correctly update the count of bytes dumped.Guy Harris1-2/+1
svn path=/trunk/; revision=12275
2004-10-12fix MSVC unused magic warningUlf Lamping1-2/+2
svn path=/trunk/; revision=12274
2004-10-11From Mark C. Brown: add support for writing nettl files.Guy Harris1-5/+171
svn path=/trunk/; revision=12258
2004-10-06From Mark C. Brown: add EISA 100BaseTX, EISA FDDI, and HSC FDDI support,Guy Harris1-12/+19
and make a small performance fix to HP-PB FDDI. svn path=/trunk/; revision=12218
2004-10-05From Mark C. Brown: support for the NETTL_SUBSYS_HPPB_FDDI records.Guy Harris1-37/+110
svn path=/trunk/; revision=12202
2004-10-01From Mark C. Brown: add the HP-PB FDDI card type, although we currentlyGuy Harris1-1/+9
don't have any code to handle it (other than to report that fact...). Also, refer to the subsystem type code as such, not as a "network type". svn path=/trunk/; revision=12178
2004-09-19From Mark C. Brown: fix support for nettl NETTL_SUBSYS_NS_LS_ICMP andGuy Harris1-3/+5
NETTL_SUBSYS_NS_LS_ICMPV6 - they don't even have IP headers, so we need to directly call the ICMP and ICMPv6 dissectors. svn path=/trunk/; revision=12047
2004-09-04From Mark C. Brown:Guy Harris1-3/+28
1) Change nettl subsystem ID's to decimal so as to match /etc/nettlgen.conf and ease maintenance 2) Add support for hp_apaport (PAgP), hp_apalacp, and IPv6 subsystem trace records 3) Correct handling of LOOPBACK trace records svn path=/trunk/; revision=11901
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2004-04-02From Mark C. Brown: add support for FDDI and Token Ring cards.Guy Harris1-12/+56
Set the file encapsulation the same way it's done for iptrace captures - leave it as "unknown" to start with, and, for each packet we see, set it to the packet's encapsulation type if the file encapsulation type is unknown and set it to "per-packet" if the file encapsulation type is "known" but isn't the type of that packet, so files that have all the same type of packet have that type as the file type and packets that *don't* have all the same type of packet have "per-packet". svn path=/trunk/; revision=10543
2004-03-27From Mark C. Brown: add support for iether (dual-port gigabit) cards inGuy Harris1-1/+2
nettl files. svn path=/trunk/; revision=10501
2004-01-25Have the Wiretap open, read, and seek-and-read routines return, inGuy Harris1-12/+15
addition to an error code, an error info string, for WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with "g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed strings returned as the error info string, and change the callers of those routines to, for those errors, put the info string into the printed message or alert box for the error. Add messages for cases where those errors were returned without printing an additional message. Nobody uses the error code from "cf_read()" - "cf_read()" puts up the alert box itself for failures; get rid of the error code, so it just returns a success/failure indication. Rename "file_read_error_message()" to "cf_read_error_message()", as it handles read errors from Wiretap, and have it take an error info string as an argument. (That handles a lot of the work of putting the info string into the error message.) Make some variables in "ascend-grammar.y" static. Check the return value of "erf_read_header()" in "erf_seek_read()". Get rid of an unused #define in "i4btrace.c". svn path=/trunk/; revision=9852
2003-10-01Have a pseudo-header for Ethernet packets, giving the size of the FCS -Guy Harris1-1/+5
0 means "there is no FCS in the packet data", 4 means "there is an FCS in the packet data", -1 means "I don't know whether there's an FCS in the packet data, guess based on the packet size". Assume that Ethernet encapsulated inside other protocols has no FCS, by having the "eth" dissector assume that (and not check for an Ethernet pseudo-header). Have "ethertype()" take an argument giving the FCS size; pass 0 when appropriate. Fix up Wiretap routines to set the pseudo-header. This means we no longer use the "generic" seek-and-read routine, so get rid of it. svn path=/trunk/; revision=8574
2003-05-05From Mark C. Brown:Guy Harris1-25/+22
Following fixes for nettl (HP-UX): 1) Fixed 11.X timestamp issue there is no difference in 10.X/11.X timestamps, so no need to shift 11.X timestamps 2) Fixed NS_LS_DRIVER trace record handling now works rather than throwing "...network type that Ethereal doesn't support" error 3) Fixed handling of traces with sliced packets (nettl -m xx) now uses correct packet and capture lengths 4) Additional ethernet card support now handles btlan[1,3-6],gelan,igelan,intl100 driver trace records svn path=/trunk/; revision=7642
2002-08-28Removed trailing whitespaces from .h and .c files using theJörg Mayer1-16/+16
winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6115
2002-07-29From Joerg Mayer:Guy Harris1-7/+7
All files: - Replace types from sys/types.h by those from glib.h - Replace ntoh family of macros from netinet/in.h and winsock2.h by g_ntoh family from glib.h - Remove now unneeded includes of sys/types.h, netinet/in.h and winsock2.h wtap.h Move includes to the top svn path=/trunk/; revision=5909
2002-06-07Graeme Hewson noted that zlib has a bug wherein "gzseek()" doesn't setGuy Harris1-10/+4
the internal z_err value for the stream if an "fseek()" call it makes fails, so that if "gzerror()" is subsequently called, it returns Z_OK rather than an error. To work around this, we pass "file_seek()" an "int *err", and have the with-zlib version of "file_seek()" check, if "gzseek()" fails, whether the return value of "file_error()" is 0 and, if so, have it return "errno" instead. svn path=/trunk/; revision=5642
2002-05-22Updated NS_LS_DRIVER to work with both pre-HPUX11 and HPUX11.Ronnie Sahlberg1-20/+49
Added support for NS_LS_TCP, NS_LS_UDP, NS_LS_LOOPBACK, NS_LS_ICMP and unnamed subsystem 0xb9 (which contains ethernet headers in my captures frames). However, NS_LS_ICMP will not be dissected since we dont have a RAW_ICMP wiretap encapsulation type. Updated decoding of usec timestamp for HPUX11 since HPUX11 has 0.1us resolution for the scalar in this field. YMMV but all these ones works for me from nettl traces from HPUX11. svn path=/trunk/; revision=5523
2002-05-17Added support for HPUX11 NETTL captures for the NS_LS_DRIVER type.Ronnie Sahlberg1-1/+108
It works for such captures containing 100baseT captures. It may explode on other link types. svn path=/trunk/; revision=5496
2002-04-09Move the definition of the FROM_DCE bit in the "flags" field of aGuy Harris1-2/+3
"struct x25_phdr" to "wiretap/wtap.h". Have two X.25 dissectors, one of which assumes that there's a "struct x25_phdr" pseudo-header and one of which doesn't; the former uses the information in that pseudo-header to determine whether the packet is DTE->DCE or DCE->DTE, and the latter assumes it has no clue whether the packet is DTE->DCE or DCE->TDE. Use the former one in the LAPB dissector, and the latter one in the XOT dissector and in the LLC dissector table. In the X.25-over-TCP dissector, handle multiple X.25 packets per TCP segment, and handle X.25 packets split across TCP segments. svn path=/trunk/; revision=5134
2002-03-05Make "wtap_seek_read()" return TRUE on success and FALSE on error, likeGuy Harris1-11/+12
"wtap_read()". Add some additional error checks to the Sniffer file reader. svn path=/trunk/; revision=4875
2002-03-05Have "wtap_seek_read()" return 0 on success and -1 on failure, and takeGuy Harris1-8/+16
an "err" argument that points to an "int" into which to put an error code if it fails. Check for errors in one call to it, and note that we should do so in other places. In the "wtap_seek_read()" call in the TCP graphing code, don't overwrite "cfile.pseudo_header", and make the buffer into which we read the data WTAP_MAX_PACKET_SIZE bytes, as it should be. In some of the file readers for text files, check for errors from the "parse the record header" and "parse the hex dump" routines when reading sequentially. In "csids_seek_read()", fix some calls to "file_error()" to check the error on the random stream (that being what we're reading). svn path=/trunk/; revision=4874
2002-03-04Check for errors in seeks, "tell"s, and "stat()"s/"fstat()"s.Guy Harris1-5/+11
For file types where we allocate private data, add "close" routines where they were missing, to free the private data. Also fix up the code to clean up after some errors by freeing private data where that wasn't being done. Get rid of unused arguments to "wtap_dump_open_finish()". Fix indentation. svn path=/trunk/; revision=4857