aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-10 11:33:03 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-10 11:33:03 +0200
commitebba79b6558b23cec13faa3562ff05ada5912ca4 (patch)
treebcd4b701b9ab847d810ef21199d3fc421362505d /libmproxy/protocol
parent3b6140dfffe5abe5bd3ce48a9371620cbd7ef78a (diff)
downloadmitmproxy-ebba79b6558b23cec13faa3562ff05ada5912ca4.tar.gz
mitmproxy-ebba79b6558b23cec13faa3562ff05ada5912ca4.tar.bz2
mitmproxy-ebba79b6558b23cec13faa3562ff05ada5912ca4.zip
raw tcp mode: use ssl_read_select
Diffstat (limited to 'libmproxy/protocol')
-rw-r--r--libmproxy/protocol/rawtcp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/protocol/rawtcp.py b/libmproxy/protocol/rawtcp.py
index 86468773..6ab0196a 100644
--- a/libmproxy/protocol/rawtcp.py
+++ b/libmproxy/protocol/rawtcp.py
@@ -4,7 +4,7 @@ import select
from OpenSSL import SSL
-from netlib.tcp import NetLibError
+from netlib.tcp import NetLibError, ssl_read_select
from netlib.utils import cleanBin
from ..exceptions import ProtocolException
from .base import Layer
@@ -28,7 +28,7 @@ class RawTCPLayer(Layer):
try:
while True:
- r, _, _ = select.select(conns, [], [], 10)
+ r = ssl_read_select(conns, 10)
for conn in r:
dst = server if conn == client else client