summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2011-09-04 16:24:48 +0300
committerAlon Levy <alevy@redhat.com>2011-09-04 16:24:48 +0300
commit1e60f86302026184e9301ae6171654342458abc2 (patch)
treeafaf37fa95a8eb72c11a65978c7a1fc8ef4220aa
parent2b277fdeea731077db6c414da1478f0a3686e0f1 (diff)
proxy: export 'other' object from handle_input, for bandwidth limiting later
-rwxr-xr-xbandwidthmon2
-rwxr-xr-xproxy.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/bandwidthmon b/bandwidthmon
index ae9afc5..c5d9102 100755
--- a/bandwidthmon
+++ b/bandwidthmon
@@ -176,7 +176,7 @@ def setup_proxy(ui, listen_port, listen_host, remote_addr, debug_proxy):
# accepter port returns nothing, don't close it.
dprint("%s: result %s" % (fd.fileno(), repr(result)))
return fd == accepter
- (src, dst, data, completer) = result
+ (src, dst, data, other, completer) = result
completer()
dprint("%s: result %d->%d #%d" % (fd.fileno(), src, dst, len(data)))
ui.add_packet(src, dst, data)
diff --git a/proxy.py b/proxy.py
index b1beda2..320ae9f 100755
--- a/proxy.py
+++ b/proxy.py
@@ -164,7 +164,7 @@ def make_proxy(local_port, remote_addr, host = '127.0.0.1',
assert(len(open_socks) == n - 1)
else:
import pdb; pdb.set_trace()
- return src, dst, data, completer
+ return src, dst, data, other, completer
def select_based_iterator():
packet_iter = iterate_packets()
packet_iter.next()