X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/43b204fbde9c5b36848320079eb7e9576536ddc3..39627668ca36cecbc78ec5f677061f128957b550:/lib/python/Components/Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 948b2fdf..f65863dc 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 *
@@ -14,21 +14,18 @@ class Network:
 		fp.write("auto lo\n")
 		fp.write("iface lo inet loopback\n\n")
 		fp.write("auto eth0\n")
-		if (currentConfigSelectionElement(config.network.dhcp) == "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()
 
-		if (currentConfigSelectionElement(config.network.dhcp) == "yes"):
-			fp = file('/etc/resolv.conf', 'w')
-			fp.write("nameserver %d.%d.%d.%d\n" % tuple(config.network.dns.value))
-			fp.close()		
-
-
 	def loadNetworkConfig(self):
 		try:
 			# parse the interfaces-file
@@ -83,10 +80,16 @@ class Network:
 		except:
 			print "[Network.py] parsing network failed"
 
+	def deactivateNetworkConfig(self):
+		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):
@@ -141,24 +144,16 @@ class Network:
 iNetwork = Network()
 
 def InitNetwork():
-	ip = iNetwork.getCurrentIP()
-
-		
 	config.network = ConfigSubsection()
-	config.network.dhcp = configElement_nonSave("config.network.dhcp", configSelection, 1, (("no", _("no")), ("yes", _("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()