[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 20a4136245496cd08f9726014aee97b1ea56854f
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Tue Dec 2 12:43:53 2008 +0100

    ogsmd: connection sharing now works

diff --git a/ChangeLog b/ChangeLog
index af8eb00..815d9de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-02	Michael Lauer	<mickey at openmoko.org>
+
+	* [onetworkd] Simple connection sharing now works. See
+	  org.freesmartphone.Network.StartConnectionSharingWithInterface(s) -> ()
+
 2008-11-30	Michael Lauer	<mickey at openmoko.org>
 
 	* [ogsmd] Start with CINTERION MC75 support
diff --git a/framework/subsystems/onetworkd/dhcp.py b/framework/subsystems/onetworkd/dhcp.py
index 32c7615..8fe48a7 100644
--- a/framework/subsystems/onetworkd/dhcp.py
+++ b/framework/subsystems/onetworkd/dhcp.py
@@ -13,7 +13,7 @@ Support for the Dynamic Host Configuration Protocol
 """
 
 MODULE_NAME = "onetworkd"
-__version__ = "0.0.0"
+__version__ = "0.0.1"
 
 from helpers import readFromFile, writeToFile
 
@@ -23,6 +23,7 @@ import logging
 logger = logging.getLogger( MODULE_NAME )
 
 ETC_RESOLV_CONF = "/etc/resolv.conf"
+ETC_UDHCPD_CONF = "/etc/udhcpd.conf"
 
 #============================================================================#
 def launchDaemon():
@@ -38,19 +39,15 @@ def prepareDaemonConfigurationForInterface( iface ):
 
     nameservers = ""
     resolv_conf = readFromFile( ETC_RESOLV_CONF ).split( '\n' )
-    for line in resolv.conf:
+    for line in resolv_conf:
         if line.startswith( "nameserver" ):
-            nameservers += ( line.strip().split( ' ' ) )
+            nameserver = line.strip().split( ' ' )[1]
+            nameservers += nameserver
             nameservers += " "
 
     conf_file = daemon_conf_file_template % ( name, nameservers, address )
 
-    writeToFile( ETC_RESOLV_CONF, conf_file )
-
-
-#============================================================================#
-daemon_conf_file_name = "/etc/udhcpd.conf"
-#============================================================================#
+    writeToFile( ETC_UDHCPD_CONF, conf_file )
 
 #============================================================================#
 daemon_conf_file_template = """# freesmartphone.org /etc/udhcpd.conf
diff --git a/framework/subsystems/onetworkd/network.py b/framework/subsystems/onetworkd/network.py
index 83fc042..235b3db 100644
--- a/framework/subsystems/onetworkd/network.py
+++ b/framework/subsystems/onetworkd/network.py
@@ -11,7 +11,7 @@ Module: network
 """
 
 MODULE_NAME = "onetworkd"
-__version__ = "0.0.0"
+__version__ = "0.0.1"
 
 import gobject
 
@@ -52,7 +52,7 @@ class Interface( object ):
         self._name = name
 
     def name( self ):
-        return self.name
+        return self._name
 
     def ipAddress4( self ):
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
diff --git a/framework/subsystems/onetworkd/sharing.py b/framework/subsystems/onetworkd/sharing.py
index 14fd6be..f023b19 100644
--- a/framework/subsystems/onetworkd/sharing.py
+++ b/framework/subsystems/onetworkd/sharing.py
@@ -11,7 +11,7 @@ Module: sharing
 """
 
 MODULE_NAME = "onetworkd"
-__version__ = "0.0.0"
+__version__ = "0.0.1"
 
 from network import theNetwork
 from helpers import isValidAddress, writeToFile
@@ -80,14 +80,6 @@ class ConnectionSharing( dbus.service.Object ):
 
         source_address = iface.ipAddress4()
 
-        if not isValidAddress( address ):
-            dbus_error( NoAddress( "%s is not a valid IPv4 address." % address ) )
-            return
-
-        target_address = address
-
-        # FIXME use dhcp daemon
-
         commands = []
         commands.append( "iptables -I INPUT 1 -s 192.168.0.0/24 -j ACCEPT" )
         commands.append( "iptables -I OUTPUT 1 -s %s -j ACCEPT" % source_address )

-- 
FSO frameworkd Debian packaging