Commit Graph

710 Commits

Author SHA1 Message Date
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
Gerald Combs f60ef5f4d3 Make F8 and F7 move to the next and previous packets, which adds
compatibility with a different analyzer.

svn path=/trunk/; revision=19926
2006-11-18 05:05:18 +00:00
Stephen Fisher bd9673f84f Fix for bug 948, "Apply capture preferences not applying." Now when the user
changes a capture option in the preferences, it will show up right away in
the capture options dialog.


svn path=/trunk/; revision=19908
2006-11-16 07:04:02 +00:00
Stephen Fisher 90303fb17f New feature to automatically highlight the field found when doing a find.
This works for both string and hex searches.  This resolves feature request
bug #776.


svn path=/trunk/; revision=19897
2006-11-14 22:35:22 +00:00
Anders Broman 99511df5a0 From Simon Munton as pointed out by Stephen Fisher:
patch on bug #220 (to main.c. 
the second part to packet_list.c was done separately for bug 1159 in rev 19735).  That patch fixes bug #1205 coincidentally.

svn path=/trunk/; revision=19888
2006-11-14 06:00:48 +00:00
Ulf Lamping 59d6c8ea33 change all file offsets from long to gint64 so we can - theoretically - handle files > 2GB correct.
Please distclean Win32 builds!

svn path=/trunk/; revision=19814
2006-11-05 22:46:44 +00:00
Guy Harris 87dd0d2636 Make the routines that manipulate the hex/text display window take a
GtkWidget * as an argument, rather than a version-of-GTK+-dependent
pointer; that way, we need fewer #ifdefs.

Use WIDGET_SET_SIZE() instead of #ifdeffed code using
gtk_widget_set_usize() or gtk_widget_set_size_request() -
WIDGET_SET_SIZE() was created to encapsulate that GTK+ 1.2[.x] vs. 2.x
difference.

Make some variables not used outside gtk/main.c static.

Clean up white space.

Clean up handling of return value from load_airpcap() a bit.

Use one big #ifdef HAVE_AIRPCAP/#endif for all the AirPcap stuff in
gtk/main.c.

Attach _U_ to the unused arguments to driver_warning_dialog_cb(), not to
the arguments that are being used - and don't include it at all if
HAVE_AIRPCAP isn't defined, as it's not used in that case.

svn path=/trunk/; revision=19798
2006-11-05 00:54:17 +00:00
Gerald Combs 2fcb67b496 From Giorgio Tino: Add a "Don't show this message again" option to an
AirPcap warning dialog.  Fix a callback bug in simple_dialog.c.

svn path=/trunk/; revision=19747
2006-10-31 01:44:11 +00:00
Gerald Combs ff8422a3e4 From Giorgio Tino: Add support for version 2.0 of the AirPcap driver,
which has an updated API for WEP key handling.

svn path=/trunk/; revision=19736
2006-10-30 06:34:31 +00:00
Gerald Combs ac0181b469 Put a trailing ellipsis behind the wireless toolbar buttons since they open
a new window.

svn path=/trunk/; revision=19673
2006-10-24 21:07:05 +00:00
Guy Harris a08a2b5b89 Put the ", " before the PortAudio item regardless of whether we have
PortAudio or not; this fixes 1174.

svn path=/trunk/; revision=19653
2006-10-21 17:48:45 +00:00
Gerald Combs fd2d2df09f AirPcap fixes from Giorgio Tino:
1) When choosing to Merge, Import or Keep decryption keys,  key lists will be saved to the preferences file AND into the registry.

2) Now if you check/uncheck the WEP deccryption checkbox in the Preferences..., the AirPcap toolbar will be modified as well.

svn path=/trunk/; revision=19646
2006-10-20 23:22:53 +00:00
Guy Harris b12232d7a1 Do the word-wrapping in end_string(), once the string is completely
constructed.  Clean up the insertion of ", ".

Put the runtime libpcap version into the runtime version info.

svn path=/trunk/; revision=19625
2006-10-20 09:06:24 +00:00
Jaap Keuter 22a949a42f Make dumpcap complile again and other minor improvements.
svn path=/trunk/; revision=19624
2006-10-20 06:24:56 +00:00
Gerald Combs 99d5c5e440 Rename get_epan_and_portaudio_version_info() to get_gui_compiled_info()
and add version info for AirPcap.  Add a corresponding
get_gui_runtime_info().  Fix up whitespace.

