Commit Graph

266 Commits

Author SHA1 Message Date
Shai Ayal
3f2de26f67 Fixed issue #12
family should be an integer. fixed parsing routes
2015-07-22 22:52:25 +03:00
Brian May
53d5260f8f Merge pull request #11 from douglas/master
Fix the excludes rule for OS X Yosemite and OS X El Captain
2015-06-19 17:34:14 +10:00
Douglas Soares de Andrade
f870ceba00 Fix the excludes rule for OS X Yosemite and OS X El Captain
Without this fix, the rdr rule is executed sending the packages that
should be excluded to the ssh tunnel.

What I did was make sure that the packages that are going to the
excluded subnets are processed first and only after that, the remaining
packages will be sent to the ssh tunnel.

Thanks Warr1024 on #openssh channel in freenode for telling me about
the quick keyword and the rest of guys in the channel who tried to help.
2015-06-18 18:09:18 -03:00
Brian May
a38963301e Merge pull request #10 from jbd/patch-1
Check for fileno attribute in _tty_width function
2015-05-13 11:01:05 +10:00
jbd
bbd54e150d Check for fileno attribute in _tty_width function
When using Options parser within a unittest.TextTestRunner with buffering enabled (buffer=True), it fails with: 
AttributeError: StringIO instance has no attribute 'fileno'

This change will prevent this kind of error.
2015-05-12 16:43:38 +02:00
Brian May
00f20657e3 Merge pull request #9 from scommab/patch-1
Make firewall.py use the right params for islocal
2015-05-03 14:42:23 +10:00
Saul
84b30be904 Make firewall.py use the right params for islocal 2015-05-01 23:36:08 -07:00
Brian May
5825dddb02 Merge pull request #8 from nanoant/patch/osx-improvements
Patch/osx improvements
2015-04-21 09:49:18 +10:00
Adam Strzelecki
9eced8d049 OSX: New Retina compatible menu & app icon
This icons are using scale independent PDF template images which make menu item
icon look great on both Yosemite light & dark theme. Also adding new flatter
and higher resolution app icon.
2015-04-20 20:32:02 +02:00
Adam Strzelecki
fecb53413d OSX: Remove status item on application quit
This ensures application is not leaving empty status item.
2015-04-20 20:23:20 +02:00
Adam Strzelecki
1b1ed4d495 OSX: Improve app startup time
Importing everything (*) from AppKit takes a while, since we got 3 scripts
doing that, startup could take up to few seconds. This change makes script
import only what they need, improving startup time to fraction of second.
2015-04-20 18:53:06 +02:00
Brian May
b19272a67a Merge pull request #7 from xtaran/master
Fix the most blatant issues of the generated .deb
2015-04-20 10:39:55 +10:00
Axel Beckert
bc2a0b7fbc Fix path to main.py in .deb 2015-04-18 14:46:55 +02:00
Axel Beckert
6a96ace497 autossh is not required but nice to have 2015-04-18 14:40:00 +02:00
Axel Beckert
163aab2ca1 Fix typo in long description of .deb 2015-04-18 14:31:30 +02:00
Axel Beckert
964977220e Change .deb section from utils to net 2015-04-18 14:30:35 +02:00
Axel Beckert
db67834164 Add missing dependency on iptables in the .deb 2015-04-18 14:30:30 +02:00
Axel Beckert
1bc2f84d16 Use a less confusing version for .deb packages built from git 2015-04-18 14:30:30 +02:00
Axel Beckert
a229fc020c Properly separate short and long description in .deb 2015-04-18 14:30:30 +02:00
Axel Beckert
d6e7a9b6ad Update homepage header of .deb 2015-04-18 14:30:30 +02:00
Axel Beckert
e6ca7148fa Fix formatting of versioned dependency in the .deb 2015-04-18 14:30:21 +02:00
Axel Beckert
95529a5137 Don't include MacOS X stuff in .deb 2015-04-18 14:30:21 +02:00
Axel Beckert
93c4af6fc8 There's no need to have hard dependency on a init system in the .deb
Otherwise the package is only installable on current Ubuntu releases
and neither on future Ubuntu releases (which will use systemd) nor on
Debian and other Debian derivatives (where the administrator can
decided which init system is used).
2015-04-18 14:30:16 +02:00
Axel Beckert
2ca9aaa450 The .deb is and needs to be architecture-independent 2015-04-18 14:14:33 +02:00
Brian May
2cfc39fac8 Fix UDP channel expiration. 2015-04-12 09:59:49 +10:00
Brian May
29819ea0af Merge pull request #6 from lkorth/patch-1
Fix clone url in README
2015-04-11 10:15:20 +10:00
Luke Korth
e43a40565b Fix clone url in README 2015-04-09 09:22:31 -07:00
Brian May
57d1cb1e11 Merge pull request #5 from seanzxx/yosemite_support_sudo_fix
fix sudo issue in yosemite
2015-03-23 14:11:16 +11:00
Sean Zeng
6e32d1445a add -e/-d support 2015-03-21 22:43:12 -07:00
Sean Zeng
bdad253ef5 fix mistake 2015-03-21 15:36:42 -07:00
Sean Zeng
49c55f6825 use -E/-X to enable/disable pf on yosemite 2015-03-21 15:28:17 -07:00
Sean Zeng
1874aaceb4 refine firewall initlization 2015-03-21 00:00:15 -07:00
Sean Zeng
4c31bc02a4 add anchor rule directly 2015-03-20 18:21:00 -07:00
Sean Zeng
84047089a9 fix sudo issue 2015-03-19 02:43:11 -07:00
Brian May
8be9270fdb Merge pull request #4 from seanzxx/yosemite_support
Yosemite support
2015-03-19 09:55:39 +11:00
Sean Zeng
10dc229125 fix bootstrapping issue when pf started before 2015-03-18 09:25:41 -07:00
Sean Zeng
cd77ad5e7b refine error message 2015-03-15 22:53:08 -07:00
Sean Zeng
c13cb9b8ca optimize the ctypes import 2015-03-15 22:45:32 -07:00
Sean Zeng
0fe48a4682 initial support for pf in yosemite 2015-03-15 22:34:40 -07:00
Tim D. Smith
6121a6dca3 sshuttle.md: fix whitespace issues. 2014-12-16 14:06:13 +11:00
Tim D. Smith
c576682caf sshuttle.md: document Internet Sharing incompatibility 2014-12-16 14:04:25 +11:00
Tianyi Cui
343905784b Added --exclude-from feature.
(Slightly modified by apenwarr)
2014-10-06 13:04:33 +11:00
Miguel Landaeta
91d705c24f Document missing --dns option in sshuttle manpage 2014-10-06 13:01:31 +11:00
Avery Pennarun
e5251969b0 firewall.py: catch SIGINT and SIGTERM too.
There were still a few conditions under some OSes that would cause
firewall.py to terminate without cleaning up the firewall settings.  'pkill
sshuttle' was one of them.  Ignore a couple more signals to further ensure a
correct cleanup.

