openstack/os-ken
Code Issues Proposed changes

snortlib: Remove disabled flag MSG_WAITALL

Browse Source 
Because Ryu is based on Eventlet, GreenSocket is used by default and
blocking flags is disabled. So MSG_WAITALL flag is not available.

This patch removes MSG_WAITALL flag, and fixes snortlib.py to check
received buffer size in _recv_loop_nw_sock().

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Yusuke Iwase 2015-03-02 10:47:32 +09:00 committed by FUJITA Tomonori
parent 305e41f47b
commit e922a92979
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ryu/lib/snortlib.py
View File

@ -92,26 +92,21 @@ class SnortLib(app_manager.RyuApp):
hub.spawn(self._recv_loop_nw_sock, conn, addr)
def _recv_loop_nw_sock(self, conn, addr):
data = str()
buf = str()
while True:
data += conn.recv(BUFSIZE, hub.socket.MSG_WAITALL)
if len(data) == 0:
ret = conn.recv(BUFSIZE)
if len(ret) == 0:
self.logger.info("Disconnected from %s", addr[0])
break
elif len(data) == BUFSIZE:
buf += ret
while len(buf) >= BUFSIZE:
# self.logger.debug("Received buffer size: %d", len(buf))
data = buf[:BUFSIZE]
msg = alert.AlertPkt.parser(data)
if msg:
self.send_event_to_observers(EventAlert(msg))
elif len(data) > BUFSIZE:
self.logger.debug("Over BUFSIZE data received: %d (>%d)",
len(data), BUFSIZE)
elif len(data) < BUFSIZE:
self.logger.debug("Short BUFSIZE data received: %d (<%d)",
len(data), BUFSIZE)
continue
data = str()
buf = buf[BUFSIZE:]
def _set_logger(self):
"""change log format."""