Commit Graph

654 Commits

Author SHA1 Message Date
Brian May
1e04eb1616 Updates to TPROXY docs. 2015-12-14 20:27:47 +11:00
vieira
117afc7a68 Fixed dictionary changed size during iteration
The removal loop should probably be outside the iteration loop.
2015-12-14 16:46:11 +11:00
Brian May
c61984088b Test PF on non-darwin. 2015-12-14 09:28:43 +11:00
Brian May
e63e121354 Print PF rules used.
Also support multiline debug output better.
2015-12-14 09:21:15 +11:00
Brian May
2b235331d0 Split setup_firewall method.
* setup_firewall sets the firewall up.
* restore_firewall restores the firewall to initial state.
2015-12-13 11:56:18 +11:00
vieira
2eeea9536a Fixed str being used as bytes in daemonize 2015-12-09 16:32:39 +11:00
vieira
9a77d03edf Respect --syslog as soon as possible
When executing with the option --syslog start redirecting to
syslog immediately after the command line options are validated.
This way when using with some init daemon, e.g., upstart all the
relevant information (connection failures, etc) can be retrieved from
the log instead of being lost to stdout or stderr.
2015-12-09 14:46:11 +11:00
Brian May
4fdd715bc1 Don't change object while iterating
Closes: #40
2015-12-09 10:29:40 +11:00
Brian May
bea723c598 Add tox.ini file. 2015-12-07 13:17:09 +11:00
Brian May
1ae4fce6b3 Fix logging with pf method and Python 3.5 2015-12-07 13:16:47 +11:00
Brian May
118171af7f Fix get_tcp_dstip with MacOSX/Python3.5 2015-12-07 07:14:26 +11:00
Brian May
3367124e6b Fix more brokenness. 2015-12-06 11:45:49 +11:00
Brian May
aaa6062329 Remove IPFW support.
This is no longer used by modern MacOSX and not getting tested.

It also required a do_wait() function which was a complication for
sshuttle as a whole.

Can get resurrected if required.
2015-12-06 11:33:52 +11:00
Brian May
da4ce19121 Fix MacOSX tests. 2015-12-06 11:24:38 +11:00
Brian May
12d4b304c3 Fix another MacOSX/Python3.5 issue. 2015-12-06 11:24:11 +11:00
Brian May
bd97506f7d Fixup firewall tests. 2015-12-06 11:02:31 +11:00
Brian May
53c07f7d90 hostmap shouldn't be global. 2015-12-06 11:00:12 +11:00
Brian May
7e0c1534df Be more explicit 2015-12-06 10:58:51 +11:00
Brian May
a3fbf860ff Fix more MacOSX/Python3.5 issues. 2015-12-05 20:21:36 +11:00
Brian May
7a9e36d211 Fix MacOSX/Python3.5 issues.
Closes: #36.
2015-12-05 16:41:33 +11:00
Brian May
65e81d51c6 Try Python3.5 by default.
Python 3.0, 3.1, 3.2, and 3.4 not supported however.
2015-12-05 14:41:22 +11:00
Brian May
43084eb49a Fix typo. 2015-12-05 14:40:33 +11:00
Brian May
bbb4d31c3f Add accidentally removed line. 2015-12-05 14:39:07 +11:00
Brian May
f7682d4c33 Make firewall messages consistent 2015-12-05 14:26:20 +11:00
Brian May
d07a775d50 Don't fail if can't revert errors
We will log the errors, however no point in failing; not only can this
hide errors that occured setting up the firewall, but is pointless as we
can't actually handle these errors in a good way anyway.
2015-12-05 14:14:01 +11:00
Brian May
50a6e87237 Don't use Xtoken if not set 2015-12-05 14:12:57 +11:00
Brian May
ed0a92e714 Remove reference to obsolete global 2015-12-05 14:12:24 +11:00
Brian May
36a1d7ead9 Python 3.5 fix. 2015-12-01 10:29:24 +11:00
Brian May
43d6ad6a51 Print Python version used for the various stages. 2015-12-01 10:03:24 +11:00
Brian May
5ab76a6ba9 Merge pull request #33 from felixonmars/master
Fix bug reported by @matiwinnetou in #31
2015-12-01 09:47:41 +11:00
Felix Yan
61f9ae6fb4 Fix bug reported by @matiwinnetou in #31 2015-11-30 23:45:24 +08:00
Brian May
191df92824 Ensure tempfiles are chmod 600 2015-11-28 16:13:56 +11:00
Brian May
6dfbc467c0 Ensure verbose is never None.
None >= 1 not valid under Python3.

Fixes #31.
2015-11-28 16:03:01 +11:00
Brian May
c06c972039 Prefer Python3 by default. 2015-11-28 16:02:47 +11:00
Brian May
da62fe5b80 Merge pull request #30 from felixonmars/master
Add tests_require into setup.py
2015-11-27 20:01:30 +11:00
Felix Yan
698351cf44 Add tests_require into setup.py
pytest and mock are needed for running tests.
2015-11-27 12:52:03 +08:00
Brian May
13457c773b Improve summary line. 2015-11-27 14:28:52 +11:00
Brian May
780997e8a7 New release 0.73. 2015-11-27 14:22:09 +11:00
Brian May
d41579c265 Add comment about IPFW support. 2015-11-27 14:18:16 +11:00
Brian May
974f9aee81 Remove legacy Debian packaging.
This needs to be redone; will do so at a later stage.
2015-11-27 14:13:45 +11:00
Brian May
4252e81fb0 Update documentation. 2015-11-27 14:13:18 +11:00
Brian May
7e10fc0756 Add to debugging messages. 2015-11-25 13:06:43 +11:00
Brian May
2c2ee12e58 Formatting change. 2015-11-25 12:59:48 +11:00
Brian May
256ed7d244 Fix reversed debug messages. 2015-11-25 12:59:17 +11:00
Brian May
151634cd8c Fix typo setting up UDP. 2015-11-25 12:58:39 +11:00
Brian May
c0748c2388 Support IPV6 DNS servers.
Closes #28.
2015-11-24 12:23:17 +11:00
Brian May
71d46d77bf Add sock paramater to Handler callbacks
As Handler objects can have multiple sockets, we need to know which one
was involved in the incoming event.
2015-11-24 12:19:31 +11:00
Brian May
c1083e983f Pass correct method back from firewall.
Don't pass auto back.
2015-11-24 12:08:12 +11:00
Brian May
9944b97629 Remove legacy MACOSX files.
Broken and not been maintained in some time. See #21.
2015-11-24 07:17:19 +11:00
Brian May
eaad54f68b Add FIXME comment. 2015-11-18 20:08:15 +11:00