summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-16 17:48:03 (UTC)
committer mickeyl <mickeyl>2005-05-16 17:48:03 (UTC)
commitd2426de3452342ab4af8e95214b9ff408f30744e (patch) (side-by-side diff)
tree41eb23ab226a83778112aaf6d14ab3e8fc5dc896
parenta0276f0957bd503491e8d435b7ad1a6479ce24eb (diff)
downloadopie-d2426de3452342ab4af8e95214b9ff408f30744e.zip
opie-d2426de3452342ab4af8e95214b9ff408f30744e.tar.gz
opie-d2426de3452342ab4af8e95214b9ff408f30744e.tar.bz2
- add ONetworkInterfaceDriverInfo block extracting info using ethtool ioctls
- adjust example
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--examples/opienet/onetworkdemo/onetworkdemo.cpp5
-rw-r--r--libopie2/opienet/onetutils.h26
-rw-r--r--libopie2/opienet/onetwork.cpp31
-rw-r--r--libopie2/opienet/onetwork.h7
-rw-r--r--libopie2/opienet/opienet.pro2
5 files changed, 60 insertions, 11 deletions
diff --git a/examples/opienet/onetworkdemo/onetworkdemo.cpp b/examples/opienet/onetworkdemo/onetworkdemo.cpp
index e0c93a2..b3a1115 100644
--- a/examples/opienet/onetworkdemo/onetworkdemo.cpp
+++ b/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -48,6 +48,11 @@ int main( int argc, char** argv )
while ( it.current() )
{
odebug << "DEMO: ONetwork contains Interface '" << it.current()->name() << "'" << oendl;
+ ONetworkInterfaceDriverInfo info = it.current()->driverInfo();
+ odebug << "DEMO: DriverName reported as '" << info.name() << "'" << oendl;
+ odebug << "DEMO: DriverVersion reported as '" << info.version() << "'" << oendl;
+ odebug << "DEMO: DriverFirmware reported as '" << info.firmware() << "'" << oendl;
+ odebug << "DEMO: DriverBus reported as '" << info.bus() << "'" << oendl;
odebug << "DEMO: Datalink code is '" << it.current()->dataLinkType() << "'" << oendl;
odebug << "DEMO: MAC Address is '" << it.current()->macAddress().toString() << "'" << oendl;
odebug << "DEMO: MAC Address is '" << it.current()->macAddress().toString(true) << "'" << oendl;
diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h
index 32f5355..25c9238 100644
--- a/libopie2/opienet/onetutils.h
+++ b/libopie2/opienet/onetutils.h
@@ -100,6 +100,32 @@ class OHostAddress : public QHostAddress
/*======================================================================================
+ * ONetworkInterfaceDriverInfo
+ *======================================================================================*/
+
+class ONetworkInterfaceDriverInfo
+{
+ public:
+ ONetworkInterfaceDriverInfo( const QString& name = "<unknown>",
+ const QString& version = "<unknown>",
+ const QString& firmware = "<unknown>",
+ const QString& bus = "<unknown>" ) :
+ _name( name ), _version( version ), _firmware( firmware ), _bus( bus ) { };
+ ~ONetworkInterfaceDriverInfo() { };
+
+ QString name() const { return _name; };
+ QString version() const { return _version; };
+ QString firmware() const { return _firmware; };
+ QString bus() const { return _bus; };
+
+ private:
+ const QString _name;
+ const QString _version;
+ const QString _firmware;
+ const QString _bus;
+};
+
+/*======================================================================================
* OPrivateIOCTL
*======================================================================================*/
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 05513f8..1deb051 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -29,38 +29,40 @@
*/
/* OPIE */
-
#include <opie2/onetwork.h>
#include <opie2/ostation.h>
#include <opie2/odebug.h>
+using namespace Opie::Core;
/* QT */
-
#include <qfile.h>
#include <qtextstream.h>
#include <qapplication.h>
-/* UNIX */
-
+/* STD */
#include <assert.h>
#include <arpa/inet.h>
#include <errno.h>
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include <math.h>
+#include <unistd.h>
+#include <net/if_arp.h>
+#include <net/ethernet.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/types.h>
-#include <unistd.h>
+#include <linux/types.h>
#include <linux/sockios.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <stdarg.h>
+#define u64 __u64
+#define u32 __u32
+#define u16 __u16
+#define u8 __u8
+#include <linux/ethtool.h>
#ifndef NODEBUG
#include <opie2/odebugmapper.h>
-
-using namespace Opie::Core;
using namespace Opie::Net::Internal;
DebugMapper* debugmapper = new DebugMapper();
#endif
@@ -381,6 +383,14 @@ bool ONetworkInterface::isWireless() const
}
+ONetworkInterfaceDriverInfo ONetworkInterface::driverInfo() const
+{
+ struct ethtool_drvinfo info;
+ info.cmd = ETHTOOL_GDRVINFO;
+ _ifr.ifr_data = (caddr_t) &info;
+ return ioctl( SIOCETHTOOL ) ? ONetworkInterfaceDriverInfo( info.driver, info.version, info.fw_version, info.bus_info) : ONetworkInterfaceDriverInfo();
+}
+
/*======================================================================================
* OChannelHopper
*======================================================================================*/
@@ -405,6 +415,7 @@ OChannelHopper::OChannelHopper( OWirelessNetworkInterface* iface )
if ( _maxChannel >= 11 ) _channels.append( 11 );
if ( _maxChannel >= 6 ) _channels.append( 6 );
if ( _maxChannel >= 12 ) _channels.append( 12 );
+ //FIXME: Add 802.11a/g channels
_channel = _channels.begin();
}
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index fa9f39f..f0c4450 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -202,6 +202,7 @@ class ONetworkInterface : public QObject
/**
* Associate the MAC address @a addr with the interface.
* @note It can be necessary to shut down the interface prior to calling this method.
+ * @note This operation needs root privileges
* @warning This is not supported by all drivers.
*/
void setMacAddress( const OMacAddress& addr );
@@ -222,6 +223,12 @@ class ONetworkInterface : public QObject
* @see #include <net/if_arp.h> for possible values.
*/
int dataLinkType() const;
+ /**
+ * @returns a ONetworkInterfaceDriverInfo driver information block
+ * @note This operation needs root privileges
+ * @warning This is not supported by all drivers
+ */
+ ONetworkInterfaceDriverInfo driverInfo() const;
protected:
const int _sfd;
diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro
index 460de0a..854e5ff 100644
--- a/libopie2/opienet/opienet.pro
+++ b/libopie2/opienet/opienet.pro
@@ -18,7 +18,7 @@ SOURCES = odebugmapper.cpp \
ostation.cpp
INTERFACES =
TARGET = opienet2
-VERSION = 1.8.6
+VERSION = 1.8.7
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lpcap