summaryrefslogtreecommitdiffstats
path: root/Sshuttle VPN.app/Contents/Resources/sshuttle/main.py
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@gmail.com>2012-07-06 16:26:45 -0400
committerAvery Pennarun <apenwarr@gmail.com>2012-07-06 16:26:45 -0400
commit87ca53cbc420008d59a5f6d1711314ad5a144721 (patch)
tree717f6d8a3f47d869803e5bfaaf3a79833cbc792d /Sshuttle VPN.app/Contents/Resources/sshuttle/main.py
parentd5c3aa61b8b77d3b12647bb15a83ba51a5f4d312 (diff)
MacOS precompiled app package for sshuttle-0.61sshuttle-0.61-macos-bin
Diffstat (limited to 'Sshuttle VPN.app/Contents/Resources/sshuttle/main.py')
-rwxr-xr-xSshuttle VPN.app/Contents/Resources/sshuttle/main.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Sshuttle VPN.app/Contents/Resources/sshuttle/main.py b/Sshuttle VPN.app/Contents/Resources/sshuttle/main.py
index daf3b87..34d9fb1 100755
--- a/Sshuttle VPN.app/Contents/Resources/sshuttle/main.py
+++ b/Sshuttle VPN.app/Contents/Resources/sshuttle/main.py
@@ -57,6 +57,7 @@ dns capture local DNS requests and forward to the remote DNS server
python= path to python interpreter on the remote server
r,remote= ssh hostname (and optional username) of remote sshuttle server
x,exclude= exclude this subnet (can be used more than once)
+exclude-from= exclude the subnets in a file (whitespace separated)
v,verbose increase debug message verbosity
e,ssh-cmd= the command to use to connect to the remote [ssh]
seed-hosts= with -H, use these hostnames for initial scan (comma-separated)
@@ -104,6 +105,8 @@ try:
for k,v in flags:
if k in ('-x','--exclude'):
excludes.append(v)
+ if k in ('-X', '--exclude-from'):
+ excludes += open(v).read().split()
remotename = opt.remote
if remotename == '' or remotename == '-':
remotename = None