From 69fed18c81ac7104b5a867eabdba81b5dced7c49 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@sugarlabs.org>
Date: Sat, 30 May 2009 17:14:20 +0000
Subject: Add code for creating ad-hoc wireless networks

---
(limited to 'src')

diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index a87a1f2..abbdaa6 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -353,6 +353,11 @@ class AccessPointView(CanvasPulsingIcon):
             settings.connection.type = '802-11-wireless'
             settings.wireless.ssid = self._name
 
+            if self._mode == network.NM_802_11_MODE_INFRA:
+                settings.wireless.mode = 'infrastructure'
+            elif self._mode == network.NM_802_11_MODE_ADHOC:
+                settings.wireless.mode = 'adhoc'
+
             wireless_security = self._get_security()
             settings.wireless_security = wireless_security
 
diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
index 39c71e8..bff5197 100644
--- a/src/jarabe/model/network.py
+++ b/src/jarabe/model/network.py
@@ -102,11 +102,17 @@ class Wireless(object):
     def __init__(self):
         self.ssid = None
         self.security = None
+        self.mode = None
+        self.channel = None
 
     def get_dict(self):
         wireless = {'ssid': self.ssid}
         if self.security:
             wireless['security'] = self.security
+        if self.mode:
+            wireless['mode'] = self.mode
+        if self.channel:
+            wireless['channel'] = self.channel
         return wireless
 
 class Connection(object):
@@ -126,10 +132,22 @@ class Connection(object):
             connection['timestamp'] = self.timestamp
         return connection
 
+class IP4Config(object):
+    def __init__(self):
+        self.method = None
+
+    def get_dict(self):
+        ip4_config = {}
+        print self.method
+        if self.method is not None:
+            ip4_config['method'] = self.method
+        return ip4_config
+
 class Settings(object):
     def __init__(self):
         self.connection = Connection()
         self.wireless = Wireless()
+        self.ip4_config = None
         self.wireless_security = None
 
     def get_dict(self):
@@ -139,6 +157,8 @@ class Settings(object):
         if self.wireless_security is not None:
             settings['802-11-wireless-security'] = \
                 self.wireless_security.get_dict()
+        if self.ip4_config is not None:
+            settings['ipv4'] = self.ip4_config.get_dict()
         return settings
 
 class Secrets(object):
--
cgit v0.9.1