Commit Graph

408 Commits

Author SHA1 Message Date
vieira
7d8309ef05 Refactor OS specific portions of PF
This will make it easier to support other platforms/versions in the
future, e.g., OpenBSD.
2016-03-02 18:04:43 +11:00
Brian May
b7d37e44fb Remove legacy file 2016-03-02 12:47:45 +11:00
Matt Boswell
4a954c547a fix byte/string bug introduced in 1c46f25e
This is the error message that this commit fixes:
TypeError: sequence item 142: expected a bytes-like object, str found

Complete what 1c46f25e started, more or less.
2016-01-31 16:26:21 -05:00
Brian May
4fcf7c73da Fix regression: ensure we do bind
Closes: #68
2016-01-31 19:15:02 +11:00
Brian May
ba8e948c0d Don't allocate socket until we need it
Wew were trying to allocate an IPv6 socket even though we weren't using
IPv6, causing failures on systems without IPv6 support available.

This change means a number of methods on MultiListener, e.g. setsockopt,
should not be called until after the bind call.

Closes #68
2016-01-30 11:28:59 +11:00
Brian May
e06f0240cb Make sure we use Python 3.5 2016-01-30 11:27:37 +11:00
Veljko Tornjanski
517fc2c930 Remove references to number of years
Closes: #65
2016-01-21 08:42:34 +11:00
KS Chan
11533869a8 Fix description of excludes in Windows setup
And some subtle grammar.

Closes: #66
2016-01-21 08:38:38 +11:00
Brian May
0392a779a2 Update usage documentation 2016-01-20 21:19:44 +11:00
Brian May
ee26157faa Add Windows documentation
Copied from https://coderwall.com/p/adfxgw/sshuttle-on-windows

Closes #64
2016-01-20 20:55:10 +11:00
Brian May
0bdfb883aa Don't distribute sshuttle/version.py
It is autogenerated.
2016-01-18 09:00:00 +11:00
Brian May
ff9756f290 Release version 0.76 2016-01-17 18:38:43 +11:00
Brian May
59865269ac Update documentation
Closes #60.
2016-01-17 18:34:10 +11:00
Brian May
28017303f2 Add link to documentation 2016-01-17 18:20:42 +11:00
Brian May
c5af6fef8c Remove table.
Suspect it is causing sphinx to crash on readthedocs. See
https://github.com/sphinx-doc/sphinx/issues/1871
2016-01-17 18:07:52 +11:00
Brian May
6835183b37 Attempt work around of sphinx bug 2016-01-17 17:58:48 +11:00
Brian May
242c266e7d Move recvmsg to requirements 2016-01-17 17:58:36 +11:00
Brian May
7408ab3c53 Remove coverage
Not required as we are not documenting the source code.
2016-01-17 17:24:13 +11:00
Brian May
ea10ff1305 Fix broken link. 2016-01-17 16:43:25 +11:00
Brian May
d9939b8460 Add changelog to documentation 2016-01-17 16:37:47 +11:00
Brian May
80f363842d Add requirements.txt for readthedocs 2016-01-17 16:32:53 +11:00
Brian May
262affe94f Use Sphinx for documentation
See #60
2016-01-17 16:19:13 +11:00
shaiay
d80b590a71 Fix joining of seed hosts to be compatible with python 3.5
this should also be backwards compatible with python 2
2016-01-17 12:05:23 +11:00
Brian May
7f0b5c698b Fix installation from wheel
Fix the following error. Looks like we have to have a function to call
for the entrypoint.

$ pip install dist/sshuttle-0.76.dev8_ngf59508f-py2-none-any.whl
Processing ./dist/sshuttle-0.76.dev8_ngf59508f-py2-none-any.whl
Installing collected packages: sshuttle
Exception:
Traceback (most recent call last):
  File "/tmp/ddd/local/lib/python2.7/site-packages/pip/basecommand.py", line 211, in main
    status = self.run(options, args)
  File "/tmp/ddd/local/lib/python2.7/site-packages/pip/commands/install.py", line 311, in run
    root=options.root_path,
  File "/tmp/ddd/local/lib/python2.7/site-packages/pip/req/req_set.py", line 646, in install
    **kwargs
  File "/tmp/ddd/local/lib/python2.7/site-packages/pip/req/req_install.py", line 803, in install
    self.move_wheel_files(self.source_dir, root=root)
  File "/tmp/ddd/local/lib/python2.7/site-packages/pip/req/req_install.py", line 998, in move_wheel_files
    isolated=self.isolated,
  File "/tmp/ddd/local/lib/python2.7/site-packages/pip/wheel.py", line 479, in move_wheel_files
    maker.make_multiple(['%s = %s' % kv for kv in console.items()])
  File "/tmp/ddd/local/lib/python2.7/site-packages/pip/_vendor/distlib/scripts.py", line 364, in make_multiple
    filenames.extend(self.make(specification, options))
  File "/tmp/ddd/local/lib/python2.7/site-packages/pip/_vendor/distlib/scripts.py", line 353, in make
    self._make_script(entry, filenames, options=options)
  File "/tmp/ddd/local/lib/python2.7/site-packages/pip/_vendor/distlib/scripts.py", line 244, in _make_script
    script = self._get_script_text(entry).encode('utf-8')
  File "/tmp/ddd/local/lib/python2.7/site-packages/pip/wheel.py", line 396, in _get_script_text
    "import_name": entry.suffix.split(".")[0],
