Commit Graph

737 Commits

Author SHA1 Message Date
Gerald Combs e9f1a0b692 One more step in privilege separation.
Add a capture_interface_list(), which works similar to
get_interface_list() except that it forks dumpcap instead of calling
the pcap routines directly.  Use it in the GUI.

Add a "-I" flag to dumpcap, which prints out verbose interface
information.

Tested under Windows and Linux.

svn path=/trunk/; revision=22071
2007-06-11 03:58:58 +00:00
Stephen Fisher d1d72fd232 Fix for bug #93: changes to the columns has no effect until restart
These changes allow the packet list clist to be destroyed and recreated
with the new column titles/values/order that the user changed in the
preferences without restarting Wireshark. 


svn path=/trunk/; revision=22038
2007-06-04 20:15:10 +00:00
Guy Harris d2ac4f7133 Check for G_GINT64_MODIFIER in Wireshark as we do in Wiretap.
In all the places where a cast to "long long" or "unsigned long long"
was done, use G_GINT64_MODIFIER and get rid of the cast, as

	1) there's no guarantee that "%ll" works

and

	2) there's no guarantee that "long long" works

(the latter definitely does *NOT* work with MSVC++; the former doesn't
work with regular printf in MSVC++, but it might work with the GLib
printf-based functions).

svn path=/trunk/; revision=21978
2007-05-29 06:56:07 +00:00
Sebastien Tandel 76729e5d0f From David Howells :
Fix compilation failures when building wireshark-0.99.6-SVN-21916 on an
x86_64-unknown-linux-gnu target with gcc version 4.1.2 20070403 (Red Hat
4.1.2-8).

The failures fall into two categories:
  (1) Casts between pointers and 32-bit integers without an intermediary cast
via 'long' or 'unsigned long'.  This results in a compiler warning complaining
about casts between a pointer and an integer of a different size.
  (2) Passing values to "%lld" or similar printf-style format options that the
compiler thinks are a different size.  Such values need to be cast to 'long
long' or 'unsigned long long'.

svn path=/trunk/; revision=21975
2007-05-29 02:43:18 +00:00
Guy Harris 944d2e5487 Squelch some qualifier (const vs. non-const) warnings.
svn path=/trunk/; revision=21938
2007-05-25 19:13:49 +00:00
Gerald Combs b6408d1673 As Martin pointed out, we were comparing the wrong variable against our
modifier mask (and using the wrong bitwise operator to boot).

svn path=/trunk/; revision=21937
2007-05-25 17:24:35 +00:00
Luis Ontanon 11f06217ce Have editcap and capinfos loading the wiretap plugins.
epan/filesystem.c
   have get_plugin_dir() calling init_plugin_dir() if necessary

epan/epan.c and epan/report_err.c
   move the report_failure family into the new report_err.c file, have epan_init() calling the initializer

epan/plugins.h and epan/proto.c
   do not have init_plugins() calling the proto_reg functions instead do it in init_proto()

gtk/main.c and tshark.c
   init_plugin_dir() has become suprefluous

capinfos.c and editcap.c
   load the wiretap plugins

Makefiles
   do what's needed to build withe the above changes.




svn path=/trunk/; revision=21935
2007-05-25 17:22:32 +00:00
Luis Ontanon 869732d121 Prepare wireshark and tshark for wiretap plugins
svn path=/trunk/; revision=21928
2007-05-24 22:26:51 +00:00
Gerald Combs 4b43b48b2c Don't set the focus on the display filter entry when we're passed a
contorl- or alt-modified character.  Fixes bug 1610.

Fixup whitespace.

svn path=/trunk/; revision=21898
2007-05-22 23:06:22 +00:00
Guy Harris a3d3282e64 Have init_progfile_dir() also check whether
WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set and, if so and we weren't run
with special privileges, set the running_in_build_directory_flag.  Have
it do the same if it finds ".libs" in the pathname of the program and we
weren't run with special privileges, as that means it was probably run
from the libtool wrapper script and presumably thus isn't an installed
binary.

This means that get_credential_info() has to be called before
init_progfile_dir().

Clean up some indentation.

svn path=/trunk/; revision=21866
2007-05-21 20:31:45 +00:00
Gerald Combs 55d2b928c2 From Dustin Johnson:
- Update the wireless/AirPcap GUI code to support 802.11n as well as
    some related upcoming code changes.
  - Remove airpcap.h from the repository, since it exists in the AirPcap
    devpack (and will be superseded Real Soon Now).
  - Show the individual channel flag bits in radiotap.
  
Fix the 802.11n MCS set display.

This is a partial checkin, so hopefully nothing is broken.

