Changeset ea0e8cb for fedd/federation

Timestamp:

Mar 3, 2014 10:16:51 AM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

26821ac, 2c16731, 7862660

Parents:

0608d96

Message:

More routing options

File:

• fedd/federation/desktop_access.py (modified) (3 diffs)

fedd/federation/desktop_access.py

@@ -68 +68 @@
         # File containing the routing entries for external networks
         self.external_networks = config.get('access', 'external_networks')
+        # Comma-separated list of interfaces to export (may be empty)
+        self.export_interfaces = config.get('access', 'export_interfaces')
+        if self.export_interfaces is not None:
+            self.export_interfaces = \
+                    [ x.strip() for x in self.export_interfaces.split(',')]
+        else:
+            self.export_interfaces = []
+
+        # Comma separated list of connected nets to export - these won't work
+        # in external_networks
+        self.export_networks = config.get('access', 'export_networks')
+        if self.export_networks is not None:
+            self.export_networks = \
+                    [ x.strip() for x in self.export_networks.split(',')]
+        else:
+            self.export_networks = []
+
         # values for locations of zebra and ospfd.
         self.zebra = config.get('access', 'zebra')
@@ -454 +471 @@
             print >>f, 'hostname %s' % my_name
             print >>f, 'interface tap0'
+            for i in self.export_interfaces:
+                print >>f, 'interface %s' % i
             if  self.external_networks is not None:
                 try:
@@ -471 +490 @@
             print >>f, ' redistribute static'
             print >>f, ' network %s/24 area 0.0.0.2' % my_addr
+            for i in self.export_networks:
+                print >>f, ' network %s area 0.0.0.2' % i
         except EnvironmentError, e:
             raise service_error(service_error.internal, 
                     'Cannot create connect %s: %s' % (e.filename, e.strerror))
         script_log = open('/tmp/connect.log', 'w')
-        subprocess.Popen(['sudo', '/bin/sh', cscript], stdout=script_log, stderr=script_log)
+        subprocess.Popen(['sudo', '/bin/sh', cscript], stdout=script_log,
+                stderr=script_log)
         return True