Commit graph

971 commits

Author SHA1 Message Date
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
Anders Broman
f083675919 Use g_snprintf isf strncpy.
svn path=/trunk/; revision=33759
2010-08-10 12:54:23 +00:00
Anders Broman
26274eb701 From Cal Turney:
Remember folder of capture selected from Welcome screen file dialog.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5038

svn path=/trunk/; revision=33758
2010-08-10 11:36:18 +00:00
Guy Harris
1e5aeaac2a You can't free a string constant.
svn path=/trunk/; revision=33740
2010-08-08 21:38:36 +00:00
Guy Harris
e85c2051ff Don't set the icon name:
1) the GTK+ documentation recommends against it;

	2) the X11 implementation of gtk_window_set_title() sets the
	   icon name to the title, so gdk_window_set_icon_name() doesn't
	   do anything interesting, and the Win32 and Quartz
	   implementations of gdk_window_set_icon_name() don't do
	   anything;

	3) gdk_window_set_icon_name() either crashes or complains if
	   it's handed a null pointer, which happens at startup.

Clean up indentation.

svn path=/trunk/; revision=33739
2010-08-08 21:26:39 +00:00
Anders Broman
c9a7fade6a From Cal Turney:
Optionally display Wireshark version in the main window's title bar.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5040

svn path=/trunk/; revision=33729
2010-08-07 14:37:37 +00:00
Bill Meier
6cdec04e59 (Minor) Cleanup some "event callback" function declarations/definitions:
- Add missing 'user_data' arg as needed;
- Use gboolean rather than int as the type of the value returned.
Also: Cleanup whitespace & reformat long lines in a few cases.

svn path=/trunk/; revision=33679
2010-07-30 12:41:56 +00:00
Guy Harris
deae609c44 Backing out r33631 for now - it has a number of issues.
svn path=/trunk/; revision=33646
2010-07-28 01:12:41 +00:00
Anders Broman
2bd0983a36 From Cal Turney:
Optionally display Wireshark version in the main window's title bar.
(Modified to include SVN version).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5040

svn path=/trunk/; revision=33631
2010-07-26 13:23:30 +00:00
Jaap Keuter
7330e63128 Backing out r33612.
svn path=/trunk/; revision=33619
2010-07-23 05:08:07 +00:00
Jaap Keuter
210227d8da From Cal Turney:
Remember folder of capture selected from Welcome screen file dialog.

svn path=/trunk/; revision=33612
2010-07-21 19:42:01 +00:00
Guy Harris
cc3540b0fb Move the code to get version information for libraries used by
libwireshark into libwireshark, and call it only in programs linked with
libwireshark.  That way, programs that don't link with libwireshark
don't have to link with libgcrypt or libgnutls solely so that they can
say that they're linked with a particular version of libgcrypt or
libgnutls.

Don't link dumpcap with libgcrypt or libgnutls any more.

svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
Stig Bjørlykke
6b5a031808 Fetch filter and copy summary from correct column after DND columns.
This does not recreate the internal structures, but we we fix the problem
with fetching wrong data.  Printing still uses the configured column order.

svn path=/trunk/; revision=33399
2010-07-01 12:21:29 +00:00
Stig Bjørlykke
abb629c4f8 Fixed removing a Time Reference from a column not matching the display filter.
svn path=/trunk/; revision=33334
2010-06-26 22:53:36 +00:00
Stig Bjørlykke
59e35b0fbc Always show packets with Time Reference (as in the old packet list).
Recreate visible rows when removing a Time Reference which has not passed
the display filter.

svn path=/trunk/; revision=33332
2010-06-26 21:30:36 +00:00
Stig Bjørlykke
1fdc2a2428 Initialize recent.gui_fileopen_remembered_dir correctly.
Set last open dir when changing profile.

svn path=/trunk/; revision=33324
2010-06-25 19:33:18 +00:00
Stig Bjørlykke
86d55f9a13 Fall back to get_persdatafile_dir() if recent.gui_fileopen_remembered_dir
does not exist or is no directory.

svn path=/trunk/; revision=33323
2010-06-25 19:22:32 +00:00
Stig Bjørlykke
7608a89820 From Cal Turney via bug 4849:
Save the folder path of the last capture selected in the Open dialog in recent.

svn path=/trunk/; revision=33322
2010-06-25 18:55:09 +00:00
Stephen Fisher
217b344bd9 Per Jaap's suggestion on -dev list: remove "with new_packet_list" from
version output since it has been the default for a while now and show
"with old_packet_list" if compiled as such. 


