aboutsummaryrefslogtreecommitdiffstats
path: root/editcap.c
Commit message (Collapse)AuthorAgeFilesLines
* Another small closing bracket fixup.Richard Sharpe2004-02-231-3/+3
| | | | svn path=/trunk/; revision=10196
* Small fix to usage text to add a trailing closed square bracket (]).Richard Sharpe2004-02-231-2/+2
| | | | svn path=/trunk/; revision=10194
* Free the error info string after using it.Guy Harris2004-01-251-1/+2
| | | | svn path=/trunk/; revision=9855
* Have the Wiretap open, read, and seek-and-read routines return, inGuy Harris2004-01-251-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fix warnings found by -Wstrict-prototypesJörg Mayer2004-01-181-2/+2
| | | | svn path=/trunk/; revision=9722
* Removed trailing whitespaces from .h and .c files using theJörg Mayer2002-08-281-6/+6
| | | | | | | winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
* Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer2002-08-021-7/+3
| | | | | | | | equivalents for the toplevel directory. The removal of winsock2.h will hopefully not cause any problems under MSVC++, as those files using struct timeval still include wtap.h, which still includes winsock2.h. svn path=/trunk/; revision=5932
* From Joerg Mayer: add some missing static declarations.Guy Harris2002-06-301-6/+6
| | | | svn path=/trunk/; revision=5806
* WinPcap 2.3's <pcap.h> includes <packet32.h>, and WinPcap 2.3'sGuy Harris2002-06-231-3/+3
| | | | | | | | <packet32.h> includes <winsock2.h>; we include that rather than <winsock.h>, to avoid errors due to conflicting declarations in <winsock.h> and <winsock2.h>. svn path=/trunk/; revision=5742
* From Joerg Mayer: mark function arguments as unused.Guy Harris2002-03-311-2/+2
| | | | svn path=/trunk/; revision=5049
* When defining the struct select_item, don't create an instance of thatGilbert Ramirez2002-03-141-2/+2
| | | | | | struct, alsoc alled select_item, as it's not used. svn path=/trunk/; revision=4938
* From Peter Valchev: fix editcap to assign the result of "getopt()" to anGuy Harris2002-02-241-3/+3
| | | | | | | | | | "int" and to check "getopt()"s return value with -1 rather than EOF. Fix other "getopt()" loops to check against -1 as well (EOF is -1 on most if not all platforms, but the Single UNIX Specification says "getopt()" returns -1, so we should check against -1, not EOF). svn path=/trunk/; revision=4793
* Have Wiretap set the snapshot length to 0 if it can't be derived fromGuy Harris2002-02-081-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading the capture file. Have callers of "wtap_snapshot_length()" treat a value of 0 as "unknown", and default to WTAP_MAX_PACKET_SIZE (so that, when writing a capture file in a format that *does* store the snapshot length, we can at least put *something* in the file). If we don't know the snapshot length of the current capture file, don't display a value in the summary window. Don't use "cfile.snap" as the snapshot length option when capturing - doing so causes Ethereal to default, when capturing, to the snapshot length of the last capture file that you read in, rather than to the snapshot length of the last capture you did (or the initial default of "no snapshot length"). Redo the "Capture Options" dialog box to group options into sections with frames around them, and add units to the snapshot length, maximum file size, and capture duration options, as per a suggestion by Ulf Lamping. Also add units to the capture count option. Make the snapshot length, capture count, maximum file size, and capture duration options into a combination of a check box and a spin button. If the check box is not checked, the limit in question is inactive (snapshot length of 65535, no max packet count, no max file size, no max capture duration); if it's checked, the spinbox specifies the limit. Default all of the check boxes to "not checked" and all of the spin boxes to small values. Use "gtk_toggle_button_get_active()" rather than directly fetching the state of a check box. svn path=/trunk/; revision=4709
* Use longs as file offsets, so that on platforms with 64-bit "long" weGuy Harris2001-10-041-2/+2
| | | | | | can handle capture files bigger than 2GB. svn path=/trunk/; revision=3993
* From Scott Renfro:Guy Harris2001-07-131-12/+30
| | | | | | | | | - make a leading zero in the argument to -t optional; - includes the -t option in in the summary portion of of the editcap usage message. svn path=/trunk/; revision=3712
* "-t" flag for editcap, to adjust timestamps in frames, from ScottGuy Harris2001-07-121-4/+100
| | | | | | Renfro. svn path=/trunk/; revision=3696
* More signed vs. unsigned cleanups, and initialization cleanups, fromGuy Harris2001-06-191-2/+2
| | | | | | Joerg Mayer. svn path=/trunk/; revision=3578
* In ANSI C (and in pre-ANSI UNIX implementations), if you return fromGuy Harris2001-04-201-3/+2
| | | | | | | | "main()", the program exits, and exits with an exit status equal to the return value of "main()", so "return 0;" is sufficient at the end of "main()". svn path=/trunk/; revision=3354
* Put the "-s" flag into the usage message for editcap.Guy Harris2000-12-031-3/+5
| | | | svn path=/trunk/; revision=2738
* Make "editcap -h" give the usage message without an error message (i.e.,Guy Harris2000-08-091-2/+2
| | | | | | specify it in the argument to "getopt()"). svn path=/trunk/; revision=2235
* Add wtap-int.h. Move definitions relevant to the internal workins of wiretapGilbert Ramirez2000-05-191-2/+2
| | | | | | | | | to that file, leave public definitions in wtap.h. Rename "union pseudo_header" to "union wtap_pseudo_header". Make the wtap_pseudo_header pointer available in packet_info struct. svn path=/trunk/; revision=1989
* Remove the "union pseudo_header" from the "frame_data" structure;Guy Harris2000-05-181-4/+4
| | | | | | | | | | | | | | | | | | | | there's no need to keep it around in memory - when the frame data is read in when handing a frame, read in the information, if any, necessary to reconstruct the frame header, and reconstruct it. This saves some memory. This requires that the seek-and-read function be implemented inside Wiretap, and that the Wiretap handle remain open even after we've finished reading the file sequentially. This also points out that we can't really do X.25-over-Ethernet correctly, as we don't know where the direction (DTE->DCE or DCE->DTE) flag is stored; it's not clear how the Ethernet type 0x0805 for X.25 Layer 3 is supposed to be handled in any case. We eliminate X.25-over-Ethernet support (until we find out what we're supposed to do). svn path=/trunk/; revision=1975
* Add a "-s" flag to editcap, to make it truncate packets to a specifiedGuy Harris2000-04-271-3/+22
| | | | | | | | | | | snapshot length before writing them to the output file; this may come in handy if you are translating the file to a different format so that it can be read by a program that can't handle packets above a certain size (e.g., the snoop in Solaris 2.5.1 or 2.6, which reject Ethernet packets larger than the Ethernet MTU, and thus can't handle gigabit Ethernet captures using jumbo frames). svn path=/trunk/; revision=1891
* Remove optopt and opterr, two unused variables.Gilbert Ramirez2000-04-171-2/+2
| | | | svn path=/trunk/; revision=1877
* Build tethereal and editcap on Win32.Gilbert Ramirez2000-04-121-1/+20
| | | | | | Add RCS ID tags to Makefile.nmake's. svn path=/trunk/; revision=1836
* Use "strchr()" rather than "index()" - the ANSI C standard specifiesGuy Harris2000-01-171-2/+3
| | | | | | "strchr()", and it, unlike "index()", is declared in <string.h>. svn path=/trunk/; revision=1502
* Small patch to editcap to allow ranges of packets to be specifiedRichard Sharpe2000-01-171-6/+62
| | | | | | | | | | as well as individual packets. I needed to grab quite a few from the middle of a large capture file. Will eventually need to sort the extract list. svn path=/trunk/; revision=1498
* Another commit from a Qantas Club Lounge ... :-)Richard Sharpe1999-12-121-29/+62
| | | | | | | Update editcap to print out the type of capture file if -v specified and add a -h flag. Also fix a few compiler warnings ... svn path=/trunk/; revision=1302
* Use the new routines in Wiretap to make the argument to "-T" be aGuy Harris1999-12-051-5/+19
| | | | | | | | | | symbolic name, and to list the encapsulation types in the usage message. Note in the usage message that the default output encapsulation type is "same as the input file" and that the default output file type is "libpcap". svn path=/trunk/; revision=1213
* It's now called "editcap", as it can read any file format Wiretap canGuy Harris1999-12-041-9/+22
| | | | | | | | | | | | | | | read, and write any format it can write; change the error messages. Make the "-F" flag take a symbolic capture file type; use "wtap_short_string_to_file_type()" to translate it to a WTAP_FILE_ value. List, in the usage message, the capture file types we can write, and the symbolic types you use on the command line to specify them. Give it an RCS ID. svn path=/trunk/; revision=1210
* Adding editcap.c. This is an example of a simple wiretap editing program.Richard Sharpe1999-12-041-0/+174
Will need new functions in wiretap before I can do more. Should perhaps be moved into an examples directory and have other bots added. svn path=/trunk/; revision=1206