extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-05-30 14:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix logging with pf method and Python 3.5

Browse Source
This commit is contained in:
Brian May 2015-12-07 13:16:47 +11:00
parent 118171af7f
commit 1ae4fce6b3
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sshuttle/methods/pf.py
View File

@ -158,12 +158,13 @@ class Method(BaseMethod):
argv = (sock.family, socket.IPPROTO_TCP, argv = (sock.family, socket.IPPROTO_TCP,
peer[0].encode("ASCII"), peer[1], peer[0].encode("ASCII"), peer[1],
proxy[0].encode("ASCII"), proxy[1]) proxy[0].encode("ASCII"), proxy[1])
pfile.write(b"QUERY_PF_NAT %d,%d,%s,%d,%s,%d\n" % argv) out_line = b"QUERY_PF_NAT %d,%d,%s,%d,%s,%d\n" % argv
pfile.write(out_line)
pfile.flush() pfile.flush()
line = pfile.readline() in_line = pfile.readline()
debug2(b"QUERY_PF_NAT %d,%d,%s,%d,%s,%d" % argv + b' > ' + line) debug2(out_line.decode("ASCII") + ' > ' + in_line.decode("ASCII"))
if line.startswith(b'QUERY_PF_NAT_SUCCESS '): if in_line.startswith(b'QUERY_PF_NAT_SUCCESS '):
(ip, port) = line[21:].split(b',') (ip, port) = in_line[21:].split(b',')
return (ip.decode("ASCII"), int(port)) return (ip.decode("ASCII"), int(port))
return sock.getsockname() return sock.getsockname()

1
sshuttle/tests/test_methods_pf.py
View File

@ -12,6 +12,7 @@ def test_get_supported_features():
assert not features.udp assert not features.udp
@patch('sshuttle.helpers.verbose', new=3)
def test_get_tcp_dstip(): def test_get_tcp_dstip():
sock = Mock() sock = Mock()
sock.getpeername.return_value = ("127.0.0.1", 1024) sock.getpeername.return_value = ("127.0.0.1", 1024)