Changeset 949

Timestamp:

08/07/08 15:00:43 (4 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)

Location:

trunk/tcosmonitor

Files:

• TcosCommon.py (modified) (8 diffs)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• ping.py (modified) (5 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')

trunk/tcosmonitor/debian/changelog

@@ +1 @@
+tcosmonitor (0.2.16~rc5) unstable; urgency=low
+
+  * ping.py TcosCommon.py debian/control:
+    - Replace old code to get interfaces and IP addr with python-netifaces (in TCOS mirror)
+
+ -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com>  Thu, 07 Aug 2008 14:58:45 +0200
+
 tcosmonitor (0.2.16~rc4) unstable; urgency=low
 

trunk/tcosmonitor/debian/control

@@ -13 +13 @@
 Architecture: all
 Depends:  gksu | kdebase-bin, zenity, dbus,
-          python-dbus | python2.4-dbus, python-gtk2, python-glade2, 
+          python-dbus | python2.4-dbus, python-gtk2, python-glade2, python-netifaces, 
           x11vnc, lsb-base (>= 3.0-6), python-notify, python-gnome2-extras, 
           notification-daemon, libnotify-bin, tcos-core ( >= 0.89~rc0), python-utmp, 

trunk/tcosmonitor/ping.py

@@ -20 +20 @@
 from time import sleep
 from subprocess import Popen, PIPE, STDOUT
+
+import netifaces
 
 if "DISPLAY" in os.environ:
@@ -137 +139 @@
  
     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
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         try:
@@ -148 +159 @@
             print_debug("get_ip_address() ifname %s don't have ip address, error=%s"%(ifname,err))
         return ip
+        """
 
 
     def get_server_ips(self):
+        IPS=[]
+        for dev in netifaces.interfaces():
+            if not dev in shared.hidden_network_ifaces:
+                print_debug("get_server_ips() add interface %s"%dev)
+                ip=netifaces.ifaddresses(dev)
+                if ip.has_key(netifaces.AF_INET):
+                    print_debug("get_server_ips() iface=%s data=%s"%(dev,ip[netifaces.AF_INET] ))
+                    IPS.append(ip[netifaces.AF_INET][0]['addr'])
+        return IPS
+        """
+        old code
         IPS=[]
         for dev in os.listdir("/sys/class/net"):
@@ -162 +185 @@
         print_debug("get_server_ips() IPS=%s"%IPS)
         return IPS
+        """
 
 
@@ -231 +255 @@
     #PingPort("192.168.0.5", 6000, 0.5).get_status()
     #PingPort("192.168.0.1", 6000, 0.5).get_status()
-    PingPort(sys.argv[1], sys.argv[2], 0.5).get_status()
-    #app=Ping(None)
-    #print app.get_server_ips()
+    #PingPort(sys.argv[1], sys.argv[2], 0.5).get_status()
+    app=Ping(None)
+    print app.get_server_ips()
+    print app.get_ip_address('eth0')
+    print app.get_ip_address('br0')
+