open.source/magic-wormhole-transit-relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

count totals in state-machine

Browse Source
This commit is contained in:
meejah 2021-02-01 16:55:15 -07:00
parent 0e11f1b8f1
commit 0e64707459
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wormhole_transit_relay/server_state.py
View File

@ -161,6 +161,7 @@ class TransitServerState(object):
_side = None _side = None
_first = None _first = None
_mood = "empty" _mood = "empty"
_total_sent = 0
def __init__(self, pending_requests): def __init__(self, pending_requests):
self._pending_requests = pending_requests self._pending_requests = pending_requests
@ -274,6 +275,10 @@ class TransitServerState(object):
def _send_impatient(self): def _send_impatient(self):
self._client.send(b"impatient\n") self._client.send(b"impatient\n")
@_machine.output()
def _count_bytes(self, data):
self._total_sent += len(data)
@_machine.output() @_machine.output()
def _send(self, data): def _send(self, data):
self._client.send(data) self._client.send(data)
@ -404,7 +409,7 @@ class TransitServerState(object):
wait_relay.upon( wait_relay.upon(
got_bytes, got_bytes,
enter=done, enter=done,
outputs=[_mood_errory, _disconnect], outputs=[_count_bytes, _mood_errory, _disconnect],
) )
wait_relay.upon( wait_relay.upon(
connection_lost, connection_lost,

10
src/wormhole_transit_relay/transit_server.py
View File

@ -42,9 +42,6 @@ class TransitConnection(LineReceiver):
MAX_LENGTH = 1024 MAX_LENGTH = 1024
def __init__(self):
self._total_sent = 0
def send(self, data): def send(self, data):
""" """
ITransitClient API ITransitClient API
@ -104,10 +101,10 @@ class TransitConnection(LineReceiver):
side = new.group(2) side = new.group(2)
return self._got_handshake(token, side) return self._got_handshake(token, side)
# state-machine calls us via ITransitClient interface to do # we should have been switched to "raw data" mode on the first
# bad handshake etc. # line received (after which rawDataReceived() is called for
# all bytes) so getting here means a bad handshake.
return self._state.bad_token() return self._state.bad_token()
#return self._state.got_bytes(line)
def rawDataReceived(self, data): def rawDataReceived(self, data):
# We are an IPushProducer to our buddy's IConsumer, so they'll # We are an IPushProducer to our buddy's IConsumer, so they'll
@ -117,7 +114,6 @@ class TransitConnection(LineReceiver):
# point the sender will only transmit data as fast as the # point the sender will only transmit data as fast as the
# receiver can handle it. # receiver can handle it.
self._state.got_bytes(data) self._state.got_bytes(data)
self._total_sent += len(data)
def _got_handshake(self, token, side): def _got_handshake(self, token, side):
self._state.please_relay_for_side(token, side) self._state.please_relay_for_side(token, side)