Changeset 37a809f

Timestamp:

Aug 15, 2014 10:53:23 AM (10 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

36e701e

Parents:

f74e3a1

Message:

ssh 6.5 parsing workaround

Files:

• fedd/federation/desktop_access.py (modified) (1 diff)
• fedkit/fed-tun.pl (modified) (1 diff)

fedd/federation/desktop_access.py

@@ -418 +418 @@
             print >>f,'while ! /usr/bin/scp -P %s -o "StrictHostKeyChecking no" -i %s %s:/usr/local/federation/etc/prep_done /dev/null; do' % (port, self.ssh_identity, peer)
             print >>f, 'sleep 60; done'
-            print >>f, ('ssh -w 0:0 -p %s -o "Tunnel ethernet" ' + \
+            # Important safety tip:  ssh v 6.5 and above have a parsing bug
+            # that means if you put -w before the -o "Tunnel ethernet"
+            # parameter, you get a layer 3 tunnel instead of a layer 2 tunnel.
+            # Don't move args in this line capricously.
+            print >>f, ('ssh -p %s -o "Tunnel ethernet" -w 0:0 ' + \
                     '-o "StrictHostKeyChecking no" -i %s %s perl ' +
                     '-I/usr/local/federation/lib ' +

fedkit/fed-tun.pl

@@ -274 +274 @@
         # a tap device rather than a tun device.  Strict host key checking
         # avoids asking the user to OK a strange host key.
-        $cmd =  "$SSH -w $count:$count -o \"Tunnel ethernet\" " . 
+        #
+        # Important safety tip:  ssh v 6.5 and above have a parsing bug
+        # that means if you put -w before the -o "Tunnel ethernet"
+        # parameter, you get a layer 3 tunnel instead of a layer 2 tunnel.
+        # Don't move args in this line capricously.
+        $cmd =  "$SSH -o \"Tunnel ethernet\" -w $count:$count " .
             "-o \"StrictHostKeyChecking no\" " . 
             "$opts{'peer'}  \"$remote_script_dir/fed-tun.pl " .