7 files changed, 115 insertions, 66 deletions
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
index fc2026f..21026e1 100644
--- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
+++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -1,2 +1,3 @@
 #include <opie2/onetwork.h>
+#include <opie2/ostation.h>
 #include <opie2/omanufacturerdb.h>
@@ -29,3 +30,3 @@ int main( int argc, char** argv )
            //{
-                qDebug( "DEMO: Associated AP has MAC Address '%s'", (const char*) iface->associatedAP() );
+                qDebug( "DEMO: Associated AP has MAC Address '%s'", (const char*) iface->associatedAP().toString() );
            //}
@@ -60,7 +61,14 @@ int main( int argc, char** argv )
-            int stations = iface->scanNetwork();
+            OStationList* stations = iface->scanNetwork();
-            if ( stations != -1 )
+            if ( stations )
            {
-                qDebug( "DEMO: # of stations around = %d", stations );
+                qDebug( "DEMO: # of stations around = %d", stations->count() );
+                OStation* station;
+                for ( station = stations->first(); station != 0; station = stations->next() )
+                {
+                    qDebug( "DEMO: station dump following..." );
+                    station->dump();
+                }
            }
            else
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
@@ -36,3 +36,3 @@
 #include <net/if.h>
+#include <cassert>
 #include <cstdio>
@@ -215 +215,29 @@ void dumpBytes( const unsigned char* data, int num )
+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 );
+    }
+}
diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h
index 18731ba..541c5ab 100644
--- a/libopie2/opienet/onetutils.h
+++ b/libopie2/opienet/onetutils.h
@@ -86,5 +86,6 @@ class OHostAddress : public QHostAddress
 {
-  public:
+  /*public:
    OHostAddress();
    ~OHostAddress();
+  */
 };
@@ -122,5 +123,5 @@ class OPrivateIOCTL : public QObject
-/* dump bytes */
 void dumpBytes( const unsigned char* data, int num );
+QString modeToString( int );
+int stringToMode( const QString& );
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index a85a510..50c6679 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -258,2 +258,3 @@ QString ONetworkInterface::ipV4Address() const
        return "<unknown>";
 }
@@ -476,3 +477,3 @@ bool OWirelessNetworkInterface::isAssociated() const
    //FIXME: handle different modes
-    return associatedAP() != "44:44:44:44:44:44";
+    return !(associatedAP() == OMacAddress::unknown);
 }
@@ -480,22 +481,8 @@ bool OWirelessNetworkInterface::isAssociated() const
-QString OWirelessNetworkInterface::associatedAP() const
+OMacAddress OWirelessNetworkInterface::associatedAP() const
 {
-    //FIXME: use OMacAddress
-    QString mac;
    if ( ioctl( SIOCGIWAP ) )
-    {
+        return (const unsigned char*) &_ifr.ifr_hwaddr.sa_data[0];
-        mac.sprintf( "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
-        _ifr.ifr_hwaddr.sa_data[0]&0xff,
-        _ifr.ifr_hwaddr.sa_data[1]&0xff,
-        _ifr.ifr_hwaddr.sa_data[2]&0xff,
-        _ifr.ifr_hwaddr.sa_data[3]&0xff,
-        _ifr.ifr_hwaddr.sa_data[4]&0xff,
-        _ifr.ifr_hwaddr.sa_data[5]&0xff );
-    }
    else
-    {
+        return OMacAddress::unknown;
-        mac = "<Unknown>";
-    }
-    return mac;
 }
@@ -690,14 +677,3 @@ void OWirelessNetworkInterface::setMode( const QString& mode )
 {
-    if ( mode == "auto" )            _iwr.u.mode = IW_MODE_AUTO;
+    _iwr.u.mode = stringToMode( mode );
-    else if ( mode == "adhoc" )      _iwr.u.mode = IW_MODE_ADHOC;
-    else if ( mode == "managed" )    _iwr.u.mode = IW_MODE_INFRA;
-    else if ( mode == "master" )     _iwr.u.mode = IW_MODE_MASTER;
-    else if ( mode == "repeater" )   _iwr.u.mode = IW_MODE_REPEAT;
-    else if ( mode == "secondary" )  _iwr.u.mode = IW_MODE_SECOND;
-    else if ( mode == "monitor" )    _iwr.u.mode = IW_MODE_MONITOR;
-    else
-    {
-        qDebug( "ONetwork: Warning! Invalid IEEE 802.11 mode '%s' specified.", (const char*) mode );
-        return;
-    }
    wioctl( SIOCSIWMODE );
@@ -712,13 +688,3 @@ QString OWirelessNetworkInterface::mode() const
    }
