author | mickeyl <mickeyl> | 2002-10-12 15:37:56 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2002-10-12 15:37:56 (UTC) |
commit | 83aed438ec060307bf5562d91bd8b61fe60f860b (patch) (side-by-side diff) | |
tree | b5156e2be374491e0dbf587b48272c1ae121660d /noncore/applets/wirelessapplet/wireless.cpp | |
parent | fe2f3c3b72dfcffe0b6ab02cea37f6dcb300b218 (diff) | |
download | opie-83aed438ec060307bf5562d91bd8b61fe60f860b.zip opie-83aed438ec060307bf5562d91bd8b61fe60f860b.tar.gz opie-83aed438ec060307bf5562d91bd8b61fe60f860b.tar.bz2 |
- dhcp renew now really functions
- added dhcp renew support for udhcp
Diffstat (limited to 'noncore/applets/wirelessapplet/wireless.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/applets/wirelessapplet/wireless.cpp | 34 |
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 @@ -43,25 +43,25 @@ #include "connect0.xpm" #include "connect1.xpm" #include "connect2.xpm" #include "connect3.xpm" #include "connect4.xpm" #include "connect5.xpm" #include "nowireless.xpm" #define STYLE_BARS 0 #define STYLE_ANTENNA 1 -//#define MDEBUG 0 +//#define MDEBUG #undef MDEBUG WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name ) : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet ) { readConfig(); writeConfigEntry( "UpdateFrequency", updateFrequency ); writeConfigEntry( "DisplayStyle", displayStyle ); setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); QGridLayout *grid = new QGridLayout( this, 3, 2, 6, 2, "top layout" ); @@ -237,39 +237,65 @@ void WirelessApplet::checkInterface() } void WirelessApplet::renewDHCP() { #ifdef MDEBUG qDebug( "WIFIAPPLET: Going to request a DHCP configuration renew." ); #endif QString pidfile; 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 ) { rocESSID = ESSID; rocFREQ = FREQ; rocAP = AP; rocMODE = MODE; } void WirelessApplet::updateDelayChange( int delay ) { |