diff options
author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-05-30 17:14:20 (GMT) |
---|---|---|
committer | Daniel Drake <dsd@laptop.org> | 2009-12-01 17:54:05 (GMT) |
commit | 5cf7303835b15f9b67a020a72cfef874a9f98aac (patch) | |
tree | 854b79c83c07a96d138d5952c772954ab6ff584b /src | |
parent | e3f7e296ed92c811c40e37ccfc1b8a4e2d917dcb (diff) |
Add code for creating ad-hoc wireless networks
Diffstat (limited to 'src')
-rw-r--r-- | src/jarabe/desktop/meshbox.py | 5 | ||||
-rw-r--r-- | src/jarabe/model/network.py | 20 |
2 files changed, 25 insertions, 0 deletions
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): |