Commit Graph

5402 Commits

Author SHA1 Message Date
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
Michael Tüxen 79f53d1fdc When capturing from multiple interface, indicate this in the main status bar.
This patch is, as all other patches related to capturing from multiple interfaces,
based on work of Irene Ruengeler.

svn path=/trunk/; revision=37296
2011-05-19 16:11:02 +00:00
Michael Tüxen 60822702bb Fix compilation.
svn path=/trunk/; revision=37295
2011-05-19 15:38:44 +00:00
Bill Meier e0f6ebef7f Don't assign a value to a variable which is then not used: Coverity 1145
svn path=/trunk/; revision=37293
2011-05-19 14:48:05 +00:00
Bill Meier 8499c857a7 Don't assign to an unused variable; remove variable definition: Coverity 1144.
svn path=/trunk/; revision=37291
2011-05-19 14:32:14 +00:00
Michael Tüxen 307d7e8c3c When capturing from multiple interfaces, indicate this in the window
title of the wireshark main window.

svn path=/trunk/; revision=37289
2011-05-19 12:19:03 +00:00
Jörg Mayer 7b6b4cfd12 Fix warnings about unused variables in UI_MANAGER code.
Move gsm_a_stat.c back to clean dissectors.

svn path=/trunk/; revision=37283
2011-05-19 05:46:07 +00:00
Jörg Mayer 6b93c33026 Fix two warning in case of UIMANAGER:
- Unused variable
- ‘graph_type’ may be used uninitialized

Is the second part of the patch (added inside the else clause)
correct?

svn path=/trunk/; revision=37282
2011-05-19 05:44:32 +00:00
Michael Tüxen ef718b0209 When capturing from multiple interfaces, indicate this in the
capture info dialog.
This is based on wirk from Irene Ruengeler.

svn path=/trunk/; revision=37280
2011-05-19 05:00:28 +00:00
Michael Tüxen 8b01902a02 Add support for multiple interfaces for the -L option.
svn path=/trunk/; revision=37250
2011-05-18 18:04:50 +00:00
Balint Reczey 5921cd68a2 Refer to "Capture Help" as "Capture Help below" when there are no interfaces
to capture on.

svn path=/trunk/; revision=37238
2011-05-18 13:08:02 +00:00
Stig Bjørlykke 8aad87c84e Removed "Copy" from the profiles popup menu in favour of a "Create from"
dropdown in the "Create New Profile" window.

svn path=/trunk/; revision=37237
2011-05-18 08:10:37 +00:00
Guy Harris 8f53a5655c Make some routines static that aren't used outside the source file in
which they're defined.

Include some header files that declare functions in the source files
that define the functions.

Declare packet_list_get_type() in gtk/packet_list_store.h, as it defines
a macro that uses that function.

svn path=/trunk/; revision=37223
2011-05-17 23:33:23 +00:00
Guy Harris 1372515b02 More eradication of old-style function definitions.
svn path=/trunk/; revision=37216
2011-05-17 22:18:32 +00:00
Guy Harris da1403c6dd This ain't C++; you have to put "void" in as the argument list of
functions that take no arguments, otherwise the function is treated as a
crufty old C function with undeclared arguments.

svn path=/trunk/; revision=37211
2011-05-17 21:26:25 +00:00
Chris Maynard 4530909323 A gboolean is a gint; technically, it doesn't fit in a bit field of length 1,
so eliminate the bit field.  Fixes Coverity CIDs 1195-1196.

svn path=/trunk/; revision=37189
2011-05-16 20:33:39 +00:00
Anders Broman 0cb247defc More GUIManager stuff.
svn path=/trunk/; revision=37175
2011-05-16 06:28:33 +00:00
Bill Meier 5a54b1d742 Mark a function arg as unused.
svn path=/trunk/; revision=37170
2011-05-15 21:28:21 +00:00
Bill Meier c4a6e2f044 Replace a number if 'if(...){exit(10);}' by _g_asserts;
Fix an event callback function signature;
Change quit() signal calback function to return void;
#include <stdlib.h> not req'd;
Misc minor changes.

svn path=/trunk/; revision=37169
2011-05-15 21:12:55 +00:00