- 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
@@ -54,3 +54,3 @@
 
-//#define MDEBUG 0
+//#define MDEBUG
 #undef MDEBUG
@@ -64,8 +64,8 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
     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" );
@@ -86,3 +86,3 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
     /* visualization group box */
-    
+
     QButtonGroup* group = new QButtonGroup( 1, Qt::Horizontal, "Visualization", this );
@@ -97,3 +97,3 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
     /* quality graph */
-    
+
     mgraph = new MGraph( this );
@@ -104,5 +104,5 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
     mgraph->setFocusPolicy( QWidget::NoFocus );
-    
+
     /* advanced configuration Button */
-    
+
     QPushButton* advanced = new QPushButton( "Advanced...", this );
@@ -114,3 +114,3 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
     /* update Frequency Label */
-    
+
     updateLabel = new QLabel( this );
@@ -121,3 +121,3 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
     /* update Frequency Slider */
-    
+
     QSlider* updateSlider = new QSlider( QSlider::Horizontal, this );
@@ -235,4 +235,4 @@ void WirelessApplet::checkInterface()
         hide();
-    }   
-}    
+    }
+}
 
@@ -248,5 +248,8 @@ void WirelessApplet::renewDHCP()
     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
@@ -257,9 +260,32 @@ void WirelessApplet::renewDHCP()
     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;
+    }
+}