guy [Tue, 1 Jul 2008 21:13:32 +0000 (21:13 +0000)]
Put printf into a separate "termoutput" API group. For most files,
check for it - but not for TShark plugins, as they are expected to
print to the standard output.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25653
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 1 Jul 2008 21:05:45 +0000 (21:05 +0000)]
Fix bug "iax2 dissector always reports retransmission bit to be false"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2666
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25652
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 1 Jul 2008 20:53:22 +0000 (20:53 +0000)]
Get rid of some unused code warnings. Hopefully without breaking anything.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25651
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 1 Jul 2008 20:30:21 +0000 (20:30 +0000)]
The intended argument for "-g" was presumably "abort", given Gerald's
checkin comment (that Wiretap routines shouldn't abort the program).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25650
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 1 Jul 2008 20:28:26 +0000 (20:28 +0000)]
Unless I've misread the GetOptions documentation, the "-g" flag to
checkAPIs.pl takes a mandatory string argument, not an optional string
argument.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25649
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 1 Jul 2008 19:58:01 +0000 (19:58 +0000)]
Update the ASN.1 files.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25648
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 1 Jul 2008 19:57:03 +0000 (19:57 +0000)]
Get rid of some unused code warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25647
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Tue, 1 Jul 2008 13:39:09 +0000 (13:39 +0000)]
Added a new make target, osx-app, to build only the app and not the dmg.
This is usefull when using the app locally.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25646
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 1 Jul 2008 12:55:08 +0000 (12:55 +0000)]
Get rid of some unused code warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25645
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 1 Jul 2008 12:54:33 +0000 (12:54 +0000)]
Get rid of some unused code warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25644
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 1 Jul 2008 02:57:35 +0000 (02:57 +0000)]
unicode-utils.h is in wsutil now.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25643
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 30 Jun 2008 18:57:13 +0000 (18:57 +0000)]
SET_ADDRESS should not be called with an address type of FT_IPv4 but rather AT_IPv4.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25642
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 30 Jun 2008 18:07:34 +0000 (18:07 +0000)]
Move privileges.c and unicode-utils.c symbols from epan to wsutil
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25641
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 30 Jun 2008 17:16:29 +0000 (17:16 +0000)]
Move privileges.c and unicode-utils.c from epan to wsutil (so things like
capinfos and dumpcap don't need to depend on libwireshark nor directly pull
in those modules). Because capinfos and editcap were only being linked with
privileges.c if we had plugins, this allows those programs to be linked when
someone is compiling --without-plugins.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25640
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 30 Jun 2008 16:36:37 +0000 (16:36 +0000)]
When we open a debug console on Windows, don't grab stdin. We never read
anything on this particular console, and if we open stdin here we can't
read a capture from an anonymous pipe.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25638
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 30 Jun 2008 15:23:11 +0000 (15:23 +0000)]
Create the MTP3 TVB (if any) with a reported length that mirrors the reported length of the frame. That way subdissector exceptions on short frames will (properly) show up as 'packet size limited during capture'.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25637
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 30 Jun 2008 13:46:34 +0000 (13:46 +0000)]
From Abhik Sarkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2661 : fix prototypes of tvb_fake_unicode() and tvb_get_ephemeral_faked_unicode()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25636
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Mon, 30 Jun 2008 06:35:22 +0000 (06:35 +0000)]
Fix for bug 2659:
Account for IPv6 addresses representation in Via header.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25635
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sun, 29 Jun 2008 15:51:43 +0000 (15:51 +0000)]
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_container_border_width() ==> gtk_container_set_border_width()
gtk_container_children() ==> gtk_container_get_children()
gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length()
gtk_menu_append() ==> gtk_menu_shell_append()
gtk_menu_prepend() ==> gtk_menu_shell_prepend()
gtk_notebook_set_page() ==> gtk_notebook_set_current_page()
gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size()
gtk_radio_button_group() ==> gtk_radio_button_get_group()
gtk_signal_connect() ==> g_signal_connect()
gtk_signal_disconnect() ==> g_signal_handler_disconnect()
gtk_signal_emit_by_name() ==> g_signal_emit_by_name()
gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched()
gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func()
gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched()
gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func()
gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value()
gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25634
f5534014-38df-0310-8fa8-
9805f1628bb7
sake [Sun, 29 Jun 2008 14:59:23 +0000 (14:59 +0000)]
From Kovarththanan Rajaratnam (bug 2657):
Resolve accelerator ambiguity in filter toolbar
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25633
f5534014-38df-0310-8fa8-
9805f1628bb7
sake [Sun, 29 Jun 2008 12:55:14 +0000 (12:55 +0000)]
From Kovarththanan Rajaratnam (bug 2658):
Leading $ will now be propageted to display filter entry (on keyboards
where AltGr needs to be used to enter a '$').
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25632
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Sun, 29 Jun 2008 10:15:41 +0000 (10:15 +0000)]
* Fix a bug reported by Peter Hertting: Handle more than one integer interface identifier.
* Call parameters parameter.
* List integer interface ranges in range parameters.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25631
f5534014-38df-0310-8fa8-
9805f1628bb7
sake [Sun, 29 Jun 2008 09:01:12 +0000 (09:01 +0000)]
Add accelerator keys for (un)mark all packets
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25630
f5534014-38df-0310-8fa8-
9805f1628bb7
sake [Sun, 29 Jun 2008 08:36:24 +0000 (08:36 +0000)]
From Kovarththanan Rajaratnam (bug 2652):
Add accelerator keys for Find Next/Previous Reference
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25629
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Sat, 28 Jun 2008 21:09:57 +0000 (21:09 +0000)]
Fix some warnings reported by gcc -Wshadow ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25628
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 28 Jun 2008 20:58:35 +0000 (20:58 +0000)]
Get rid of some unused code warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25627
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 28 Jun 2008 20:53:13 +0000 (20:53 +0000)]
Get rid of some unused code warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25626
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 28 Jun 2008 20:31:56 +0000 (20:31 +0000)]
Add som missing extension IE's and try to get rid of som unused code warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25625
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 28 Jun 2008 19:25:15 +0000 (19:25 +0000)]
To handle 64 bit constraints we also need to change FT_UINT32 to FT_UINT64
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25624
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 28 Jun 2008 17:23:07 +0000 (17:23 +0000)]
Add FT_INT64 to IS_FT_INT and FT_UINT_64 to IS_FT_UINT.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25623
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 28 Jun 2008 01:51:12 +0000 (01:51 +0000)]
Set the Info column.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25622
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 27 Jun 2008 23:47:25 +0000 (23:47 +0000)]
If we find an invalid version number, at least put something into the
Info column and protocol tree to indicate that.
If we find an invalid version number in the *second* switch statement,
don't bother spewing out a warning - that's a "cannot happen", so just
throw a dissector assertion.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25621
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 27 Jun 2008 22:48:25 +0000 (22:48 +0000)]
Have checkAPIs.pl print to stderr, so that its output is colored red in
Buildbot. Make capitalization more consistent. Look for abort functions in
wsutil.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25619
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 27 Jun 2008 16:15:30 +0000 (16:15 +0000)]
Fix some warnings reported by gcc -Wshadow ...
Fix some spacing in packet-dcom.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25618
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 27 Jun 2008 16:07:21 +0000 (16:07 +0000)]
Fix some checkAPIs warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25617
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 27 Jun 2008 04:52:56 +0000 (04:52 +0000)]
Fix some warnings reported by gcc -Wshadow ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25616
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 26 Jun 2008 23:43:15 +0000 (23:43 +0000)]
Wiretap code probably shouldn't abort the application either.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25615
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 26 Jun 2008 22:20:05 +0000 (22:20 +0000)]
Add support for "API groups" in checkAPIs.pl. Make the "prohibited"
and "deprecated" groups the default. Add an "abort" group for code that
shouldn't exit the program. Update the makefiles to call "checkAPIs.pl
-g abort" for dissectors. Remove a dependency on "cat" in checkAPIs.pl.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25614
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 26 Jun 2008 20:42:58 +0000 (20:42 +0000)]
Fix a comment: the subdissector won't /assert/ out it will /except/ out if the MSU is truncated.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25613
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 26 Jun 2008 20:40:30 +0000 (20:40 +0000)]
From Abhik Sarkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2647 :
The syslog dissector could crash if the "packlog" MSU is truncated such that
the hex string ends in with a nibble.
From me: Check if that will happen and chop off the nibble before giving it to
convert_string_to_hex() so we'll dissect as much of the MSU as possible.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25612
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Thu, 26 Jun 2008 16:42:07 +0000 (16:42 +0000)]
Remove a lot of vestigal GTK-Wimp stuff. It's been included with
GTK+ since version 2.8, when its name was changed to the "GTK MS
Windows-Engine."
Simplify the Windows installer by removing the GTK-Wimp option (which
means the "Wireshark" item can be an entry instead of a group). Move
Rawshark to the "Tools" group.
(If anyone wants to disable the MS Windows Engine they can still do so
after installation by disabling or removing libwimp.dll.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25611
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 26 Jun 2008 02:29:13 +0000 (02:29 +0000)]
Fix a missed "item" -> "item_local" in the previous checkin.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25610
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 26 Jun 2008 01:47:59 +0000 (01:47 +0000)]
Make the default for HDLC traffic "Raw data", just as it is for other
record types, so that people know they have to set the preference.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25609
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 26 Jun 2008 01:38:38 +0000 (01:38 +0000)]
Make the preference settings for the dissector to use for various ERF
link-layer types static.
If the preference is set to "raw data" for any of those types, display
the raw data with an indication that the preference in question has been
set to "raw data", so people don't just wonder why ERF files aren't
working right any more. (See bug 2641; I had the same surprise when I
tried it on some ERF captures I have.)
Pull the dissect_erf_header() code into dissect_erf() - it's dissecting
the *payload*, not the *header*.
Fill in the Info column with the record type.
When using tvb_new_subset() to chop a header off of a tvbuff, just
specify lengths of -1, so we go all the way to the end.
Clean up the Infiniband dissector call.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25608
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 26 Jun 2008 00:16:58 +0000 (00:16 +0000)]
Fix some warnings reported by gcc -Wshadow ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25607
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 25 Jun 2008 23:07:40 +0000 (23:07 +0000)]
We last supported NT 4.0 with version 0.99.4 (according to
wireshark.nsi, at least). Drop it from the "supported" list and add a
note about NT 4.0 and older Windows versions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25606
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 25 Jun 2008 22:52:08 +0000 (22:52 +0000)]
We apper to spell it "TShark" rather than "Tshark", the fact that it's
"Wireshark" rather than "WireShark" nonwithstanding.
Say we run on NT 4.0 rather than "NT" - I don't know whether we run on
NT 3.x (and 2000/2003/XP are really NT 5.x and Vista/2008 are really NT
6.x - that's why Microsoft are talking about "Windows 7" as the next big
release).
In the capture-privileges paragraph, note that it's dumpcap that needs
to run as root, and suggest not only that Wireshark shouldn't be set-UID
root, but that it shouldn't even be run as root, and that the same
applies to TShark.
Update "How to Report a Bug" to reflect that we're telling people to
report bugs on Bugzilla, and that "wireshark -v"/"tshark -v" give almost
all the version information we want.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25605
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Wed, 25 Jun 2008 21:21:33 +0000 (21:21 +0000)]
Update the document to the current state of affairs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25604
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Wed, 25 Jun 2008 12:40:15 +0000 (12:40 +0000)]
Make sip.msg_hdr a string field instead of FT_NONE.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25602
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 25 Jun 2008 09:12:35 +0000 (09:12 +0000)]
Constify a bunch of stuff, to squelch -Wwrite-strings warnings.
epan/dissectors/packet-ncp2222.inc is a bit hard to fix, so we're not
ready to enable that warning by default yet.
Throw in some casts to handle GLib routines that take arbitrary
non-const pointers (they can later return the pointers, and some
callers might want to modify or free up those pointers in cases where
they're known to be writable or allocated).
Use ep_tvb_memdup() rather than a combination of ep_alloc() and
tvb_memcpy().
Clean up some indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25601
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 25 Jun 2008 09:10:50 +0000 (09:10 +0000)]
Clean up indentation.
Make build_expert_data() take the size of "buffer" as an argument, and
use that when doing g_snprintf() into the buffer, to ensure we don't
overflow the buffer. Also, don't just assign to "buffer", as that
doesn't put anything *in* the buffer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25600
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Wed, 25 Jun 2008 08:54:22 +0000 (08:54 +0000)]
For for compressed DLMAP decode error.
From Frank Wang (bug 2640).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25599
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Wed, 25 Jun 2008 06:18:23 +0000 (06:18 +0000)]
From Max Ivanov:
The destination unreachable indication for external IP routes is at offset 24, not 4 as in internal IP routes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25598
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 25 Jun 2008 03:05:53 +0000 (03:05 +0000)]
Update a comment.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25597
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 25 Jun 2008 03:05:19 +0000 (03:05 +0000)]
Fix some warnings - declare some arguments, variables, and structure
members to be const pointers when that's possible, and throw in some
casts when the GLib API fails to have properly consted arguments.
Use ep_strdup_printf() in some cases.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25596
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 24 Jun 2008 22:53:52 +0000 (22:53 +0000)]
Make it obvious that this is a development version. Fix a makefile
dependency on the splash images.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25594
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 24 Jun 2008 21:16:22 +0000 (21:16 +0000)]
Add TurboCap-related changes from /trunk-1.0:
From Dustin Johnson: Add support for TurboCap.
- packet-ppi.c: Add aggregation and 802.3 extended information.
- capture-wpcap.c: Add support for pcap_list_datalinks and pcap_set_datalink.
Make pcap_list_datalinks and pcap_set_datalink mandatory on Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25593
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 24 Jun 2008 20:54:38 +0000 (20:54 +0000)]
Fix a logic problem.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25592
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Tue, 24 Jun 2008 20:09:43 +0000 (20:09 +0000)]
Make inet_ntop fix work for out-of-tree builds
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25590
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 19:58:29 +0000 (19:58 +0000)]
Make -Wwrite-strings non-default for now.
Note what files are blocking some -W flags.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25589
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 19:38:40 +0000 (19:38 +0000)]
Get rid of another unused variable.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25588
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 19:27:46 +0000 (19:27 +0000)]
Get rid of some code that fills in a string that's never used. Get rid
of the string, while we're at it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25587
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 24 Jun 2008 19:18:21 +0000 (19:18 +0000)]
Highlight the whole hostname, even if we've truncated it in the display.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25586
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 19:13:15 +0000 (19:13 +0000)]
We're not ready for -Wshadow by default yet.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25585
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 24 Jun 2008 19:08:54 +0000 (19:08 +0000)]
Noam Rathus discovered that the RMI dissector was using g_strlcpy
incorrectly, which could lead to information disclosure or worse. Use
tvb_format_text instead. This lets us get rid of a character array and
avoids feeding raw packet data to the GUI.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25584
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 18:22:26 +0000 (18:22 +0000)]
Assign pointers to strings to a const pointer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25582
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 18:10:57 +0000 (18:10 +0000)]
Fix another variable named "index".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25581
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 18:00:14 +0000 (18:00 +0000)]
We don't check structure sizes elsewhere; don't check them here. (In
any case, the detailed error string is supposed to be g_malloced....)
Fix some "snoop" to be "btsnoop", and note that this is Symbian btsnoop,
not regular snoop.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25580
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Tue, 24 Jun 2008 17:57:44 +0000 (17:57 +0000)]
Fix *NIX builds where we need our own inet_pton.c or inet_ntop.c . This should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2607
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25579
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 17:45:09 +0000 (17:45 +0000)]
Temporarily turn on some -W options, to provoke the buildbots to build
with them to check whether we've cleaned those warnings up or not.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25578
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 17:43:48 +0000 (17:43 +0000)]
One -Wcast-align suffices.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25577
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 08:05:45 +0000 (08:05 +0000)]
Have separate callback mechanisms in file.c and capture.c; pass the
capture callbacks the capture_options * as its second argument in all
cases. This makes it a bit clearer what arguments callbacks take, and
means we can get rid of all global_capture_opts references in
gtk/main_statusbar.c.
Put the interface between gtk/main.c and gtk/main_statusbar.c into a
private header.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25576
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 04:04:47 +0000 (04:04 +0000)]
Only include gtk/capture_globals.h if we're building with capture
support.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25575
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 03:38:15 +0000 (03:38 +0000)]
Add gtk/capture_globals.h, to declare global_capture_opts, so files that
don't need global_capture_opts don't need to have it declared and thus
don't need capture_options defined.
Include gtk/capture_globals in the files in question.
Change some more capture_opts references to refer to
global_capture_opts.
Change some global_capture_opts references in routines with a
capture_opts argument to refer to capture_opts.
The structure type is capture_options, not capture_opts; fix some
references.
Include <sys/types.h>, if it's present, in capture_opts.h, so we get
gid_t defined.
Clean up indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25574
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 03:33:51 +0000 (03:33 +0000)]
Fix some references to the global loop_data structure that weren't
changed in the previous checkin.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25573
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 02:24:17 +0000 (02:24 +0000)]
For now, just refer to global_capture_opts, replacing references to the
now-defult global capture_opts pointer; we eventually should try to
minimize the use of global variables.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25572
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 02:22:36 +0000 (02:22 +0000)]
For now, just refer to global_capture_opts, replacing references to the
now-defult global capture_opts pointer; we eventually should try to
minimize the use of global variables.
Export global_capture_opts from gtk/main.h.
Clean up indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25571
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 24 Jun 2008 01:23:33 +0000 (01:23 +0000)]
Have capture_info_ui_create() and capture_info_open() take a pointer to
the capture_opts structure as an argument, rather than just a pointer to
the interface name.
Don't declare a global "capture_opts" pointer, as we don't define it any
more.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25570
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 23 Jun 2008 21:58:16 +0000 (21:58 +0000)]
Do not only update the argument name, but also where it's used.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25566
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 23 Jun 2008 21:53:24 +0000 (21:53 +0000)]
Renamed some local variables to avoid name collisions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25565
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 23 Jun 2008 21:43:00 +0000 (21:43 +0000)]
Renamed a local variable to avoid name collisions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25564
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 23 Jun 2008 21:40:40 +0000 (21:40 +0000)]
Renamed a local variable to avoid name collisions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25563
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 23 Jun 2008 21:36:22 +0000 (21:36 +0000)]
Renamed a local variable to avoid name collisions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25562
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 23 Jun 2008 21:34:40 +0000 (21:34 +0000)]
Renamed a local variable to avoid name collisions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25561
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 23 Jun 2008 21:31:47 +0000 (21:31 +0000)]
Renamed index and ipv4_addr to avoid name collisions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25560
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 21:31:10 +0000 (21:31 +0000)]
Rename an argument to avoid colliding with a global variable.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25559
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 23 Jun 2008 21:28:44 +0000 (21:28 +0000)]
Removed argument names in function pointers to avoid shadowing warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25558
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 23 Jun 2008 21:27:52 +0000 (21:27 +0000)]
Renamed the global bit_mask to avoid collisions with the bit_mask used
in various functions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25557
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 21:27:37 +0000 (21:27 +0000)]
Rename an argument to avoid colliding with pipe().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25556
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 21:24:48 +0000 (21:24 +0000)]
Rename an argument to avoid colliding with pipe().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25555
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 21:22:11 +0000 (21:22 +0000)]
Rename the global "ld" structure to "global_ld", to avoid collisions
with the "ld" pointer argument (and to point out that it's a global
variable).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25554
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 21:08:58 +0000 (21:08 +0000)]
Rename a local variable in a macro to avoid collisions with regular
variables.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25553
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 23 Jun 2008 21:07:37 +0000 (21:07 +0000)]
Copy over r25535 from /trunk-1.0: When we're run with -p, set
VERSION_BUILD no matter what.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25552
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 21:06:42 +0000 (21:06 +0000)]
Rename a variable to avoid collisions with the old V7 index() function,
still declared by <string.h> on some platforms (at least the way we
compile, with all sorts of non-ANSI C/non-POSIX stuff added).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25551
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 20:51:31 +0000 (20:51 +0000)]
Temporarily make -Wshadow not a default.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25550
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 20:34:18 +0000 (20:34 +0000)]
Rename a variable to avoid collisions with a global variable, as noted
by John Smith.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25549
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 20:32:50 +0000 (20:32 +0000)]
Rename a variable to avoid collisions with a global variable, as noted
by John Smith.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25548
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 20:31:21 +0000 (20:31 +0000)]
Rename an argument to avoid collisions with a global variable name, as
noted by John Smith.
Fix indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25547
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 20:29:13 +0000 (20:29 +0000)]
Get rid of the static capture_opts pointer - it collides with parameter
names, as noted by John Smith.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25546
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 23 Jun 2008 20:25:17 +0000 (20:25 +0000)]
Rename capture_opts to global_capture_opts - that's what it's called in
dumpcap, and calling it capture_opts collides with parameter names, as
noted by John Smith.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25545
f5534014-38df-0310-8fa8-
9805f1628bb7