I'm attaching patched versions for ica-launcher and italc-launcher, which hopefully fix the following:
* If the requested ports are in use, they use the next available ones. This fixes the xorg 100% CPU usage problem when both vino and italc are in use. It also fixes the "ISDSERVER: port 5800 already in use" error when starting a second session in a standalone Ubuntu client. * If /etc/italc/italc.conf is present, it sources it, and respects: * The requested ISDPORT / IVSPORT ports, * NO_AUTODETECTION. If someone sets this to true, then this client doesn't show up in the Autodetected clients. Many teachers prefer to put static entries in ~/.italc, and then the autodetected clients would be duplicate entries... * It uses LTSP_CLIENT_HOSTNAME, if it's available, for the client list to be more informative with ltsp clients. * It uses sed a little more to try to be a little faster. The scripts are *minimally tested* to make the freeze deadline, so any testing would be welcome. Sorry for being unable to send a patch instead of the whole scripts. :( Cheers, Alkis
#!/usr/bin/python # coding=UTF-8 # iTalc master launcher using avahi # Written by Stéphane Graber <[email protected]> from xml.dom import minidom from hashlib import md5 import subprocess, re, socket, os, sys, urllib2, gettext # gettext gettext.textdomain('italc') _ = gettext.gettext # Store the old environment lang=os.environ["LANG"] # Empty config file to use if it doesn't already exist skeleton="""<?xml version="1.0"?> <!DOCTYPE italc-config-file> <globalclientconfig version="1.0.9" > <body> </body> </globalclientconfig>""" try: confdir=os.environ.get("HOME")+"/.italc/" except: sys.exit('Invalid or undefined env variable \"HOME\"') try: file=open("/etc/italc/keys/public/teacher/key","r") md5_1=md5(file.read()).hexdigest() file.close() file=open("/etc/italc/keys/public/admin/key","r") md5_2=md5(file.read()).hexdigest() file.close() file=open("/etc/italc/keys/public/supporter/key","r") md5_3=md5(file.read()).hexdigest() file.close() except: sys.exit('iTalc keys not correctly installed') def getLocalIPs(): "Scan ifconfig output for local IPV4 addresses" os.environ["LANG"]="C" # Set environ LANG to C ip=[] output=subprocess.Popen("ifconfig",stdout=subprocess.PIPE) output.wait() for line in output.stdout.readlines(): line=line.strip() if line.startswith("inet addr"): ip.append(line.split(" ")[1].split(":")[1]) return ip def getHostPort(): isdhost="127.0.0.1" try: output=subprocess.Popen(["xprop", "-root", "ICA_PORT"], stdout=subprocess.PIPE).communicate()[0] isdport=str(int(output.split('=')[1].strip())) except: isdport="5800" if "LTSP_CLIENT" in os.environ: xprop=subprocess.Popen(["xprop","-root","ica_ltsp"],stdout=subprocess.PIPE) xprop.wait() if xprop.stdout.read().split(" ")[2].strip() == "1": isdhost=os.environ["LTSP_CLIENT"] else: isdport=str(int(os.environ["LTSP_CLIENT"].split(".")[3])+11000) return [isdhost,isdport] def getClusterHosts(): hosts=[] if not os.path.exists("/etc/ltsp/getltscfg-cluster.conf") or not "LTSP_CLIENT" in os.environ: return hosts conf=open("/etc/ltsp/getltscfg-cluster.conf","r") for line in conf.readlines(): if line.startswith("SERVER="): controlcenter=line.replace("SERVER=","").strip() conf.close() if not controlcenter: return hosts page=urllib2.urlopen("http://"+controlcenter+"/ltsp-cluster-control/Terminal/TeachTools.php?list/ip="+os.environ["LTSP_CLIENT";]) for line in page.readlines(): line=line.strip() if line and not line.startswith("CLASSROOM"): ip,mac,username=line.split(",") hosts.append([ip+":5900",0,username]) return hosts def getAvahiHosts(): global local_addr hosts=[] if not os.path.exists("/usr/bin/avahi-browse"): return hosts client_list=subprocess.Popen(["avahi-browse","-trp","_italc._tcp"],stdout=subprocess.PIPE) client_list.wait() for line in client_list.stdout.readlines(): if line.startswith("="): try: param=line.split(";") comment=re.findall('"(.*)" "(.*)" "(.*)" "(.*)"\n',param[9])[0] if (comment[1] == md5_1 or comment[2] == md5_2 or comment[3] == md5_3): if param[7] in local_addr: param[7]="127.0.0.1" host=[param[7]+":"+param[8],1,comment[0]] if host not in hosts: hosts.append(host) except: print 'Ignoring a client, invalid data received' return hosts if not os.access("/etc/italc/keys/private/teacher/key",os.R_OK): md5_1="0" if not os.access("/etc/italc/keys/private/admin/key",os.R_OK): md5_2="0" if not os.access("/etc/italc/keys/private/supporter/key",os.R_OK): md5_3="0" access="none" else: access="supporter" else: access="admin" else: access="teacher" try: xmldoc=minidom.parse(confdir+"globalconfig.xml") body=xmldoc.getElementsByTagName("globalclientconfig")[0].getElementsByTagName("body")[0] classrooms=body.getElementsByTagName("classroom") except: mkdir=subprocess.Popen(["mkdir","-p",confdir]) mkdir.wait() try: config=open(confdir+"globalconfig.xml","w+") config.write(skeleton) config.close() except: sys.exit('Unable to write to config file') xmldoc=minidom.parse(confdir+"globalconfig.xml") body=xmldoc.getElementsByTagName("globalclientconfig")[0].getElementsByTagName("body")[0] classrooms=body.getElementsByTagName("classroom") # Scan for an existing classroom and delete it for classroom in classrooms: if classroom.getAttribute("name") == _("Auto-detected computers"): body.removeChild(classroom) # Create the Auto-detected computers classroom avahi=xmldoc.createElement("classroom") avahi.setAttribute("name",_("Auto-detected computers")) avahi.setAttribute("forcevisible","yes") body.appendChild(avahi) # Add computers to the classroom local_addr=getLocalIPs() isdhost,isdport=getHostPort() clients=sorted(getAvahiHosts()+getClusterHosts(), reverse=True) count=0 if isdhost not in local_addr: local_addr=[isdhost] for client in clients: try: line=client[0] host,port=line.split(":") if (host in local_addr and str(int(isdport)+100) == port): continue # Do not perform some checks when in ltsp-cluster environment if client[1] == 1: # Make sure we have a running VNC server connection=socket.socket(socket.AF_INET,socket.SOCK_STREAM) connection.connect((host,int(port))) connection.close() # Get MAC address mac=subprocess.Popen(("arp", host, "-n", "-a"),stdout=subprocess.PIPE) mac.wait() mac=mac.stdout.read().strip().split(" ")[3] if not re.match("^..:..:..:..:..:..$",mac): mac="" else: mac="" #FIXME: This should be retrieved from the control-center (along with the username) # Generate the name if client[2] != '': name=client[2] else: name="client "+str(count) # Generate the new node client=xmldoc.createElement("client") client.setAttribute("id",str(count)) client.setAttribute("localip",host+":"+port) client.setAttribute("mac",mac) client.setAttribute("name",name) client.setAttribute("type","0") avahi.appendChild(client) count+=1 except: print 'Ignoring a client, invalid data received' try: file=open(confdir+"globalconfig.xml","w") file.write(xmldoc.documentElement.toxml( "utf-8")) file.close() except: exit('Failed to save updated config') print "Starting italc as "+access+" ("+isdhost+":"+isdport+")" # Restore environment os.environ["LANG"]=lang subprocess.Popen(["italc","-isdport",isdport,"-isdhost",isdhost,"-role",access])
ica-launcher
Description: application/shellscript
-- edubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/edubuntu-devel
