author | mickeyl <mickeyl> | 2005-05-10 17:27:42 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-05-10 17:27:42 (UTC) |
commit | 7ef3deff5f0023f0e73ad805b13cbd2b12bc1395 (patch) (unidiff) | |
tree | 17e209a557b79fd47a82301dae8982a3d16a4cdf | |
parent | e31f22952f47aeb54b206349f1e469704a6a6e8f (diff) | |
download | opie-7ef3deff5f0023f0e73ad805b13cbd2b12bc1395.zip opie-7ef3deff5f0023f0e73ad805b13cbd2b12bc1395.tar.gz opie-7ef3deff5f0023f0e73ad805b13cbd2b12bc1395.tar.bz2 |
Remove joining networks from Wellenreiter. It never really fit into the
philosophy of this application and with OpieStumbler there is an application
that does it better (active scan).
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 11 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.h | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 39 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/wellenreiter.pro | 2 |
7 files changed, 5 insertions, 53 deletions
@@ -1,16 +1,17 @@ | |||
1 | 2005-??-??Opie 1.2.1 | 1 | 2005-??-??Opie 1.2.1 |
2 | 2 | ||
3 | 3 | ||
4 | New Features | 4 | New Features |
5 | ------------ | 5 | ------------ |
6 | * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker) | 6 | * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker) |
7 | * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly) | 7 | * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly) |
8 | * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer) | 8 | * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer) |
9 | * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl) | ||
9 | 10 | ||
10 | Fixed Bugs | 11 | Fixed Bugs |
11 | ---------- | 12 | ---------- |
12 | * #1476 - Wrong order of application entries in the O-menu (skyhusker) | 13 | * #1476 - Wrong order of application entries in the O-menu (skyhusker) |
13 | * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) | 14 | * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) |
14 | * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller) | 15 | * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller) |
15 | * #1614 - Make Opie-console start in $HOME instead of / (skyhusker) | 16 | * #1614 - Make Opie-console start in $HOME instead of / (skyhusker) |
16 | * n.a.- always show volume and wireless applet popups inside visible screen (deller) | 17 | * n.a.- always show volume and wireless applet popups inside visible screen (deller) |
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index faedd1b..544c2af 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro | |||
@@ -28,17 +28,17 @@ SOURCES = main.cpp \ | |||
28 | packetview.cpp \ | 28 | packetview.cpp \ |
29 | protolistview.cpp \ | 29 | protolistview.cpp \ |
30 | gps.cpp | 30 | gps.cpp |
31 | 31 | ||
32 | INCLUDEPATH += $(OPIEDIR)/include | 32 | INCLUDEPATH += $(OPIEDIR)/include |
33 | DEPENDPATH += $(OPIEDIR)/include | 33 | DEPENDPATH += $(OPIEDIR)/include |
34 | INTERFACES = configbase.ui | 34 | INTERFACES = configbase.ui |
35 | TARGET = wellenreiter | 35 | TARGET = wellenreiter |
36 | VERSION = 1.0.5 | 36 | VERSION = 1.0.6 |
37 | 37 | ||
38 | DEFINES += WELLENREITER_VERSION='"$$VERSION (GPL) Opie"' | 38 | DEFINES += WELLENREITER_VERSION='"$$VERSION (GPL) Opie"' |
39 | 39 | ||
40 | !contains( platform, x11 ) { | 40 | !contains( platform, x11 ) { |
41 | message( qws ) | 41 | message( qws ) |
42 | include( $(OPIEDIR)/include.pro ) | 42 | include( $(OPIEDIR)/include.pro ) |
43 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2 | 43 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2 |
44 | } | 44 | } |
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index f24e09f..587faad 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -397,26 +397,19 @@ void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, in | |||
397 | { | 397 | { |
398 | if ( !item ) return; | 398 | if ( !item ) return; |
399 | 399 | ||
400 | MScanListItem* itm = static_cast<MScanListItem*>( item ); | 400 | MScanListItem* itm = static_cast<MScanListItem*>( item ); |
401 | 401 | ||
402 | odebug << "contextMenuRequested on item '" << itm->text(0) << "' (" | 402 | odebug << "contextMenuRequested on item '" << itm->text(0) << "' (" |
403 | << itm->type << ") in column: '" << col << "'" << oendl; | 403 | << itm->type << ") in column: '" << col << "'" << oendl; |
404 | 404 | ||
405 | if ( itm->type == "adhoc" || itm->type == "managed" ) | 405 | /* do something meaningful */ |
406 | { | ||
407 | QString entry = QString( "&Join %1 Net '%2'..." ).arg( itm->type ).arg( itm->essid() ); | ||
408 | 406 | ||
409 | QPopupMenu m( this ); | 407 | return; |
410 | m.insertItem( entry, 37773, 0 ); | ||
411 | int result = m.exec( QCursor::pos() ); | ||
412 | if ( result == 37773 ) | ||
413 | emit joinNetwork( itm->type, itm->essid(), itm->channel(), itm->macaddr() ); | ||
414 | } | ||
415 | } | 408 | } |
416 | 409 | ||
417 | //============================================================ | 410 | //============================================================ |
418 | // MScanListItem | 411 | // MScanListItem |
419 | //============================================================ | 412 | //============================================================ |
420 | 413 | ||
421 | MScanListItem::MScanListItem( QListView* parent, const QString& type, const QString& essid, const QString& macaddr, | 414 | MScanListItem::MScanListItem( QListView* parent, const QString& type, const QString& essid, const QString& macaddr, |
422 | bool wep, int channel, int signal, bool probed ) | 415 | bool wep, int channel, int signal, bool probed ) |
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index 8b3814a..eec51af 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h | |||
@@ -50,17 +50,16 @@ class MScanListView: public Opie::Ui::OListView | |||
50 | void IBSStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via ); | 50 | void IBSStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via ); |
51 | 51 | ||
52 | void identify( const Opie::Net::OMacAddress&, const QString& ipaddr ); | 52 | void identify( const Opie::Net::OMacAddress&, const QString& ipaddr ); |
53 | 53 | ||
54 | void contextMenuRequested( QListViewItem* item, const QPoint&, int ); | 54 | void contextMenuRequested( QListViewItem* item, const QPoint&, int ); |
55 | 55 | ||
56 | signals: | 56 | signals: |
57 | void rightButtonClicked(QListViewItem*,const QPoint&,int); | 57 | void rightButtonClicked(QListViewItem*,const QPoint&,int); |
58 | void joinNetwork( const QString&, const QString&, int, const QString& ); | ||
59 | 58 | ||
60 | protected: | 59 | protected: |
61 | void addIfNotExisting( MScanListItem* parent, const Opie::Net::OMacAddress& addr, const QString& type = "station" ); | 60 | void addIfNotExisting( MScanListItem* parent, const Opie::Net::OMacAddress& addr, const QString& type = "station" ); |
62 | 61 | ||
63 | }; | 62 | }; |
64 | 63 | ||
65 | //****************************** MScanListItem **************************************************************** | 64 | //****************************** MScanListItem **************************************************************** |
66 | 65 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 8cabf0d..c4e6f02 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -77,18 +77,16 @@ Wellenreiter::Wellenreiter( QWidget* parent ) | |||
77 | 77 | ||
78 | #ifdef QWS | 78 | #ifdef QWS |
79 | QString sys = QString( "(i) Running on '%1'.").arg( ODevice::inst()->systemString() ); | 79 | QString sys = QString( "(i) Running on '%1'.").arg( ODevice::inst()->systemString() ); |
80 | _system = ODevice::inst()->system(); | 80 | _system = ODevice::inst()->system(); |
81 | logwindow->log( sys ); | 81 | logwindow->log( sys ); |
82 | #endif | 82 | #endif |
83 | 83 | ||
84 | netview->setColumnWidthMode( 1, QListView::Manual ); | 84 | netview->setColumnWidthMode( 1, QListView::Manual ); |
85 | connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ), | ||
86 | this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) ); | ||
87 | pcap = new OPacketCapturer(); | 85 | pcap = new OPacketCapturer(); |
88 | pcap->setAutoDelete( false ); | 86 | pcap->setAutoDelete( false ); |
89 | 87 | ||
90 | gps = new GPS( this ); | 88 | gps = new GPS( this ); |
91 | 89 | ||
92 | QTimer::singleShot( 1000, this, SLOT( initialTimer() ) ); | 90 | QTimer::singleShot( 1000, this, SLOT( initialTimer() ) ); |
93 | 91 | ||
94 | registerSignalHandler(); | 92 | registerSignalHandler(); |
@@ -723,53 +721,16 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa | |||
723 | else if ( action == "MessageBox" ) | 721 | else if ( action == "MessageBox" ) |
724 | QMessageBox::information( this, "Notification!", | 722 | QMessageBox::information( this, "Notification!", |
725 | QString(tr( "Got packet with protocol '%1'", "Protocol Name" ) ).arg( protocol ) ); | 723 | QString(tr( "Got packet with protocol '%1'", "Protocol Name" ) ).arg( protocol ) ); |
726 | #else | 724 | #else |
727 | #warning Actions do not work with Qt/X11 yet | 725 | #warning Actions do not work with Qt/X11 yet |
728 | #endif | 726 | #endif |
729 | } | 727 | } |
730 | 728 | ||
731 | void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int channel, const QString& macaddr) | ||
732 | { | ||
733 | #ifdef QWS | ||
734 | if ( !iface ) | ||
735 | { | ||
736 | QMessageBox::warning( this, tr( "Can't do that!" ), tr( "No wireless\ninterface available." ) ); | ||
737 | return; | ||
738 | } | ||
739 | |||
740 | if ( sniffing ) | ||
741 | { | ||
742 | QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Stop sniffing before\njoining a net." ) ); | ||
743 | return; | ||
744 | } | ||
745 | |||
746 | odebug << "joinNetwork() with Interface " << iface->name() | ||
747 | << ": " << type << ", " << essid | ||
748 | << ", " << channel << ", " << macaddr << oendl; | ||
749 | |||
750 | QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" ); | ||
751 | int count = 3; | ||
752 | odebug << "sending " << count << " messages" << oendl; | ||
753 | msg << QString("count") << QString::number(count); | ||
754 | odebug << "msg >" << iface->name() << "< Mode >" << type.latin1() << "<" << oendl; | ||
755 | msg << QString(iface->name()) << QString("Mode") << type; | ||
756 | odebug << "msg >" << iface->name() << "< essid >" << essid.latin1() << "<" << oendl; | ||
757 | msg << QString(iface->name()) << QString("ESSID") << essid; | ||
758 | odebug << "msg >" << iface->name() << "< channel >" << channel << "<" << oendl; | ||
759 | msg << QString(iface->name()) << QString("Channel") << channel; | ||
760 | // odebug << "msg >" << iface->name() << "< mac >" << macaddr << "<" << oendl; | ||
761 | // msg << QString(iface->name()) << QString("MacAddr") << macaddr; | ||
762 | #else | ||
763 | QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Function only available on Embedded build" ) ); | ||
764 | #endif | ||
765 | |||
766 | } | ||
767 | |||
768 | void Wellenreiter::updateStatistics() | 729 | void Wellenreiter::updateStatistics() |
769 | { | 730 | { |
770 | // print out statistics | 731 | // print out statistics |
771 | for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it ) | 732 | for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it ) |
772 | statwindow->updateCounter( it.key(), it.data() ); | 733 | statwindow->updateCounter( it.key(), it.data() ); |
773 | } | 734 | } |
774 | 735 | ||
775 | void Wellenreiter::slotTabChanged( QWidget* wid ) | 736 | void Wellenreiter::slotTabChanged( QWidget* wid ) |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index 5ac389e..1c9633d 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h | |||
@@ -66,18 +66,16 @@ class Wellenreiter : public WellenreiterBase { | |||
66 | public slots: | 66 | public slots: |
67 | void initialTimer(); | 67 | void initialTimer(); |
68 | 68 | ||
69 | void channelHopped(int); | 69 | void channelHopped(int); |
70 | void receivePacket(Opie::Net::OPacket*); | 70 | void receivePacket(Opie::Net::OPacket*); |
71 | void startClicked(); | 71 | void startClicked(); |
72 | void stopClicked(); | 72 | void stopClicked(); |
73 | 73 | ||
74 | void joinNetwork(const QString&,const QString&,int,const QString&); | ||
75 | |||
76 | signals: | 74 | signals: |
77 | void startedSniffing(); | 75 | void startedSniffing(); |
78 | void stoppedSniffing(); | 76 | void stoppedSniffing(); |
79 | 77 | ||
80 | private: | 78 | private: |
81 | void handleManagementFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); | 79 | void handleManagementFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); |
82 | void handleManagementFrameBeacon( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); | 80 | void handleManagementFrameBeacon( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); |
83 | void handleManagementFrameProbeRequest( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); | 81 | void handleManagementFrameProbeRequest( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); |
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro index e995db9..673868f 100644 --- a/noncore/net/wellenreiter/wellenreiter.pro +++ b/noncore/net/wellenreiter/wellenreiter.pro | |||
@@ -1,10 +1,10 @@ | |||
1 | TEMPLATE = subdirs | 1 | TEMPLATE = subdirs |
2 | VERSION = 1.0.3-cvs | 2 | VERSION = 1.0.5-cvs |
3 | 3 | ||
4 | !contains( platform, x11 ) { | 4 | !contains( platform, x11 ) { |
5 | message( Configuring Wellenreiter for build on Opie ) | 5 | message( Configuring Wellenreiter for build on Opie ) |
6 | SUBDIRS = gui | 6 | SUBDIRS = gui |
7 | include( $(OPIEDIR)/include.pro ) | 7 | include( $(OPIEDIR)/include.pro ) |
8 | } | 8 | } |
9 | 9 | ||
10 | contains( platform, x11 ) { | 10 | contains( platform, x11 ) { |