remove debug code

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

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 9dc06e7ff50b2259589d3d1b59491e21ea09f671..99afb75db93c7dd946fc95353fe59006c24bd595 100644 (file)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -1,6 +1,7 @@
 from config import *
 
 import os
 from config import *
 
 import os

+from socket import *

 
 class Network:
        def __init__(self):
 
 class Network:
        def __init__(self):


@@ -9,9 +10,9 @@ class Network:
        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
        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')
+               fp = file('/etc/network/interfaces', 'w')

                fp.write("auto eth0\n")
                fp.write("auto eth0\n")

-               if (config.network.dhcp.value == "yes"):
+               if (config.network.dhcp.value == _("yes")):

                        fp.write("iface eth0 inet dhcp\n")
                else:
                        fp.write("iface eth0 inet static\n")
                        fp.write("iface eth0 inet dhcp\n")
                else:
                        fp.write("iface eth0 inet static\n")


@@ -20,9 +21,64 @@ class Network:
                        fp.write("      gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
                fp.close()
 
                        fp.write("      gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
                fp.close()
 

+       def loadNetworkConfig(self):
+               try:
+                       # parse the interfaces-file
+                       fp = file('/etc/network/interfaces', 'r')
+                       interfaces = fp.readlines()
+                       fp.close()
+                       
+                       ifaces = {}
+                       currif = ""
+                       for i in interfaces:
+                               split = i.strip().split(' ')
+                               if (split[0] == "iface"):
+                                       currif = split[1]
+                                       ifaces[currif] = {}
+                                       if (len(split) == 4 and split[3] == "dhcp"):
+                                               ifaces[currif]["dhcp"] = "yes"
+                                       else:
+                                               ifaces[currif]["dhcp"] = "no"
+                               if (currif != ""):
+                                       if (split[0] == "address"):
+                                               ifaces[currif]["address"] = map(int, split[1].split('.'))
+                                       if (split[0] == "netmask"):
+                                               ifaces[currif]["netmask"] = map(int, split[1].split('.'))
+                                       if (split[0] == "gateway"):
+                                               ifaces[currif]["gateway"] = map(int, split[1].split('.'))                                                                       
+                       
+                       # parse the resolv.conf-file
+                       fp = file('/etc/network/interfaces', 'r')
+                       resolv = fp.readlines()
+                       fp.close()
+               except:
+                       pass
+                       
+               try:
+                       for i in resolv:
+                               split = i.strip().split(' ')
+                               if (split[0] == "nameserver"):
+                                       config.network.nameserver.value = map(int, split[1].split('.'))
+               except:
+                       pass
+               
+               try:
+                       # set this config
+                       if (ifaces.has_key("eth0")):
+                               if (ifaces["eth0"]["dhcp"] == "yes"):
+                                       config.network.dhcp.value = 1
+                               else:
+                                       config.network.dhcp.value = 0
+                               if (ifaces["eth0"].has_key("address")): config.network.ip.value = ifaces["eth0"]["address"]
+                               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
+

        def activateNetworkConfig(self):
                import os
        def activateNetworkConfig(self):
                import os

-               #os.system("/etc/init.d/networking restart")
+               os.system("/etc/init.d/networking restart")
+               config.network.ip.value = self.getCurrentIP()

                
        def setDHCP(self, useDHCP):
                if (useDHCP):
                
        def setDHCP(self, useDHCP):
                if (useDHCP):


@@ -49,31 +105,51 @@ class Network:
                pass
                
        def setIPAddress(self, ip):
                pass
                
        def setIPAddress(self, ip):

-               os.system("echo ifconfig eth0 %d.%d.%d.%d" % tuple(ip))
-               self.writeNetworkConfig()
+               pass
+               #os.system("echo ifconfig eth0 %d.%d.%d.%d" % tuple(ip))
+               #self.writeNetworkConfig()

 
        def setGateway(self, ip):
 
        def setGateway(self, ip):

-               os.system("echo route add default gw %d.%d.%d.%d" % tuple(ip))
-               self.writeNetworkConfig()
+               pass
+               #os.system("echo route add default gw %d.%d.%d.%d" % tuple(ip))
+               #self.writeNetworkConfig()

                
        def setNetmask(self, ip):
                
        def setNetmask(self, ip):

-               os.system("echo ifconfig eth0 netmask %d.%d.%d.%d" % tuple(ip))         
-               self.writeNetworkConfig()               
+               pass
+               #os.system("echo ifconfig eth0 netmask %d.%d.%d.%d" % tuple(ip))                
+               #self.writeNetworkConfig()              
+
+       def getCurrentIP(self):
+               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():
 
 def InitNetwork():

+       ip = iNetwork.getCurrentIP()
+
+               

        config.network = ConfigSubsection()
        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], (("."), (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)))
+       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"))
+
+       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"))
        
        #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"))
+       #config.network.activate = configElement("config.network.activate", configSelection, 0, ("yes", "you are my hero"))

 
 

-       iNetwork = Network()

 
        def writeNetworkConfig(configElement):
                iNetwork.writeNetworkConfig()
 
        def writeNetworkConfig(configElement):
                iNetwork.writeNetworkConfig()


@@ -96,9 +172,6 @@ def InitNetwork():
        def setMACAddress(configElement):
                iNetwork.setMACAddress(configElement.value)
 
        def setMACAddress(configElement):
                iNetwork.setMACAddress(configElement.value)
 

-       def activateNetworkConfig(configElement):
-               iNetwork.activateNetworkConfig()
-

 
        # this will call the "setup-val" initial
        config.network.dhcp.addNotifier(setDHCP)
 
        # this will call the "setup-val" initial
        config.network.dhcp.addNotifier(setDHCP)


@@ -107,4 +180,3 @@ def InitNetwork():
        config.network.gateway.addNotifier(setGateway)
        config.network.dns.addNotifier(setIPNameserver)
        config.network.mac.addNotifier(setMACAddress)
        config.network.gateway.addNotifier(setGateway)
        config.network.dns.addNotifier(setIPNameserver)
        config.network.mac.addNotifier(setMACAddress)

-       config.network.activate.addNotifier(activateNetworkConfig)
\ No newline at end of file