Michael Tüxen
6c1435408e
This should get it building on Windows.
...
svn path=/trunk/; revision=46676
2012-12-21 15:03:35 +00:00
Michael Tüxen
4c08d75359
Try to get text2pcap building on Windows.
...
svn path=/trunk/; revision=46675
2012-12-21 14:59:41 +00:00
Michael Tüxen
3039785ecb
Fix a warning on Windows.
...
svn path=/trunk/; revision=46674
2012-12-21 14:38:00 +00:00
Michael Tüxen
2440176cab
Use pcapio routines. This concludes the preperation for
...
adding pcapng support.
svn path=/trunk/; revision=46673
2012-12-21 14:34:26 +00:00
Michael Tüxen
edc47dbf88
This should make the Linux buildbot happy.
...
svn path=/trunk/; revision=46670
2012-12-21 13:53:21 +00:00
Michael Tüxen
67f86530b1
Address a build issue on Windows.
...
svn path=/trunk/; revision=46669
2012-12-21 13:17:20 +00:00
Michael Tüxen
2dcbad6126
Build the packet to be sent completely in the buffer and
...
then send it out at once.
This allows the usage of routines from pcapio.
svn path=/trunk/; revision=46668
2012-12-21 13:05:43 +00:00
Guy Harris
d7763299ae
The KRB_RM_ #defines fit in 32 bits, so just make them unsigned, not
...
long.
dissect_krb5_Checksum() is declared in
epan/dissectors/packet-kerberos.h; don't declare it again here.
svn path=/trunk/; revision=46666
2012-12-21 11:37:54 +00:00
Guy Harris
8dbe2af621
Check whether something's too big before subtracting it from another
...
variable.
Adjust offset and len in parallel.
svn path=/trunk/; revision=46665
2012-12-21 11:12:23 +00:00
Guy Harris
954b90418a
Squelch a qualifier-discard warning.
...
svn path=/trunk/; revision=46664
2012-12-21 11:04:10 +00:00
Guy Harris
b1d5b64da6
Well, at least on my machine, packet-pres.c now compiles cleanly, with
...
the recent changes to pres.cnf to keep from generating some code.
svn path=/trunk/; revision=46663
2012-12-21 10:55:43 +00:00
Guy Harris
69270d1bea
Get rid of unused routines for UDC-type.
...
svn path=/trunk/; revision=46662
2012-12-21 10:52:29 +00:00
Guy Harris
594e855738
Don't assume a pointer fits inside an unsigned long - it doesn't, in
...
LLP64 environments such as Windows.
Cast the result of a modulus op that causes the result to fit into an
int to int, to suppress implicit 64-bit-to-32-bit conversion warnings.
svn path=/trunk/; revision=46661
2012-12-21 10:26:52 +00:00
Guy Harris
81b8fd389e
Get rid of duplicate declarations (so that -Wredundant-decls doesn't
...
complain).
svn path=/trunk/; revision=46660
2012-12-21 09:29:46 +00:00
Guy Harris
808c79a6b4
Everything else in the floating-point calculations is single-precision,
...
so make the constants single-precision, so we don't end up with warnings
about double-precision values being assigned to single-precision
variables.
svn path=/trunk/; revision=46658
2012-12-21 08:18:47 +00:00
Guy Harris
be77dce42a
Make some loop counters unsigned, so that we handle very large loop
...
counts by trying to iterate all over the items (and, presumably, failing
when we go past the end of the packet).
When assigning to the loop count, cast the value down, to avoid implicit
64-bit-to-32-bit conversion warnings.
Write those loops as for loops - it makes it a bit clearer what's going
on.
svn path=/trunk/; revision=46657
2012-12-21 08:16:12 +00:00
Bill Meier
02e201da7b
Convert to use new ws_gtk_grid...() wrappers to replace
...
direct use of Gtktable.
(The first of many conversions ...)
Essentially: the wrappers use GtkTable on Gtk2 and GtkGrid on Gtk3.
svn path=/trunk/; revision=46655
2012-12-21 06:30:55 +00:00
Bill Meier
43df5e02ac
Wrapper functions and macros to be used to replace
...
Wireshark Gtk2 GtkTable code with code providing
essentially equivalent funtionality on Gtk2 and Gtk3.
See gui_utils.h for details.
svn path=/trunk/; revision=46654
2012-12-21 06:27:00 +00:00
Guy Harris
e2b61c828f
Constify some character pointer variables to avoid warnings about
...
strings being assigned to them.
svn path=/trunk/; revision=46653
2012-12-21 05:34:38 +00:00
Guy Harris
14d5511143
Squelch a warning - the code shouldn't ever let "have" get so large that
...
it exceeds size_t on any platform, including Win64.
svn path=/trunk/; revision=46652
2012-12-21 04:52:15 +00:00
Gerald Combs
2ae8b65a39
Reduce the spacer height in the "go to" and search frames. Fix the
...
search frame class.
svn path=/trunk/; revision=46651
2012-12-21 04:42:05 +00:00
Guy Harris
5996b49c53
Squelch implicit 64-bit-to-32-bit conversion warnings.
...
svn path=/trunk/; revision=46650
2012-12-21 03:32:16 +00:00
Guy Harris
9bfcd83721
Squelch 64-bit-to-32-bit implicit conversion warning; the warning
...
appears to be bogus - even if I put "(gint64) phdr->ts.nsecs" in an
extra layer of parentheses, i.e.
(((gint64) phdr->ts.nsecs) / 1000)
I still get the warning from
i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple
Inc. build 5658) (LLVM build 2336.11.00)
svn path=/trunk/; revision=46649
2012-12-21 02:30:35 +00:00
Guy Harris
bb674a2e1e
Include <wsutil/crc11.h> so that we check whether the prototypes therein
...
match the actual function types here.
svn path=/trunk/; revision=46648
2012-12-21 01:57:03 +00:00
Guy Harris
166b5d4469
Squelch some cast-discard warnings.
...
svn path=/trunk/; revision=46647
2012-12-21 00:53:30 +00:00
Guy Harris
a9f4da4549
Clean up white space.
...
Add a return where I presume it was intended to be - a 4-octet address
is completely handled in that if clause, so there's no reason to fall
through.
Fix a comment.
svn path=/trunk/; revision=46646
2012-12-21 00:43:00 +00:00
Evan Huus
e43dba76e0
Fix some valgrind warnings from the capture attached to
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8110
I can't reproduce the actual reported crash on trunk.
svn path=/trunk/; revision=46645
2012-12-21 00:19:16 +00:00
Pascal Quantin
79bde3d86a
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8095 :
...
Fix dissection of GPRS-NS over Frame Relay over MPLS
svn path=/trunk/; revision=46644
2012-12-20 21:18:26 +00:00
Pascal Quantin
d6f2abcbfd
Revert r46595
...
svn path=/trunk/; revision=46643
2012-12-20 21:17:23 +00:00
Guy Harris
6549d5a47f
Expand the comment about alignment.
...
svn path=/trunk/; revision=46642
2012-12-20 21:02:22 +00:00
Jeff Morriss
550c36d042
32-bit Linux (at least from Redhat) has a host_cpu of i686 (not i386). Don't force 8-byte alignment on such systems.
...
svn path=/trunk/; revision=46641
2012-12-20 20:52:26 +00:00
Guy Harris
0ddce65214
fclose() and fflush() are standard C routines, so there's no need for
...
our own wrappers. (pcapio.c isn't using wrappers around, for example,
fwrite().)
svn path=/trunk/; revision=46640
2012-12-20 20:00:06 +00:00
Michael Tüxen
197ac6704d
Need to include Windows.h for gettting FILETIME.
...
svn path=/trunk/; revision=46638
2012-12-20 15:40:28 +00:00
Michael Tüxen
9a2f4c8e9d
Don't use an pcap structures in pcapio.[ch].
...
Currently, pcapio is only used by dumpcap, which is only compiled
if there is pcap support. However, making pcapio independent from
libpcap allows it also to be used from text2pcap, which does not
rely on libpcap.
svn path=/trunk/; revision=46637
2012-12-20 15:20:10 +00:00
Michael Tüxen
7e84abf005
Add ws_fclose(), ws_fflush(), and ws_fdopen() to the fileutils.
...
Retire libpcap_fdopen(), libpcap_dump_flush(), and libpcap_dump_close().
svn path=/trunk/; revision=46636
2012-12-20 14:53:09 +00:00
Michael Tüxen
a1cca8c54a
rawshark does not use any routine from pcapio.c. So remove header.
...
svn path=/trunk/; revision=46635
2012-12-20 14:50:24 +00:00
Jeff Morriss
f0b9d97f18
tshark now accepts -Q.
...
svn path=/trunk/; revision=46633
2012-12-20 14:36:06 +00:00
Anders Broman
b3dbedd144
From Edwin Groothuis:
...
IO Stats - Smooth should be per graph.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8090
svn path=/trunk/; revision=46631
2012-12-20 13:15:20 +00:00
Anders Broman
8a508ee3d9
Try to determine wether it is MEAS REP, EXT MEAS REP or ENH MEAS REP.
...
svn path=/trunk/; revision=46630
2012-12-20 12:53:38 +00:00
Evan Huus
4e642fde4c
Tweak the order of the UI updates when finishing a live-update capture so that
...
certain menu items are enabled correctly.
Should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8108
svn path=/trunk/; revision=46629
2012-12-20 04:06:44 +00:00
Evan Huus
b06842274a
Remove unused parameter from iousers_process_address_packet
...
svn path=/trunk/; revision=46628
2012-12-20 03:20:24 +00:00
Michael Mann
0bdfbe97d4
Add -Q option to TShark to force only "true" errors to stderr. No "status" messages should be included if -Q option is specified. Bug 2881 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2881 )
...
svn path=/trunk/; revision=46627
2012-12-20 01:22:42 +00:00
Michael Mann
072041e3fb
Add absolute date options (-ad) for start date/time of conversation in TShark. Bug 1849 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1849 )
...
svn path=/trunk/; revision=46626
2012-12-20 01:19:22 +00:00
Evan Huus
5ca70369a0
Add missing wmem strbuf routine to the documentation.
...
svn path=/trunk/; revision=46625
2012-12-19 23:12:58 +00:00
Evan Huus
b0ca152217
Only include wmem_core.h in packet_info.h. It's not technically a
...
public header, but since packet_info.h is included in most of the tree it saves
a great deal of recompilation when something in one of the wmem data structures
changes.
svn path=/trunk/; revision=46624
2012-12-19 23:11:22 +00:00
Jeff Morriss
935b4904d4
Add a new target: install_desktop_files which installs some files for
...
use with a freekdesktop (at least I think so). This stuff was taken from
Fedora's Wireshark RPM.
The intent is to a) use Wireshark's own files and b) remove most of the manual
installation steps from RPMs.
svn path=/trunk/; revision=46623
2012-12-19 22:51:51 +00:00
Jeff Morriss
9e21fcc087
Also register Wireshark for MIME types application/x-pcapng and application/x-snoop.
...
svn path=/trunk/; revision=46622
2012-12-19 21:02:07 +00:00
Jeff Morriss
b10f83c531
Add wireshark-mime-package.xml to EXTRA_DIST.
...
svn path=/trunk/; revision=46621
2012-12-19 21:01:00 +00:00
Jeff Morriss
9780dcf7be
Add a mime-info file for freedesktop.org-compliant desktops; this one is
...
based on that from Fedora.
Define MIME information for PCAP, PCAPNG, and Snoop files.
svn path=/trunk/; revision=46620
2012-12-19 20:59:41 +00:00
Michael Tüxen
10dbe80c65
Add support for writing the flags option in the enhanced
...
packet block (pcapng).
svn path=/trunk/; revision=46619
2012-12-19 20:27:12 +00:00