Commit Graph

1000 Commits

Author SHA1 Message Date
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 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
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
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
Jeff Morriss 2daa006cd2 main_widgets_rearrange(): only pack the airpcap_tb once (to avoid GTK complaints about the child already having a parent).
svn path=/trunk/; revision=37150
2011-05-15 02:42:52 +00:00
Michael Tüxen cfe3d2d0da Get -L and -d working with multiple interface. Internally get some functions
using the array of interface data.
Improve output of -L by printing the interface name.

svn path=/trunk/; revision=37120
2011-05-13 11:28:51 +00:00
Stig Bjørlykke dbf6e826af Check if changing to another profile in change_configuration_profile()
svn path=/trunk/; revision=36830
2011-04-23 09:47:28 +00:00
Chris Maynard 43803a3457 More console tweaks. But how to prevent prompt from being displayed before
command finishes without requiring, "start /wait <command>"?

svn path=/trunk/; revision=36463
2011-04-04 19:15:31 +00:00
Gerald Combs 031164aa9f More console tweaks.
svn path=/trunk/; revision=36458
2011-04-04 18:03:24 +00:00
Gerald Combs e7435f2d3f Only call destroy_console() when we create a console (pointed out by
Chris Maynard).

svn path=/trunk/; revision=36455
2011-04-04 17:48:07 +00:00
Gerald Combs 82a145ceb5 On Windows, try to use an existing console for our messages. Create one if
it doesn't exist.

svn path=/trunk/; revision=36452
2011-04-04 17:11:56 +00:00
Chris Maynard 9e55be72fc Wrap all text lines of help at column 80.
svn path=/trunk/; revision=36408
2011-03-30 14:44:18 +00:00
Chris Maynard c91893191d Move -D option into "pre-scan" group as there's no need to start gtk+ for it.
svn path=/trunk/; revision=36388
2011-03-28 22:12:53 +00:00
Stig Bjørlykke 0ae643e27d Removed "comparing an array to null", with no effect.
Coverity 533.

svn path=/trunk/; revision=36280
2011-03-23 07:29:19 +00:00
Sake Blok 307c0d70fb Removal of the old packet-list in favor of the new packet list.
It compiles with "./configure without options" on my Mac. Let's see what the buildbots have to say about it :-)


svn path=/trunk/; revision=36161
2011-03-08 01:52:25 +00:00
Stig Bjørlykke d188988e83 Added functionality for handling global profiles.
Global profiles can be installed in a "profiles" directory in the
Global configuration directory, and a global profile will be copied
to the users profiles on first time usage.

svn path=/trunk/; revision=36077
2011-02-26 17:23:24 +00:00
Stephen Fisher 9d3586b4f5 And even more -DGSEAL_ENABLE cleanup for GTK+ 3.0 preparation...
svn path=/trunk/; revision=35849
2011-02-07 18:41:38 +00:00
Anders Broman 6adf502aa7 Replace a couple of deprecated functions # ifdef:ed with the GTK version they are deprecated in.
svn path=/trunk/; revision=35740
2011-02-01 07:15:14 +00:00
Anders Broman b7527dd063 From Cal Turney:
Bug 5621 - With String in Packet details searches, highlight row in tree 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5621

svn path=/trunk/; revision=35718
2011-01-31 12:19:15 +00:00
Stephen Fisher 347d0a77bf From Cal Turney via enhancement bug #5587: In hex or string searches of the
packet data highlight the target rather than the entire field.


svn path=/trunk/; revision=35584
2011-01-19 18:21:21 +00:00
Gerald Combs 3bc1fc3802 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.

