misc changes

1 files changed, 29 insertions, 1 deletions

diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index ad0e89d..ce147c5 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -21,33 +21,33 @@
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <opie2/onetutils.h>
 #include <opie2/onetwork.h>
 #include <opie2/omanufacturerdb.h>
 
 #include <net/if.h>
-
+#include <cassert>
 #include <cstdio>
 using namespace std;
 
 #define IW_PRIV_TYPE_MASK       0x7000
 #define IW_PRIV_TYPE_NONE       0x0000
 #define IW_PRIV_TYPE_BYTE       0x1000
 #define IW_PRIV_TYPE_CHAR       0x2000
 #define IW_PRIV_TYPE_INT        0x4000
 #define IW_PRIV_TYPE_FLOAT      0x5000
 #define IW_PRIV_TYPE_ADDR       0x6000
 #define IW_PRIV_SIZE_FIXED      0x0800
 #define IW_PRIV_SIZE_MASK       0x07FF
 
 /*======================================================================================
  * OMacAddress
  *======================================================================================*/
@@ -200,16 +200,44 @@ void OPrivateIOCTL::setParameter( int num, u_int32_t value )
  * assorted functions
  *======================================================================================*/
 
 void dumpBytes( const unsigned char* data, int num )
 {
     printf( "Dumping %d bytes @ %0x", num, data );
     printf( "-------------------------------------------\n" );
 
     for ( int i = 0; i < num; ++i )
     {
         printf( "%02x ", data[i] );
         if ( !((i+1) % 32) ) printf( "\n" );
     }
     printf( "\n\n" );
 }
 
+
+int stringToMode( const QString& mode )
+{
+    if ( mode == "auto" )            return IW_MODE_AUTO;
+    else if ( mode == "adhoc" )      return IW_MODE_ADHOC;
+    else if ( mode == "managed" )    return IW_MODE_INFRA;
+    else if ( mode == "master" )     return IW_MODE_MASTER;
+    else if ( mode == "repeater" )   return IW_MODE_REPEAT;
+    else if ( mode == "secondary" )  return IW_MODE_SECOND;
+    else if ( mode == "monitor" )    return IW_MODE_MONITOR;
+    else assert( 0 );
+}
+
+
+QString modeToString( int mode )
+{
+    switch ( mode )
+    {
+        case IW_MODE_AUTO:          return "auto";
+        case IW_MODE_ADHOC:         return "adhoc";
+        case IW_MODE_INFRA:         return "managed";
+        case IW_MODE_MASTER:        return "master";
+        case IW_MODE_REPEAT:        return "repeater";
+        case IW_MODE_SECOND:        return "second";
+        case IW_MODE_MONITOR:       return "monitor";
+        default: assert( 0 );
+    }
+}