extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2024-11-24 17:04:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: bad file descriptor error in windows, fix pytest errors

Browse Source
This commit is contained in:
nom3ad 2024-01-02 01:31:24 +05:30 committed by Brian May
parent 4a84ad3be6
commit d4d0fa945d
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/exec-tool
View File

@ -24,7 +24,7 @@ ping)
;; ;;
iperf3) iperf3)
port=5001 port=5001
with_set_x exec iperf3 --client "$ip" --port=$port --connect-timeout=$connect_timeout_sec "$@" with_set_x exec iperf3 --client "$ip" --port=$port --connect-timeout=$((connect_timeout_sec * 1000)) "$@"
;; ;;
curl) curl)
port=8080 port=8080
@ -32,6 +32,6 @@ curl)
;; ;;
ab) ab)
port=8080 port=8080
with_set_x exec ab -n 100 -c 20 -s $connect_timeout_sec "$@" "http://$ip:$port/" with_set_x exec ab -n 100 -c 20 -s $connect_timeout_sec "$@" "http://$ip:$port/"
;; ;;
esac esac

9
hack/run-checks Executable file
View File

@ -0,0 +1,9 @@
#!/usr/bin/env bash
set -e
cd "$(dirname "$0")/.."
export PYTHONPATH=.
set -x
python -m pytest .
python -m flake8 .

1
sshuttle/firewall.py
View File

@ -224,7 +224,6 @@ def main(method_name, syslog):
stdout.write(('READY %s\n' % method.name).encode('ASCII')) stdout.write(('READY %s\n' % method.name).encode('ASCII'))
stdout.flush() stdout.flush()
def _read_next_string_line(): def _read_next_string_line():
try: try:
line = stdin.readline(128) line = stdin.readline(128)

3
sshuttle/ssnet.py
View File

@ -432,7 +432,8 @@ class Mux(Handler):
def flush(self): def flush(self):
set_non_blocking_io(self.wfile.fileno()) set_non_blocking_io(self.wfile.fileno())
if self.outbuf and self.outbuf[0]: if self.outbuf and self.outbuf[0]:
wrote = _nb_clean(os.write, self.wfile.fileno(), self.outbuf[0]) wrote = _nb_clean(self.wfile.write, self.outbuf[0])
self.wfile.flush()
debug2('mux wrote: %r/%d' % (wrote, len(self.outbuf[0]))) debug2('mux wrote: %r/%d' % (wrote, len(self.outbuf[0])))
if wrote: if wrote:
self.outbuf[0] = self.outbuf[0][wrote:] self.outbuf[0] = self.outbuf[0][wrote:]

2
tests/client/test_firewall.py
View File

@ -21,7 +21,7 @@ NSLIST
PORTS 1024,1025,1026,1027 PORTS 1024,1025,1026,1027
GO 1 - - 0x01 12345 GO 1 - - 0x01 12345
HOST 1.2.3.3,existing HOST 1.2.3.3,existing
""".format(inet=AF_INET, inet6=AF_INET6)) """.format(inet=AF_INET, inet6=AF_INET6).encode('ASCII'))
stdout = Mock() stdout = Mock()
return stdin, stdout return stdin, stdout