Commit Graph

63 Commits

Author SHA1 Message Date
Ulf Lamping 6a5b1e0ec0 use the ending "_win32" for every windows specific file
svn path=/trunk/; revision=24972
2008-04-13 12:14:57 +00:00
Ulf Lamping 0b97c4211e sort #includes by directories
svn path=/trunk/; revision=24967
2008-04-13 00:55:59 +00:00
Ulf Lamping 1f8e6c08be various code cleanup
svn path=/trunk/; revision=24964
2008-04-12 23:34:44 +00:00
Guy Harris 21e4075535 Add a stub set_capture_if_dialog_for_capture_in_progress() routine when
HAVE_LIBPCAP isn't defined, as it's called even when it's not defined.

svn path=/trunk/; revision=24958
2008-04-12 21:30:38 +00:00
Ulf Lamping e08ae89241 cleanup of "capture_in_progress" ugly hack from main_toolbar, call capture_if_dlg directly from within main.c
svn path=/trunk/; revision=24943
2008-04-12 17:04:21 +00:00
Ulf Lamping 4151a40503 rename toolbar to main_toolbar
svn path=/trunk/; revision=24940
2008-04-12 16:38:13 +00:00
Ulf Lamping 55c2be83db move stock icon code from toolbar.c into specific stock_icons file(s)
svn path=/trunk/; revision=24921
2008-04-12 00:49:20 +00:00
Ulf Lamping 9af9a0e619 first round to replace SIGNAL_CONNECT with g_signal_connect
This requires some casts to be added and I just don't want to add casts at all possible places. So I compile and only add casts where the (MSVC) compiler has a hard time. 

Unfortunately this won't find any problems in Linux/Unix only code - I'll keep an eye on the buildbot and try to fix things as I'm going on ...

svn path=/trunk/; revision=24912
2008-04-11 21:20:51 +00:00
Ulf Lamping ae5f841083 replace all appearances of BUTTON_NEW_FROM_STOCK with GTK2's gtk_button_new_from_stock
svn path=/trunk/; revision=24904
2008-04-11 18:58:19 +00:00
Bill Meier 0502078a1b OBJECT_..._DATA --> g_object_..._data
svn path=/trunk/; revision=24898
2008-04-11 17:14:11 +00:00
Anders Broman c973aa3830 Remove:
#ifdef NEED_G_ASCII_STRCASECMP_H
#include "g_ascii_strcasecmp.h"
#endif

svn path=/trunk/; revision=24868
2008-04-09 19:39:58 +00:00
Ulf Lamping 2ddd2d6b6e remove GTK1 code
svn path=/trunk/; revision=24812
2008-04-06 22:44:20 +00:00
Stig Bjørlykke f3747bf637 Hide hidden devices in "Capture Interfaces" dialog.
Added a function to check for hidden devices, which also work correctly
for plumbed devices on solaris.

svn path=/trunk/; revision=24231
2008-01-31 16:47:05 +00:00
Bill Meier e923010814 Fix various small memory leaks & 1 invalid g_free (airpcap_gui_utils.c)
svn path=/trunk/; revision=24185
2008-01-24 22:26:05 +00:00
Ronnie Sahlberg 2830cf2045 fix the path to include g_ascii_strcasecmp.h
svn path=/trunk/; revision=23636
2007-11-28 01:23:09 +00:00
Guy Harris 9c89cdaaa3 strcasecmp(), strncasecmp(), g_strcasecmp(), and g_strncasecmp() delenda
est.  Use g_ascii_strcasecmp() and g_ascii_strncasecmp(), and supply our
own versions if they're missing from GLib (as is the case with GLib
1.x).

In the code to build the list of named fields for Diameter, don't use
g_strdown(); do our own g_ascii_-style upper-case to lower-case mapping
in the hash function and use g_ascii_strcasecmp() in the compare
function.