(This only affects sshuttle --firewall, which is a subprocess of the main
sshuttle process.  The firewall is supposed to exit automatically whenever
the client exits, and so far that part seems to work reliably.)
2014-10-06 13:00:57 +11:00
Tyler Sy
b8e150fc4d Use python-config to compile with latest Python version.
For OS X systems without Python 2.5, runpython.c does not compile.
Use python-config to get the paths for the latest version.
2014-10-03 14:58:26 -07:00
Brian May
36378efe5e Revert Debian package specific change.
This is required so sshuttle can be run from git repository.

The way the Debian package is created is non-standard, and probably
needs redoing anyway.
2014-09-23 11:14:56 +10:00
Jimmy Tang
cba8b261c6 Use the new arguments from redo v0.10.
(apenwarr: also updates to the matching, latest minimal/do)
2014-09-23 10:14:59 +10:00
Avery Pennarun
39425a03c5 firewall: catch SIGHUP and SIGPIPE.
Not sure if this will fix anything, but it might stop the problem reported
on some MacOS versions where the firewall doesn't get cleaned up correctly.
2014-09-23 10:14:27 +10:00
Avery Pennarun
5a39341d50 ui-macos/main.py: fix wait() to avoid deadlock.
If the subprocess was trying to write to its stdout/stderr, its process
would never actually finish because it was blocked waiting for us to read
it, but we were blocked on waitpid().  Instead, use waitpid(WNOHANG) and
continually read from the subprocess (which should be a blocking operation)
until it exits.
2014-09-23 10:11:13 +10:00
Avery Pennarun
3eef3635ac ipfw: don't use 'log' parameter.
I guess we were causing the kernel to syslog on every single packet on
MacOS.  Oops.
2014-09-23 10:09:16 +10:00