| -rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 57 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 9 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/Makefile | 2 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/wellenreiter.pro | 2 |
4 files changed, 66 insertions, 4 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 9364a75..96ab7bd 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -4,42 +4,97 @@ ** This file is part of Opie Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ***********************************************************************/ +// Qt + +#include <qpushbutton.h> + +// Standard + +#include <unistd.h> +#include <sys/types.h> + +// Local + #include "wellenreiter.h" #include "scanlistitem.h" -#include <qpushbutton.h> +#include "../libwellenreiter/source/sock.hh" // <--- ugly path, FIX THIS! +#include "../daemon/source/config.hh" // <--- ugly path, FIX THIS! Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) : WellenreiterBase( parent, name, fl ) { connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) ); + // + // setup socket for daemon communication and start poller + // + + daemon_fd = commsock( DAEMONADDR, DAEMONPORT ); + if ( daemon_fd == -1 ) + qDebug( "D'oh! Could not get file descriptor for daemon socket." ); + else + startTimer( 700 ); + } Wellenreiter::~Wellenreiter() { // no need to delete child widgets, Qt does it all for us } +void Wellenreiter::handleMessage() +{ + // FIXME: receive message and handle it + + qDebug( "received message from daemon." ); +} + + +bool Wellenreiter::hasMessage() +{ + fd_set rfds; + FD_ZERO( &rfds ); + FD_SET( daemon_fd, &rfds ); + struct timeval tv; + tv.tv_sec = 0; + tv.tv_usec = 0; + return select( 1, &rfds, NULL, NULL, &tv ); +} + +void Wellenreiter::timerEvent( QTimerEvent* e ) +{ + // qDebug( "checking for message..." ); + + if ( hasMessage() ) + { + handleMessage(); + } + else + { + // qDebug( "no message :(" ); + } +} + void Wellenreiter::buttonClicked() { // FIXME: communicate with daemon and set button text according to state button->setText( "Stop Scanning" ); // add some icons, so that we can see if this works new MScanListItem( netview, "managed", "MyNet", "04:00:20:EF:A6:43", true, 6, 80 ); new MScanListItem( netview, "adhoc", "YourNet", "40:03:A3:E7:56:22", false, 11, 30 ); diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index 7ba8b01..206f364 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h @@ -9,32 +9,39 @@ ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** **********************************************************************/ #ifndef WELLENREITER_H #define WELLENREITER_H #include "wellenreiterbase.h" +class QTimerEvent; + class Wellenreiter : public WellenreiterBase { Q_OBJECT public: Wellenreiter( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~Wellenreiter(); protected: - + virtual void timerEvent( QTimerEvent* ); public slots: void buttonClicked(); private: + int daemon_fd; // socket filedescriptor for udp communication socket + + bool hasMessage(); + void handleMessage(); + //void readConfig(); //void writeConfig(); }; #endif diff --git a/noncore/net/wellenreiter/libwellenreiter/source/Makefile b/noncore/net/wellenreiter/libwellenreiter/source/Makefile index ecae73c..05a5bd3 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/Makefile +++ b/noncore/net/wellenreiter/libwellenreiter/source/Makefile @@ -1,17 +1,17 @@ # $Id$ INCLUDES = LIBRARIES = -LIBOBJ = proto.o sock.o log.o +LIBOBJ = sock.o log.o CXX = g++ -Wall -pedantic -g $(INCLUDES) -DDEBUG static: libwellenreiter.a libwellenreiter.a: $(LIBOBJ) ar -cr libwellenreiter.a $(LIBOBJ) shared: libwellenreiter.so libwellenreiter.so: $(LIBOBJ) $(CXX) -shared -o libwellenreiter.so $(LIBOBJ) clean: rm -f *.o *.a *.so *~ diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro index 6b6276b..6f07ac4 100644 --- a/noncore/net/wellenreiter/wellenreiter.pro +++ b/noncore/net/wellenreiter/wellenreiter.pro @@ -1,11 +1,11 @@ DESTDIR = $(OPIEDIR)/bin TEMPLATE = app CONFIG = qt warn_on debug #CONFIG = qt warn_on release HEADERS = gui/mainwindowbase.h gui/wellenreiter.h gui/scanlistitem.h SOURCES = gui/main.cpp gui/wellenreiter.cpp gui/scanlistitem.cpp INCLUDEPATH += $(OPIEDIR)/include gui daemon DEPENDPATH += $(OPIEDIR)/include gui daemon -LIBS += -lqpe +LIBS += -lqpe -Llibwellenreiter/source -lwellenreiter INTERFACES = gui/wellenreiterbase.ui TARGET = wellenreiter |