We do this because there is no guarantee that toupper(), tolower(), and
functions that use them will, for example, map between "I" and "i" in
all locales; in Turkish locales, for example, there are, in both
upper case and lower case, versions of "i" with and without a dot, and
the upper-case version of "i" is "I"-with-a-dot and the lower-case
version of "I" is "i"-without-a-dot.  This causes strings that should
match not to match.

This finishes fixing bug 2010 - an earlier checkin prevented the crash
(as there are other ways to produce the same crash, e.g. a bogus
dictionary.xml file), but didn't fix the case-insensitive string matching.

svn path=/trunk/; revision=23623
2007-11-27 18:52:51 +00:00
Stig Bjørlykke 2b49760882 It seems like capture_stats is working as a correctly implemented pcap_stats.
Update the Packets count in Capture Interfaces according to this.

svn path=/trunk/; revision=22755
2007-08-30 17:36:38 +00:00
Jeff Morriss 2f77efce7d Fix bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1757 :
Try to call get_interface_descriptive_name() as little as possible (storing
the result in capture_opts) to avoid a performance hit during live capture
(especially if you have lots of interfaces) and to avoid leaking memory.

One issue with this is that capture_opts.c cannot (without adding significant
dependencies) set the iface_descr so readers of that field (only gtk/main.c
and tshark.c) use a macro to (set if not already set and) get the value of
that field.

svn path=/trunk/; revision=22587
2007-08-22 16:30:16 +00:00
Gerald Combs 89a2966ced Add a "-S" flag to dumpcap, which prints out interface statistics. Use
this in the GUI rather than calling pcap_stats() directly. This gets rid
of the last pcap_open_live() call in the GUI code. Update
README.packaging.

svn path=/trunk/; revision=22443
2007-08-02 21:45:27 +00:00
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
Guy Harris 11d553e9ce Convert the arguments to if_list_comparator_alph() to if_info_t *'s
early on, and use the converted versions.

#if 0 out the error dialog for CANT_GET_AIRPCAP_INTERFACE_LIST, rather
than commenting it out - it's a bit easier to un-out the code, and you
don't have to worry about whether there's a comment in the stuff being
xxx-outed.

svn path=/trunk/; revision=21838
2007-05-19 22:00:09 +00:00
Jaap Keuter 3e0d91c307 Get the build going.
svn path=/trunk/; revision=21833
2007-05-19 10:59:44 +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
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 fdfd0be5bd remove some warnings
svn path=/trunk/; revision=20116
2006-12-11 19:43:19 +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
Ulf Lamping 2aa248f652 seems the height offset 16 seems a bit too small to prevent a scrollbar, using 20 instead
svn path=/trunk/; revision=19088
2006-08-30 20:24:49 +00:00
Ulf Lamping 8ed01f4cb7 fix a warning by removing now unused code
svn path=/trunk/; revision=19051
2006-08-27 10:41:30 +00:00
Guy Harris 0f6f2f4b45 Clean up indentation.
Only define cap_air_w if we have AirPcap.

svn path=/trunk/; revision=19041
2006-08-26 00:12:12 +00:00
Ulf Lamping 0fcfd360e9 capture interfaces dialog: use capture stock icons instead of plain text buttons
capture info dialog: add a "Help" and use stock buttons

svn path=/trunk/; revision=19020
2006-08-24 21:40:53 +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
Guy Harris 92552c2d76 Get rid of a bunch of "Ethereal"s and "ethereal"s in comments, GUI
strings, and function names.

svn path=/trunk/; revision=18205
2006-05-22 07:29:40 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Ulf Lamping ec5efe7370 as I've experienced a scrollbar again while having 7 interfaces, I've tried to add the number of interfaces to the height formula to fix this
svn path=/trunk/; revision=17960
2006-04-22 20:16:47 +00:00
Jaap Keuter 3d14528215 Add 2px height to avoid a vertical scrollbar with Gtk-Wimp
svn path=/trunk/; revision=17846
2006-04-10 17:24:14 +00:00
Jaap Keuter 3d22396ca0 Fix for bug 848. Make a scrollable window when more than 10 interfaces are listed.
svn path=/trunk/; revision=17844
2006-04-08 20:19:40 +00:00
Ulf Lamping 79053183c5 remove dependencies to pcap.h, so getting an idea what needs to be done by dumpcap in addition to the things already done now
various dumpcap related code cleanup: mainly #include's and capture engine related stuff