-    switch ( _iwr.u.mode )
+    return modeToString( _iwr.u.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 "secondary";
-        case IW_MODE_MONITOR: return "monitor";
-        default: assert( 0 ); // shouldn't happen
-    }
 }
@@ -832,3 +798,3 @@ void OWirelessNetworkInterface::setSSID( const QString& ssid )
-int OWirelessNetworkInterface::scanNetwork()
+OStationList* OWirelessNetworkInterface::scanNetwork()
 {
@@ -838,5 +804,7 @@ int OWirelessNetworkInterface::scanNetwork()
    {
-        return -1;
+        return 0;
    }
+    OStationList* stations = new OStationList();
    int timeout = 1000000;
@@ -888,3 +856,3 @@ int OWirelessNetworkInterface::scanNetwork()
            qDebug( " - no results (empty neighbourhood)" );
-            return 0;
+            return stations;
        }
@@ -894,4 +862,2 @@ int OWirelessNetworkInterface::scanNetwork()
-        int stations = 0;
        // parse results
@@ -908,6 +874,27 @@ int OWirelessNetworkInterface::scanNetwork()
            {
-                case SIOCGIWAP: qDebug( "SIOCGIWAP" ); stations++; break;
+                case SIOCGIWAP:
-                case SIOCGIWMODE: qDebug( "SIOCGIWMODE" ); break;
+                {
-                case SIOCGIWFREQ: qDebug( "SIOCGIWFREQ" ); break;
+                    qDebug( "SIOCGIWAP" );
-                case SIOCGIWESSID: qDebug( "SIOCGIWESSID" ); break;
+                    stations->append( new OStation() );
+                    stations->last()->macAddress = (const unsigned char*) &we->u.ap_addr.sa_data[0];
+                    break;
+                }
+                case SIOCGIWMODE:
+                {
+                    qDebug( "SIOCGIWMODE" );
+                    stations->last()->type = modeToString( we->u.mode );
+                    break;
+                }
+                case SIOCGIWFREQ:
+                {
+                    qDebug( "SIOCGIWFREQ" );
+                    stations->last()->channel = _channels[ static_cast<int>(double( we->u.freq.m ) * pow( 10.0, we->u.freq.e ) / 1000000) ];
+                    break;
+                }
+                case SIOCGIWESSID:
+                {
+                    qDebug( "SIOCGIWESSID" );
+                    stations->last()->ssid = we->u.essid.pointer;
+                    break;
+                }
                case SIOCGIWSENS: qDebug( "SIOCGIWSENS" ); break;
@@ -926,2 +913,4 @@ int OWirelessNetworkInterface::scanNetwork()
+        return stations;
    }
@@ -930,3 +919,3 @@ int OWirelessNetworkInterface::scanNetwork()
        qDebug( " - no results (timeout) :(" );
-        return 0;
+        return stations;
    }
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index e1545dd..0eb4542 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -41,2 +41,3 @@
 #include <opie2/onetutils.h>
+#include <opie2/ostation.h>
@@ -408,3 +409,3 @@ class OWirelessNetworkInterface : public ONetworkInterface
     */
-    virtual QString associatedAP() const;
+    virtual OMacAddress associatedAP() const;
    /**
@@ -422,3 +423,3 @@ class OWirelessNetworkInterface : public ONetworkInterface
     */
-    virtual int scanNetwork();
+    virtual OStationList* scanNetwork();
diff --git a/libopie2/opienet/ostation.cpp b/libopie2/opienet/ostation.cpp
index 3817b31..ba1e4f6 100644
--- a/libopie2/opienet/ostation.cpp
+++ b/libopie2/opienet/ostation.cpp
@@ -40,2 +40,9 @@ OStation::OStation()
    qDebug( "OStation::OStation()" );
+    type = "<unknown>";
+    macAddress = OMacAddress::unknown;
+    ssid = "<unknown>";
+    channel = 0;
+    apAddress = OMacAddress::unknown;
 }
@@ -49 +56,9 @@ OStation::~OStation()
+void OStation::dump()
+{
+    qDebug( "------- OStation::dump() ------------" );
+    qDebug( "type: %s", (const char*) type );
+    qDebug( "mac:  %s", (const char*) macAddress.toString() );
+    qDebug( "ap:   %s", (const char*) apAddress.toString() );
+    qDebug( "ip:   %s", (const char*) ipAddress.toString() );
+}
diff --git a/libopie2/opienet/ostation.h b/libopie2/opienet/ostation.h
index f61570b..a6956c9 100644
--- a/libopie2/opienet/ostation.h
+++ b/libopie2/opienet/ostation.h
@@ -36,4 +36,3 @@
-#include <qdict.h>
+#include <qlist.h>
-#include <qmap.h>
 #include <qstring.h>
