GUI used wrong comm port.

1 files changed, 14 insertions, 10 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 02a6f76..693f20d 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -39,17 +39,17 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
     netview->setColumnWidthMode( 1, QListView::Manual );
 
     //
     // setup socket for daemon communication and start poller
     //
 
-    daemon_fd = commsock( DAEMONADDR, DAEMONPORT );
+    daemon_fd = commsock( GUIADDR, GUIPORT );
     if ( daemon_fd == -1 )
-        qDebug( "D'oh! Could not get file descriptor for daemon socket." );
-    else
-        startTimer( 700 );
+        qDebug( "D'oh! Could not get file descriptor for daemon-->gui communication socket." );
+    //else
+        //startTimer( 700 );
 
 }
 
 Wellenreiter::~Wellenreiter()
 {
     // no need to delete child widgets, Qt does it all for us
@@ -74,17 +74,17 @@ typedef struct {
   int wep;          1 = WEP enabled ; 0 = disabled
   char mac[64];     MAC address of Accesspoint
   char bssid[128];  BSSID of Accesspoint
 } wl_network_t;
 */
 
-    if ( result == 1 )  /* new network found */
+    if ( result == NETFOUND )  /* new network found */
     {
         qDebug( "Sniffer said: new network found." );
         wl_network_t n;
-        get_network_found( &n, (const char*) &buffer );
+        get_network_found( &n, (char*) &buffer );
         n.bssid[n.ssid_len] = "\0";
 
         QString type;
 
         if ( n.net_type == 1 )
             type == "managed";
@@ -118,21 +118,21 @@ bool Wellenreiter::hasMessage()
     int result = select( daemon_fd+1, &rfds, NULL, NULL, &tv );
     return FD_ISSET( daemon_fd, &rfds );
 }
 
 void Wellenreiter::timerEvent( QTimerEvent* e )
 {
-     qDebug( "checking for message..." );
+    //qDebug( "checking for message..." );
 
     if ( hasMessage() )
     {
         handleMessage();
     }
     else
     {
-        qDebug( "no message :(" );
+        //qDebug( "no message :(" );
     }
 }
 
 void Wellenreiter::addNewItem( QString type, QString essid, QString ap, bool wep, int channel, int signal )
 {
     // FIXME: this code belongs in customized QListView, not into this class
@@ -163,10 +163,14 @@ 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
 
-    addNewItem( "managed", "MyNet", "04:00:20:EF:A6:43", true, 6, 80 );
-    addNewItem( "adhoc", "YourNet", "40:03:A3:E7:56:22", false, 11, 30 );
+    addNewItem( "managed", "DummyNet", "04:00:20:EF:A6:43", true, 6, 80 );
+    addNewItem( "adhoc", "DummyNet", "40:03:A3:E7:56:22", false, 11, 30 );
+
+    QString command ("98");
+
+    sendcomm( DAEMONADDR, DAEMONPORT, (const char*) command );
 
 }