svn path=/trunk/; revision=17327
2006-02-17 02:18:48 +00:00
Ulf Lamping 7e3a24418c rename pcap-....c/.h files to capture-pcap-....c/.h
this way, the capture prefix will "logically" group the files together and file browsers will also group them

we may want to move the files into a subdir capture later

svn path=/trunk/; revision=16691
2005-12-06 00:07:13 +00:00
Ulf Lamping c3187174bf replace *a lot* of file related calls by their GLib counterparts. This is necessary for the switch to GTK 2.6 (at least on WIN32).
to do this, I've added file_util.h to wiretap (would file_compat.h be a better name?), and provide compat_macros like eth_open() instead of open(). While at it, move other file related things there, like #include <io.h>, definition of O_BINARY and alike, so it's all in one place.

deleted related things from config.h.win32

As of these massive changes, I'm almost certain that this will break the Unix build. I'll keep an eye on the buildbot so hopefully everything is working again soon.

svn path=/trunk/; revision=16403
2005-11-06 22:43:25 +00:00
Ulf Lamping aa7a238a42 fix cant_load_winpcap_err() parameter
svn path=/trunk/; revision=16123
2005-10-05 06:05:35 +00:00
Guy Harris bfcbcfb4ea Add a "capture_errs.c" routine to cough up error messages for capture
problems, and use the first routine in it in multiple places.

Get rid of DISSECTOR_SUPPORT_INCLUDES - just add its contents to
ETHEREAL_COMMON_INCLUDES.

svn path=/trunk/; revision=16109
2005-10-04 06:25:01 +00:00
Ulf Lamping c5b67384a5 close the capture interfaces dialog if the user pressed "Capture" or "Prepare"
this dialog is live capturing from all "known" interfaces while it's open, so huge system load is generated, which is not preferred while doing a real capture.

svn path=/trunk/; revision=15719
2005-09-07 22:00:25 +00:00
Jörg Mayer 0edcc8920e - Declare some functions static
- Add plugins_dlg.h
- Include .h files in their respective .c files
- Include .h and remove extern declarations in .c files
- set eol-style and keywords on gui_utils.[hc]

svn path=/trunk/; revision=15471
2005-08-20 14:02:00 +00:00
Ulf Lamping eafbbbcabb renamed ui_util.c/.h to gui_utils.c/.h to prevent confusion with identical named ui_util.h in / dir
svn path=/trunk/; revision=15465
2005-08-20 12:09:48 +00:00
Jörg Mayer e9ea42eed9 Fix more "no previous declaration" warnings
svn path=/trunk/; revision=15173
2005-08-02 04:47:15 +00:00
Guy Harris e6dfe72d71 Update URLs and domain names that refer to the WinPcap site.
svn path=/trunk/; revision=14540
2005-06-03 09:55:28 +00:00
Ulf Lamping bfbb46de43 win32 only: get interface details from WinPcap's packet.dll (direct access to NDIS specific driver information, upper second GTK part)
svn path=/trunk/; revision=14407
2005-05-20 22:23:00 +00:00
Ulf Lamping 9b5d52aab6 ask for unsaved file when using the new start capture feature,
ask for unsaved file when really starting the capture, not already when showing the options dialog,
use the start capture icon in the capture options dialog (instead of simply Ok)

svn path=/trunk/; revision=14142
2005-04-19 21:02:01 +00:00
Ulf Lamping ce8a65b3da minor refactoring
svn path=/trunk/; revision=14102
2005-04-16 19:24:10 +00:00