Browse files

MacOS precompiled app package for sshuttle-0.61

  • Loading branch information...
1 parent d5c3aa6 commit 87ca53cbc420008d59a5f6d1711314ad5a144721 @apenwarr committed Jul 6, 2012
View
BIN Sshuttle VPN.app/Contents/MacOS/Sshuttle
Binary file not shown.
View
2 Sshuttle VPN.app/Contents/Resources/sshuttle/firewall.py
@@ -471,6 +471,8 @@ def main(port, dnsport, syslog):
# disappears; we still have to clean up.
signal.signal(signal.SIGHUP, signal.SIG_IGN)
signal.signal(signal.SIGPIPE, signal.SIG_IGN)
+ signal.signal(signal.SIGTERM, signal.SIG_IGN)
+ signal.signal(signal.SIGINT, signal.SIG_IGN)
# ctrl-c shouldn't be passed along to me. When the main sshuttle dies,
# I'll die automatically.
View
3 Sshuttle VPN.app/Contents/Resources/sshuttle/main.py
@@ -57,6 +57,7 @@ def parse_ipport(s):
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 @@ def parse_ipport(s):
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
View
11 Sshuttle VPN.app/Contents/Resources/sshuttle/server.py
@@ -43,7 +43,12 @@ def _maskbits(netmask):
def _shl(n, bits):
- return n * int(2**bits)
+ # we use our own implementation of left-shift because
+ # results may be different between older and newer versions
+ # of python for numbers like 1<<32. We use long() because
+ # int(2**32) doesn't work in older python, which has limited
+ # int sizes.
+ return n * long(2**bits)
def _list_routes():
@@ -68,9 +73,11 @@ def _list_routes():
def list_routes():
+ l = []
for (ip,width) in _list_routes():
if not ip.startswith('0.') and not ip.startswith('127.'):
- yield (ip,width)
+ l.append((ip,width))
+ return l
def _exc_dump():

0 comments on commit 87ca53c

Please sign in to comment.