diff options
| author | Brian May <brian@linuxpenguins.xyz> | 2015-11-16 09:20:40 +1100 |
|---|---|---|
| committer | Brian May <brian@linuxpenguins.xyz> | 2015-11-16 09:23:24 +1100 |
| commit | a651d748cd529f0f8619a8f5a72c5bbf084e51b1 (patch) | |
| tree | 0dfb87bcd67afef2542e46fdce2802bfbf5bda23 | |
| parent | fe48c7c0266e16f644e3ff365ea432e006ab1b35 (diff) | |
Remove unused code.
| -rw-r--r-- | sshuttle/__main__.py | 9 | ||||
| -rw-r--r-- | sshuttle/sshuttle.md | 5 |
2 files changed, 1 insertions, 13 deletions
diff --git a/sshuttle/__main__.py b/sshuttle/__main__.py index 1144c68..6664abb 100644 --- a/sshuttle/__main__.py +++ b/sshuttle/__main__.py @@ -4,7 +4,6 @@ import socket import sshuttle.helpers as helpers import sshuttle.options as options import sshuttle.client as client -import sshuttle.server as server import sshuttle.firewall as firewall import sshuttle.hostwatch as hostwatch from sshuttle.helpers import family_ip_tuple, log, Fatal @@ -112,7 +111,6 @@ def parse_list(list): optspec = """ sshuttle [-l [ip:]port] [-r [username@]sshserver[:port]] <subnets...> -sshuttle --server sshuttle --firewall <port> <subnets...> sshuttle --hostwatch -- @@ -150,12 +148,7 @@ if opt.wrap: helpers.verbose = opt.verbose try: - if opt.server: - if len(extra) != 0: - o.fatal('no arguments expected') - server.latency_control = opt.latency_control - sys.exit(server.main()) - elif opt.firewall: + if opt.firewall: if len(extra) != 6: o.fatal('exactly six arguments expected') port, dnsport = int(extra[0]), int(extra[1]) diff --git a/sshuttle/sshuttle.md b/sshuttle/sshuttle.md index 806e181..8f772a1 100644 --- a/sshuttle/sshuttle.md +++ b/sshuttle/sshuttle.md @@ -147,11 +147,6 @@ entire subnet to the VPN. *pidfilename*. The default is `sshuttle.pid` in the current directory. ---server -: (internal use only) run the sshuttle server on - stdin/stdout. This is what the client runs on - the remote end. - --firewall : (internal use only) run the firewall manager. This is the only part of sshuttle that must run as root. If |