Commit Graph

39 Commits

Author SHA1 Message Date
Stig Bjørlykke 062aa7a45f Make it compile without warnings on OSX.
svn path=/trunk/; revision=28343
2009-05-13 10:01:17 +00:00
Jörg Mayer 21dd65ec11 Hmm, HMODULE should have been void*
svn path=/trunk/; revision=28341
2009-05-13 06:29:14 +00:00
Jörg Mayer e699ac6498 Replace all Windows types by glib types - hopefully the
correct ones.
Use buildbot as a compile test on Windows.

This makes "configure --enable-airpcap && make" succeed
on Linux. It crashes the moment you click the wireless
settings button because some relevant information isn't
present (nullpointer deref).


svn path=/trunk/; revision=28340
2009-05-13 04:57:45 +00:00
Jörg Mayer ec71e49011 Move the #if _WIN32 way inwards. This is needed to make
the whole thing link under Linux - of course we are still
a long way from the code being usable.
Oh, compiling will only work if the windows types get
replaced by glib types, but that is for another patch.


svn path=/trunk/; revision=28331
2009-05-11 18:46:19 +00:00
Bill Meier 247337bad7 Use g_malloc instead of malloc.
svn path=/trunk/; revision=27738
2009-03-16 14:32:01 +00:00
Stig Bjørlykke 30db09a3a4 Removed a _U_ for a used argument.
svn path=/trunk/; revision=26941
2008-12-08 23:46:26 +00:00
Jaap Keuter cddb781f53 Various corrections, as in: typos, whitespace, few return values, _U_ markers.
svn path=/trunk/; revision=26472
2008-10-15 23:17:40 +00:00
Gerald Combs 9a41723b2b Keep the wireless toolbar extension channel entry from inadvertently
setting its value to -1. Fix a bug that kept the wireless toolbar from
being enabled if HAVE_PCAP_REMOTE was defined. Fix a couple of other
minor issues.
--Thisr line, and those below, will be ignored--

M    airpcap_loader.c
M    gtk/airpcap_dlg.c
M    gtk/main_airpcap_toolbar.c

svn path=/trunk/; revision=26469
2008-10-15 21:43:00 +00:00
Anders Broman 3d39efc2c3 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25248
2008-05-07 05:26:40 +00:00
Anders Broman 63c5c71cf8 Remove:
#ifdef NEED_G_ASCII_STRCASECMP_H
#include "g_ascii_strcasecmp.h"
#endif

svn path=/trunk/; revision=24859
2008-04-09 05:36:08 +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
Gerald Combs 72daa58e19 Instead of converting between 802.11 frequencies and channels umpteen
different ways, add a set of common conversion routines.  Add a
"Frequency/Channel" column and fill it in where we can.  Fix RSSI column
printing in PPI.

Fix up whitespace along the way.

svn path=/trunk/; revision=22538
2007-08-17 19:34:14 +00:00
Bill Meier fe25e21a0e Alter slightly so compile/link with airpcap works again....
svn path=/trunk/; revision=21848
2007-05-21 00:41:58 +00:00
Anders Broman 001d89c183 Undefine AIRPCAP_DIR to get the Windows build going again.
svn path=/trunk/; revision=21841
2007-05-20 19:55:34 +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
Jeff Morriss 47668171e3 Fix bug 1377:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1377

and complaints to the mailing list that a bogus (empty or non-ASCII contents)
dialog box was popped up when getting the list of interfaces.  The problem was
that 'get_airpcap_interface_list()' wasn't setting the returned error value
when it found that AirPcap was not loaded.  If whatever was in that variable
happened to be 1 when a non-AirPcap user requested the list of interfaces
then the bogus dialog would show up.


svn path=/trunk/; revision=21380
2007-04-11 04:57:43 +00:00
Bill Meier 547a03b25b Fix some C++ style comments
svn path=/trunk/; revision=20865
2007-02-19 21:45:27 +00:00
Gerald Combs 065e9f88e5 Spelling fixes.
svn path=/trunk/; revision=20561
2007-01-26 06:45:12 +00:00
Gerald Combs 4342c8d885 It's not an error if we don't find any AirPcap interfaces when AirPcap isn't
loaded.

svn path=/trunk/; revision=20543
2007-01-24 01:17:48 +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
Tomas Kukosa 084bbf692c make airpcap_loader.c compileable and linkable under Windows
svn path=/trunk/; revision=20391
2007-01-11 07:56:37 +00:00
Gerald Combs 983f496f69 Add uri_str_to_bytes(), byte_array_dup(), and byte_array_equal()
functions to strutil.  Use GByteArrays to store SSIDs for decryption,
and let the user specify arbitrary byte strings using percent-encoded
strings.  We should probably add percent encoding for pass phrases as
well, so you can escape the ":" character.

Move the key struct key conversion utilities to airpdcap.c, and remove
duplicate code from packet-ieee80211.c.  Fix a lot of indentation.

svn path=/trunk/; revision=20388
2007-01-11 02:42:34 +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
Ulf Lamping de84023a1b remove a warning
svn path=/trunk/; revision=20139
2006-12-14 22:32:13 +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 21671dbedf fix a warning: "airpcap_loader.c(2287) : warning C4700: local variable 'ad' used without having been initialized"
svn path=/trunk/; revision=19771
2006-11-01 23:22:13 +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 c0abcac660 Set AirpcapLoaded to TRUE if we've successfully loaded our DLL and obtained
our addresses.

svn path=/trunk/; revision=19720
2006-10-27 20:33:19 +00:00
Gerald Combs d982e8670e Add a lot of sanity checks, particularly to get_airpcap_interface_list(),
which should fix bug 1176.  Fix up whitespace and indentation.

svn path=/trunk/; revision=19712
2006-10-26 21:53:30 +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
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 a47363f51b don't crash, if airpcap.dll isn't available
svn path=/trunk/; revision=19448
2006-10-07 22:41:17 +00:00
Gerald Combs 2649d26145 Fix WEP key bug in the AirPcap code that could cause a crash. Enable
AirPcap by default. Add initial support for the "Any" device in AirPcap
(more to come).

svn path=/trunk/; revision=19401
2006-10-02 23:44:10 +00:00
Ulf Lamping 0dbb8ffcaf remove obsolete "HAVE_AIRPCAP_API" comment
svn path=/trunk/; revision=19197
2006-09-12 00:23:46 +00:00
Gerald Combs 27c127863e Fix up copyrights and whitespace.
svn path=/trunk/; revision=18981
2006-08-21 19:22:33 +00:00
Gerald Combs a238f1f7ac Make sure a preference exists before we try to use it.
svn path=/trunk/; revision=18961
2006-08-20 01:19:56 +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