aboutsummaryrefslogtreecommitdiffstats
path: root/text2pcap.c
Commit message (Collapse)AuthorAgeFilesLines
* There's no __solaris__ predefine for Solaris; just use __sun.Guy Harris2012-04-101-1/+1
| | | | svn path=/trunk/; revision=42012
* Revisit https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161Jeff Morriss2012-02-241-1/+3
| | | | | | | | | | | | | | | | and r39501: Setting _XOPEN_SOURCE to 600 is only allowed on Solaris 10 if the compiler is set to C99 mode. Conversely (and as reported in the bug), simply defining it (but with no value) is not allowed if the compiler *is* compiling to C99. So, don't define _XOPEN_SOURCE at all on Solaris. Keep defining it as 600 on other OS's as (also) requested in that bug. Maybe there's a cleaner way to do this but all of this is a "trickery" mess anyway... svn path=/trunk/; revision=41182
* Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161 :Jeff Morriss2011-10-211-7/+7
| | | | | | | | Solaris doesn't like _XOPEN_SOURCE being defined but with no value, at least when being compiled in C99-mode. So set it to 600 (XPG6); hopefully this won't break any other systems. svn path=/trunk/; revision=39501
* From Peter Fales via bug 6424:Stig Bjørlykke2011-10-021-1/+7
| | | | | | Corrected IP address with text2pcap -i option on big endian machines. svn path=/trunk/; revision=39215
* From Pascal Quantin via bug 1723:Stig Bjørlykke2011-09-051-43/+57
| | | | | | Make ASCII text dump identification optional. svn path=/trunk/; revision=38886
* Change malloc -> g_malloc and free -> g_free.Stig Bjørlykke2011-09-051-2/+2
| | | | svn path=/trunk/; revision=38884
* Yet another cast.Stig Bjørlykke2011-08-241-1/+1
| | | | svn path=/trunk/; revision=38703
* Fix a warning by changing a pointer type.Stig Bjørlykke2011-08-241-2/+2
| | | | | | | | text2pcap.c: In function ‘parse_token’: text2pcap.c:1076: warning: cast from pointer to integer of different size text2pcap.c:1076: warning: cast from pointer to integer of different size svn path=/trunk/; revision=38702
* From Jack Yu modified by Chris Maynard:Anders Broman2011-08-231-4/+81
| | | | | | | Enhancement of text2cap for parsing flexibility. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1723 svn path=/trunk/; revision=38679
* Test return value from fwrite(); If an error occurred then exit with a message.Bill Meier2011-08-101-10/+31
| | | | svn path=/trunk/; revision=38449
* Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :Jeff Morriss2011-08-091-3/+1
| | | | | | | | | | | | | | getopt() can/should normally be found in unistd.h, so: - When testing for getopt(), define that we HAVE_GETOPT instead of HAVE_GETOPT_H (to avoid confusion). - Don't attempt to include getopt.h: not all OS's have it (for example, Solaris 9 does not). - (All the places which need getopt already include unistd.h (if we have it).) If this breaks things on some OS, we might need (a real) HAVE_GETOPT_H check. svn path=/trunk/; revision=38437
* Replace all strerror() with g_strerror().Stig Bjørlykke2011-06-281-2/+2
| | | | | | | | | Remove our local strerror implementation. Mark strerror as locale unsafe API. This fixes bug 5715. svn path=/trunk/; revision=37812
* Move the Windows argument list conversion code to a common routine.Gerald Combs2011-05-241-13/+2
| | | | svn path=/trunk/; revision=37372
* Fix a typo in the help message.Michael Tüxen2011-04-051-1/+1
| | | | | | Reported by Matthias Wellmeyer. svn path=/trunk/; revision=36471
* Fix a couple of typos.Chris Maynard2011-03-301-2/+2
| | | | svn path=/trunk/; revision=36410
* Wrap all text lines of help at column 80.Chris Maynard2011-03-301-5/+7
| | | | svn path=/trunk/; revision=36408
* Don't compute each checksum twice when adding dummy headers (-u, -T, -s, -S ↵Bill Meier2011-03-231-15/+31
| | | | | | | | | options) g_ntohs() & friends may be (are ?) macros and may (will ?) eval args more than once ... svn path=/trunk/; revision=36272
* On Windows, convert all of our command-line arguments from UTF-16 toGerald Combs2011-01-061-1/+21
| | | | | | | UTF-8 where we don't already do so. In Wireshark use g_utf16_to_utf8 instead of utf_16to8. This should fix bug 5520. svn path=/trunk/; revision=35411
* Change dummy MAC addresses so we don't get Wireshark expert message:Bill Meier2010-10-191-3/+3
| | | | | | | | "[...] Source MAC must not be a group address: IEEE 802.3-2002, Section 3.2.3(b)" Specifically: use 0a:01:01:01:01:01 and 0a:02:02:02;02:02 (and dummy IP addresses 10.1.1.1 and 10.2.2.2). svn path=/trunk/; revision=34571
* Move some code (including the optional objects) into libwsutilJeff Morriss2010-05-281-3/+3
| | | | svn path=/trunk/; revision=33012
* From Jim Young: Include svnversion.h in capinfos and text2pcapBill Meier2009-12-291-0/+1
| | | | | | | | | | This patch adds a #include "svnversion.h" statement to the capinfos.c and text2pcap.c files so that their usage() functions will display the SVNVERSION and SVNPATH infos (if defined). See Bug #4360 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4360) svn path=/trunk/; revision=31382
* From Jakub Zawadzki via bug #4289: (Fix for) Frame arrival times (pcap)Stephen Fisher2009-12-081-0/+1
| | | | | | | are 1 hour more than timestamps in txt svn path=/trunk/; revision=31195
* Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_HStig Bjørlykke2009-10-061-2/+4
| | | | | | Rename getopt.[ch] -> wsgetopt.[ch] to avoid name collision. svn path=/trunk/; revision=30370
* Use "svn info" to fetch the version by default. Fetch the repository path asGerald Combs2009-07-221-1/+1
| | | | | | well. Add the repository path to the version strings. svn path=/trunk/; revision=29171
* Minor cleanup of "-h" output text.Bill Meier2009-05-121-23/+27
| | | | svn path=/trunk/; revision=28334
* Fix the last(?) of the Win64 compilation problems.Gerald Combs2009-04-161-2/+2
| | | | svn path=/trunk/; revision=28065
* Declare ts_sec as a time_t because that's how it's used; this avoids a warningJeff Morriss2008-09-211-8/+8
| | | | | | | | | | about how dereferencing a type-punned pointer will break strict-aliasing rules when calling localtime(). Make ts_sec in text2pcap's definition of a PCAP record header unsigned to match that in libpcap.h . Cast the time_t into guint32 as necessary. svn path=/trunk/; revision=26242
* The joys of beating header files over the head to get all the variousGuy Harris2008-06-041-0/+16
| | | | | | | APIs we use declared. We still need to define __EXTENSIONS__ on Solaris, in order to get strptime() declared. svn path=/trunk/; revision=25426
* Move the file utility functions from wiretap to libwsutil so thatJeff Morriss2008-05-221-3/+3
| | | | | | | | | libwireshark (and the plugins using those functions) do not depend on wiretap on Windows. While doing that, rename the eth_* functions to ws_*. svn path=/trunk/; revision=25354
* Fix some of the Errors/warnings detected by checkapi.Anders Broman2008-05-131-4/+4
| | | | svn path=/trunk/; revision=25284
* "Read 1 potential packet, wrote 1 packet": use packet or packets as appropriateBill Meier2008-03-011-2/+3
| | | | svn path=/trunk/; revision=24526
* From Michael McCartney (bug 2246):Stig Bjørlykke2008-02-051-3/+7
| | | | | | Enhancement to allow dec option when parsing offset. svn path=/trunk/; revision=24272
* More rewrite of prohibited APIs (sprintf, strcpy, strcat).Stig Bjørlykke2008-02-031-2/+2
| | | | svn path=/trunk/; revision=24258
* Pavol Rusnak <stick@gk2.sk>:Jörg Mayer2008-01-091-6/+9
| | | | | | | | | | | Fix for http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2183 Strptime function is not properly included. It needs __USE_XOPEN macro, but it is defined in wrong place. It must be defined before _any_ include file. Otherwise I get "implicit declaration of function `strptime`" (gcc 4.3.0). svn path=/trunk/; revision=24044
* A few more s/fopen/eth_fopen/Jeff Morriss2007-10-161-8/+9
| | | | svn path=/trunk/; revision=23207
* When -t option: Use current date or time fields for unspecified fields; ↵Bill Meier2007-09-201-20/+29
| | | | | | Fixes bug #1836. svn path=/trunk/; revision=22916
* If bad date/time: use 1/1/70 00:00:00 local time; Add some addt'l output if ↵Bill Meier2007-09-181-30/+36
| | | | | | debug option used svn path=/trunk/; revision=22902
* Output err msg if strptime fails converting input time;Bill Meier2007-09-121-1/+4
| | | | svn path=/trunk/; revision=22852
* fix usage message for -o optionRichard van der Hoff2007-08-211-1/+1
| | | | svn path=/trunk/; revision=22574
* set #ifndef __USE_XOPEN instead of only #ifndefSebastien Tandel2007-04-221-1/+1
| | | | | | should fix rev21508 svn path=/trunk/; revision=21511
* Only #deinfe __USE_XOPEN if not already defined. On my Suse 10.2 it wasJörg Mayer2007-04-221-2/+5
| | | | | | | already #defined to 1, so this would create a warning/error. svn path=/trunk/; revision=21508
* Remove almost all of the casts I committed recently and in place ofStephen Fisher2007-03-281-3/+3
| | | | | | | them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
* Fix about 150 warnings new to gcc 4.0 in the error on warning directories.Stephen Fisher2007-03-231-3/+3
| | | | | | | Comment out -Werror in plugins/asn1/ until warnings can be fixed. svn path=/trunk/; revision=21158
* fix MSVC warnings of / and set CFLAGS to block new warningsUlf Lamping2007-03-211-1/+1
| | | | svn path=/trunk/; revision=21098
* Ethereal->WiresharkAnders Broman2006-05-281-1/+1
| | | | svn path=/trunk/; revision=18235
* name changeRonnie Sahlberg2006-05-211-2/+2
| | | | svn path=/trunk/; revision=18197
* "help()" really just prints a usage message; it's not a full-blown helpGuy Harris2006-03-011-26/+27
| | | | | | | | | | | | system. Just call it "usage()". Also, it doesn't use the "progname" argument - it doesn't need to, it's text2pcap-specific, and it prefers to call it "Text2pcap" anyway (and, besides, argv[0] might well be a pathname). Get rid of that argument. Fix some white space. svn path=/trunk/; revision=17431
* update usage textUlf Lamping2006-01-111-44/+55
| | | | svn path=/trunk/; revision=16999
* More 'char*' -> 'const char*' changes to fix warnings.Jörg Mayer2005-07-231-4/+4
| | | | svn path=/trunk/; revision=15015
* Set the svn:eol-style property on all text files to "native", so thatGuy Harris2004-07-181-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