svn path=/trunk/; revision=33035
2010-06-01 18:33:16 +00:00
Jeff Morriss
47e2d75820 Move some code (including the optional objects) into libwsutil
svn path=/trunk/; revision=33012
2010-05-28 20:19:55 +00:00
Gerald Combs
fa5f6cced7 From Edgar Gladkich:
This is an extension to the Wireshark context sensitive protocol help. Rows in
TreeView window are analyzed and suitable help file (as HTML) is opened in a
browser.

The help part (large file, 23 MB) of the Protocol Help can be downloaded under
www.inacon.com/dowload/stuff/protocol_help.tar.gz

This protocol help "light" provides descriptive content for the most frequently
used standard protocols, including IP, TCP or SMTP.

From me:

Changes:

Rename "ph_" in some function names to "proto_help_". Move the protocol
help code to its own module.

Make a bunch of functions static. Remove unused code.

Use browser_open_url() instead of a custom function.

Increase the logging levels. Don't clobber the normal log handler.

Update some Doxygen comments to match the format in the rest of the code
base.

Removed GTK version checks. We've been 2.x only for a while.

Move ph_replace_string to string_replace() in epan/strutil.[ch].

Fix a bunch of memory leaks.

Add a NULL pointer check.

Reformat the overview menu label.

Document the file format and locations.

Add Edgar to AUTHORS.

svn path=/trunk/; revision=32995
2010-05-27 15:51:25 +00:00
Anders Broman
9992de5a4a From Jakub Zawadzki:
One more change from wtap_seek_read to cf_read_frame.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4666

svn path=/trunk/; revision=32984
2010-05-26 21:39:24 +00:00
Anders Broman
65ee4e797a From Jakub Zawadzki:
New functions: cf_read_frame_r, cf_read_frame

It's much easier to write:
 cf_read_frame (cf, fdata, &err, &err_info)
Than:
 wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header, cf->pd,
fdata->cap_len, &err, &err_info)

svn path=/trunk/; revision=32980
2010-05-26 19:11:23 +00:00
Guy Harris
36623bcb71 From H.sivank: GtkOSXApplication support.
Call the various flavors of OS X integration just "OS X integration",
not anything with "IGE" in it - it appears that, in some places,
"ige-mac-integration" refers only to the older Carbon-based functions,
although the library still appears to be called -ligemacintegration.

Update the URLs for the information about the OS X integration
libraries.

Clean up help message for --with-pcap-remote.

Clean up white space a bit.

Speaking of white space, it's "Mac OS X", not "MacOS X".

svn path=/trunk/; revision=32941
2010-05-25 00:35:44 +00:00
Guy Harris
991c5e9898 When dumpcap is run to get an interface list, interface capabilities, or
interface statistics, have its error messages come out as sync-pipe
errors, have it send a sync-pipe "success" message on success, and have
the callers get that message and display it.

svn path=/trunk/; revision=32843
2010-05-17 18:40:23 +00:00
Guy Harris
8d56103f48 Don't include capture-related headers if we don't support capturing
network traffic.

svn path=/trunk/; revision=32802
2010-05-14 01:39:02 +00:00
Guy Harris
9307251bb8 Um, no, the problem with the Leopard x86 build is that we first do a
build without libpcap, to make sure that works, and then do a build with
libpcap, to put into a binary release.  It's the former that's failing;
I'll back out the previous change and then work on that.

svn path=/trunk/; revision=32801
2010-05-14 00:49:28 +00:00
Guy Harris
0e54136213 See whether the Leopard x86 buildbot is upset because of the name
if_capabilities_t - it doesn't fail on Snow Leopard, even if I undefine
HAVE_PCAP_CREATE, and doesn't fail on the Leopard PPC buildbot, either.

svn path=/trunk/; revision=32799
2010-05-14 00:10:15 +00:00
Guy Harris
1c18115bd3 Fetch an indication of whether the interface supports capturing in
monitor mode at the same time that we fetch its list of link-layer
types.  Support fetching that list in monitor mode, as the list may be
different in regular and monitor mode.  If the interface supports
monitor mode, when printing the list of link-layer types, indicate
whether they're fetched in monitor mode or not, as tcpdump 4.1.x does.

svn path=/trunk/; revision=32789
2010-05-13 17:37:39 +00:00
Jeff Morriss
60b8391d5b Follow on to rev 32593: apparently delaying the start of resolv_update_cb() isn't always enough. Delaying it further is would require adding the function call to several cases of an already complicated if/then/else + #ifdef/#else, so instead just put in a NULL check before calling gdk_window_invalidate_rect().
svn path=/trunk/; revision=32743
2010-05-11 02:25:22 +00:00