svn path=/trunk/; revision=19620
2006-10-19 22:43:38 +00:00
Guy Harris 1eefc6d60e Clean up the word wrap stuff a bit. (Arguably, that should be done in
the code that displays it - we might, for example, be able to have the
About dialog word-wrap to the appropriate size, and word-wrap text
printed to the standard output to the terminal width if it's going to a
terminal and to 80 or whatever columns otherwise.)

Don't report anything in dumpcap about libraries not used by dumpcap. 
(It was printing a blank, which looked a bit weird.)

Fix the handling of _MSC_VER as per Gerald's fix for _MSC_FULL_VER.

svn path=/trunk/; revision=19618
2006-10-19 21:17:23 +00:00
Guy Harris 00d8ca2d45 Fix up the changes to put the Portaudio information at the end of the
version string, so the information comes out right for applications that
don't use Portaudio.

Get rid of an extra "with" in the version string for dumpcap.

Get rid of an extra blank after the libpcap version string, and get rid
of an extra newline before it.

Attempt to add more compiler version information and to prettify the
MSVC++ version information (both untested).

svn path=/trunk/; revision=19613
2006-10-19 18:43:12 +00:00
Gerald Combs 40b8458408 Add support for:
- The AirPcap Multi-Channel Aggregator (which is marketspeak for an "any" 
    device)
  - Merging the 802.11 dissector WEP key list with AirPcap's
  - Decrypting WEP in the adapter, in Wireshark, or not at all
  
Update the release notes.

svn path=/trunk/; revision=19599
2006-10-19 00:48:03 +00:00
Ulf Lamping c9ad9d765a remove the experimental display of the highest expert level in the statusbar for now.
as long as we haven't solved that TCP checksum offload problems causing checksum errors all the time, this will display the error level for almost every capture done on a local machine - rendering this display pretty useless in it's current form.

svn path=/trunk/; revision=19516
2006-10-13 18:19:42 +00:00
Jaap Keuter fe2f2920b8 Don't let PortAudio skip the queue on the about dialog ;)
svn path=/trunk/; revision=19478
2006-10-10 19:00:50 +00:00
Ulf Lamping cdb790c0b2 experimental: append the current maximum expert warning level to the "File" statusbar, e.g. "[Expert: Chat]".
I'm still looking for a good way to display the current expert level and this seems to be the best place.

However, ideas are still welcome ...

svn path=/trunk/; revision=19297
2006-09-22 23:49:08 +00:00
Gerald Combs b18c049226 Don't complain if we can't find airpcap.dll.
svn path=/trunk/; revision=19296
2006-09-22 23:26:52 +00:00
Gerald Combs ea0b3b5d10 Fix protocol reference link URL.
svn path=/trunk/; revision=19256
2006-09-18 22:22:44 +00:00
Guy Harris c577480d71 Move the PortAudio stuff to from version_info.c to gtk/main.c, so it can
use Pa_GetVersionText().

(The word-wrapping stuff appears to work.)

svn path=/trunk/; revision=19222
2006-09-12 20:23:57 +00:00
Guy Harris a28b428aff Go back to setting the capture filter to an empty string when we start;
that obviates the need to check for a null capture filter string, and
fixes bug 1055.

Keep track of whether it was set from the command line, though, so we
can catch attempts to set the filter more than once, and attempts to set
it when we're not capturing.

Clean up white space.

svn path=/trunk/; revision=19047
2006-08-26 18:36:09 +00:00
Graeme Lunt 14be5e2bcc U3 packaging, utility and Wireshark modifications that allows Wireshark to be run from a U3 USB device.
For more details see packaging/u3/win32/README.txt


svn path=/trunk/; revision=19046
2006-08-26 17:55:21 +00:00
Ronnie Sahlberg b588469ccf guids are not olnly used in dcerpc interfaces and they often occur in many other protocols such as ldap and smb/smb2
move the initialization of the guid mapping table from the dcerpc dissector to a more neutral place


svn path=/trunk/; revision=18947
2006-08-18 09:32:19 +00:00
Gerald Combs f9661850d1 Add support for AirPcap, an upcoming wireless product from CACE. Support
is disabled by default, and can be enabled by setting AIRPCAP_CONFIG
in config.nmake.  The code is currently limited to Windows, but should
be adaptable to other platforms.

The official announcement won't come until next week, so you'll have to
read the source for details.  :)

svn path=/trunk/; revision=18928
2006-08-16 18:01:25 +00:00