From 6792d6df2a28aac436eb9e2afb1fe07bd30a1831 Mon Sep 17 00:00:00 2001 From: IWAMOTO Toshihiro Date: Fri, 21 Oct 2016 14:08:12 +0900 Subject: [PATCH] Log OFPErrorMsg.data as ascii when type is OFPET_HELLO_FAILED OFPErrorMsg.data usually contains the offending OpenFlow message, but is an ASCII text string if its type is OFPET_HELLO_FAILED. Signed-off-by: IWAMOTO Toshihiro Signed-off-by: FUJITA Tomonori --- ryu/controller/ofp_handler.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ryu/controller/ofp_handler.py b/ryu/controller/ofp_handler.py index b524a285..70ffc8cb 100644 --- a/ryu/controller/ofp_handler.py +++ b/ryu/controller/ofp_handler.py @@ -280,7 +280,10 @@ class OFPHandler(ryu.base.app_manager.RyuApp): hex(msg.type), hex(msg.code), utils.binary_str(msg.data), ofp.ofp_error_type_to_str(msg.type), ofp.ofp_error_code_to_str(msg.type, msg.code)) - if len(msg.data) >= ofp.OFP_HEADER_SIZE: + if msg.type == ofp.OFPET_HELLO_FAILED: + self.logger.debug( + " `-- data: %s", msg.data.decode('ascii')) + elif len(msg.data) >= ofp.OFP_HEADER_SIZE: (version, msg_type, msg_len, xid) = ofproto_parser.header(msg.data) self.logger.debug( " `-- data: version=%s, msg_type=%s, msg_len=%s, xid=%s\n"