@@ -46,3 +45,3 @@ class OStation;
-typedef QDict<OStation> OStationDict;
+typedef QList<OStation> OStationList;
@@ -58,9 +57,17 @@ class OStation
-  private:
+    void dump();
+    /* Ethernet */
+    QString type;
    OMacAddress macAddress;
    QHostAddress ipAddress;
+    /* WaveLan */
    QString ssid;
-    QString type;
+    OMacAddress apAddress;
+    int channel;
+    bool encrypted;
 };
 #endif // OSTATION_H

diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp index fc2026f..21026e1 100644 --- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp +++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -1,2 +1,3 @@
1	#include <opie2/onetwork.h>	1	#include <opie2/onetwork.h>
		2	#include <opie2/ostation.h>
2	#include <opie2/omanufacturerdb.h>	3	#include <opie2/omanufacturerdb.h>
@@ -29,3 +30,3 @@ int main( int argc, char** argv )
29	//{	30	//{
30	qDebug( "DEMO: Associated AP has MAC Address '%s'", (const char*) iface->associatedAP() );	31	qDebug( "DEMO: Associated AP has MAC Address '%s'", (const char*) iface->associatedAP().toString() );
31	//}	32	//}
@@ -60,7 +61,14 @@ int main( int argc, char** argv )
60		61
61	int stations = iface->scanNetwork();	62	OStationList* stations = iface->scanNetwork();
62	if ( stations != -1 )	63	if ( stations )
63	{	64	{
64	qDebug( "DEMO: # of stations around = %d", stations );	65	qDebug( "DEMO: # of stations around = %d", stations->count() );
		66	OStation* station;
		67	for ( station = stations->first(); station != 0; station = stations->next() )
		68	{
		69	qDebug( "DEMO: station dump following..." );
		70	station->dump();
		71	}
65	}	72	}
		73
66	else	74	else


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
@@ -36,3 +36,3 @@
36	#include <net/if.h>	36	#include <net/if.h>
37		37	#include <cassert>
38	#include <cstdio>	38	#include <cstdio>
@@ -215 +215,29 @@ void dumpBytes( const unsigned char* data, int num )
215		215
		216
		217	int stringToMode( const QString& mode )
		218	{
		219	if ( mode == "auto" ) return IW_MODE_AUTO;
		220	else if ( mode == "adhoc" ) return IW_MODE_ADHOC;
		221	else if ( mode == "managed" ) return IW_MODE_INFRA;
		222	else if ( mode == "master" ) return IW_MODE_MASTER;
		223	else if ( mode == "repeater" ) return IW_MODE_REPEAT;
		224	else if ( mode == "secondary" ) return IW_MODE_SECOND;
		225	else if ( mode == "monitor" ) return IW_MODE_MONITOR;
		226	else assert( 0 );
		227	}
		228
		229
		230	QString modeToString( int mode )
		231	{
		232	switch ( mode )
		233	{
		234	case IW_MODE_AUTO: return "auto";
		235	case IW_MODE_ADHOC: return "adhoc";
		236	case IW_MODE_INFRA: return "managed";
		237	case IW_MODE_MASTER: return "master";
		238	case IW_MODE_REPEAT: return "repeater";
		239	case IW_MODE_SECOND: return "second";
		240	case IW_MODE_MONITOR: return "monitor";
		241	default: assert( 0 );
		242	}
		243	}


diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h index 18731ba..541c5ab 100644 --- a/libopie2/opienet/onetutils.h +++ b/libopie2/opienet/onetutils.h
@@ -86,5 +86,6 @@ class OHostAddress : public QHostAddress
86	{	86	{
87	public:	87	/*public:
88	OHostAddress();	88	OHostAddress();
89	~OHostAddress();	89	~OHostAddress();
		90	*/
90	};	91	};
@@ -122,5 +123,5 @@ class OPrivateIOCTL : public QObject
122		123
123	/* dump bytes */
124
125	void dumpBytes( const unsigned char* data, int num );	124	void dumpBytes( const unsigned char* data, int num );
		125	QString modeToString( int );
		126	int stringToMode( const QString& );
126		127


diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index a85a510..50c6679 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp
@@ -258,2 +258,3 @@ QString ONetworkInterface::ipV4Address() const
258	return "<unknown>";	258	return "<unknown>";
		259