svn path=/trunk/; revision=35411
2011-01-06 23:28:58 +00:00
Stephen Fisher a3d313a967 Don't include epan/emem.h twice.
svn path=/trunk/; revision=35109
2010-12-03 18:47:10 +00:00
Sake Blok a857d6d69b Fix "colorize with filter" functionality that got broken with the new_packet_list.
svn path=/trunk/; revision=35074
2010-11-29 22:50:21 +00:00
Stephen Fisher eda0f472c9 Move u3 code to top-level directory since it's not GTK specific
svn path=/trunk/; revision=35046
2010-11-28 00:15:21 +00:00
Guy Harris 186ce16c52 Add GCC-style printf annotation to the routines that now take a format
string and format arguments, and fix issues warned about by that.

svn path=/trunk/; revision=35044
2010-11-28 00:02:39 +00:00
Guy Harris 002a1b75fa Make some other statusbar routines take a format string and format args,
and get rid of an unnecessary string pointer.

Make the argument to welcome_header_push_msg() a const pointer.

svn path=/trunk/; revision=35042
2010-11-27 23:06:14 +00:00
Guy Harris a4cc25f84d Move main_statusbar.h to the top-level directory; none of its routines
use GTK+ data types, so, at least in theory, it could be implemented
atop another toolkit.

Make statusbar_push_temporary_msg() take a format string and format
arguments.  Use it instead of simple_status(), and change one call to
just take a format string and arguments rather than to take the result
of using that format string and arguments with g_strdup_printf() and
passing the result to statusbar_push_temporary_msg().

svn path=/trunk/; revision=35041
2010-11-27 21:50:49 +00:00
Anders Broman d65eab20bc Update comments to point to the previous commit to enhance traceabillity.
svn path=/trunk/; revision=35028
2010-11-25 15:21:24 +00:00
Anders Broman 9e277ae615 Remove threading of tap update.
See http://www.wireshark.org/lists/wireshark-dev/200611/msg00199.html

svn path=/trunk/; revision=35027
2010-11-25 13:56:29 +00:00
Stig Bjørlykke 2cedc69849 Fixed "Compiled with" information in the About box.
svn path=/trunk/; revision=34601
2010-10-21 07:13:43 +00:00
Bill Meier 2b0f6a63f1 Define some fcns & vars as static;
Rename g_capture_in_progress to gbl_capture_in_progress (capture_if_dlg.c)
Do some whitespace cleanup.

svn path=/trunk/; revision=34490
2010-10-12 17:39:44 +00:00
Bill Meier c78221d4ce Rename g_resolv_flags --> gbl_resolv_flags; Also: cleanup some whitespace & indentation.
svn path=/trunk/; revision=34487
2010-10-12 13:15:08 +00:00
Stig Bjørlykke ce8e4aa47c Don't add a border around the main window, this looks bad in the new
Ubuntu release.

svn path=/trunk/; revision=34468
2010-10-11 08:28:38 +00:00
Stig Bjørlykke 93633b301f Allow creating a filter from a multi occurrence field if only one
value is present.

svn path=/trunk/; revision=34252
2010-09-26 10:54:12 +00:00
Sake Blok 7ec231f7f1 Fix the output of columns with "show resolved" disabled when all occurrences are displayed.
Limit the input field for occurrence to 4 characters to prevent an overflow.
Make sure "... as filter" does not result in an invalid filter string if all occurrences are displayed.


svn path=/trunk/; revision=34247
2010-09-25 09:33:29 +00:00
Sake Blok 7364bef1b3 When using a custom column, make it possible to select which occurrence to show if the field has multiple occurrences.
svn path=/trunk/; revision=34186
2010-09-22 20:56:14 +00:00
Gerald Combs a87bdf9660 Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().
svn path=/trunk/; revision=34137
2010-09-16 19:20:06 +00:00
Stephen Fisher f18fe680e4 These two capture option variables are defined by capture_opts_init(), so
don't redefine them to new values.


svn path=/trunk/; revision=34073
2010-09-07 19:22:05 +00:00
Stig Bjørlykke fe341f145a Ensure we always update the display filter when changing profile.
svn path=/trunk/; revision=34030
2010-08-31 07:53:51 +00:00
Stig Bjørlykke 835a43312f Always update the display filter when changing a display filter macro
and when changing profile.  Not sure why I have to invalidate cfile.dfilter
in macro_update(), because this will be done in macros_post_update(),
but unless this we get a crash when renaming a macro...

