Commit a651d748 authored by Brian May's avatar Brian May

Remove unused code.

parent fe48c7c0
...@@ -4,7 +4,6 @@ import socket ...@@ -4,7 +4,6 @@ import socket
import sshuttle.helpers as helpers import sshuttle.helpers as helpers
import sshuttle.options as options import sshuttle.options as options
import sshuttle.client as client import sshuttle.client as client
import sshuttle.server as server
import sshuttle.firewall as firewall import sshuttle.firewall as firewall
import sshuttle.hostwatch as hostwatch import sshuttle.hostwatch as hostwatch
from sshuttle.helpers import family_ip_tuple, log, Fatal from sshuttle.helpers import family_ip_tuple, log, Fatal
...@@ -112,7 +111,6 @@ def parse_list(list): ...@@ -112,7 +111,6 @@ def parse_list(list):
optspec = """ optspec = """
sshuttle [-l [ip:]port] [-r [username@]sshserver[:port]] <subnets...> sshuttle [-l [ip:]port] [-r [username@]sshserver[:port]] <subnets...>
sshuttle --server
sshuttle --firewall <port> <subnets...> sshuttle --firewall <port> <subnets...>
sshuttle --hostwatch sshuttle --hostwatch
-- --
...@@ -150,12 +148,7 @@ if opt.wrap: ...@@ -150,12 +148,7 @@ if opt.wrap:
helpers.verbose = opt.verbose helpers.verbose = opt.verbose
try: try:
if opt.server: if opt.firewall:
if len(extra) != 0:
o.fatal('no arguments expected')
server.latency_control = opt.latency_control
sys.exit(server.main())
elif opt.firewall:
if len(extra) != 6: if len(extra) != 6:
o.fatal('exactly six arguments expected') o.fatal('exactly six arguments expected')
port, dnsport = int(extra[0]), int(extra[1]) port, dnsport = int(extra[0]), int(extra[1])
......
...@@ -147,11 +147,6 @@ entire subnet to the VPN. ...@@ -147,11 +147,6 @@ entire subnet to the VPN.
*pidfilename*. The default is `sshuttle.pid` in the *pidfilename*. The default is `sshuttle.pid` in the
current directory. current directory.
--server
: (internal use only) run the sshuttle server on
stdin/stdout. This is what the client runs on
the remote end.
--firewall --firewall
: (internal use only) run the firewall manager. This is : (internal use only) run the firewall manager. This is
the only part of sshuttle that must run as root. If the only part of sshuttle that must run as root. If
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment