From: YAMAMOTO Takashi Date: Thu, 24 Oct 2013 02:58:53 +0000 (+0900) Subject: connmgr: Fix an abort. X-Git-Tag: sliver-openvswitch-2.0.90-1~7^2~8 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b9b0087274759ea3aaa55fc489c2265db0445b82;hp=b0b906ccf485f8342e7be4f976f14d2a235e0a69;p=sliver-openvswitch.git connmgr: Fix an abort. Fix a problem introduced by commit cfa955b083c5617212a29a03423e063ff6cb350a. (connmgr: Fix packet-in reason for OpenFlow1.3 table-miss flow entries.). ofconn might not be connected here, in that case ofputil_protocol_to_ofp_version aborts. Signed-off-by: YAMAMOTO Takashi Signed-off-by: Ben Pfaff --- diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 3c2b6cc40..c9feae52d 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -1496,9 +1496,9 @@ wire_reason(struct ofconn *ofconn, const struct ofproto_packet_in *pin) { if (pin->generated_by_table_miss && pin->up.reason == OFPR_ACTION) { enum ofputil_protocol protocol = ofconn_get_protocol(ofconn); - enum ofp_version version = ofputil_protocol_to_ofp_version(protocol); - if (version >= OFP13_VERSION) { + if (protocol != OFPUTIL_P_NONE + && ofputil_protocol_to_ofp_version(protocol) >= OFP13_VERSION) { return OFPR_NO_MATCH; } }