service: add sort of servicelist including all required layers

[enigma2.git] / lib / python / Components / Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index e56e5c8476daf634349f27cc4e5f06871a080802..9dc06e7ff50b2259589d3d1b59491e21ea09f671 100644 (file)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -6,7 +6,7 @@ class Network:
        def __init__(self):
                pass
                
-       def updateNetworkConfig(self):
+       def writeNetworkConfig(self):
                # 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.tmp', 'w')
@@ -20,8 +20,9 @@ class Network:
                        fp.write("      gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
                fp.close()
 
+       def activateNetworkConfig(self):
                import os
-               os.system("/etc/init.d/networking restart")
+               #os.system("/etc/init.d/networking restart")
                
        def setDHCP(self, useDHCP):
                if (useDHCP):
@@ -38,26 +39,53 @@ class Network:
                        config.network.dns.enabled = True
                                        
        def setIPNameserver(self, ip):
+               return
                resolvconf = file('/etc/resolv.conf', 'w')
                resolvconf.write("nameserver %d.%d.%d.%d" % tuple(ip))
                resolvconf.close()
                
        def setMACAddress(self, mac):
-               os.system("echo ifconfig eth0 ether %02x:%02x:%02x:%02x:%02x:%02x" % tuple(mac))
+               #os.system("echo ifconfig eth0 ether %02x:%02x:%02x:%02x:%02x:%02x" % tuple(mac))
+               pass
+               
+       def setIPAddress(self, ip):
+               os.system("echo ifconfig eth0 %d.%d.%d.%d" % tuple(ip))
+               self.writeNetworkConfig()
+
+       def setGateway(self, ip):
+               os.system("echo route add default gw %d.%d.%d.%d" % tuple(ip))
+               self.writeNetworkConfig()
                
+       def setNetmask(self, ip):
+               os.system("echo ifconfig eth0 netmask %d.%d.%d.%d" % tuple(ip))         
+               self.writeNetworkConfig()               
+
 def InitNetwork():
        config.network = ConfigSubsection()
        config.network.dhcp = configElement("config.network.dhcp", configSelection, 0, ("no", "yes"))
-       config.network.ip = configElement("config.network.ip", configSequence, [192,168,1,45], (("."), 3))
-       config.network.netmask = configElement("config.network.netmask", configSequence, [255,255,255,0], (("."), 3))   
-       config.network.gateway = configElement("config.network.gateway", configSequence, [192,168,1,3], (("."), 3))
-       config.network.dns = configElement("config.network.dns", configSequence, [192,168,1,3], (("."), 3))
-       config.network.mac = configElement("config.network.mac", configSequence, [00,11,22,33,44,55], ((":"), 2))
+       config.network.ip = configElement("config.network.ip", configSequence, [192,168,1,45], (("."), (1,255)))
+       config.network.netmask = configElement("config.network.netmask", configSequence, [255,255,255,0], (("."), (1,255)))
+       config.network.gateway = configElement("config.network.gateway", configSequence, [192,168,1,3], (("."), (1,255)))
+       config.network.dns = configElement("config.network.dns", configSequence, [192,168,1,3], (("."), (1,255)))
+       config.network.mac = configElement("config.network.mac", configSequence, [00,11,22,33,44,55], ((":"), (1,255)))
+       
+       #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"))
 
        iNetwork = Network()
 
-       def updateNetworkConfig(configElement):
-               iNetwork.updateNetworkConfig()
+       def writeNetworkConfig(configElement):
+               iNetwork.writeNetworkConfig()
+               
+       def setIPAddress(configElement):
+               iNetwork.setIPAddress(configElement.value)
+
+       def setGateway(configElement):
+               iNetwork.setGateway(configElement.value)
+
+       def setNetmask(configElement):
+               iNetwork.setNetmask(configElement.value)                
 
        def setDHCP(configElement):
                iNetwork.setDHCP(configElement.value)
@@ -68,10 +96,15 @@ def InitNetwork():
        def setMACAddress(configElement):
                iNetwork.setMACAddress(configElement.value)
 
+       def activateNetworkConfig(configElement):
+               iNetwork.activateNetworkConfig()
+
+
        # this will call the "setup-val" initial
        config.network.dhcp.addNotifier(setDHCP)
-       config.network.ip.addNotifier(updateNetworkConfig)
-       config.network.netmask.addNotifier(updateNetworkConfig) 
-       config.network.gateway.addNotifier(updateNetworkConfig)
+       config.network.ip.addNotifier(setIPAddress)
+       config.network.netmask.addNotifier(setNetmask)  
+       config.network.gateway.addNotifier(setGateway)
        config.network.dns.addNotifier(setIPNameserver)
-       config.network.mac.addNotifier(setMACAddress)
\ No newline at end of file
+       config.network.mac.addNotifier(setMACAddress)
+       config.network.activate.addNotifier(activateNetworkConfig)
\ No newline at end of file