259	}	260	}
@@ -476,3 +477,3 @@ bool OWirelessNetworkInterface::isAssociated() const
476	//FIXME: handle different modes	477	//FIXME: handle different modes
477	return associatedAP() != "44:44:44:44:44:44";	478	return !(associatedAP() == OMacAddress::unknown);
478	}	479	}
@@ -480,22 +481,8 @@ bool OWirelessNetworkInterface::isAssociated() const
480		481
481	QString OWirelessNetworkInterface::associatedAP() const	482	OMacAddress OWirelessNetworkInterface::associatedAP() const
482	{	483	{
483	//FIXME: use OMacAddress
484	QString mac;
485
486	if ( ioctl( SIOCGIWAP ) )	484	if ( ioctl( SIOCGIWAP ) )
487	{	485	return (const unsigned char*) &_ifr.ifr_hwaddr.sa_data[0];
488	mac.sprintf( "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
489	_ifr.ifr_hwaddr.sa_data[0]&0xff,
490	_ifr.ifr_hwaddr.sa_data[1]&0xff,
491	_ifr.ifr_hwaddr.sa_data[2]&0xff,
492	_ifr.ifr_hwaddr.sa_data[3]&0xff,
493	_ifr.ifr_hwaddr.sa_data[4]&0xff,
494	_ifr.ifr_hwaddr.sa_data[5]&0xff );
495	}
496	else	486	else
497	{	487	return OMacAddress::unknown;
498	mac = "<Unknown>";
499	}
500	return mac;
501	}	488	}
@@ -690,14 +677,3 @@ void OWirelessNetworkInterface::setMode( const QString& mode )
690	{	677	{
691	if ( mode == "auto" ) _iwr.u.mode = IW_MODE_AUTO;	678	_iwr.u.mode = stringToMode( mode );
692	else if ( mode == "adhoc" ) _iwr.u.mode = IW_MODE_ADHOC;
693	else if ( mode == "managed" ) _iwr.u.mode = IW_MODE_INFRA;
694	else if ( mode == "master" ) _iwr.u.mode = IW_MODE_MASTER;
695	else if ( mode == "repeater" ) _iwr.u.mode = IW_MODE_REPEAT;
696	else if ( mode == "secondary" ) _iwr.u.mode = IW_MODE_SECOND;
697	else if ( mode == "monitor" ) _iwr.u.mode = IW_MODE_MONITOR;
698	else
699	{
700	qDebug( "ONetwork: Warning! Invalid IEEE 802.11 mode '%s' specified.", (const char*) mode );
701	return;
702	}
703	wioctl( SIOCSIWMODE );	679	wioctl( SIOCSIWMODE );
@@ -712,13 +688,3 @@ QString OWirelessNetworkInterface::mode() const
712	}	688	}
713	switch ( _iwr.u.mode )	689	return modeToString( _iwr.u.mode );
714	{
715	case IW_MODE_AUTO: return "auto";
716	case IW_MODE_ADHOC: return "adhoc";
717	case IW_MODE_INFRA: return "managed";
718	case IW_MODE_MASTER: return "master";
719	case IW_MODE_REPEAT: return "repeater";
720	case IW_MODE_SECOND: return "secondary";
721	case IW_MODE_MONITOR: return "monitor";
722	default: assert( 0 ); // shouldn't happen
723	}
724	}	690	}
@@ -832,3 +798,3 @@ void OWirelessNetworkInterface::setSSID( const QString& ssid )
832		798
833	int OWirelessNetworkInterface::scanNetwork()	799	OStationList* OWirelessNetworkInterface::scanNetwork()
834	{	800	{
@@ -838,5 +804,7 @@ int OWirelessNetworkInterface::scanNetwork()
838	{	804	{
839	return -1;	805	return 0;
840	}	806	}
841		807
		808	OStationList* stations = new OStationList();
		809
842	int timeout = 1000000;	810	int timeout = 1000000;
@@ -888,3 +856,3 @@ int OWirelessNetworkInterface::scanNetwork()
888	qDebug( " - no results (empty neighbourhood)" );	856	qDebug( " - no results (empty neighbourhood)" );
889	return 0;	857	return stations;
890	}	858	}
@@ -894,4 +862,2 @@ int OWirelessNetworkInterface::scanNetwork()
894		862
895	int stations = 0;
896
897	// parse results	863	// parse results
@@ -908,6 +874,27 @@ int OWirelessNetworkInterface::scanNetwork()
908	{	874	{
909	case SIOCGIWAP: qDebug( "SIOCGIWAP" ); stations++; break;	875	case SIOCGIWAP:
910	case SIOCGIWMODE: qDebug( "SIOCGIWMODE" ); break;	876	{
911	case SIOCGIWFREQ: qDebug( "SIOCGIWFREQ" ); break;	877	qDebug( "SIOCGIWAP" );
912	case SIOCGIWESSID: qDebug( "SIOCGIWESSID" ); break;	878	stations->append( new OStation() );
		879	stations->last()->macAddress = (const unsigned char*) &we->u.ap_addr.sa_data[0];
		880	break;
		881	}
		882	case SIOCGIWMODE:
		883	{
		884	qDebug( "SIOCGIWMODE" );
		885	stations->last()->type = modeToString( we->u.mode );
		886	break;
		887	}
		888	case SIOCGIWFREQ:
		889	{
		890	qDebug( "SIOCGIWFREQ" );
		891	stations->last()->channel = _channels[ static_cast<int>(double( we->u.freq.m ) * pow( 10.0, we->u.freq.e ) / 1000000) ];
		892	break;
		893	}
		894	case SIOCGIWESSID:
		895	{
		896	qDebug( "SIOCGIWESSID" );
		897	stations->last()->ssid = we->u.essid.pointer;
		898	break;
		899	}
913	case SIOCGIWSENS: qDebug( "SIOCGIWSENS" ); break;	900	case SIOCGIWSENS: qDebug( "SIOCGIWSENS" ); break;
@@ -926,2 +913,4 @@ int OWirelessNetworkInterface::scanNetwork()
926		913
		914	return stations;
		915
927	}	916	}
@@ -930,3 +919,3 @@ int OWirelessNetworkInterface::scanNetwork()
930	qDebug( " - no results (timeout) :(" );	919	qDebug( " - no results (timeout) :(" );
931	return 0;	920	return stations;
932	}	921	}


diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index e1545dd..0eb4542 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h
@@ -41,2 +41,3 @@
41	#include <opie2/onetutils.h>	41	#include <opie2/onetutils.h>
		42	#include <opie2/ostation.h>
42		43
@@ -408,3 +409,3 @@ class OWirelessNetworkInterface : public ONetworkInterface
408	*/	409	*/
409	virtual QString associatedAP() const;	410	virtual OMacAddress associatedAP() const;
410	/**	411	/**
@@ -422,3 +423,3 @@ class OWirelessNetworkInterface : public ONetworkInterface
422	*/	423	*/
423	virtual int scanNetwork();	424	virtual OStationList* scanNetwork();
424		425


diff --git a/libopie2/opienet/ostation.cpp b/libopie2/opienet/ostation.cpp index 3817b31..ba1e4f6 100644 --- a/libopie2/opienet/ostation.cpp +++ b/libopie2/opienet/ostation.cpp
@@ -40,2 +40,9 @@ OStation::OStation()
40	qDebug( "OStation::OStation()" );	40	qDebug( "OStation::OStation()" );
		41
		42	type = "<unknown>";
		43	macAddress = OMacAddress::unknown;
		44	ssid = "<unknown>";
		45	channel = 0;
		46	apAddress = OMacAddress::unknown;
		47
41	}	48	}
@@ -49 +56,9 @@ OStation::~OStation()
49		56
		57	void OStation::dump()
		58	{
		59	qDebug( "------- OStation::dump() ------------" );
		60	qDebug( "type: %s", (const char*) type );
		61	qDebug( "mac: %s", (const char*) macAddress.toString() );
		62	qDebug( "ap: %s", (const char*) apAddress.toString() );
		63	qDebug( "ip: %s", (const char*) ipAddress.toString() );
		64	}


diff --git a/libopie2/opienet/ostation.h b/libopie2/opienet/ostation.h index f61570b..a6956c9 100644 --- a/libopie2/opienet/ostation.h +++ b/libopie2/opienet/ostation.h
@@ -36,4 +36,3 @@
36		36
37	#include <qdict.h>	37	#include <qlist.h>
38	#include <qmap.h>
39	#include <qstring.h>	38	#include <qstring.h>
@@ -46,3 +45,3 @@ class OStation;
46		45
47	typedef QDict<OStation> OStationDict;	46	typedef QList<OStation> OStationList;
48		47
@@ -58,9 +57,17 @@ class OStation
58		57
59	private:	58	void dump();
		59
		60	/* Ethernet */
		61	QString type;
60	OMacAddress macAddress;	62	OMacAddress macAddress;
61	QHostAddress ipAddress;	63	QHostAddress ipAddress;
		64
		65	/* WaveLan */
62	QString ssid;	66	QString ssid;
63	QString type;	67	OMacAddress apAddress;
		68	int channel;
		69	bool encrypted;
64	};	70	};
65		71
		72
66	#endif // OSTATION_H	73	#endif // OSTATION_H