X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e7a77b87eee22c35e93cbd42b329dc5165e29144..da54ea206b908d0ab08f7e8c61466c5fe6180540:/lib/python/Components/Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index c38c44c6..5add0c01 100644
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -1,4 +1,4 @@
-from config import *
+from config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigMAC
 
 import os
 from socket import *
@@ -11,14 +11,19 @@ class Network:
 		# fixme restarting and updating the network too often. possible fix: check current config and execute only if changed :/
 		# fixme using interfaces.tmp instead of interfaces for now
 		fp = file('/etc/network/interfaces', 'w')
+		fp.write("auto lo\n")
+		fp.write("iface lo inet loopback\n\n")
 		fp.write("auto eth0\n")
-		if (config.network.dhcp.value == _("yes")):
+		if config.network.dhcp.value:
 			fp.write("iface eth0 inet dhcp\n")
 		else:
 			fp.write("iface eth0 inet static\n")
 			fp.write("	address %d.%d.%d.%d\n" % tuple(config.network.ip.value))
 			fp.write("	netmask %d.%d.%d.%d\n" % tuple(config.network.netmask.value))
 			fp.write("	gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
+			fp2 = file('/etc/resolv.conf', 'w')
+			fp2.write("nameserver %d.%d.%d.%d\n" % tuple(config.network.dns.value))
+			fp2.close()
 		fp.close()
 
 	def loadNetworkConfig(self):
@@ -48,19 +53,19 @@ class Network:
 						ifaces[currif]["gateway"] = map(int, split[1].split('.'))									
 			
 			# parse the resolv.conf-file
-			fp = file('/etc/network/interfaces', 'r')
+			fp = file('/etc/resolv.conf', 'r')
 			resolv = fp.readlines()
 			fp.close()
 		except:
-			pass
+			print "[Network.py] loading network files failed"
 			
 		try:
 			for i in resolv:
 				split = i.strip().split(' ')
 				if (split[0] == "nameserver"):
-					config.network.nameserver.value = map(int, split[1].split('.'))
+					config.network.dns.value = map(int, split[1].split('.'))
 		except:
-			pass
+			print "[Network.py] resolv.conf parsing failed"
 		
 		try:
 			# set this config
@@ -73,12 +78,20 @@ class Network:
 				if (ifaces["eth0"].has_key("netmask")): config.network.netmask.value = ifaces["eth0"]["netmask"]
 				if (ifaces["eth0"].has_key("gateway")): config.network.gateway.value = ifaces["eth0"]["gateway"]
 		except:
-			pass
+			print "[Network.py] parsing network failed"
+
+	def deactivateNetworkConfig(self):
+		import os
+		os.system("ip addr flush eth0")
+		os.system("/etc/init.d/networking stop")
+		os.system("killall -9 udhcpc")
+		os.system("rm /var/run/udhcpc*")
 
 	def activateNetworkConfig(self):
 		import os
-		os.system("/etc/init.d/networking restart")
+		os.system("/etc/init.d/networking start")
 		config.network.ip.value = self.getCurrentIP()
+		config.network.ip.save()
 		
 	def setDHCP(self, useDHCP):
 		if (useDHCP):
@@ -120,35 +133,29 @@ class Network:
 		#self.writeNetworkConfig()		
 
 	def getCurrentIP(self):
-		ip = [0, 0, 0, 0]
-		try:
-			print gethostbyname(gethostname())
-			ip = gethostbyname(gethostname()).split('.')
-		except:
-			print "[Network.py] Could not get current ip (not necessarily an error)"
+		ipstr = [0,0,0,0]
+		for x in os.popen("ifconfig eth0 | grep 'inet addr:'", "r").readline().split(' '):
+			if x.split(':')[0] == "addr":
+				ipstr = x.split(':')[1].split('.')
+		ip = []
+		for x in ipstr:
+			ip.append(int(x))
+		print "[Network.py] got ip " + str(ip)
 		return ip
 
 iNetwork = Network()
 
 def InitNetwork():
-	ip = iNetwork.getCurrentIP()
-
-		
 	config.network = ConfigSubsection()
-	config.network.dhcp = configElement_nonSave("config.network.dhcp", configSelection, 1, (_("no"), _("yes")))
-	config.network.ip = configElement_nonSave("config.network.ip", configSequence, ip, configsequencearg.get("IP"))
-	config.network.netmask = configElement_nonSave("config.network.netmask", configSequence, [255,255,255,0], configsequencearg.get("IP"))
-	config.network.gateway = configElement_nonSave("config.network.gateway", configSequence, [192,168,1,3], configsequencearg.get("IP"))
-	config.network.dns = configElement_nonSave("config.network.dns", configSequence, [192,168,1,3], configsequencearg.get("IP"))
-	config.network.mac = configElement_nonSave("config.network.mac", configSequence, [00,11,22,33,44,55], configsequencearg.get("MAC"))
+	config.network.dhcp = NoSave(ConfigYesNo(default=True))
+	config.network.ip = NoSave(ConfigIP(default=iNetwork.getCurrentIP()))
+	config.network.netmask = NoSave(ConfigIP(default=[255,255,255,0]))
+	config.network.gateway = NoSave(ConfigIP(default=[192,168,1,3]))
+	config.network.dns = NoSave(ConfigIP(default=[192,168,1,3]))
+	config.network.mac = NoSave(ConfigMAC(default=[00,11,22,33,44,55]))
 
 	iNetwork.loadNetworkConfig()
 	
-	#FIXME using this till other concept for this is implemented
-	#config.network.activate = configElement("config.network.activate", configSelection, 0, ("yes, sir", "you are my hero"))
-	#config.network.activate = configElement("config.network.activate", configSelection, 0, ("yes", "you are my hero"))
-
-
 	def writeNetworkConfig(configElement):
 		iNetwork.writeNetworkConfig()