Commit 574ed8e5 authored by Scott Kuhl's avatar Scott Kuhl

Allow no remote to work.

Pull request #502 made -r/--remote required. However, the
documentation still indicates that using no remote is a valid way to
test sshuttle (see Examples section of man page). I think this mode
might be useful for testing performance local without ssh, local with
ssh, and remote with ssh.

This patch adds a warning when -r/--remote is missing but restores the
previous behavior.
parent c1cc3911
...@@ -572,9 +572,9 @@ def main(listenip_v6, listenip_v4, ...@@ -572,9 +572,9 @@ def main(listenip_v6, listenip_v4,
user, sudo_pythonpath): user, sudo_pythonpath):
if not remotename: if not remotename:
# XXX: We can't make it required at the argparse level, print("WARNING: You must specify -r/--remote to securely route "
# because sshuttle calls out to itself in FirewallClient. "traffic to a remote machine. Running without -r/--remote "
raise Fatal("You must specify -r/--remote.") "is only recommended for testing.")
if daemon: if daemon:
try: try:
......
...@@ -43,6 +43,8 @@ def parse_hostport(rhostport): ...@@ -43,6 +43,8 @@ def parse_hostport(rhostport):
""" """
# leave use of default port to ssh command to prevent overwriting # leave use of default port to ssh command to prevent overwriting
# ports configured in ~/.ssh/config when no port is given # ports configured in ~/.ssh/config when no port is given
if rhostport is None or len(rhostport) == 0:
return None, None, None, None
port = None port = None
username = None username = None
password = None password = None
......
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