svn path=/trunk/; revision=21831
2007-05-18 21:06:20 +00:00
Graeme Lunt cf56e76be9 Updated splash screen for Wireshark that shows the initialisation progress.
The splash screen shows a progress bar and a percentage complete - like the progress dialog.
As dissectors are initialised and handed off the name is shown. However, the names of plugin dissectors are not shown.
The update to the make-dissector-reg shell script has been tested, though I think generally the python version is used.


svn path=/trunk/; revision=21716
2007-05-07 17:55:42 +00:00
Ulf Lamping 730fbdc983 add -P command line option help
svn path=/trunk/; revision=21693
2007-05-05 12:20:37 +00:00
Jaap Keuter 639b32aeee Spare the filter compilation and filter list handling on clear display filter.
svn path=/trunk/; revision=21681
2007-05-04 11:28:01 +00:00
Ronnie Sahlberg 26ee9ac8ea dont include these headers under gtk1
svn path=/trunk/; revision=21501
2007-04-22 15:45:34 +00:00
Stephen Fisher 6d8d2854c8 From Sake Blok:
Fix for bug #491: Unexpected frame.time_delta behavior

This patch ... fixes bug 491. It does this by changing the
behaviour of the frame.time_delta field so it reflects the delta
time between captured packets (tshark already did this).  To keep
the delta time between displayed packets, the field 
frame.time_delta_displayed is created.


svn path=/trunk/; revision=21154
2007-03-23 18:08:17 +00:00
Guy Harris 082282b6f4 Don't enable "Save As" if you don't have an unsaved live capture file
and there are no formats in which the file can be saved by some means
other than copying the raw data; "Save As" isn't a very useful function
in that case, and that prevents us from having an empty list of formats
in which the file can be saved.

svn path=/trunk/; revision=21032
2007-03-14 19:30:19 +00:00
Guy Harris 8a3ea1a6f7 Fix indentation.
svn path=/trunk/; revision=21027
2007-03-14 18:19:13 +00:00
Ulf Lamping 7366ae37a0 as requested by "John T. Haller" for PortableApps.com:
add new WS command line option -P to be able to change some of the path settings

this is experimental, please report bugs

svn path=/trunk/; revision=21022
2007-03-14 02:55:54 +00:00
Jörg Mayer fb820f0a07 GCC warning fixes
epan/dissectors/
packet-bctp.c:
	no newline at end of file
packet-epl.c:
	C++ style comments are not allowed in ISO C90
packet-sccp.c:
	missing initializer
packet-sccp.h:
	comma at end of enumerator list
packet-sctp.c:
	suggest parentheses around assignment used as truth value
packet-vnc.c:
	control reaches end of non-void function
	pointer targets in passing argument 1 of 'g_strtod' differ in
		signedness
	pointer targets in passing argument 3 of 'vnc_client_to_server'
		differ in signedness
gtk/
main.c:
	C++ style comments are not allowed in ISO C90
u3.h:
	function declaration isn't a prototype

Other (trivial) stuff
packet-sccp.h:
	Add svn properties


svn path=/trunk/; revision=21011
2007-03-09 13:14:09 +00:00
Ulf Lamping acefba187a from Sake Blok:
I have changed the patch according to your suggestions and also changed
the doc[book] files accordingly. I tested the patch and it does seem to
work fine on my test-system.

ULFL: In addition, I've added the en-/disabling to the other (already existing) Copy menu items - some just did nothing, some crashed if nothing was selected.
I've also sligthly changed the menu seperators and made both context menus look a bit more identical.

svn path=/trunk/; revision=21005
2007-03-08 23:37:55 +00:00
Luis Ontanon a2a25e7586 revert (most) changes in rev #20753, to avoid items being created on a wrong menu on windows.
svn path=/trunk/; revision=20928
2007-02-25 18:03:05 +00:00
Bill Meier 547a03b25b Fix some C++ style comments
svn path=/trunk/; revision=20865
2007-02-19 21:45:27 +00:00
Guy Harris b8a2977742 We only need the Wireshark splash image if we have the welcome page.
svn path=/trunk/; revision=20847
2007-02-19 01:19:36 +00:00
Luis Ontanon 7c57c05ed5 * Add a Submenu (/Views/User Tables) where UATs can be accessed.
* Remove macros_dlg, the DFMacros UAT goes in the menu with all the rest
* in packet-user_encap.c WTAP_ENCAP=XXX has become useless information for the user leave just the DLT#



svn path=/trunk/; revision=20753
2007-02-09 03:11:14 +00:00
Ulf Lamping a70a78e0ec some further work on the "welcome page", still far from being complete
svn path=/trunk/; revision=20741
2007-02-08 01:05:43 +00:00
Jeff Morriss 0c17bfd3a8 From Eric Hall to fix bug 1289:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1289

