The Linux Wireless Extensions V16 introduce some massive changes in the

binary structures. Since we still use V15 on most target platforms I have
to introduce two headers. Define OPIE_WE_VERSION to specify which header to include

5 files changed, 107 insertions, 39 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 16fa8ae..36f409b 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -1,8 +1,8 @@
 /*

                              This file is part of the Opie Project

-                             Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de>

-              =.

+                             Copyright (C) 2003-2004 by Michael 'Mickey' Lauer

+              =.             <mickey@Vanille.de>

             .=l.

            .>+-=

  _;:,     .>    :=|.         This program is free software; you can

 .> <`_,   >  .   <=          redistribute it and/or  modify it under

@@ -581,10 +581,17 @@ void OWirelessNetworkInterface::buildPrivateList()
 void OWirelessNetworkInterface::dumpInformation() const

 {

     odebug << "OWirelessNetworkInterface::() -------------- dumping information block ----------------" << oendl;

 

-    qDebug( " - driver's idea of maximum throughput is %d bps = %d byte/s = %d Kb/s = %f.2 Mb/s", _range.throughput, _range.throughput / 8, _range.throughput / 8 / 1024, float( _range.throughput ) / 8.0 / 1024.0 / 1024.0 );

-    qDebug( " - driver for '%s' has been compiled against WE V%d (source=V%d)", name(), _range.we_version_compiled, _range.we_version_source );

+    qDebug( " - driver's idea of maximum throughput is %d bps = %d byte/s = %d Kb/s = %f.2 Mb/s", 

+            _range.throughput, _range.throughput / 8, _range.throughput / 8 / 1024, float( _range.throughput ) / 8.0 / 1024.0 / 1024.0 );

+    qDebug( " - driver for '%s' (V%d) has been compiled against WE V%d",

+             name(), _range.we_version_source, _range.we_version_compiled );

+             

+    if ( _range.we_version_compiled != WIRELESS_EXT )

+    {

+        owarn << "Version mismatch! WE_DRIVER = " << _range.we_version_compiled << " and WE_OPIENET = " << WIRELESS_EXT << oendl;

+    }

 

     odebug << "OWirelessNetworkInterface::() ---------------------------------------------------------" << oendl;

 }

 

@@ -964,12 +971,26 @@ OStationList* OWirelessNetworkInterface::scanNetwork()
 }

 

 

 int OWirelessNetworkInterface::signalStrength() const

-{

-    int max = _range.max_qual.level;

-    odebug << "signalStrength(): max quality seems to be " << max << "dBM" << oendl;

-    return 50;

+{   

+    iw_statistics stat;

+    ::memset( &stat, 0, sizeof stat );

+    _iwr.u.data.pointer = (char*) &stat;

+    _iwr.u.data.flags = 0;

+    _iwr.u.data.length = sizeof stat;

+    

+    if ( !wioctl( SIOCGIWSTATS ) )

+    {

+        return -1;

+    }

+   

+    int max = _range.max_qual.qual;

+    int cur = stat.qual.qual;

+    int lev = stat.qual.level; //FIXME: Do something with them?

+    int noi = stat.qual.noise; //FIXME: Do something with them?

+    

+    return cur*100/max;

 }

 

 

 bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const

diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 9b8a0d4..0a51108 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -30,9 +30,19 @@
 
 #ifndef ONETWORK_H
 #define ONETWORK_H
 
-#include "wireless.h"
+#if !defined( OPIE_WE_VERSION )
+#error Need to define a wireless extension version to build against!
+#endif
+
+#if OPIE_WE_VERSION == 15
+#include "wireless.15.h"
+#endif
+
+#if OPIE_WE_VERSION == 16
+#include "wireless.16.h"
+#endif
 
 /* OPIE */
 
 #include <opie2/onetutils.h>
diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro
index cab6da6..97bcf31 100644
--- a/libopie2/opienet/opienet.pro
+++ b/libopie2/opienet/opienet.pro
@@ -3,16 +3,17 @@ CONFIG      += qt warn_on debug
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = 802_11_user.h       \
               dhcp.h              \
               udp_ports.h         \
