Changeset 949 for trunk/tcosmonitor/TcosCommon.py

Timestamp:

08/07/08 15:00:43 (5 months ago)

Author:

mariodebian

Message:

tcosmonitor (0.2.16~rc5)

• ping.py TcosCommon?.py debian/control:
  • Replace old code to get interfaces and IP addr with python-netifaces (in TCOS mirror)

Files:

• trunk/tcosmonitor/TcosCommon.py (modified) (8 diffs)

trunk/tcosmonitor/TcosCommon.py

@@ -34 +34 @@
 from gettext import gettext as _
 
+import netifaces
 
 from time import sleep
@@ -112 +113 @@
     def get_ip_address(self, ifname):
         print_debug("get_ip_address() ifname=%s" %(ifname) )
+        if not ifname in netifaces.interfaces():
+            return None
+        ip=netifaces.ifaddresses(ifname)
+        if ip.has_key(netifaces.AF_INET):
+            return ip[netifaces.AF_INET][0]['addr']
+        return None
+        """
+        old code
+        print_debug("get_ip_address() ifname=%s" %(ifname) )
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         #print_debug("get_ip_address() iface=%s" %ifname)
@@ -119 +129 @@
             struct.pack('256s', ifname[:15])
         )[20:24])
+        """
 
     def GetAllNetworkInterfaces(self):
+        self.vars["allnetworkinterfaces"]=[]
+        for dev in netifaces.interfaces():
+            if not dev in shared.hidden_network_ifaces:
+                self.vars["allnetworkinterfaces"].append(dev)
+                ip=netifaces.ifaddresses(dev)
+        print_debug ( "GetAllNetworkInterfaces() %s" %( self.vars["allnetworkinterfaces"] ) )
+        return self.vars["allnetworkinterfaces"]
+        """
         self.vars["allnetworkinterfaces"]=[]
         d="/sys/class/net/"
@@ -129 +148 @@
         print_debug ( "GetAllNetworkInterfaces() %s" %( self.vars["allnetworkinterfaces"] ) )
         return self.vars["allnetworkinterfaces"]
+        """
 
     def get_my_local_ip(self, last=True, force=False):
@@ -135 +155 @@
             self.vars["local_ip"]=[]
             for dev in self.GetAllNetworkInterfaces():
+                ip=self.get_ip_address(dev)
+                if ip:
+                    self.vars["local_ip"].append(ip)
+                """
                 try:
                     ip=self.get_ip_address(dev)
@@ -141 +165 @@
                     print_debug("get_my_local_ip() Exception, dev=%s error=%s"%(dev,err) )
                     pass
+                """
         if last:
             return self.vars["local_ip"][0]
@@ -150 +175 @@
         if "local_ip" in self.vars:
             return self.vars["local_ip"]
-        return get_my_local_ip(last=False)
+        return self.get_my_local_ip(last=False)
 
     def get_display(self, ip_mode=True):
@@ -249 +274 @@
     #print app.get_all_my_ips()
     #print app.get_extensions()
-    app.init_all_extensions(extfilter="menu_one")
-    print app.get_icon_theme()
+    #app.init_all_extensions(extfilter="menu_one")
+    #print app.get_icon_theme()
+    #print app.get_all_my_ips()
+    #print app.GetAllNetworkInterfaces()
+    print app.get_ip_address('eth0')
+    print app.get_ip_address('eth1')
+    print app.get_ip_address('br0')
+    print app.get_ip_address('br0:0')