Rename 'svnversion' to 'wireshark_svnversion' to resolve a symbol conflict with
GTK 2.10.6 (hmm, shouldn't GTK not be exporting that symbol or at least naming
it so as to prevent such collisions? Well, so should we, so...)

From Andreas Fink: change #ifdef for size_t in airdcap_interop.h to fix
compile on MacOS X.


svn path=/trunk/; revision=20726
2007-02-06 02:27:59 +00:00
Graeme Lunt 3bdc71b56b Augment get_gui_runtime_info() with additional information about the U3 device Wireshark is being run from.
svn path=/trunk/; revision=20711
2007-02-04 12:39:07 +00:00
Ulf Lamping b1cdc9bcb9 backup of some design work of the Wireshark "Welcome" page - the one shown when no trace file is loaded - this page is still disabled.
This is only a "personal backup" of some design ideas / experiments for this page - and needs a lot more work / cleanup. I'm checking this in just to prevent data loss.

svn path=/trunk/; revision=20640
2007-01-31 03:08:39 +00:00
Stephen Fisher 580092477d Show the channel frequencies in the wireless (AirPcap) toolbar next to the channel number in the drop-down list.
svn path=/trunk/; revision=20619
2007-01-30 01:57:34 +00:00
Ulf Lamping c01304b04d remove unused "cant_get_if_list_errstr" warning
svn path=/trunk/; revision=20594
2007-01-28 23:48:53 +00:00
Gerald Combs ed12aa0cb1 Propagate the recent interface list changes (r20521) to the AirPcap code.
Fix a mismatched declaration found by Gisle Vanem.

svn path=/trunk/; revision=20535
2007-01-23 20:12:09 +00:00
Guy Harris cc22748169 Have the routines to get interface lists take a pointer to a "gchar *"
as an argument, and, on an error, if they have an error message, have
them set that "gchar *" to point to a g_malloc()ed string containing the
error message, rather than taking a pointer to a buffer for that message
as an argument.  That's more like what's done in Wiretap, and doesn't
impose an upper limit on the lengths of those error messages.  If that
pointer is null, don't allocate the message string and return it.

Have that error message already have the "cant_get" processing applied
to it, so nobody other than those routines need to call the "cant_get"
routines to process the error messages.

Have get_airpcap_interface_list() explicitly set "*err" to the
appropriate error code.

Clean up indentation.

svn path=/trunk/; revision=20521
2007-01-21 23:45:36 +00:00
Ulf Lamping 3e1344fd4b fix #301: Windows file dialog should:
- initially show the "My Documents" folder
- don't use the "open folder" preference setting on save and alike dialogs (we don't do it in the GTK versions either)



svn path=/trunk/; revision=20433
2007-01-14 23:28:35 +00:00
Ulf Lamping 2cbce84d41 Win32: MSVC > 6 doesn't work well with Unicode filenames!
fix this, by providing required functions in the new file file_util.c - it's mostly copied from GLib (g_open alike - that take UTF8 as filename format but don't use msvcrt.dll V6 for this as the glib files do) 

"link" to these functions in file_util.h: #define eth_open eth_stdio_open

revert changes (from SVN 20282) throughout the code related to these file functions which were introduced with the first tries of MSVC 2005 ...

Hopefully I've done everything right with the new file_util.c ...

svn path=/trunk/; revision=20402
2007-01-12 03:05:28 +00:00
Ulf Lamping 894f6cd603 from Laurent Rabret:
I posted a patch about 1.5 years ago for the formerly Ethereal to successfully compiled with Visual > 6. I have always successfully used this patched Ethereal/Wireshark compiled with VS 2003 and have just checked when compiled with Visual C++ 2005 Express

svn path=/trunk/; revision=20282
2007-01-03 02:50:22 +00:00
Guy Harris 44c0624bd9 Add a WIRESHARK_RUN_FROM_BUILD_DIRECTORY environment variable on UN*X;
if set, and if the program isn't running with additional privileges,
it'll treat the directory in which the program is found as the data
directory.

If, on Windows, the version-number subdirectory of {data
directory}\plugins doesn't exist (which is assumed to mean that the
program is being run from the build directory), or if, on UN*X,
WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set, the plugin directory is the
"plugins" subdirectory of the data directory, and all subdirectories of
that directory are scanned for plugins, as the "plugins" subdirectory of
the build directory contains subdirectories for the plugins; this means
that if we're running from the build directory, we'll find the plugins
we built in the build tree.

