Commit Graph

81 Commits

Author SHA1 Message Date
darkjames 65b03d0135 Update Free Software Foundation address.
(COPYING will be updated in next commit)


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43536 f5534014-38df-0310-8fa8-9805f1628bb7
2012-06-28 22:56:06 +00:00
morriss c8391561bf Use separate filters for the RTT found on a SACK and the RTT found on a
DATA chunk: having them in both places is helpful when looking at the
messages but having them separate is helpful when graphing the RTTs.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43406 f5534014-38df-0310-8fa8-9805f1628bb7
2012-06-20 13:30:07 +00:00
morriss 4602685a93 Revisit https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161
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...


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41182 f5534014-38df-0310-8fa8-9805f1628bb7
2012-02-24 20:33:19 +00:00
morriss dd7f71cd57 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161 :
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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39501 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-21 01:03:48 +00:00
stig f14eb4ada0 From Peter Fales via bug 6424:
Corrected IP address with text2pcap -i option on big endian machines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39215 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-02 13:43:57 +00:00
stig 42abdf7732 From Pascal Quantin via bug 1723:
Make ASCII text dump identification optional.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38886 f5534014-38df-0310-8fa8-9805f1628bb7
2011-09-05 20:03:03 +00:00
stig ceebacb190 Change malloc -> g_malloc and free -> g_free.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38884 f5534014-38df-0310-8fa8-9805f1628bb7
2011-09-05 19:12:31 +00:00
stig 142dd88730 Yet another cast.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38703 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-24 06:57:14 +00:00
stig 297612d382 Fix a warning by changing a pointer type.
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38702 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-24 06:42:40 +00:00
etxrab 0cfa41f4c5 From Jack Yu modified by Chris Maynard:
Enhancement of text2cap for parsing flexibility.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1723

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38679 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-23 04:36:37 +00:00
wmeier 0b7cfac1a1 Test return value from fwrite(); If an error occurred then exit with a message.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38449 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-10 17:15:08 +00:00
morriss 2d657ad97a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :
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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38437 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-09 21:02:10 +00:00
stig bd2648f6d0 Replace all strerror() with g_strerror().
Remove our local strerror implementation.
Mark strerror as locale unsafe API.

This fixes bug 5715.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37812 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-28 09:00:11 +00:00
gerald b0470ef1fe Move the Windows argument list conversion code to a common routine.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37372 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-24 00:07:56 +00:00
tuexen e15596b91c Fix a typo in the help message.
Reported by Matthias Wellmeyer.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36471 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-05 14:28:33 +00:00
cmaynard ae81f549fb Fix a couple of typos.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36410 f5534014-38df-0310-8fa8-9805f1628bb7
2011-03-30 15:54:28 +00:00
cmaynard ccd8cd1847 Wrap all text lines of help at column 80.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36408 f5534014-38df-0310-8fa8-9805f1628bb7
2011-03-30 14:44:18 +00:00
wmeier 947b1f6130 Don't compute each checksum twice when adding dummy headers (-u, -T, -s, -S options)
g_ntohs() & friends may be (are ?) macros and may (will ?) eval args more than once ...



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36272 f5534014-38df-0310-8fa8-9805f1628bb7
2011-03-23 00:43:55 +00:00
gerald eb492e28af On Windows, convert all of our command-line arguments from UTF-16 to
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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35411 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-06 23:28:58 +00:00
wmeier 9226bc1d11 Change dummy MAC addresses so we don't get Wireshark expert message:
"[...] 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).


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34571 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-19 16:13:48 +00:00
morriss da0f3a2fe7 Move some code (including the optional objects) into libwsutil
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33012 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-28 20:19:55 +00:00
wmeier c3ea639191 From Jim Young: Include svnversion.h in capinfos and text2pcap
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)


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31382 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-29 16:11:43 +00:00
sfisher f14ac71244 From Jakub Zawadzki via bug #4289: (Fix for) Frame arrival times (pcap)
are 1 hour more than timestamps in txt



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31195 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-08 07:12:59 +00:00
stig 72676c1263 Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_H
Rename getopt.[ch] -> wsgetopt.[ch] to avoid name collision.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30370 f5534014-38df-0310-8fa8-9805f1628bb7
2009-10-06 16:01:18 +00:00
gerald c5c000a32d Use "svn info" to fetch the version by default. Fetch the repository path as
well. Add the repository path to the version strings.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29171 f5534014-38df-0310-8fa8-9805f1628bb7
2009-07-22 23:59:15 +00:00
wmeier 00a048f2b3 Minor cleanup of "-h" output text.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28334 f5534014-38df-0310-8fa8-9805f1628bb7
2009-05-12 16:06:14 +00:00
gerald ebaddf5c97 Fix the last(?) of the Win64 compilation problems.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28065 f5534014-38df-0310-8fa8-9805f1628bb7
2009-04-16 04:05:39 +00:00
morriss bc3fecca93 Declare ts_sec as a time_t because that's how it's used; this avoids a warning
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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26242 f5534014-38df-0310-8fa8-9805f1628bb7
2008-09-21 14:04:41 +00:00
guy 5076b6eeb8 The joys of beating header files over the head to get all the various
APIs we use declared.  We still need to define __EXTENSIONS__ on
Solaris, in order to get strptime() declared.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25426 f5534014-38df-0310-8fa8-9805f1628bb7
2008-06-04 18:05:45 +00:00
morriss 440ebe03d7 Move the file utility functions from wiretap to libwsutil so that
libwireshark (and the plugins using those functions) do not depend on
wiretap on Windows.

