We now have a server that works... some of the time.

There still seem to be some weird timing and/or closing-related bugs, since
I can't load the eqldata project correctly unless I use --noserver.

1 files changed, 2 insertions, 5 deletions

diff --git a/main.py b/main.py
index 02fa00c..9115e63 100755
--- a/main.py
+++ b/main.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import sys, os, re
-import options, client, iptables
+import options, client, iptables, server
 
 
 # list of:
@@ -58,10 +58,7 @@ o = options.Options('sshuttle', optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if opt.server:
-    #o.fatal('server mode not implemented yet')
-    os.dup2(2,1)
-    os.execvp('hd', ['hd'])
-    sys.exit(1)
+    sys.exit(server.main())
 elif opt.iptables:
     if len(extra) < 1:
         o.fatal('at least one argument expected')