-              wireless.h          \
+              wireless.15.h       \
+              wireless.16.h       \
               odebugmapper.h      \
               omanufacturerdb.h   \
               onetutils.h         \
               onetwork.h          \
               opcap.h             \
               ostation.h
-SOURCES     = odebugmapper.cpp       \
+SOURCES     = odebugmapper.cpp    \
               omanufacturerdb.cpp \
               onetutils.cpp       \
               onetwork.cpp        \
               opcap.cpp           \
@@ -31,4 +32,5 @@ LIBS        += -lpcap
 
 contains( platform, x11 ) {
   LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
 }
+
diff --git a/libopie2/opienet/wireless.h b/libopie2/opienet/wireless.15.h
index 8135e97..8135e97 100644
--- a/libopie2/opienet/wireless.h
+++ b/libopie2/opienet/wireless.15.h
diff --git a/libopie2/opienet/wireless.h b/libopie2/opienet/wireless.16.h
index 8135e97..9a9accd 100644
--- a/libopie2/opienet/wireless.h
+++ b/libopie2/opienet/wireless.16.h
@@ -1,8 +1,8 @@
 /*
  * This file define a set of standard wireless extensions
  *
- * Version :	15	12.7.02
+ * Version :	16	2.4.03
  *
  * Authors :	Jean Tourrilhes - HPL - <jt@hpl.hp.com>
  * Copyright (c) 1997-2002 Jean Tourrilhes, All Rights Reserved.
  */
@@ -68,8 +68,10 @@
  */
 
 /***************************** INCLUDES *****************************/
 
+/* To minimise problems in user space, I might remove those headers
+ * at some point. Jean II */
 #include <sys/types.h>
 #include <net/if.h>
 #include <linux/types.h>
 
@@ -86,9 +88,9 @@
  * extensions and to know which version of wireless extensions it is
  * (there is some stuff that will be added in the future...)
  * I just plan to increment with each new version.
  */
-#define WIRELESS_EXT	15
+#define WIRELESS_EXT	16
 
 /*
  * Changes :
  *
@@ -169,8 +171,18 @@
  *	- Add IW_MAX_GET_SPY for driver returning a lot of addresses
  *	- Add IW_TXPOW_RANGE for range of Tx Powers
  *	- Add IWEVREGISTERED & IWEVEXPIRED events for Access Points
  *	- Add IW_MODE_MONITOR for passive monitor
+ *
+ * V15 to V16
+ * ----------
+ *	- Increase the number of bitrates in iw_range to 32 (for 802.11g)
+ *	- Increase the number of frequencies in iw_range to 32 (for 802.11b+a)
+ *	- Reshuffle struct iw_range for increases, add filler
+ *	- Increase IW_MAX_AP to 64 for driver returning a lot of addresses
+ *	- Remove IW_MAX_GET_SPY because conflict with enhanced spy support
+ *	- Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy"
+ *	- Add IW_ENCODE_TEMP and iw_range->encoding_login_index
  */
 
 /**************************** CONSTANTS ****************************/
 
@@ -202,11 +214,13 @@
 #define SIOCGIWSTATS	0x8B0F		/* Get /proc/net/wireless stats */
 /* SIOCGIWSTATS is strictly used between user space and the kernel, and
  * is never passed to the driver (i.e. the driver will never see it). */
 
-/* Mobile IP support (statistics per MAC address) */
+/* Spy support (statistics per MAC address - used for Mobile IP support) */
 #define SIOCSIWSPY	0x8B10		/* set spy addresses */
 #define SIOCGIWSPY	0x8B11		/* get spy info (quality of link) */
+#define SIOCSIWTHRSPY	0x8B12		/* set spy threshold (spy event) */
+#define SIOCGIWTHRSPY	0x8B13		/* get spy threshold */
 
 /* Access Point manipulation */
 #define SIOCSIWAP	0x8B14		/* set access point MAC addresses */
 #define SIOCGIWAP	0x8B15		/* get access point MAC addresses */
