- dhcp renew now really functions

- added dhcp renew support for udhcp

1 files changed, 44 insertions, 18 deletions

diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index 649cf20..fb9522a 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -53,5 +53,5 @@
 #define STYLE_ANTENNA 1
 
-//#define MDEBUG 0
+//#define MDEBUG
 #undef MDEBUG
 
@@ -63,10 +63,10 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
     writeConfigEntry( "UpdateFrequency", updateFrequency );
     writeConfigEntry( "DisplayStyle", displayStyle );
-    
-    setFrameStyle( QFrame::PopupPanel | QFrame::Raised );    
-    QGridLayout *grid = new QGridLayout( this, 3, 2, 6, 2, "top layout" );  
-    
+
+    setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
+    QGridLayout *grid = new QGridLayout( this, 3, 2, 6, 2, "top layout" );
+
     /* status label */
-    
+
     statusLabel = new QLabel( this, "statuslabel" );
     QString text( "Wireless Status:<br>"
@@ -85,5 +85,5 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
 
     /* visualization group box */
-    
+
     QButtonGroup* group = new QButtonGroup( 1, Qt::Horizontal, "Visualization", this );
     QRadioButton* r1 = new QRadioButton( "Color Bars", group );
@@ -96,5 +96,5 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
 
     /* quality graph */
-    
+
     mgraph = new MGraph( this );
     mgraph->setFrameStyle( QFrame::Panel | QFrame::Sunken );
@@ -103,7 +103,7 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
     grid->addWidget( mgraph, 1, 0 );
     mgraph->setFocusPolicy( QWidget::NoFocus );
-    
+
     /* advanced configuration Button */
-    
+
     QPushButton* advanced = new QPushButton( "Advanced...", this );
     advanced->setFocusPolicy( QWidget::NoFocus );
@@ -113,5 +113,5 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
 
     /* update Frequency Label */
-    
+
     updateLabel = new QLabel( this );
     text.sprintf( "Update every %d s", updateFrequency );
@@ -120,5 +120,5 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
 
     /* update Frequency Slider */
-    
+
     QSlider* updateSlider = new QSlider( QSlider::Horizontal, this );
     updateSlider->setRange( 0, 9 );
@@ -234,6 +234,6 @@ void WirelessApplet::checkInterface()
 #endif
         hide();
-    }   
-}    
+    }
+}
 
 void WirelessApplet::renewDHCP()
@@ -247,7 +247,10 @@ void WirelessApplet::renewDHCP()
         return;
     QString ifacename( interface->getName() );
+
+    // At first we are trying dhcpcd
+
     pidfile.sprintf( "/var/run/dhcpcd-%s.pid", (const char* ) ifacename );
 #ifdef MDEBUG
-    qDebug( "WIFIAPPLET: pidfile is '%s'", (const char*) pidfile );
+    qDebug( "WIFIAPPLET: dhcpcd pidfile is '%s'", (const char*) pidfile );
 #endif
     int pid;
@@ -256,11 +259,34 @@ void WirelessApplet::renewDHCP()
     QTextStream s( &pfile );
     if ( hasFile )
+    {
         s >> pid;
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: sent -14 to pid %d", pid );
+        qDebug( "WIFIAPPLET: sent SIGALARM to pid %d", pid );
 #endif
-        kill( pid, -14 );
+        kill( pid, SIGALRM );
+        return;
+    }
 
-}    
+    // No dhcpcd, so we are trying udhcpc
+#ifdef MDEBUG
+    qDebug( "WIFIAPPLET: dhcpcd not available." );
+#endif
+    pidfile.sprintf( "/var/run/udhcpc.%s.pid", (const char*) ifacename );
+#ifdef MDEBUG
+    qDebug( "WIFIAPPLET: udhcpc pidfile is '%s'", (const char*) pidfile );
+#endif
+    QFile pfile2( pidfile );
+    hasFile = pfile2.open( IO_ReadOnly );
+    QTextStream s2( &pfile2 );
+    if ( hasFile )
+    {
+        s2 >> pid;
+#ifdef MDEBUG
+        qDebug( "WIFIAPPLET: sent SIGUSR1 to pid %d", pid );
+#endif
+        kill( pid, SIGUSR1 );
+        return;
+    }
+}
 
 void WirelessApplet::updateDHCPConfig( bool ESSID, bool FREQ, bool AP, bool MODE )