summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/applets/wirelessapplet/wireless.cpp34
1 files changed, 30 insertions, 4 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
@@ -52,7 +52,7 @@
#define STYLE_BARS 0
#define STYLE_ANTENNA 1
-//#define MDEBUG 0
+//#define MDEBUG
#undef MDEBUG
WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name )
@@ -246,21 +246,47 @@ void WirelessApplet::renewDHCP()
if ( !interface )
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;
QFile pfile( pidfile );
bool hasFile = pfile.open( IO_ReadOnly );
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 )