aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/wtap.h
AgeCommit message (Collapse)AuthorFilesLines
2005-08-19Add APIs to Wiretap to return the file of the size as supplied by the OSGuy Harris1-1/+7
(so if the file's gzipped, it's *NOT* the size of the file after uncompressing), and an approximation of the amount of that data read sequentially so far. Use those for various progress bars and the like. Make the fstat() in the Ascend trace reader directly use wth->fd, as it's inside Wiretap; that gets rid of the last caller of wtap_fd() (as we're no longer directly using fstat() or lseek() in Ethereal), so get rid of wtap_fd(). svn path=/trunk/; revision=15437
2005-08-12From Hannes GredlerAnders Broman1-1/+2
- add support for Multi-Link Frame-Relay (FRF.15) captures taken on Juniper ML-, LS-, AS- PICs. - rework of the common juniper header dissector: test the extension flag (0x80) which indicates that there are meta-information like interface-index, interface-name etc. present - minor bugfix (LSQ L3-proto masks, direction masks were broken) svn path=/trunk/; revision=15316
2005-07-22Fix some warnings (and one of my previous 'fixes')Jörg Mayer1-2/+2
svn path=/trunk/; revision=14997
2005-07-22From Hannes Gredler:Anders Broman1-1/+2
support for support for DLT_JUNIPER_MLPPP svn path=/trunk/; revision=14994
2005-06-16third and last(?) iteration on the import routines for tektronix 32bit rf5 ↵Luis Ontanon1-2/+18
files. Now the import is correct even for large files. I found out when and where the "junk" was inserted. svn path=/trunk/; revision=14646
2005-06-13use a helper dissector to show k12 files.Luis Ontanon1-1/+11
svn path=/trunk/; revision=14621
2005-06-10Initial checkin of the 32 bit tektronix k12 binary format (rf5)Luis Ontanon1-1/+2
There is still much to do, but at the very least it can import files allowing the user to choose which protocols handle the diferent sources. svn path=/trunk/; revision=14606
2005-05-17From Mark C Brown,:Anders Broman1-1/+2
Fixes for LAP-B (SX25L2) and X.25 (SX25L3) nettl trace records. svn path=/trunk/; revision=14385
2005-05-13Add WTAP_GCOM_TIE1 and WTAP_GCOM_SERIAL forGilbert Ramirez1-1/+3
Oolan Zimmer <ethereal@gcom.com> svn path=/trunk/; revision=14362
2005-05-11From Hannes GredlerRonnie Sahlberg1-1/+2
support for Juniper PPPOE encapsulation svn path=/trunk/; revision=14346
2005-05-02- Add support for libpcap files for MTP2 with a per packet headerMichael Tüxen1-3/+12
indicating the direction, narrowband/broadband, and interface number. - Add support to display the direction and interface number. - Add support to packet-mtp2.c to use the broadband/narrowband indication. svn path=/trunk/; revision=14265
2005-04-03Make editcap use wtap_read(); that eliminates the last user ofGuy Harris1-8/+0
wtap_loop(), so eliminate wtap_loop(). svn path=/trunk/; revision=14006
2005-04-01From Mark C Brown NETTL updatesRonnie Sahlberg1-3/+19
svn path=/trunk/; revision=13999
2005-02-05From Josh Bailey:Gerald Combs1-0/+3
Attached is an update to Lucent/Ascend trace parsing: fix a few bugs, add support for ISDN and Ethernet captures - diffs to 0.10.9. svn path=/trunk/; revision=13311
2005-01-31From Florian Lohoff: Redback SmartEdge SE400/800 tcpdump disassembly.Guy Harris1-1/+2
svn path=/trunk/; revision=13212
2005-01-28From Yoshihiro Oyama: support "-" as a file name, referring to theGuy Harris1-0/+2
standard input. Opening it for random access isn't supported; we add a new error for that. svn path=/trunk/; revision=13189
2005-01-20From Hannes Gredler: support for Juniper's DLT_JUNIPER_ATM{1,2} values.Guy Harris1-1/+3
svn path=/trunk/; revision=13130
2004-12-07Add an entry for the new DLT_GPRS_LLC (so that nobody working onGuy Harris1-1/+2
Ethereal, unaware that the Ethereal team does *NOT* control libpcap format, thinks they can just grab 169 and use it for their own purposes). svn path=/trunk/; revision=12678
2004-10-29As Sam Leffler notes, the radiotap header isn't BSD-only, it's also usedGuy Harris1-1/+1
by his madwifi Atheros driver on Linux; rename WTAP_ENCAP_IEEE_802_11_WLAN_BSD to WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP, and change its text name from "ieee-802-11-bsd" to "ieee-802-11-radiotap". svn path=/trunk/; revision=12429
2004-09-19From Mark C. Brown: fix support for nettl NETTL_SUBSYS_NS_LS_ICMP andGuy Harris1-1/+3
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-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-06-07Add an encapsulation type for BACnet MS/TP, and map the newly-assignedGuy Harris1-2/+3
libpcap DLT_ value for BACnet MS/TP to it. svn path=/trunk/; revision=11126
2004-03-23Add support for DLT_APPLE_IP_OVER_IEEE_1394.Guy Harris1-2/+3
svn path=/trunk/; revision=10446
2004-03-11Add support for DLT_ value 99, as used by the Axent RaptorGuy Harris1-2/+3
firewall/Symantec Enterprise Firewall. Thanks, Axent/Symantec, for not asking us for a DLT_ value and not telling us about the link-layer type. svn path=/trunk/; revision=10361
2004-02-11From Rolf Fiedler: support for reading EyeSDN USB S0 trace files.Guy Harris1-2/+3
svn path=/trunk/; revision=10038
2004-01-29The DLT_ value 127 is being used for the BSD radio header, and theGuy Harris1-41/+42
current CVS libpcap uses 163 for the AVS radio header (127 was never used for the AVS radio header). Redo the Wiretap encapsulation values for that (and shuffle them to put the 802.11 Wiretap values together). svn path=/trunk/; revision=9904
2004-01-28From Tomas Kukosa: reserve private WTAP_ENCAP values and map them toGuy Harris1-2/+18
reserved private DLT_ values. svn path=/trunk/; revision=9892
2004-01-27Supply a pseudo-header for all 802.11 packets; add an "fcs_len" field toGuy Harris1-2/+4
it, similar to the Ethernet pseudo-header's "fcs_len" field, and use it in the 802.11 dissector. svn path=/trunk/; revision=9884
2004-01-25Have the Wiretap open, read, and seek-and-read routines return, inGuy Harris1-5/+9
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-12-18From Jan Kiszka: IrDA support.Guy Harris1-2/+29
svn path=/trunk/; revision=9345
2003-12-03From Jeff Morriss: add support for libpcap MTP2 and MTP3 captures.Guy Harris1-2/+4
Add a missing entry in "encap_table[]" for Bluetooth H4, and fix some comments. svn path=/trunk/; revision=9157
2003-12-02From Martijn Schipper: support for reading AiroPeek files in V9 captureGuy Harris1-2/+3
file format (AiroPeek 2.x). svn path=/trunk/; revision=9144
2003-10-31From Scott Emberley: support for reading Network Instruments version 9Guy Harris1-2/+3
capture files. svn path=/trunk/; revision=8840
2003-10-30From Marcel Holtmann: support for reading Linux Bluez Bluetooth stackGuy Harris1-4/+6
"hcidump -w" traces. Note that Jesper Peterson contributed support for reading Endace ERF files. svn path=/trunk/; revision=8824
2003-10-25Add a new WTAP_ENCAP_CHDLC_WITH_PHDR type, to distinguish Cisco HDLCGuy Harris1-2/+3
captures with packet direction information from captures without it. Use them appropriately. svn path=/trunk/; revision=8780
2003-10-01Have a pseudo-header for Ethernet packets, giving the size of the FCS -Guy Harris1-3/+7
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-08-26From Jesper Peterson: support for Endace ERF file format.Guy Harris1-2/+3
svn path=/trunk/; revision=8272
2003-07-29From Thierry Martin: support for reading files from Accellent 5Views LANGuy Harris1-2/+3
agents. svn path=/trunk/; revision=8093
2003-06-25GCC 3.3 noticed that checking whether the length of the slice is > 65535Guy Harris1-1/+2
is pointless, as it's a 16-bit unsigned quantity. Remove those checks - but note in a comment that WTAP_MAX_PACKET_SIZE must be at least 65535 (as there might well be link-layer types with packets at least that large). svn path=/trunk/; revision=7934
2003-05-15From Can Erkin Acar: OpenBSD is now using tcpdump.org-assigned DLT_Guy Harris1-3/+4
value for DLT_PFLOG, and that goes along with a change to the link-layer header for DLT_PFLOG - support both the old and new values and format. svn path=/trunk/; revision=7676
2003-03-08WTAP_ENCAP_ENC was, in fact, intended for use for DLT_ENC, so justGuy Harris1-2/+2
rename WTAP_ENCAP_ENC0 to WTAP_ENCAP_ENC. un-#if 0 out the code to handle the value 109 for DLT_ENC, as I've just checked in support for DLT_ENC in tcpdump.org libpcap and tcpdump, which maps DLT_ENC to 109 in the file header. Give packet-enc.c an RCS ID. svn path=/trunk/; revision=7323
2003-03-07From Markus Friedl:Gerald Combs1-2/+3
Add support for the OpenBSD enc(4) encapsulating interface. Add support for Ethernet over IP (RFC 3378). Fold Markus' .h files into their respective .c files, add a define to ipproto.h and use it. svn path=/trunk/; revision=7310
2003-01-31Add WTAP_ENCAP_FRELAY_WITH_PHDR for use with Frame Relay capture filesGuy Harris1-14/+15
that have direction information. Support writing WTAP_ENCAP_FRELAY_WITH_PHDR and WTAP_ENCAP_PPP_WITH_PHDR captures out in libpcap format - we throw away the direction information, but so it goes. When reading/writing Windows Sniffer format, read and write the direction flag. svn path=/trunk/; revision=7052
2003-01-23In the BSDs, ARCNET packets don't have an offset field between theGuy Harris1-28/+29
addresses and the protocol type, as supplied by BPF; on Linux, they *do* have an offset field, as supplied by PF_PACKET sockets. Add a new WTAP_ENCAP_ARCNET_LINUX, with packets that include the offset field, and don't dissect an offset in WTAP_ENCAP_ARCNET packets. Map a libpcap link-layer type of 129 to WTAP_ENCAP_ARCNET_LINUX; that value was recently assigned to Linux-style ARCNET. Add some more ARCNET protocol IDs. For most protocol IDs, dissect an ATA 878.2 fragmentation header; don't do it for RFC 1051 IP and ARP, and Diagnose packets. Set the length of the ARCNET protocol tree item appropriately. Dissect both the RFC 1051 and RFC 1201 styles of IP and ARP over ARCNET, and dissect the RFC 1201 style of RARP as well. svn path=/trunk/; revision=6981
2003-01-10The Sniffer file formats include a file to identify raw cells; exportGuy Harris1-1/+7
that flag in the ATM pseudo-header, and use it to determine whether a frame is a raw cell or a reassembled frame, rather than using the AAL, as you can have raw AAL5 cells in a capture. svn path=/trunk/; revision=6889
2003-01-09It appears that a channel number of 0 means DTE->DCE, and a channelGuy Harris1-2/+2
number of 1 means DCE->DTE, in DOS Sniffer ATM captures. svn path=/trunk/; revision=6881
2003-01-08From Chris Waters: support Tazmen Sniffer Protocol and DLT_TZSP capturesGuy Harris1-2/+3
from network-based libpcaps that use that protocol. svn path=/trunk/; revision=6875
2003-01-03Add support for SDLC encapsulation in DOS Sniffer captures; thatGuy Harris1-3/+4
includes adding an SDLC dissector. svn path=/trunk/; revision=6848
2003-01-03Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not justGuy Harris1-22/+23
used for the DOS-based ATM Sniffer. (That's not a great name, but I couldn't think of a better one.) Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture files where reassembled frames don't have trailers, such as the AAL5 trailer, chopped off. That's what at least some versions of the Windows-based ATM Sniffer appear to have. Map the ATM capture file type for NetXRay captures to WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've reverse-engineered, so far, for the pseudo-header; there's more that needs to be done on it, e.g. getting the channel, AAL type, and traffic type (or inferring them if they're not in the packet header). svn path=/trunk/; revision=6840
2002-12-20This adds the beginning of support for Wellfleet HDLC to ngsniffer.c asRichard Sharpe1-2/+3
well as Cisco HDLC support. It compiles OK, but I do not claim that it is not borken. I will have to add a small dissector that eats the first two bytes and then calls the Ethernet dissector as well, to complete the work. svn path=/trunk/; revision=6809