AttributeError: 'NoneType' object has no attribute 'split'
2016-01-17 10:21:21 +11:00
Brian May
f59508f41b Be explicit
These files were included, however just to make sure.
2016-01-13 20:51:09 +11:00
Nathan Aclander
329867a090 Move pyXAPI requirement 2016-01-13 19:34:20 +11:00
Brian May
1e82571b3d Experimental: Use setuptools-scm
Closes: #58
2016-01-13 19:00:08 +11:00
Nathan Aclander
aab973f12e Small grammar changes 2016-01-13 19:00:08 +11:00
Nathan Aclander
d982b36521 Remove verbose debugging from example usage 2016-01-13 19:00:08 +11:00
Nathan Aclander
a90877b49b Use correct rst formatting for inline monospace 2016-01-13 19:00:08 +11:00
Nathan Aclander
fc5545ccde Remove a print from tproxy used for debug
Closes: #61
2016-01-13 19:00:08 +11:00
Nathan Aclander
629c386dc5 Add the option to disable sshuttle ipv6 support
Using --disable-ipv6 will now force sshuttle not to capture
ipv6 traffic, even if the client supports ipv6.
2016-01-12 13:07:07 +11:00
Brian May
45f572f7a8 Version 0.75 2016-01-12 12:29:08 +11:00
Brian May
e7fe040e10 Revert "fixes the sshuttle entry-point in setup.py"
See #57 for details.

This reverts commit b4b283b214.
2016-01-12 12:25:04 +11:00
Brian May
2e237b8fbe Remember to increment version. 2016-01-10 10:05:50 +11:00
Brian May
098916a8de Version 0.74 2016-01-10 10:02:14 +11:00
Brian May
d3624332dc Fix documentation.
Should work even with different python versions on client and server.
2016-01-10 10:01:47 +11:00
zimbatm
b4b283b214 fixes the sshuttle entry-point in setup.py
This fixes the following error:

    "import_name": entry.suffix.split(".")[0],
    AttributeError: 'NoneType' object has no attribute 'split'

See
https://pythonhosted.org/setuptools/setuptools.html#automatic-script-creation
2016-01-09 20:04:58 +00:00
vieira
1c46f25e13 Fixed str being used as bytes in hostwatch
This should solve the TypeError reported in #53 and some others I found
while testing the fix.

Closes: #53
2016-01-07 14:16:03 +11:00
vieira
11838d65c2 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.
2016-01-05 18:00:57 +11:00
Brian May
e433c599e4 IPv6 routes must be added manually 2015-12-15 14:26:39 +11:00
Brian May
ba60d22478 Add another test. 2015-12-15 14:23:42 +11:00
Brian May
3db38c992a Replace numbered points with dot points. 2015-12-15 14:23:19 +11:00
Brian May
1e81bf3dfc Mirror setup/restore logic 2015-12-15 13:39:00 +11:00
Brian May
7362ba9f52 If listenip_v6 we should declare ipv6 required 2015-12-15 13:31:03 +11:00
Brian May
b207d1d0d6 Fixes for --auto-nets 2015-12-15 13:30:34 +11:00
Brian May
56e3b22820 Add FIXME comment. 2015-12-15 13:29:04 +11:00
Brian May
02fa49627f Fix server side Python3 issues.
Closes: #49.
2015-12-15 12:51:29 +11:00
Brian May
ce5187100c Add to TPROXY documentation 2015-12-15 11:48:34 +11:00
Brian May
bdc7d3a97c Fix UDP Python 3.5 issues.
Closes: #48
2015-12-15 11:41:48 +11:00