Merge branch 'pull/20'

* Merging pull request apenwarr#20.

client.py

@@ -249,7 +249,8 @@ def _main(listener, fw, ssh_cmd, remotename, python, latency_control,
     try:
         (serverproc, serversock) = ssh.connect(ssh_cmd, remotename, python,
                         stderr=ssyslog._p and ssyslog._p.stdin,
-                        options=dict(latency_control=latency_control))
+                        options=dict(latency_control=latency_control,
+                            send_nets=auto_nets))
     except socket.error, e:
         if e.args[0] == errno.EPIPE:
             raise Fatal("failed to establish ssh session (1)")

server.py

@@ -164,11 +164,16 @@ def main():
     else:
         helpers.logprefix = 'server: '
     debug1('latency control setting = %r\n' % latency_control)
+    debug1('send known routes = %r\n' % send_nets)
 
-    routes = list(list_routes())
-    debug1('available routes:\n')
-    for r in routes:
-        debug1('  %s/%d\n' % r)
+    if send_nets:
+        routes = list(list_routes())
+        debug1('available routes:\n')
+        for r in routes:
+            debug1('  %s/%d\n' % r)
+    else:
+        routes = list()
+        debug1('not sending routes\n')
 
     # synchronization header
     sys.stdout.write('\0\0SSHUTTLE0001')