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
@@ -2,4 +2,4 @@
                              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.

@@ -584,4 +584,11 @@ void OWirelessNetworkInterface::dumpInformation() const
 

-    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;

+    }

 

@@ -967,6 +974,20 @@ 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;

 }

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
@@ -33,3 +33,13 @@
 
-#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
 
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
@@ -6,3 +6,4 @@ HEADERS     = 802_11_user.h       \
               udp_ports.h         \
-              wireless.h          \
+              wireless.15.h       \
+              wireless.16.h       \
               odebugmapper.h      \
@@ -13,3 +14,3 @@ HEADERS     = 802_11_user.h       \
               ostation.h
-SOURCES     = odebugmapper.cpp       \
+SOURCES     = odebugmapper.cpp    \
               omanufacturerdb.cpp \
@@ -34 +35,2 @@ contains( platform, x11 ) {
 }
+
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
@@ -3,3 +3,3 @@
  *
-         * Version :    1512.7.02
+         * Version :    162.4.03
  *
@@ -71,2 +71,4 @@
 
+/* To minimise problems in user space, I might remove those headers
+ * at some point. Jean II */
 #include <sys/types.h>
@@ -89,3 +91,3 @@
  */
-        #define WIRELESS_EXT15
+        #define WIRELESS_EXT16
 
@@ -172,2 +174,12 @@
          *- 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
  */
@@ -205,5 +217,7 @@
 
-/* 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 */
 
@@ -303,3 +317,3 @@
 
-        #define IW_PRIV_SIZE_FIXED      0x0800/* Variable or fixed nuber of args */
+        #define IW_PRIV_SIZE_FIXED      0x0800/* Variable or fixed number of args */
 
@@ -315,3 +329,3 @@
 /* Maximum frequencies in the range struct */
-        #define IW_MAX_FREQUENCIES16
+        #define IW_MAX_FREQUENCIES32
 /* Note : if you have something like 80 frequencies,
@@ -321,3 +335,3 @@
 /* Maximum bit rates in the range struct */
-        #define IW_MAX_BITRATES         8
+        #define IW_MAX_BITRATES         32
 
@@ -329,4 +343,3 @@
 /* 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
 
@@ -363,3 +376,4 @@
         #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 */
 
@@ -491,2 +505,13 @@ struct	iw_missed
 
+/*
+         *Quality range (for spy threshold)
+ */
+        structiw_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 ------------------------ */
@@ -543,3 +568,3 @@ union	iwreq_data
                 struct sockaddr         ap_addr;/* Access point address */
-                struct sockaddr         addr;   /* Destination address (hw) */
+                struct sockaddr         addr;   /* Destination address (hw/mac) */
 
@@ -555,3 +580,3 @@ union	iwreq_data
  */
-        structiwreq
+        structiwreq 
 {
@@ -591,7 +616,7 @@ struct	iw_range
 
-        /* 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];
 
@@ -601,3 +626,17 @@ struct	iw_range
         /* 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 */
 
@@ -628,2 +667,4 @@ struct	iw_range
                 __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 */
 
@@ -647,14 +688,8 @@ struct	iw_range
 
-        /* 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 */
 };