summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2002-12-29 17:28:26 (UTC)
committer mickeyl <mickeyl>2002-12-29 17:28:26 (UTC)
commite829097195e5c4b07c79ba22e168d3ae3ded4489 (patch) (unidiff)
tree166cf184a01806be74f9b3c61c94d9109daf2afc
parent8f6559d4be4e0b1857c4ae5cdbf1ad8b485b638b (diff)
downloadopie-e829097195e5c4b07c79ba22e168d3ae3ded4489.zip
opie-e829097195e5c4b07c79ba22e168d3ae3ded4489.tar.gz
opie-e829097195e5c4b07c79ba22e168d3ae3ded4489.tar.bz2
added a manufacturer database class
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/gui-x11.pro4
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro4
-rw-r--r--noncore/net/wellenreiter/gui/manufacturers.cpp58
-rw-r--r--noncore/net/wellenreiter/gui/manufacturers.h37
-rw-r--r--noncore/net/wellenreiter/gui/scanlistitem.h22
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp16
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h5
7 files changed, 141 insertions, 5 deletions
diff --git a/noncore/net/wellenreiter/gui/gui-x11.pro b/noncore/net/wellenreiter/gui/gui-x11.pro
index 523bf15..c2a4394 100644
--- a/noncore/net/wellenreiter/gui/gui-x11.pro
+++ b/noncore/net/wellenreiter/gui/gui-x11.pro
@@ -1,10 +1,10 @@
1DESTDIR = . 1DESTDIR = .
2TEMPLATE = app 2TEMPLATE = app
3CONFIG = qt warn_on debug 3CONFIG = qt warn_on debug
4#CONFIG = qt warn_on release 4#CONFIG = qt warn_on release
5HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h wlan.h cardconfig.h 5HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h wlan.h cardconfig.h manufacturers.h
6SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp resource.cpp wlan.cpp cardconfig.cpp 6SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp resource.cpp wlan.cpp cardconfig.cpp manufacturers.cpp
7INCLUDEPATH += ../ 7INCLUDEPATH += ../
8DEPENDPATH += ../ 8DEPENDPATH += ../
9LIBS += -L. -lwellenreiter 9LIBS += -L. -lwellenreiter
10INTERFACES = configbase.ui 10INTERFACES = configbase.ui
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index ce1c387..52ed8c6 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,10 +1,10 @@
1DESTDIR = $(OPIEDIR)/bin 1DESTDIR = $(OPIEDIR)/bin
2TEMPLATE = app 2TEMPLATE = app
3CONFIG = qt warn_on debug 3CONFIG = qt warn_on debug
4#CONFIG = qt warn_on release 4#CONFIG = qt warn_on release
5HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h wlan.h cardconfig.h 5HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h wlan.h cardconfig.h manufacturers.h
6SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp wlan.cpp cardconfig.cpp 6SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp wlan.cpp cardconfig.cpp manufacturers.h
7INCLUDEPATH += $(OPIEDIR)/include ../ 7INCLUDEPATH += $(OPIEDIR)/include ../
8DEPENDPATH += $(OPIEDIR)/include ../ 8DEPENDPATH += $(OPIEDIR)/include ../
9LIBS += -lqpe -lopie -L. -lwellenreiter 9LIBS += -lqpe -lopie -L. -lwellenreiter
10INTERFACES = configbase.ui 10INTERFACES = configbase.ui
diff --git a/noncore/net/wellenreiter/gui/manufacturers.cpp b/noncore/net/wellenreiter/gui/manufacturers.cpp
new file mode 100644
index 0000000..d235989
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/manufacturers.cpp
@@ -0,0 +1,58 @@
1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
3**
4** This file is part of Opie Environment.
5**
6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file.
10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13**
14**********************************************************************/
15
16#include "manufacturers.h"
17
18// Qt
19#include <qstring.h>
20#include <qfile.h>
21#include <qtextstream.h>
22
23ManufacturerDB::ManufacturerDB( const QString& filename )
24{
25 QFile file( filename );
26 bool hasFile = file.open( IO_ReadOnly );
27 if (!hasFile)
28 {
29 qDebug( "ManufacturerDB: D'oh! Manufacturer list '%s' not found!", (const char*) filename );
30 }
31 else
32 {
33 qDebug( "ManufacturerDB: reading manufacturer list from '%s'...", (const char*) filename );
34 QTextStream s( &file );
35 QString addr;
36 QString manu;
37
38 while (!s.atEnd())
39 {
40 s >> addr;
41 s.skipWhiteSpace();
42 manu = s.readLine();
43 qDebug( "ManufacturerDB: read pair %s, %s", (const char*) addr, (const char*) manu );
44 manufacturers.insert( addr, manu );
45
46 }
47 }
48
49}
50
51ManufacturerDB::~ManufacturerDB()
52{
53}
54
55QString ManufacturerDB::lookup( const QString& macaddr )
56{
57 return manufacturers[macaddr.upper().left(8)];
58}
diff --git a/noncore/net/wellenreiter/gui/manufacturers.h b/noncore/net/wellenreiter/gui/manufacturers.h
new file mode 100644
index 0000000..d69977a
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/manufacturers.h
@@ -0,0 +1,37 @@
1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
3**
4** This file is part of Opie Environment.
5**
6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file.
10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13**
14**********************************************************************/
15
16#ifndef MANUFACTURERS_H
17#define MANUFACTURERS_H
18
19#include <qmap.h>
20#include <string.h>
21
22class ManufacturerDB
23{
24 public:
25
26 ManufacturerDB( const QString& filename );
27 virtual ~ManufacturerDB();
28 QString lookup( const QString& macaddr );
29
30 private:
31
32 QMap<QString, QString> manufacturers;
33
34};
35
36#endif
37
diff --git a/noncore/net/wellenreiter/gui/scanlistitem.h b/noncore/net/wellenreiter/gui/scanlistitem.h
index cd9d883..47a5a4e 100644
--- a/noncore/net/wellenreiter/gui/scanlistitem.h
+++ b/noncore/net/wellenreiter/gui/scanlistitem.h
@@ -48,8 +48,30 @@ class MScanListItem: public QListViewItem
48 public: 48 public:
49 49
50 QString type; 50 QString type;
51 51
52 public:
53
54 //const QString& type() { return _type; };
55 const QString& essid() { return _essid; };
56 const QString& macaddr() { return _macaddr; };
57 bool wep() { return _wep; };
58 int channel() { return _channel; };
59 int signal() { return _signal; };
60 int received() { return _received; };
61
62 void setSignal( int signal ) { /* TODO */ };
63 void incReceived() { _received++; };
64
65 private:
66 QString _type;
67 QString _essid;
68 QString _macaddr;
69 bool _wep;
70 int _channel;
71 int _signal;
72 int _received;
73
52}; 74};
53 75
54#endif 76#endif
55 77
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 2d9bbee..9068e3a 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -52,16 +52,30 @@ using namespace Opie;
52#include "logwindow.h" 52#include "logwindow.h"
53#include "hexwindow.h" 53#include "hexwindow.h"
54#include "configwindow.h" 54#include "configwindow.h"
55 55
56#include "manufacturers.h"
57
56#include <libwellenreiter/source/wl_sock.hh> 58#include <libwellenreiter/source/wl_sock.hh>
57#include <libwellenreiter/source/wl_proto.hh> 59#include <libwellenreiter/source/wl_proto.hh>
58#include <daemon/source/config.hh> 60#include <daemon/source/config.hh>
59 61
60Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) 62Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
61 : WellenreiterBase( parent, name, fl ), daemonRunning( false ) 63 : WellenreiterBase( parent, name, fl ), daemonRunning( false )
62{ 64{
63 65
66 //
67 // construct manufacturer database
68 //
69
70 QString manufile;
71 #ifdef QWS
72 manufile.sprintf( "%s/share/wellenreiter/manufacturers.dat", (const char*) qApp.qpeDir() );
73 #else
74 manufile.sprintf( "/home/mickey/work/opie/share/wellenreiter/manufacturers.dat" );
75 #endif
76 manufacturerdb = new ManufacturerDB( manufile );
77
64 logwindow->log( "(i) Wellenreiter has been started." ); 78 logwindow->log( "(i) Wellenreiter has been started." );
65 79
66 // 80 //
67 // detect operating system 81 // detect operating system
@@ -102,8 +116,10 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
102 116
103Wellenreiter::~Wellenreiter() 117Wellenreiter::~Wellenreiter()
104{ 118{
105 // no need to delete child widgets, Qt does it all for us 119 // no need to delete child widgets, Qt does it all for us
120
121 delete manufacturerdb;
106} 122}
107 123
108void Wellenreiter::handleMessage() 124void Wellenreiter::handleMessage()
109{ 125{
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index 2296892..9715983 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -24,8 +24,9 @@ using namespace Opie;
24#endif 24#endif
25 25
26class QTimerEvent; 26class QTimerEvent;
27class QPixmap; 27class QPixmap;
28class ManufacturerDB;
28 29
29class Wellenreiter : public WellenreiterBase { 30class Wellenreiter : public WellenreiterBase {
30 Q_OBJECT 31 Q_OBJECT
31 32
@@ -47,9 +48,11 @@ private:
47 #ifdef QWS 48 #ifdef QWS
48 OSystem _system; // Opie Operating System identifier 49 OSystem _system; // Opie Operating System identifier
49 #endif 50 #endif
50 void handleMessage(); 51 void handleMessage();
51 52
53 ManufacturerDB* manufacturerdb;
54
52 //void readConfig(); 55 //void readConfig();
53 //void writeConfig(); 56 //void writeConfig();
54}; 57};
55 58