This is a fix for bug 5002.

svn path=/trunk/; revision=34011
2010-08-30 08:47:26 +00:00
Gerald Combs 5aae07254f Forward-port r33953.
Move the SetDllDirectory calls to ws_init_dll_search_path. If
SetDllDirectory fails, pass the Wireshark program path to
SetCurrentDirectory.

svn path=/trunk/; revision=33958
2010-08-27 19:24:44 +00:00
Gerald Combs 607b228df6 Add ws_load_library and ws_module_open, which respectively call
LoadLibrary and g_module_open only for the program directory and system
directory on Windows. Use them to replace a bunch of LoadLibrary and
g_module_open calls. Use the extension ".dll" for all the DLLs that we
load. Add comments about DLL loading in Python.

svn path=/trunk/; revision=33924
2010-08-25 20:30:59 +00:00
Gerald Combs ad4ffa5d49 Partial fix for bug 5133. On Windows, call SetDllDirectory at startup if
it's present in Wireshark and dumpcap. This takes care of the airpcap.dll
PoC but we need to load wpcap.dll from a full path. We might want to
call SetDllDirectory from our other executables as well.

svn path=/trunk/; revision=33916
2010-08-24 23:39:29 +00:00
Jeff Morriss 7c9aac4d4a From Turney Cal as a followup to rev 33841 and bug 5038:
I tested your update ("wireshark -r foo.pcap" from a cmd window) and 
found that it did not use the current folder for the next Open dialog 
and didn't save the folder in recent.  The attached patch prepends the
filename with the current folder.

From me: don't leak memory when doing it.

svn path=/trunk/; revision=33863
2010-08-20 21:56:52 +00:00
Jeff Morriss 323c282897 main_cf_cb_file_read_finished(): use get_dirname() to get the directory of the
current file name.

This fixes a crash after failing to allocate some massive number of bytes if
the file name did not contain a path--which is the case when doing
"wireshark -r myfile.pcap".

svn path=/trunk/; revision=33841
2010-08-18 19:11:07 +00:00
Anders Broman 46cd4a8507 From Cal Turney:
1. Restore the functionality of <Ctrl>A and <Ctrl>X to the filter textbox.  
2. Assign intuitive shortcuts without consuming any new shortcut letters.  
3. Add 'Un-Time Reference All Packets' to the menu.
4. Disallow the marking or ignoring of all packets in the capture.  
5. Make the Mark/Ignore/Time Reference-related menu items context sensitive. 
6. Add 'ref_time_count' to the capture_file structure
7. Utilize marked/ignored/ref_time_count vars to prevent needless looping thru
   the entire packet list by exiting the loop when it becomes zero.

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

svn path=/trunk/; revision=33817
2010-08-16 18:17:45 +00:00
Gerald Combs 4b7cfcdb25 Convert our argument list to UTF-8 at startup on Windows. This lets us
double-click on files with non-Latin characters, e.g. "0_αßΓπ∟σµ.cap".

svn path=/trunk/; revision=33797
2010-08-13 21:21:28 +00:00
Guy Harris 2a328da4ef Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.

Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction.  Give
more information in the Doxygen comments for those routines.

Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument.  Replace
find_previous_next_frame_with_filter() with it.

Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller.  That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r().  Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().

Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.

Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet.  Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.

Clean up indentation.

svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
Stig Bjørlykke 7678d060ae From Cal Turney via bug 5038:
Fix for bug introduced in revision 33759.

svn path=/trunk/; revision=33762
2010-08-10 21:16:41 +00:00
Stig Bjørlykke baef640b37 Fixed warning: format not a string literal and no format arguments.
svn path=/trunk/; revision=33760
2010-08-10 13:19:31 +00:00