Commit graph

5520 commits

Author SHA1 Message Date
Michael Tüxen
09af2bc6d2 Don't allow capturing from multiple interface when compiled with multiple thread
support.

svn path=/trunk/; revision=38057
2011-07-16 11:07:32 +00:00
Michael Tüxen
9adf6c20ca Get rid of two gtk runtime warnings.
svn path=/trunk/; revision=38052
2011-07-15 21:26:43 +00:00
Michael Tüxen
85d399d906 You can't create a mutex without initializing the thread system.
So #ifdef the code with USE_THREADS.

svn path=/trunk/; revision=38045
2011-07-15 14:58:45 +00:00
Michael Tüxen
c481dda78c Fix compilation on non-windows platforms defining USE_THREADS.
svn path=/trunk/; revision=38044
2011-07-15 14:31:27 +00:00
Jörg Mayer
00beddf9fc Add a missing ( in the UI_MANAGER case
svn path=/trunk/; revision=38042
2011-07-15 11:14:41 +00:00
Gerald Combs
a533d70be0 On Windows enable threads everywhere instead of just in dumpcap. If
threads are enabled use them to check the recent file list. Fixes bug
3810.

svn path=/trunk/; revision=38033
2011-07-14 23:18:02 +00:00
Anders Broman
a779bef74d Fix trunk/gtk/menus.c:4427:9: error: ‘sep_entry’ undeclared (first use in this function)
svn path=/trunk/; revision=38031
2011-07-14 22:08:15 +00:00
Jörg Mayer
ef1e70dfd7 Remove trailing whitespace
Replace a deprecated gdk function

svn path=/trunk/; revision=38027
2011-07-14 21:25:33 +00:00
Anders Broman
1785a37ab4 Remove €˜GtkItemFactoryEntry code in MAIN_MENU_USE_UIMANAGER
code path.
Don't build and don't use protocol help if MAIN_MENU_USE_UIMANAGER is defined.

svn path=/trunk/; revision=38024
2011-07-14 20:36:00 +00:00
Bill Meier
43806aff9d Fix a crash when doing Telephony ! RTP ! Stream Analysis with capture files with truncated frames.
(That is: the capture files were created with a snapshot length less than the maximum).

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6120


svn path=/trunk/; revision=38023
2011-07-14 19:51:53 +00:00
Michael Tüxen
e791424ab6 Add back r37749, which was taken out by accident.
Thanks to Stephen Fisher for pointing it out.

svn path=/trunk/; revision=38018
2011-07-14 16:54:44 +00:00
Jörg Mayer
c04911c06a Fix the last non-gtkitemfactory stuff for use with -DGTK_DISABLE_DEPRECATED.
Left are:

gtk/menus.c:4382:5: error: ‘GtkItemFactoryEntry’ undeclared (first use in this function)
gtk/menus.c:4382:26: error: ‘sep_entry’ undeclared (first use in this function)
gtk/proto_help.c:79:16: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘*’ token
gtk/proto_help.c:166:2: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:166:2: error: implicit declaration of function ‘gtk_item_factory_from_widget’
gtk/proto_help.c:181:6: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:183:2: error: implicit declaration of function ‘gtk_item_factory_get_widget’
gtk/proto_help.c:191:2: error: implicit declaration of function ‘gtk_item_factory_get_item’
gtk/proto_help.c:216:2: error: ‘GtkItemFactoryEntry’ undeclared (first use in this function)
gtk/proto_help.c:216:23: error: ‘menu_entry’ undeclared (first use in this function)
gtk/proto_help.c:217:2: error: ISO C90 forbids mixed declarations and code
gtk/proto_help.c:222:6: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:258:4: error: implicit declaration of function ‘gtk_item_factory_create_item’


svn path=/trunk/; revision=38015
2011-07-14 09:43:53 +00:00
Anders Broman
6814cd03ee Replace deprecated gdk_pixmap_unref() with g_object_unref().
Update checkAPIs.

svn path=/trunk/; revision=38013
2011-07-14 08:11:16 +00:00
Anders Broman
02e71fb443 From Joerg Mayer:
Patch fixes most of the remaining errors when compiling with
GTK_DISABLE_DEPRECATED.

svn path=/trunk/; revision=38012
2011-07-14 08:02:32 +00:00
Jörg Mayer
3f798982de Update status of compile with -DGTK_DISABLE_DEPRECATED
svn path=/trunk/; revision=38007
2011-07-14 00:16:14 +00:00
Jörg Mayer
11f131b303 Fix some compiler errors with -DGTK_DISABLE_DEPRECATED
svn path=/trunk/; revision=38006
2011-07-14 00:04:37 +00:00
Jörg Mayer
0d30fdf68f make compiling with -DGTK_DISABLE_DEPRECATED work
svn path=/trunk/; revision=38005
2011-07-13 22:49:38 +00:00
Jörg Mayer
275f89b5c2 make compiling with -DGTK_DISABLE_DEPRECATED work
svn path=/trunk/; revision=38004
2011-07-13 22:32:05 +00:00
Anders Broman
1494865058 Remove two deprecated functions.
svn path=/trunk/; revision=37997
2011-07-13 14:47:31 +00:00
Anders Broman
cb98a2b2c2 Fix more tooltips fixes.
svn path=/trunk/; revision=37996
2011-07-13 08:48:13 +00:00
Michael Tüxen
865240b6ba Display interface stuff only when interfaces are available.
svn path=/trunk/; revision=37995
2011-07-12 21:33:11 +00:00
Michael Tüxen
a73931eafd This fixes the compile issue reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6111


svn path=/trunk/; revision=37990
2011-07-12 11:06:44 +00:00
Anders Broman
baf0396650 Fix more tooltips.
svn path=/trunk/; revision=37988
2011-07-12 06:54:01 +00:00
Anders Broman
fb16948f96 Fix more tooltips.
svn path=/trunk/; revision=37987
2011-07-12 06:15:24 +00:00
Anders Broman
ef84ed2d32 Fix more tooltips.
svn path=/trunk/; revision=37980
2011-07-11 21:29:47 +00:00
Gerald Combs
49b92440de More GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versions
in README.devloper. Remove g_gnuc.h since it's no longer needed. Remove
tvbuff_init(), tvbuff_cleanup(), reassemble_init(), and
reassemble_cleanup() since they were only used for older GLib versions
which didn't support GSlices. Assume we always support the "matches"
operator.

svn path=/trunk/; revision=37978
2011-07-11 20:32:19 +00:00
Anders Broman
1f923105f8 Fix more tooltips, mark gtk_tooltips_new with 'E' in checkapi.
svn path=/trunk/; revision=37976
2011-07-11 20:01:28 +00:00
Anders Broman
3a35b7229c Fix a couple of tooltips.
svn path=/trunk/; revision=37975
2011-07-11 19:34:57 +00:00
Gerald Combs
4608a76a51 Remaining GLIB_CHECK_VERSION and GTK_CHECK_VERSION in the gtk directory.
svn path=/trunk/; revision=37973
2011-07-11 19:10:57 +00:00
Anders Broman
347c71d9a8 GTK_CHECK_VERSION cleanup.
svn path=/trunk/; revision=37972
2011-07-11 18:54:49 +00:00
Gerald Combs
5ad2293f40 More GLIB_CHECK_VERSION and GTK_CHECK_VERSION cleanup.
svn path=/trunk/; revision=37971
2011-07-11 18:35:36 +00:00
Gerald Combs
2c469e3714 More GLIB_CHECK_VERSION, GTK_CHECK_VERSION, and related whitespace
cleanup.

svn path=/trunk/; revision=37970
2011-07-11 18:18:35 +00:00
Gerald Combs
f6d7f90c72 Remove a lot of instances of GTK_CHECK_VERSION. Clean up whitespace in a
couple of places.

svn path=/trunk/; revision=37969
2011-07-11 18:08:08 +00:00
Guy Harris
030ec99939 Point to the right place.
svn path=/trunk/; revision=37944
2011-07-09 01:41:09 +00:00
Balint Reczey
a2c55f0c17 Show a hint to read http://wiki.wireshark.org/CaptureSetup/CapturePrivileges
when showing the warning about running Wireshark as root
Thanks to Evan Huus for the suggestion.

svn path=/trunk/; revision=37943
2011-07-09 00:20:13 +00:00
Michael Tüxen
8e93cf895f Use a pixbuf for widgets used for icons.
svn path=/trunk/; revision=37942
2011-07-08 18:29:02 +00:00
Michael Tüxen
0472f42af7 If no interface is specified on the command line, use the default
capture interface if given.

This patch is provided by Irene Ruengeler.


svn path=/trunk/; revision=37939
2011-07-08 13:47:16 +00:00
Michael Tüxen
b2ab9d134a You can't select/deselct interfaces in the capture/interfaces
dialog while you are capturing.
This patch is provided by Irene Ruengeler.

svn path=/trunk/; revision=37938
2011-07-08 13:40:00 +00:00
Michael Tüxen
d56de3d638 Try to make non-libpcap builds compiling.
svn path=/trunk/; revision=37937
2011-07-08 09:26:34 +00:00
Michael Tüxen
15bf360095 Use the interfaces from the last capturing process as a starting point
for the next one.

Obtained from Irene Ruengeler.

svn path=/trunk/; revision=37936
2011-07-08 08:49:06 +00:00
Jaap Keuter
7890ac3667 Avoid 'variable set but no used' error from compiler.
svn path=/trunk/; revision=37935
2011-07-08 07:52:31 +00:00
Michael Tüxen
746ca92b46 The argument of capture_get_if_icon() is used.
svn path=/trunk/; revision=37932
2011-07-07 21:16:03 +00:00
Michael Tüxen
8fac080296 Try to unbreak the Mac OS X 10.5 buildbots.
svn path=/trunk/; revision=37931
2011-07-07 20:20:55 +00:00
Michael Tüxen
3500412973 Bring back interface icons.
Obtained from Irene Ruengeler.

svn path=/trunk/; revision=37929
2011-07-07 13:57:08 +00:00
Michael Tüxen
20ded72bac Use the interface descriptions again.
This patch is from Irene Ruengeler.

svn path=/trunk/; revision=37928
2011-07-07 13:34:40 +00:00
Michael Tüxen
6542687a78 Fix a crash when using hidden interfaces.
svn path=/trunk/; revision=37925
2011-07-06 17:27:42 +00:00
Martin Mathieson
c4dd3e5e5c Add
#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
around access to interface_options.buffer_size

svn path=/trunk/; revision=37920
2011-07-06 14:56:42 +00:00
Michael Tüxen
8180111144 Use g_object_set() instead of gtk_object_set().
svn path=/trunk/; revision=37917
2011-07-06 11:35:52 +00:00
Michael Tüxen
b682b5ee01 Get it even linking...
svn path=/trunk/; revision=37916
2011-07-06 11:25:57 +00:00
Michael Tüxen
eef7623fb9 Get it compiling when not having libpcap.
svn path=/trunk/; revision=37915
2011-07-06 11:22:38 +00:00
Michael Tüxen
48683778a0 Add support for multiple interface to the main welcome screen.
This patch is from Irene Ruengeler.

svn path=/trunk/; revision=37913
2011-07-06 09:17:06 +00:00
Guy Harris
ddc6baabbb Constify to squelch compiler warning.
svn path=/trunk/; revision=37911
2011-07-06 04:45:50 +00:00
Guy Harris
fc581f9865 Don't check for "(null)" as the result of a printf operation; don't pass
in a null pointer to %s in the first place!  Not all printf
implementations necessarily emit "(null)" in that case; perhaps GLib's
does, but we shouldn't even depend on that - we should, instead, at
least print something semi-useful in that case (the link-layer type's
numerical value).

Fix syntax errors in the "no libpcap" case.

svn path=/trunk/; revision=37910
2011-07-06 04:09:49 +00:00
Guy Harris
053c583fda Add some additional routine variants that handle string encodings, and
make FT_STRING and FT_UINT_STRING handle string encodings.

Get rid of FT_EBCDIC in favor of FT_STRING with ENC_EBCDIC.

Add some URLs for DRDA.

Clean up some stuff in TN3270 and TN5250, including using ENC_ values
for proto_tree_add_item().

svn path=/trunk/; revision=37909
2011-07-05 23:59:23 +00:00
Michael Tüxen
1c7349022d Don't use strcpy().
svn path=/trunk/; revision=37907
2011-07-05 21:29:06 +00:00
Michael Tüxen
8b5eee3639 (Try to) fix compilation when no libpcap is available.
svn path=/trunk/; revision=37905
2011-07-05 21:11:24 +00:00
Michael Tüxen
cb90aa7904 Add initial support for multiple interfaces. More to come after
the capture options dialog box supports also multiple interfaces.

This patch has been developed by Irene Ruengeler.

svn path=/trunk/; revision=37904
2011-07-05 20:34:03 +00:00
Michael Tüxen
4b8f5a1865 Support selecting multiple interfaces in the capture/interfaces
dialog.
Until the capture/options dialog supports multiple interfaces, the
options button is only selectable when 0 or 1 interfaces are selected.
This patch is based on work by Irene Ruengeler.

svn path=/trunk/; revision=37903
2011-07-05 20:29:33 +00:00
Anders Broman
2f05cf4dcf From Michael Mann:
Added ability to display UTC time or UTC time with date.  I liked having the
difference between UTC and local time, not just setting local=UTC.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2629

svn path=/trunk/; revision=37898
2011-07-04 21:43:34 +00:00
Bill Meier
16fabcc02c Log:
Fix incorrect usage of gtk_radio_button_new_with_label()/gtk_radio_button_get_group();
 Use gtk_radio_button_new_with_label_from_widget().

 Essentially: gtk_radio_button_get_group() must be called after each gtk_radio_button_new...()
 before using the 'group' GSList pointer in another call to gtk_radio_button_new...().

 In these cases the incorrect usage appears to only have resulted in allowing multiple
 radio buttons to be activated simultaneously.

 (In at least one case elsewhere, the incorrect usage resulted in a Wireshark crash).


svn path=/trunk/; revision=37871
2011-07-02 21:36:25 +00:00
Bill Meier
9e3d46e08b Remove 3 lines of code no longer needed after SVN #37869
svn path=/trunk/; revision=37870
2011-07-02 21:06:51 +00:00
Bill Meier
a2e7e3e2e7 Fix incorrect usage of gtk_radio_button_new_with_label()/gtk_radio_button_get_group();
Use gtk_radio_button_new_with_label_from_widget().

Essentially: gtk_radio_button_get_group() must be called after each gtk_radio_button_new...()
before using the 'group' GSList pointer in another call to gtk_radio_button_new...().

In these cases the incorrect usage appears to only have resulted in allowing multiple
radio buttons to be activated simultaneously.

(In at least one case elsewhere, the incorrect usage resulted in a Wireshark crash).



svn path=/trunk/; revision=37869
2011-07-02 21:00:56 +00:00
Bill Meier
0f310b83fe Whitespace cleanup (trailing spaces).
svn path=/trunk/; revision=37868
2011-07-02 20:14:41 +00:00
Bill Meier
6f982ec7c2 Fix: Wireshark crashes after repeating "File -> Import -> Cancel"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6080

Apparently gtk_radio_button_get_group() must be called after
each addition to the group before the 'group' GSList pointer can be used
again in, for example, a call to get_radio_button_new_with_label().

(Where does it say this in the GTK docs ? It does make sense, tho, given
the way GSLists work).

We'll use gtk_radio_button_new_with_label_from_widget() instead to let GTK
handle the grouping.


svn path=/trunk/; revision=37867
2011-07-02 19:50:41 +00:00
Jörg Mayer
7e0b65ff91 avoid warning about old style function definition
svn path=/trunk/; revision=37863
2011-07-02 11:33:32 +00:00
Stig Bjørlykke
6bdd7eed16 Renamed "___tmp_color_filter___" to "___conversation_color_filter___"
in the coloring rule name to better describe where it comes from.

svn path=/trunk/; revision=37859
2011-07-01 21:13:40 +00:00
Chris Maynard
2d11ac9051 From spamlookup via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6083:
Fix compile error introduced with r37830.


svn path=/trunk/; revision=37851
2011-07-01 15:44:42 +00:00
Michael Tüxen
2b439f46f3 Remove all interfaces when available.
Add a missing g_strdup.

svn path=/trunk/; revision=37843
2011-06-30 11:40:50 +00:00
Jakub Zawadzki
9fb3af3bf1 Fix memory leak.
svn path=/trunk/; revision=37841
2011-06-30 08:54:24 +00:00
Chris Maynard
0eb0b8f1f3 Undo r37833 in favor of Sake's changes to be committed at some future date.
svn path=/trunk/; revision=37839
2011-06-30 01:05:49 +00:00
Chris Maynard
531a787d9c Based on user feedback from Sharkfest '11, make the default choice when saving or printing packets apply to only displayed packets and not all packets.
svn path=/trunk/; revision=37833
2011-06-29 16:31:44 +00:00
Stig Bjørlykke
6747aef250 Added a preference to turn of capture filter syntax check.
This can be used to disable the effect in bug 5356.

svn path=/trunk/; revision=37830
2011-06-29 10:42:29 +00:00
Michael Tüxen
132c09f2d5 Cleanup whitespaces/indentation.
svn path=/trunk/; revision=37827
2011-06-29 06:33:54 +00:00
Stig Bjørlykke
92dde3023c Add $(GENERATED_H_FILES) to libui_a_SOURCES.
svn path=/trunk/; revision=37819
2011-06-28 16:57:10 +00:00
Stig Bjørlykke
dcbfc168b1 Add a missing dependency for text_import_scanner_lex.h
svn path=/trunk/; revision=37817
2011-06-28 15:30:28 +00:00
Stig Bjørlykke
624c40ae25 Use the generated header file from Guy's Flex front-end script from
revision 22446 for text_import_scanner.

svn path=/trunk/; revision=37815
2011-06-28 15:04:24 +00:00
Stig Bjørlykke
8443bbbf75 Replace all strerror() with g_strerror().
Remove our local strerror implementation.
Mark strerror as locale unsafe API.

This fixes bug 5715.

svn path=/trunk/; revision=37812
2011-06-28 09:00:11 +00:00
Michael Tüxen
043ea23beb Enable the cap_history again. It was temporary disabled a couple of hours ago.
svn path=/trunk/; revision=37803
2011-06-27 11:45:27 +00:00
Stig Bjørlykke
b979f2da27 From bug 6057:
Lua API: add support to temporary color filters (10 color slots)

svn path=/trunk/; revision=37801
2011-06-27 11:07:31 +00:00
Michael Tüxen
83eccec8fb Fix a bug when starting the capture without specifying an interface.
The capability history needs to be fixed.

svn path=/trunk/; revision=37795
2011-06-27 01:32:22 +00:00
Michael Tüxen
421dafd2de Get rid of old non-interface specific settings which are now interface
specifc. This finalizes the change of the infrastructure.
This patch is based on work by Irene Ruengeler.

svn path=/trunk/; revision=37794
2011-06-27 00:09:03 +00:00
Stig Bjørlykke
d374df09c0 Changed adding a new coloring rule to put the new rule at the top of the list.
This because the user most likely wants to use the new rule right away, and do
not want to think about which filters it should be above.

This was requested in bug 5669.

svn path=/trunk/; revision=37793
2011-06-26 18:25:03 +00:00
Chris Maynard
343c20e215 Make Wireshark portable to all locales by calling setlocale(). This, along with my previous commits in revisions 36160 and 36166 ought to fix the problem that Bartosz Kiziukiewicz first reported on the wireshark-users mailing list here:
http://www.wireshark.org/lists/wireshark-users/201103/msg00018.html

(I successfully generated Wireshark compare statistics after applying this change and also changing my locale to Polish.)

svn path=/trunk/; revision=37779
2011-06-24 02:35:46 +00:00
Bill Meier
2ad4b3ae3c Whitespace cleanup ...
svn path=/trunk/; revision=37772
2011-06-23 18:06:13 +00:00
Stig Bjørlykke
882e24e7f5 Code from Jakub:
Put the "Filter" back in statistics dialogs, which was removed in r37559.

svn path=/trunk/; revision=37770
2011-06-23 13:55:20 +00:00
Anders Broman
51a842184c Fix some of the GTK deprecated functions.
svn path=/trunk/; revision=37766
2011-06-23 13:36:25 +00:00
Anders Broman
7deaa0ce7a Make it possible to copy stuff from the welcome header.
svn path=/trunk/; revision=37749
2011-06-22 08:54:17 +00:00
Jörg Mayer
28c3e5c73f Oops, forgot to revert a variable after a test build
svn path=/trunk/; revision=37746
2011-06-22 07:04:34 +00:00
Anders Broman
019d39de87 Add the correct casts to make it compile on some old ERHL box.
(Will this finally be correct?)

svn path=/trunk/; revision=37742
2011-06-21 15:04:14 +00:00
Stig Bjørlykke
85b7c95cf6 One small step towards fixing outdated GtkTooltips.
svn path=/trunk/; revision=37732
2011-06-20 10:33:35 +00:00
Jörg Mayer
492ee9cafc Add some statistics
svn path=/trunk/; revision=37727
2011-06-20 07:13:17 +00:00
Jörg Mayer
7472c6cf52 Migration to gtk2 has been completed, delete the status file.
Migration to gtk3 has just begun: add a status file.

svn path=/trunk/; revision=37726
2011-06-20 06:32:55 +00:00
Jörg Mayer
3775da5680 Add some compiler flags that allow for gtk3 upward compatibility
checking while compiling on gtk2. Most are disabled.

svn path=/trunk/; revision=37725
2011-06-20 06:25:24 +00:00
Jörg Mayer
b8e727ac8d GTK3 fixes:
- Replace 2 cases where GtkObject was used (no longer exists in GTK3)
- Whenever gdkkeysyms.h is included also include gdkkeysyms-compat.h
  iff we are building against gtk3

svn path=/trunk/; revision=37722
2011-06-20 00:48:05 +00:00
Anders Broman
79e57b3666 Try to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6029
Wireshark crashes when entering anything in capture filter textbox

svn path=/trunk/; revision=37709
2011-06-19 15:28:32 +00:00
Jörg Mayer
7a8cf813ae UI_MANAGER: #if 0 out add_menu_item as it is not used yet(?).
Move menu.c back to the list of clean files.

svn path=/trunk/; revision=37707
2011-06-19 13:53:42 +00:00
Anders Broman
35fd959d6d Mark parameters as unused when MAIN_MENU_USE_UIMANAGER.
svn path=/trunk/; revision=37704
2011-06-19 09:33:18 +00:00
Anders Broman
ce01789f95 Add missing part of menu.c checkin for UI manager code.
svn path=/trunk/; revision=37703
2011-06-19 09:26:13 +00:00
Anders Broman
a2106225ad Add the correct casts to make it compile on some old ERHL box.
svn path=/trunk/; revision=37693
2011-06-17 13:19:44 +00:00
Anders Broman
9f60fc7471 Handle deprecated GtkTooltips.
svn path=/trunk/; revision=37661
2011-06-13 15:13:39 +00:00
Anders Broman
2bc816dbc1 Handle deprecated GtkTooltips.
svn path=/trunk/; revision=37660
2011-06-13 14:54:33 +00:00
Michael Tüxen
2119fdb283 cfilter can be NULL. Handle this correctly.
This should fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6016

svn path=/trunk/; revision=37655
2011-06-12 10:35:55 +00:00
Guy Harris
6584ad9781 Add some more error checking.
svn path=/trunk/; revision=37648
2011-06-10 17:16:09 +00:00
Anders Broman
59dc5adbc4 Make capture dialog compile with GTK3+
svn path=/trunk/; revision=37647
2011-06-10 16:27:53 +00:00
Anders Broman
c0d4b8a152 Seemingly this is needed to...
svn path=/trunk/; revision=37646
2011-06-10 11:01:43 +00:00
Anders Broman
22ceac7035 Add casts to make it compile on some old ERHL box.
svn path=/trunk/; revision=37645
2011-06-10 08:31:14 +00:00
Bill Meier
d2629a5335 Add a hack to prevent a gcc warning "ignoring return value of 'strtoul'..."
for some gcc configurations (see _FORTIFY_SOURCE).
This hack is used instead of storing the result returned by strtoul() in a
dummy variable so as to prevent a gcc 4.6 with -Wextra warning:
 "set but not used ...".

TBD: will this hack pass muster with other validators
     such as Coverity, CLang, & etc ?

For much gory detail: see the message thread starting at:
http://www.wireshark.org/lists/wireshark-dev/201106/msg00088.html


svn path=/trunk/; revision=37642
2011-06-10 02:10:44 +00:00
Anders Broman
5659d18813 Add casts to make it compile on some old ERHL box.
svn path=/trunk/; revision=37629
2011-06-09 08:51:30 +00:00
Martin Mathieson
651e93c93a The passed-in filter string can no longer be NULL, so use strlen instead of testing pointer.
svn path=/trunk/; revision=37621
2011-06-08 17:08:27 +00:00
Michael Tüxen
e0b054f2e2 This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6008
Clear the list of interfaces before adding new interfaces.
Also fix an endless loop which would occur in case of an error
when getting remote interfaces.

From Irene Ruengeler.

svn path=/trunk/; revision=37618
2011-06-08 14:12:47 +00:00
Anders Broman
2cc50fa41c Try to fix the Ubuntu buildbot.
svn path=/trunk/; revision=37617
2011-06-08 13:11:51 +00:00
Anders Broman
1a81c428d9 Assign to a dummy variable to squelch the warning.
svn path=/trunk/; revision=37616
2011-06-08 12:05:49 +00:00
Guy Harris
712d0fa20d Didn't need to introduce that variable.
svn path=/trunk/; revision=37607
2011-06-08 04:49:35 +00:00
Guy Harris
a3714500fd Try to squelch the warning about not using the return value of strtoul()
- we really *are* using it just for its side-effects if it fails; its
return value is not the best way to check for failure, as the failure
return values are also valid return values on success.

While we're at it, check for it setting errno, which is one of the
better ways to check for failure.

svn path=/trunk/; revision=37606
2011-06-08 04:07:15 +00:00
Bill Meier
54105fbc42 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: do some whitespace cleanup.

svn path=/trunk/; revision=37602
2011-06-07 22:59:19 +00:00
Bill Meier
d75988bacc Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: whitespace cleanup in some cases.

svn path=/trunk/; revision=37601
2011-06-07 22:50:49 +00:00
Stig Bjørlykke
6188db17c1 From Roland Knall via bug 5996:
Corrected old-style function definition.

svn path=/trunk/; revision=37564
2011-06-06 08:33:33 +00:00
Stig Bjørlykke
5cffc12201 From Roland Knall via bug 5995:
Fix CMake build.

svn path=/trunk/; revision=37563
2011-06-06 07:09:49 +00:00
Guy Harris
04269d4ac6 Add support for PARAM_ENUM tap parameters, and use the tap_param_dlg
stuff for the SCSI SRT tap.

Get rid of include of gtk/filter_dlg.h in stats taps that don't need it.

svn path=/trunk/; revision=37562
2011-06-06 01:04:56 +00:00
Guy Harris
7d1b946c0e Clean up indentation - use 4-space indentation uniformly. (No tabs -
tab stops aren't necessarily every 4 spaces.)

svn path=/trunk/; revision=37561
2011-06-05 23:16:14 +00:00
Guy Harris
dd05bb48b2 Rename the tap_dfilter_dlg.[ch] files to reflect that they can do more
than just filters.

svn path=/trunk/; revision=37560
2011-06-05 23:04:11 +00:00
Guy Harris
3a1097a0ae Some work on generalizing the "display filter" tap parameter dialog box
to more generally support fetching parameters for taps.

svn path=/trunk/; revision=37559
2011-06-05 22:39:23 +00:00
Jakub Zawadzki
11426cb47b Fix memleaks and sigsegv when coping to clipboard RTP Streams.
svn path=/trunk/; revision=37554
2011-06-05 19:35:36 +00:00
Anders Broman
aa369ddbae wrong sort of column “Packets” in “RTP Streams” window.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5988

svn path=/trunk/; revision=37550
2011-06-05 16:33:00 +00:00
Gerald Combs
0272ec5dd3 Show the plugin paths in Help→About→Plugins. Add a "-G plugins" option
to TShark which dumps a list of plugins.

svn path=/trunk/; revision=37512
2011-06-01 21:48:17 +00:00
Michael Tüxen
268c5f21b7 Improve handling of command line arg errors (for example "wireshark -f").
From Irene Ruengeler.

svn path=/trunk/; revision=37505
2011-06-01 09:26:33 +00:00
Anders Broman
4c93ff1b8a REmove the check for HAVE_AIRPDCAP
svn path=/trunk/; revision=37494
2011-05-31 21:34:23 +00:00
Bill Meier
bf4844eb99 Fix some gcc 'old-style function definition' warnings.
svn path=/trunk/; revision=37482
2011-05-31 15:49:59 +00:00
Michael Tüxen
8f8f0e9ad6 Get rid of has_cfilter to simplify the handling of multiple interfaces.
svn path=/trunk/; revision=37478
2011-05-31 14:49:21 +00:00
Michael Tüxen
4d11bebc1d Don't limit the snaplen if not reqested.
Found by Irene Ruengeler.

svn path=/trunk/; revision=37473
2011-05-31 07:30:38 +00:00
Stig Bjørlykke
92b6074f4d Include the profile name in the Edit item in the profiles popup.
svn path=/trunk/; revision=37471
2011-05-30 12:49:04 +00:00
Stig Bjørlykke
f8425c99a6 Changed "Rename" to "Edit" in profiles popup menu.
svn path=/trunk/; revision=37469
2011-05-30 12:42:46 +00:00
Jörg Mayer
fad5156f7f Rev 37446 added export_sslkeys.c
svn path=/trunk/; revision=37457
2011-05-29 08:51:04 +00:00
Guy Harris
f0f7323122 Make a routine not used outside this file static.
svn path=/trunk/; revision=37450
2011-05-29 00:08:27 +00:00
Guy Harris
691ada3816 More warning squelching. (Thank you, GLib developers, for using gulong
rather than gsize as the second argument to the GLib snprintf routines.)

svn path=/trunk/; revision=37448
2011-05-28 22:17:22 +00:00
Guy Harris
9e22269a58 Get rid of some warnings on Win64.
svn path=/trunk/; revision=37447
2011-05-28 20:55:21 +00:00
Sake Blok
ba086053c7 Add "File -> Export -> SSL Session Keys..." to be able to save the keyring info for each session in the trace file. This makes it possible to give someone the trace and the exported keys so that they can decrypt the traffic in the trace, but not new sessions to the same server.
(See also: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3444)


svn path=/trunk/; revision=37446
2011-05-28 18:17:50 +00:00
Anders Broman
1f1e8d29a3 Include text_import_scanner.l in the distribution.
svn path=/trunk/; revision=37431
2011-05-27 10:49:34 +00:00
Anders Broman
320dcc9fe0 Remove no longer used files.
svn path=/trunk/; revision=37430
2011-05-27 10:24:36 +00:00
Stig Bjørlykke
445bbfb6cd Added some row space to "Create New Profile".
svn path=/trunk/; revision=37428
2011-05-27 07:39:13 +00:00
Stig Bjørlykke
f1e5a5892d Added some row space to "Edit Column Details".
svn path=/trunk/; revision=37427
2011-05-27 07:38:08 +00:00
Jeff Morriss
f3f9f2697f Make TVBs opaque for most users.
Convert TVB_RAW_OFFSET() and TVB_GET_DS_TVB() into functions.

svn path=/trunk/; revision=37422
2011-05-27 03:06:50 +00:00
Martin Mathieson
780efd342c Allow longer field names in the advanced filter control.
svn path=/trunk/; revision=37390
2011-05-25 09:08:27 +00:00
Gerald Combs
a24687ce8e Move the Windows argument list conversion code to a common routine.
svn path=/trunk/; revision=37372
2011-05-24 00:07:56 +00:00
Michael Tüxen
985a98dd1b Fix the case where you start with interfaces on the command line
(so using ifaces) and then using the GUI (which only deals with
iface).

These kind of problems will completely disappear when the
old strucuture components like iface have completely be
retired. This is the next thing we will work on.

svn path=/trunk/; revision=37345
2011-05-22 11:11:00 +00:00
Michael Tüxen
c6c2577bbc Fix the capturing from the GUI. Honor the iface variable.
The next step is to retire the iface variable and use
the ifaces array only. This should simplify things and
fix the cases, where you start wireshark with command
line arguments and also use the GUI.

svn path=/trunk/; revision=37342
2011-05-21 13:22:38 +00:00
Stig Bjørlykke
0a3f9da616 gtk_menu_item_set_label() is from gtk 2.16.
svn path=/trunk/; revision=37325
2011-05-20 11:58:00 +00:00
Stig Bjørlykke
2c1ede3dce Include the profile name in the Delete item in the profiles popup.
Fixed creating a new profile from the popup without setting a create from.
Removed some unneeded ep_strdup_printf.

svn path=/trunk/; revision=37324
2011-05-20 11:30:51 +00:00
Michael Tüxen
8b701e108a In case we have no interface information in the array, use the global value.
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5935.

svn path=/trunk/; revision=37307
2011-05-19 20:20:35 +00:00
Bill Meier
00bf3cacb3 Remove unneeded variable and code; Rename a function arg; Fix usage of _U_: Fixes Coverity 1146 [UNUSED]
svn path=/trunk/; revision=37301
2011-05-19 19:22:49 +00:00