@@ -300,9 +314,9 @@
 #define IW_PRIV_TYPE_INT	0x4000	/* 32 bits int */
 #define IW_PRIV_TYPE_FLOAT	0x5000	/* struct iw_freq */
 #define IW_PRIV_TYPE_ADDR	0x6000	/* struct sockaddr */
 
-#define IW_PRIV_SIZE_FIXED	0x0800	/* Variable or fixed nuber of args */
+#define IW_PRIV_SIZE_FIXED	0x0800	/* Variable or fixed number of args */
 
 #define IW_PRIV_SIZE_MASK	0x07FF	/* Max number of those args */
 
 /*
@@ -312,24 +326,23 @@
 
 /* ----------------------- OTHER CONSTANTS ----------------------- */
 
 /* Maximum frequencies in the range struct */
-#define IW_MAX_FREQUENCIES	16
+#define IW_MAX_FREQUENCIES	32
 /* Note : if you have something like 80 frequencies,
  * don't increase this constant and don't fill the frequency list.
  * The user will be able to set by channel anyway... */
 
 /* Maximum bit rates in the range struct */
-#define IW_MAX_BITRATES		8
+#define IW_MAX_BITRATES		32
 
 /* Maximum tx powers in the range struct */
 #define IW_MAX_TXPOWER		8
 /* Note : if you more than 8 TXPowers, just set the max and min or
  * a few of them in the struct iw_range. */
 
 /* Maximum of address that you may set with SPY */
-#define IW_MAX_SPY		8	/* set */
-#define IW_MAX_GET_SPY		64	/* get */
+#define IW_MAX_SPY		8
 
 /* Maximum of address that you may get in the
    list of access points in range */
 #define IW_MAX_AP		64
@@ -360,9 +373,10 @@
 #define IW_ENCODE_DISABLED	0x8000	/* Encoding disabled */
 #define IW_ENCODE_ENABLED	0x0000	/* Encoding enabled */
 #define IW_ENCODE_RESTRICTED	0x4000	/* Refuse non-encoded packets */
 #define IW_ENCODE_OPEN		0x2000	/* Accept non-encoded packets */
-#define IW_ENCODE_NOKEY         0x0800  /* Key is write only, so not present */
+#define IW_ENCODE_NOKEY		0x0800  /* Key is write only, so not present */
+#define IW_ENCODE_TEMP		0x0400  /* Temporary key */
 
 /* Power management flags available (along with the value, if any) */
 #define IW_POWER_ON		0x0000	/* No details... */
 #define IW_POWER_TYPE		0xF000	/* Type of parameter */
@@ -488,8 +502,19 @@ struct	iw_missed
 {
 	__u32		beacon;		/* Missed beacons/superframe */
 };
 
+/*
+ *	Quality range (for spy threshold)
+ */
+struct	iw_thrspy
+{
+	struct sockaddr		addr;		/* Source address (hw/mac) */
+	struct iw_quality	qual;		/* Quality of the link */
+	struct iw_quality	low;		/* Low threshold */
+	struct iw_quality	high;		/* High threshold */
+};
+
 /* ------------------------ WIRELESS STATS ------------------------ */
 /*
  * Wireless statistics (used for /proc/net/wireless)
  */
@@ -540,9 +565,9 @@ union	iwreq_data
 	struct iw_param	power;		/* PM duration/timeout */
 	struct iw_quality qual;		/* Quality part of statistics */
 
 	struct sockaddr	ap_addr;	/* Access point address */
-	struct sockaddr	addr;		/* Destination address (hw) */
+	struct sockaddr	addr;		/* Destination address (hw/mac) */
 
 	struct iw_param	param;		/* Other small parameters */
 	struct iw_point	data;		/* Other large parameters */
 };
@@ -552,9 +577,9 @@ union	iwreq_data
  * This structure is the same as 'struct ifreq', but (re)defined for
  * convenience...
  * Do I need to remind you about structure size (32 octets) ?
  */
