Changeset 4cf0198 for fedd

Timestamp:

Mar 12, 2014 10:59:12 AM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

d846cbe

Parents:

a80a4a7

Message:

Cleaner connect/disconnect

File:

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

fedd/federation/desktop_access.py

@@ -418 +418 @@
             print >>f, 'sleep 60; done'
             print >>f, ('ssh -w 0:0 -p %s -o "Tunnel ethernet" ' + \
-                    '-o "StrictHostKeyChecking no" -i %s %s perl -I/usr/local/federation/lib /usr/local/federation/bin/setup_bridge.pl --tapno=0 --addr=%s --use_file &') % \
+                    '-o "StrictHostKeyChecking no" -i %s %s perl ' +
+                    '-I/usr/local/federation/lib ' +
+                    '/usr/local/federation/bin/setup_bridge.pl --tapno=0 ' +
+                    '--addr=%s --use_file &') % \
                     (port, self.ssh_identity, peer, my_addr)
             # This should give the tap a a chance to come up
@@ -452 +455 @@
                 print >>f, '%s -D FORWARD -i tap0 -o %s -j ACCEPT' % \
                         (self.iptables, self.nat_interface)
-            # Linux ?
-            print >>f, 'ifconfig tap0 destroy'
-            self.unset_route(peer, f)
+            print >>f, 'pkill -f setup_bridge.pl'
             print >>f, 'mv /etc/hosts.DETER.fedd.hold /etc/hosts'
+            print >>f, ('ssh -p %s -o "StrictHostKeyChecking no" -i %s %s ' +
+                'perl -I/usr/local/federation/lib ' +
+                '/usr/local/federation/bin/unsetup_bridge.pl --tapno=0 ' +
+                '--addr=%s') % \
+                    (port, self.ssh_identity, peer, my_addr)
             print >>f, 'kill `cat /var/run/quagga/ospfd.pid`'
             print >>f, 'kill `cat /var/run/quagga/zebra.pid`'