From: yuta-hamada <[email protected]> If client does socket.close() the serve will be non-wait looping. So must stop the serve of endpoint that received 0 byte packet.
Signed-off-by: YAMAMOTO Takashi <[email protected]> --- ryu/lib/rpc.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ryu/lib/rpc.py b/ryu/lib/rpc.py index 6b8a0ab..0322e8e 100644 --- a/ryu/lib/rpc.py +++ b/ryu/lib/rpc.py @@ -127,6 +127,7 @@ class EndPoint(object): self._notifications = deque() self._responses = {} self._incoming = 0 # number of incoming messages in our queues + self.closed_by_peer = False def selectable(self): rlist = [self._sock] @@ -154,7 +155,7 @@ class EndPoint(object): select.select(rlist, wlist, rlist + wlist) def serve(self): - while True: + while not self.closed_by_peer: self.block() self.process() @@ -194,6 +195,9 @@ class EndPoint(object): except IOError: packet = None if not packet: + if packet is not None: + # socket closed by peer + self.closed_by_peer = True break self._encoder.get_and_dispatch_messages(packet, self._table) return self._incoming > 0 -- 1.8.1.5 ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
