b55fd5cdcf
Anchor name should be binary instead of str
...
This fixes an issue on FreeBSD with Python 3 where although no errors
were reported packets wouldn't get routed through sshuttle as the anchor
was not being properly set.
2016-01-02 15:32:04 +00:00
c3cd3799e4
Adds support for FreeBSD PF
...
The PF firewall that is included in the FreeBSD base system does not
have exactly the same data structures as the OSX version. This commit
fixes the offsets and some field types that are also different. Tested
with FreeBSD 10.2 and OSX 10.11.2.
2015-12-30 02:57:07 +00:00
e433c599e4
IPv6 routes must be added manually
2015-12-15 14:26:39 +11:00
ba60d22478
Add another test.
2015-12-15 14:23:42 +11:00
3db38c992a
Replace numbered points with dot points.
2015-12-15 14:23:19 +11:00
1e81bf3dfc
Mirror setup/restore logic
2015-12-15 13:39:00 +11:00
7362ba9f52
If listenip_v6 we should declare ipv6 required
2015-12-15 13:31:03 +11:00
b207d1d0d6
Fixes for --auto-nets
2015-12-15 13:30:34 +11:00
56e3b22820
Add FIXME comment.
2015-12-15 13:29:04 +11:00
02fa49627f
Fix server side Python3 issues.
...
Closes : #49 .
2015-12-15 12:51:29 +11:00
ce5187100c
Add to TPROXY documentation
2015-12-15 11:48:34 +11:00
bdc7d3a97c
Fix UDP Python 3.5 issues.
...
Closes : #48
2015-12-15 11:41:48 +11:00
90654b4fb9
Simplify selection of features
2015-12-15 11:40:55 +11:00
6b4e36c528
Declare DNS support as feature
2015-12-14 21:00:31 +11:00
eed917f062
Don't declare udp feature without recvmsg
2015-12-14 20:59:26 +11:00
74f2d9ca7e
Ensure Fatal errors are really Fatal
2015-12-14 20:51:49 +11:00
1e04eb1616
Updates to TPROXY docs.
2015-12-14 20:27:47 +11:00
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
c61984088b
Test PF on non-darwin.
2015-12-14 09:28:43 +11:00
e63e121354
Print PF rules used.
...
Also support multiline debug output better.
2015-12-14 09:21:15 +11:00
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
2eeea9536a
Fixed str being used as bytes in daemonize
2015-12-09 16:32:39 +11:00
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
4fdd715bc1
Don't change object while iterating
...
Closes : #40
2015-12-09 10:29:40 +11:00
bea723c598
Add tox.ini file.
2015-12-07 13:17:09 +11:00
1ae4fce6b3
Fix logging with pf method and Python 3.5
2015-12-07 13:16:47 +11:00
118171af7f
Fix get_tcp_dstip with MacOSX/Python3.5
2015-12-07 07:14:26 +11:00
3367124e6b
Fix more brokenness.
2015-12-06 11:45:49 +11:00
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
da4ce19121
Fix MacOSX tests.
2015-12-06 11:24:38 +11:00
12d4b304c3
Fix another MacOSX/Python3.5 issue.
2015-12-06 11:24:11 +11:00
bd97506f7d
Fixup firewall tests.
2015-12-06 11:02:31 +11:00
53c07f7d90
hostmap shouldn't be global.
2015-12-06 11:00:12 +11:00
7e0c1534df
Be more explicit
2015-12-06 10:58:51 +11:00
a3fbf860ff
Fix more MacOSX/Python3.5 issues.
2015-12-05 20:21:36 +11:00
7a9e36d211
Fix MacOSX/Python3.5 issues.
...
Closes : #36 .
2015-12-05 16:41:33 +11:00
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
43084eb49a
Fix typo.
2015-12-05 14:40:33 +11:00
bbb4d31c3f
Add accidentally removed line.
2015-12-05 14:39:07 +11:00
f7682d4c33
Make firewall messages consistent
2015-12-05 14:26:20 +11:00
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
50a6e87237
Don't use Xtoken if not set
2015-12-05 14:12:57 +11:00
ed0a92e714
Remove reference to obsolete global
2015-12-05 14:12:24 +11:00
36a1d7ead9
Python 3.5 fix.
2015-12-01 10:29:24 +11:00
43d6ad6a51
Print Python version used for the various stages.
2015-12-01 10:03:24 +11:00
5ab76a6ba9
Merge pull request #33 from felixonmars/master
...
Fix bug reported by @matiwinnetou in #31
2015-12-01 09:47:41 +11:00
61f9ae6fb4
Fix bug reported by @matiwinnetou in #31
2015-11-30 23:45:24 +08:00
191df92824
Ensure tempfiles are chmod 600
2015-11-28 16:13:56 +11:00
6dfbc467c0
Ensure verbose is never None.
...
None >= 1 not valid under Python3.
Fixes #31 .
2015-11-28 16:03:01 +11:00
c06c972039
Prefer Python3 by default.
2015-11-28 16:02:47 +11:00
