extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-04-15 23:08:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added --exclude-from feature.

Browse Source 
(Slightly modified by apenwarr)
This commit is contained in:
Tianyi Cui 2011-04-19 20:19:06 +08:00 committed by Brian May
parent 91d705c24f
commit 343905784b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.py
View File

@ -120,6 +120,7 @@ method= auto, nat, tproxy, or ipfw
python= path to python interpreter on the remote server python= path to python interpreter on the remote server
r,remote= ssh hostname (and optional username) of remote sshuttle server r,remote= ssh hostname (and optional username) of remote sshuttle server
x,exclude= exclude this subnet (can be used more than once) x,exclude= exclude this subnet (can be used more than once)
X,exclude-from= exclude the subnets in a file (whitespace separated)
v,verbose increase debug message verbosity v,verbose increase debug message verbosity
e,ssh-cmd= the command to use to connect to the remote [ssh] 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) seed-hosts= with -H, use these hostnames for initial scan (comma-separated)
@ -165,6 +166,8 @@ try:
for k, v in flags: for k, v in flags:
if k in ('-x', '--exclude'): if k in ('-x', '--exclude'):
excludes.append(v) excludes.append(v)
if k in ('-X', '--exclude-from'):
excludes += open(v).read().split()
remotename = opt.remote remotename = opt.remote
if remotename == '' or remotename == '-': if remotename == '' or remotename == '-':
remotename = None remotename = None

4
src/sshuttle.md
View File

@ -94,6 +94,10 @@ entire subnet to the VPN.
`0/0 -x 1.2.3.0/24` to forward everything except the `0/0 -x 1.2.3.0/24` to forward everything except the
local subnet over the VPN, for example. local subnet over the VPN, for example.
-X, --exclude-from=*file*
: exclude the subnets specified in a file, one subnet per
line. Useful when you have lots of subnets to exclude.
-v, --verbose -v, --verbose
: print more information about the session. This option : print more information about the session. This option
can be used more than once for increased verbosity. By can be used more than once for increased verbosity. By