-struct	iwreq
+struct	iwreq 
 {
 	union
 	{
 		char	ifrn_name[IFNAMSIZ];	/* if name, e.g. "eth0" */
@@ -588,19 +613,33 @@ struct	iw_range
 	/* NWID (or domain id) */
 	__u32		min_nwid;	/* Minimal NWID we are able to set */
 	__u32		max_nwid;	/* Maximal NWID we are able to set */
 
-	/* Frequency */
-	__u16		num_channels;	/* Number of channels [0; num - 1] */
-	__u8		num_frequency;	/* Number of entry in the list */
-	struct iw_freq	freq[IW_MAX_FREQUENCIES];	/* list */
-	/* Note : this frequency list doesn't need to fit channel numbers */
+	/* Old Frequency (backward compat - moved lower ) */
+	__u16		old_num_channels;
+	__u8		old_num_frequency;
+	/* Filler to keep "version" at the same offset */
+	__s32		old_freq[6];
 
 	/* signal level threshold range */
 	__s32	sensitivity;
 
 	/* Quality of link & SNR stuff */
+	/* Quality range (link, level, noise)
+	 * If the quality is absolute, it will be in the range [0 ; max_qual],
+	 * if the quality is dBm, it will be in the range [max_qual ; 0].
+	 * Don't forget that we use 8 bit arithmetics... */
 	struct iw_quality	max_qual;	/* Quality of the link */
+	/* This should contain the average/typical values of the quality
+	 * indicator. This should be the threshold between a "good" and
+	 * a "bad" link (example : monitor going from green to orange).
+	 * Currently, user space apps like quality monitors don't have any
+	 * way to calibrate the measurement. With this, they can split
+	 * the range between 0 and max_qual in different quality level
+	 * (using a geometric subdivision centered on the average).
+	 * I expect that people doing the user space apps will feedback
+	 * us on which value we need to put in each driver... */
+	struct iw_quality	avg_qual;	/* Quality of the link */
 
 	/* Rates */
 	__u8		num_bitrates;	/* Number of entries in the list */
 	__s32		bitrate[IW_MAX_BITRATES];	/* list, in bps */
@@ -625,8 +664,10 @@ struct	iw_range
 	/* Encoder stuff */
 	__u16	encoding_size[IW_MAX_ENCODING_SIZES];	/* Different token sizes */
 	__u8	num_encoding_sizes;	/* Number of entry in the list */
 	__u8	max_encoding_tokens;	/* Max number of tokens */
+	/* For drivers that need a "login/passwd" form */
+	__u8	encoding_login_index;	/* token index for login token */
 
 	/* Transmit power */
 	__u16		txpower_capa;	/* What options are supported */
 	__u8		num_txpower;	/* Number of entries in the list */
@@ -644,20 +685,14 @@ struct	iw_range
 	__s32		max_retry;	/* Maximal number of retries */
 	__s32		min_r_time;	/* Minimal retry lifetime */
 	__s32		max_r_time;	/* Maximal retry lifetime */
 
-	/* Average quality of link & SNR */
-	struct iw_quality	avg_qual;	/* Quality of the link */
-	/* This should contain the average/typical values of the quality
-	 * indicator. This should be the threshold between a "good" and
-	 * a "bad" link (example : monitor going from green to orange).
-	 * Currently, user space apps like quality monitors don't have any
-	 * way to calibrate the measurement. With this, they can split
-	 * the range between 0 and max_qual in different quality level
-	 * (using a geometric subdivision centered on the average).
-	 * I expect that people doing the user space apps will feedback
-	 * us on which value we need to put in each driver...
-	 */
+	/* Frequency */
+	__u16		num_channels;	/* Number of channels [0; num - 1] */
+	__u8		num_frequency;	/* Number of entry in the list */
+	struct iw_freq	freq[IW_MAX_FREQUENCIES];	/* list */
+	/* Note : this frequency list doesn't need to fit channel numbers,
+	 * because each entry contain its channel index */
 };
 
 /*
  * Private ioctl interface information