File smpppd-wlan_connection_status.diff of Package smpppd

Overview Repositories Revisions Requests Users Attributes Meta

File smpppd-wlan_connection_status.diff of Package smpppd (Revision 4d2c60ff6a2f757e913f6a7a7813960f)

Currently displaying revision 4d2c60ff6a2f757e913f6a7a7813960f , Show latest

diff -u -r smpppd-1.59.orig/smpppd/outsider.cc smpppd-1.59/smpppd/outsider.cc
--- smpppd-1.59.orig/smpppd/outsider.cc	2005-07-11 10:22:58.000000000 +0200
+++ smpppd-1.59/smpppd/outsider.cc	2005-09-06 19:22:46.000000000 +0200
@@ -209,6 +209,8 @@
     }
     else {
       wireless=true;
+      vector<string> v;
+      changed = iw_connection_status(v);
     }
     iw_sockets_close(skfd);
     return changed;
@@ -919,19 +921,21 @@
   }
 }
 
-bool Outsider::iw_connection_status (vector<string> &status)
+bool Outsider::iw_connection_status (vector<string> &iwstatus)
 {
   struct wireless_info info;
   struct iwreq wrq;
   int skfd;
   char buf[128];
+  bool associated=false;
+  bool have_ip=false;
 
   if (!wireless) {
     fprintf(stderr,"warning: iw_connection_status called for non-wireless device, ignoring\n" );
     return false;
   }
 
-  status.clear();
+  iwstatus.clear();
 
   if ((skfd=iw_sockets_open()) <0) {
     fprintf(stderr,"warning: could not open socket, so can not query device %s\n",
@@ -946,7 +950,7 @@
     return false;
   }
   if (info.b.has_essid) {
-    status.push_back( string("essid ") + info.b.essid );
+    iwstatus.push_back( string("essid ") + info.b.essid );
   }
   if (iw_get_range_info(skfd, interface.c_str(), &info.range) >=0 ) {
     int channel = -1;
@@ -956,18 +960,23 @@
       channel = iw_channel_to_freq((int) freq, &freq, &info.range);
     if (channel>0) {
       snprintf( buf, sizeof(buf), "channel %i", channel );
-      status.push_back( buf );
+      iwstatus.push_back( buf );
     }
     snprintf( buf, sizeof(buf), "frequency %g", freq / 1000000 );
-    status.push_back( buf );
+    iwstatus.push_back( buf );
   }
   if(iw_get_ext(skfd, interface.c_str(), SIOCGIWAP, &wrq) >= 0) {
     iw_ether_ntop ((const struct ether_addr*) wrq.u.ap_addr.sa_data, buf);
-    status.push_back( string("ap_addr ") + buf );
+    iwstatus.push_back( string("ap_addr ") + buf );
+    if ( (strcmp(buf, "00:00:00:00:00:00") !=0) &&
+         (strcmp(buf, "FF:FF:FF:FF:FF:FF") !=0) &&
+         (strcmp(buf, "44:44:44:44:44:44") !=0) ) {
+      associated = true;
+    }
   }
   if(iw_get_ext(skfd, interface.c_str(), SIOCGIWRATE, &wrq) >= 0) {
     snprintf( buf, sizeof(buf), "bitrate %g", (double)wrq.u.bitrate.value / 1000000 );
-    status.push_back( buf );
+    iwstatus.push_back( buf );
   }
   /* Get stats */
   if(iw_get_stats(skfd, interface.c_str(), &(info.stats), &info.range,
@@ -1015,13 +1024,13 @@
       snprintf( sig, sizeof(sig), "signal_level %d", info.stats.qual.level );
       snprintf( noise, sizeof(noise), "noise_level %d", info.stats.qual.noise );
     }
-    status.push_back( qual );
-    status.push_back( sig );
-    status.push_back( noise );
+    iwstatus.push_back( qual );
+    iwstatus.push_back( sig );
+    iwstatus.push_back( noise );
   }
   if (info.b.has_key && info.b.key_size >0 ) {
     int keysize = 0;
-    status.push_back( "wep_key on" );
+    iwstatus.push_back( "wep_key on" );
     if ( (info.b.key_size*8) <= 40)
       keysize = 40;
     else if ( (info.b.key_size*8) <= 104)
@@ -1031,25 +1040,27 @@
     else if ( (info.b.key_size*8) <= 232)
       keysize = 232;
     snprintf( buf, sizeof(buf), "wep_key_size %i", keysize );
-    status.push_back( buf );
+    iwstatus.push_back( buf );
   }
   else
-    status.push_back( "wep_key off" );
+    iwstatus.push_back( "wep_key off" );
 
   /* now check IP address and stuff */
   int flags;
   struct ifreq ifr;
   ifr.ifr_addr.sa_family = AF_INET;
   strncpy(ifr.ifr_name, interface.c_str(), sizeof (ifr.ifr_name));
-  if (ioctl(skfd, SIOCGIFADDR, &ifr) == 0)
-    status.push_back( string("ip_addr ")+ inet_ntoa (((struct sockaddr_in *)
+  if (ioctl(skfd, SIOCGIFADDR, &ifr) == 0) {
+    iwstatus.push_back( string("ip_addr ")+ inet_ntoa (((struct sockaddr_in *)
 						      &ifr.ifr_addr)->sin_addr));
+    have_ip = true;
+  }
   else
     fprintf(stderr,"warning: could not query IP address of device %s\n",
 	    interface.c_str() );
   strncpy(ifr.ifr_name, interface.c_str(), sizeof (ifr.ifr_name));
   if (ioctl (skfd, SIOCGIFNETMASK, &ifr) == 0)
-    status.push_back( string("netmask ")+ inet_ntoa (((struct sockaddr_in *)
+    iwstatus.push_back( string("netmask ")+ inet_ntoa (((struct sockaddr_in *)
 						      &ifr.ifr_addr)->sin_addr));
   else
     fprintf(stderr,"warning: could not query netmask of device %s\n",
@@ -1058,7 +1069,7 @@
     flags = ifr.ifr_flags;
     strncpy(ifr.ifr_name, interface.c_str(), sizeof (ifr.ifr_name));
     if (flags & IFF_BROADCAST && ioctl (skfd, SIOCGIFBRDADDR, &ifr) == 0)
-      status.push_back( string("broadcast ")+ inet_ntoa(((struct sockaddr_in *)
+      iwstatus.push_back( string("broadcast ")+ inet_ntoa(((struct sockaddr_in *)
 							 &ifr.ifr_broadaddr)->sin_addr));
     else
       fprintf(stderr,"warning: could not query broadcast address of device %s\n",
@@ -1068,6 +1079,10 @@
     fprintf(stderr,"warning: could not query broadcast address of device %s\n",
 	    interface.c_str() );
 
+  if (associated && have_ip)
+    status = CONNECTED;
+  else
+    status = DISCONNECTED;
   iw_sockets_close(skfd);
   return true;
 }
diff -u -r smpppd-1.59.orig/smpppd/outsider.h smpppd-1.59/smpppd/outsider.h
--- smpppd-1.59.orig/smpppd/outsider.h	2005-03-08 10:26:54.000000000 +0100
+++ smpppd-1.59/smpppd/outsider.h	2005-09-02 16:38:49.000000000 +0200
@@ -49,7 +49,7 @@
     bool iw_set_wepkey (const string &key, keytype_t keytype, authmode_t authmode);
     bool iw_scan ();
     void iw_scan_results (vector<string> &results);
-    bool iw_connection_status (vector<string> &status);
+    bool iw_connection_status (vector<string> &iwstatus);
 
     const string interface;
 
diff -u -r smpppd-1.59.orig/smpppd/smpppd.cc smpppd-1.59/smpppd/smpppd.cc
--- smpppd-1.59.orig/smpppd/smpppd.cc	2005-03-07 12:40:16.000000000 +0100
+++ smpppd-1.59/smpppd/smpppd.cc	2005-09-06 18:58:46.000000000 +0200
@@ -463,8 +463,14 @@
     outsiders.update_rxtx_bytes ();
 
     for (Outsiders::const_iterator it = outsiders.begin ();
-	 it != outsiders.end (); it++)
+	 it != outsiders.end (); it++) {
 	frontends.write_rxtx_bytes (**it);
+	if ((*it)->is_wireless()) {
+	    std::vector<std::string> v;
+	    (*it)->iw_connection_status(v);
+	    frontends.write_status(**it);
+	}
+    }
 
     return true;
 }

Places

File smpppd-wlan_connection_status.diff of Package smpppd (Revision 4d2c60ff6a2f757e913f6a7a7813960f)

Places