cambios para trabajar mejor con network manager

git-svn-id: file:///opt/svn/colegios/controlaula/trunk@833 c4774de7-f4ed-435d-9225-5986420fcf7b

Author: jredrejo

Backend/.project

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Backend</name>
+	<name>ControlAula</name>
 	<comment></comment>
 	<projects>
-		<project>Sirvecole</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

Backend/.pydevproject

@@ -2,9 +2,6 @@
 <?eclipse-pydev version="1.0"?>
 
 <pydev_project>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/Backend/src</path>
-</pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
 </pydev_project>

Backend/.settings/org.eclipse.core.resources.prefs

@@ -1,8 +1,9 @@
-#Tue Mar 16 13:11:00 CET 2010
+#Fri May 27 13:25:23 CEST 2011
 eclipse.preferences.version=1
 encoding//src/ControlAula/Classroom.py=utf-8
 encoding//src/ControlAula/Desktop.py=utf-8
 encoding//src/ControlAula/Host.py=utf-8
+encoding//src/ControlAula/Plugins/Actions.py=utf-8
 encoding//src/ControlAula/Plugins/Broadcast.py=utf-8
 encoding//src/ControlAula/Plugins/Handler.py=utf-8
 encoding//src/ControlAula/Plugins/StudentHandler.py=utf-8
@@ -13,4 +14,5 @@ encoding//src/ControlAula/TeacherServer.py=utf-8
 encoding//src/ControlAula/User.py=utf-8
 encoding//src/ControlAula/Utils/Configs.py=utf-8
 encoding//src/ControlAula/Utils/MyUtils.py=utf-8
+encoding//src/ControlAula/Utils/NetworkUtils.py=utf-8
 encoding//src/monitor.py=utf-8

Backend/src/ControlAula/Plugins/Actions.py

@@ -90,7 +90,10 @@ def switch_off():
     from twisted.internet import reactor
     import os.path
     if os.path.exists('/usr/sbin/ethtool'):
-        subprocess.call(['ethtool','-s','eth0','wol','g'])
+        try:
+            subprocess.call(['ethtool','-s','eth0','wol','g'])
+        except:
+            pass #this will fail if eth0 does not exist
 
     if MyUtils.isLTSP()=='':                      
         subprocess.call(['killall','-9','x-session-manager'])            

Backend/src/controlaula.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from subprocess import call
+from time import sleep
+import sys
+
+if __name__ == '__main__': 
+    exitSignal=call(["python","/usr/share/controlaula/monitor.py"])
+    while True:
+
+        if exitSignal == 97:
+            sleep(2.0)
+            exitSignal=call(["python","/usr/share/controlaula/monitor.py"])
+        else:
+            sys.exit(0)

Backend/src/monitor.py

@@ -43,6 +43,9 @@
 PORT=8900
 #Interval to check if the hosts are off or users have logout
 REFRESH=5
+myIp="None"
+
+exitStatus=0
 
 def SigHandler(signum, frame):
     print 'Stopping Monitor'
@@ -61,10 +64,19 @@ def SigHandler(signum, frame):
 def checkActivity():
 
     def sendNext():
-
+        global myIp
+        global exitStatus
+        nuevaIP=NetworkUtils.get_ip_inet_address()        
+        
+        if myIp != "None" and myIp != nuevaIP:
+            exitStatus=97
+            reactor.stop()
+        else:
+            myIp= nuevaIP
+            
         if not MyUtils.isActive():
             reactor.stop()
-            sys.exit()
+            
 
     loop = LoopingCall(sendNext)
     loop.start(5)
@@ -205,6 +217,9 @@ def __del__(self):
         reactor.callWhenRunning(MyStudent.startScan)    
 
     #begin application loop:
-    reactor.callWhenRunning(checkActivity)        
+    reactor.callWhenRunning(checkActivity)    
+    logging.getLogger().debug("Starting controlaula")    
     reactor.run()
+    if exitStatus==97: logging.getLogger().debug("Restarting controlaula due to network changes")
+    sys.exit(exitStatus)
 

Backend/src/sirvecole.py

@@ -77,8 +77,6 @@ def prepareBroadcast():
                 datefmt='%a, %d %b %Y %H:%M:%S',
                 filename=LOG_FILENAME)
 
-if os.path.exists('/usr/sbin/ethtool'):
-    subprocess.call(['ethtool','-s','eth0','wol','g'])
 ######### Begin the application loop #######
 
 from ControlAula import StudentLoop

controlaula

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-exec python "/usr/share/controlaula/monitor.py"
+exec python "/usr/share/controlaula/controlaula.py"
 

debian/99controlaula

@@ -0,0 +1,18 @@
+#!/bin/sh   
+
+if [ -z "$1" ]; then
+    echo "$0: called with no interface" 1>&2
+    exit 1;
+fi
+
+# Run the right scripts
+case "$2" in
+    up)
+        su root -c "invoke-rc.d controlaula restart &"
+        exit 0
+        ;;
+    *)
+        echo "$0: called with unknown action \`$2'" 1>&2
+        exit 0
+        ;;
+esac

debian/changelog

@@ -1,3 +1,9 @@
+controlaula (1.6.21-1) unstable; urgency=low
+
+  * Modified to improve compatibility with network-manager
+
+ -- José L. Redrejo Rodríguez <[email protected]>  Fri, 27 May 2011 13:46:09 +0200
+
 controlaula (1.6.20-1) unstable; urgency=low
 
   * Increased security for teacher detection

debian/controlaula.dirs

@@ -8,3 +8,4 @@ usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 usr/share/xul-ext-controlaula
 etc/dhcp3/dhclient-exit-hooks.d
 etc/dhcp/dhclient-exit-hooks.d
+etc/NetworkManager/dispatcher.d

debian/controlaula.ifup

@@ -3,4 +3,8 @@
 [ "$IFACE" != "lo" ] || exit 0
 
 #ensure wol is programmed
-/usr/sbin/ethtool -s $IFACE wol g
+case $IFACE in
+eth*) /usr/sbin/ethtool -s $IFACE wol g ;;
+*) echo " no eth in  $IFACE" ;;
+esac
+

debian/controlaula.install

@@ -6,3 +6,4 @@ startcontrolaula.desktop etc/xdg/autostart
 add-on/* usr/share/xul-ext-controlaula
 debian/controlaula.dhcp etc/dhcp3/dhclient-exit-hooks.d
 debian/controlaula.ifup etc/network/if-up.d
+debian/99controlaula etc/NetworkManager/dispatcher.d

setup.py

@@ -17,6 +17,7 @@
 datafiles.append(('/etc/xdg/autostart',['startcontrolaula.desktop']))
 datafiles.append(('share/controlaula',['nobody.png']))
 datafiles.append(('share/controlaula',['Backend/src/monitor.py']))
+datafiles.append(('share/controlaula',['Backend/src/controlaula.py']))
 
 setup(name='ControlAula',
 	version='1.6',