While doing that, rename the eth_* functions to ws_*.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25354 f5534014-38df-0310-8fa8-9805f1628bb7
2008-05-22 15:46:27 +00:00
etxrab 330bb2c781 Fix some of the Errors/warnings detected by checkapi.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25284 f5534014-38df-0310-8fa8-9805f1628bb7
2008-05-13 07:26:20 +00:00
wmeier 9105ce438f "Read 1 potential packet, wrote 1 packet": use packet or packets as appropriate
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24526 f5534014-38df-0310-8fa8-9805f1628bb7
2008-03-01 20:39:31 +00:00
stig 0ca3c6f4b0 From Michael McCartney (bug 2246):
Enhancement to allow dec option when parsing offset.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24272 f5534014-38df-0310-8fa8-9805f1628bb7
2008-02-05 21:31:18 +00:00
stig fa849b3bb2 More rewrite of prohibited APIs (sprintf, strcpy, strcat).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24258 f5534014-38df-0310-8fa8-9805f1628bb7
2008-02-03 15:38:20 +00:00
jmayer 0654b684b0 Pavol Rusnak <stick@gk2.sk>:
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).



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24044 f5534014-38df-0310-8fa8-9805f1628bb7
2008-01-09 16:05:17 +00:00
morriss b8ee0c23f5 A few more s/fopen/eth_fopen/
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23207 f5534014-38df-0310-8fa8-9805f1628bb7
2007-10-16 15:58:25 +00:00
wmeier 91169593d0 When -t option: Use current date or time fields for unspecified fields; Fixes bug #1836.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22916 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-20 16:12:17 +00:00
wmeier f40f7cf76b If bad date/time: use 1/1/70 00:00:00 local time; Add some addt'l output if debug option used
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22902 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-18 15:30:34 +00:00
wmeier 8e7cd2eab0 Output err msg if strptime fails converting input time;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22852 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-12 14:50:27 +00:00
richardv 1c6f89217d fix usage message for -o option
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22574 f5534014-38df-0310-8fa8-9805f1628bb7
2007-08-21 21:25:53 +00:00
standel 5154a51129 set #ifndef __USE_XOPEN instead of only #ifndef
should fix rev21508


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21511 f5534014-38df-0310-8fa8-9805f1628bb7
2007-04-22 21:55:39 +00:00
jmayer a714624667 Only #deinfe __USE_XOPEN if not already defined. On my Suse 10.2 it was
already #defined to 1, so this would create a warning/error.



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21508 f5534014-38df-0310-8fa8-9805f1628bb7
2007-04-22 20:04:34 +00:00
sfisher 9157627925 Remove almost all of the casts I committed recently and in place of
them, add -Wno-pointer-sign to CFLAGS when gcc will accept it.



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21253 f5534014-38df-0310-8fa8-9805f1628bb7
2007-03-28 21:55:11 +00:00
sfisher ffefcea365 Fix about 150 warnings new to gcc 4.0 in the error on warning directories.
Comment out -Werror in plugins/asn1/ until warnings can be fixed.



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21158 f5534014-38df-0310-8fa8-9805f1628bb7
2007-03-23 22:49:23 +00:00
ulfl c16b3cacc9 fix MSVC warnings of / and set CFLAGS to block new warnings
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21098 f5534014-38df-0310-8fa8-9805f1628bb7
2007-03-21 23:14:23 +00:00
etxrab 88547059e5 Ethereal->Wireshark
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18235 f5534014-38df-0310-8fa8-9805f1628bb7
2006-05-28 20:28:20 +00:00
sahlberg 33270db64f name change
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18197 f5534014-38df-0310-8fa8-9805f1628bb7
2006-05-21 05:12:17 +00:00
guy 36977dde42 "help()" really just prints a usage message; it's not a full-blown help
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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17431 f5534014-38df-0310-8fa8-9805f1628bb7
2006-03-01 00:11:16 +00:00
ulfl 8a418cd637 update usage text
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16999 f5534014-38df-0310-8fa8-9805f1628bb7
2006-01-11 10:14:32 +00:00
jmayer 23ec4b07a3 More 'char*' -> 'const char*' changes to fix warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15015 f5534014-38df-0310-8fa8-9805f1628bb7
2005-07-23 11:41:25 +00:00