When generating the wireshark-filter man page, run tshark with
WIRESHARK_RUN_FROM_BUILD_DIRECTORY set, so it uses the plugins from the
build to generate the list of filters.

svn path=/trunk/; revision=20261
2007-01-02 06:49:40 +00:00
Gerald Combs bd282b4114 Move the contents of airpdcap to epan/crypt. Try to fix the current
distcheck failure.  Move the nmake build targets for airpdcap from 
epan/dissectors to epan.  This will probably break the Windows build.

svn path=/trunk/; revision=20231
2006-12-28 17:22:12 +00:00
Gerald Combs 2437fd2e77 Prepare to move the airpdcap code to epan/crypt (SVN won't let me actually
move the files until these changes are checked in).  Add an AC_DEFINE
for airpdcap (which will be removed once the changes have settled).
Update the airpdcap code to compile on non-Windows systems.  Fix up
comments and whitespace to conform more closely to the rest of the
code base.  Verified to compile under Windows and OS X.

svn path=/trunk/; revision=20227
2006-12-27 23:05:55 +00:00
Gerald Combs a980d04783 From Davide Schiera and Giorgio Tino: Add initial WPA/WPA2 decryption
support.

WEP key preferences have been overloaded to allow WPA keys.  The
decryption code currently uses Windows-specific data types, but can be
converted to use glib equivalents.

Add a few text and whitespace fixups.

svn path=/trunk/; revision=20049
2006-12-05 19:24:25 +00:00
Stephen Fisher 75acf34518 From Douglas Pratley with trivial changes and documentation changes
by myself:

Corrected patch; epan/column.c and epan/column_utils.c were not included. This
one has now been properly tested against a clean checkout of today's code.

- New menu option available under view\time display format
- New sub-option (e) to -t switch for both wireshark and tshark
- Extended recent settings code to handle new value
- Did NOT add new explicit epoch time column


svn path=/trunk/; revision=20040
2006-12-05 03:19:51 +00:00
Gerald Combs cd7b6c9dbf Make sure we don't trigger undefined behavior in isprint().
svn path=/trunk/; revision=19978
2006-11-25 06:15:51 +00:00
Guy Harris d3fed959bc Have separate proto_construct_match_selected_string() and
proto_can_match_selected() routines, to more clearly separate the two
functions - but have them both call the same underlying routine, so
they both make the same decisions as to whether a match-selected string
can be constructed or not.

svn path=/trunk/; revision=19976
2006-11-24 18:25:23 +00:00
Guy Harris 37a6c02697 Rename proto_construct_dfilter_string() to
proto_construct_match_selected_string() to indicate what it does - and
have it return a Boolean indication of whether the string could be
built, returning the string through a pointer, and, if that pointer is
null, have it just return the Boolean and not construct the string.

Get rid of proto_can_match_selected() -
proto_construct_match_selected_string() can be used for that, which
means we have only one piece of code that knows whether a "match
selected" string can be constructed or not.

Have proto_construct_match_selected_string() support matching
zero-length FT_NONE (and FT_PCRE, but that shouldn't happen) fields even
if there's no epan_dissect_t, as such a match just checks whether the
field is present.

svn path=/trunk/; revision=19967
2006-11-23 21:16:46 +00:00
Gerald Combs 0c22180f93 If a user starts typing text in the main window, append it to the
display filter instead of replacing it.  Check for a valid character
with a simple isprint() instead of a giant boolean expression paragraph.

svn path=/trunk/; revision=19944
2006-11-21 01:27:29 +00:00
Ulf Lamping 0fb45e0bf1 while loading a huge capture file, enable the main window to show packets rushing into the packet list
svn path=/trunk/; revision=19943
2006-11-21 00:45:38 +00:00
Guy Harris a22101f8f0 We also need the memory allocation subsystem initialized in anything
that uses libwireshark.

svn path=/trunk/; revision=19940
2006-11-21 00:30:36 +00:00
Guy Harris b0640ceefc Call guids_init() in epan_init(), so anything that needs libwireshark -
including dftest - will get the GUID table initialized (which anything
that needs libwireshark needs to have happen, so dissectors can register
GUIDs in that table).

svn path=/trunk/; revision=19939
2006-11-21 00:16:44 +00:00
Gerald Combs 0eab4b6c26 Add exclamation and left parenthesis to the display filter keystroke
catcher.

svn path=/trunk/; revision=19935
2006-11-19 23:23:53 +00:00
Gerald Combs 1f01b81e6e If the user starts typing ([a-zA-Z0-9]) anywhere in the main window, start
filling in a display filter.

svn path=/trunk/; revision=19930
2006-11-18 17:17:28 +00:00