From e8962c296edc52b4308394e52a1f381adb5603d4 Mon Sep 17 00:00:00 2001 From: yuta-hamada Date: Thu, 28 Nov 2013 14:30:01 +0900 Subject: [PATCH] rpc: If the socket is closed by peer, endpoint stop the serve. 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 Signed-off-by: FUJITA Tomonori --- 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 57a35bab..d06180e6 100644 --- a/ryu/lib/rpc.py +++ b/ryu/lib/rpc.py @@ -115,6 +115,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] @@ -142,7 +143,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() @@ -182,6 +183,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