diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index a599243..68c0fac 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -2629,6 +2629,39 @@ index 4c07e2216..270dc95ce 100644 id->prio = tc_get_major(tc->tcm_info); id->handle = tc->tcm_handle; +diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c +index 7b14cae77..b092e9e04 100644 +--- a/ofproto/connmgr.c ++++ b/ofproto/connmgr.c +@@ -1649,6 +1649,8 @@ connmgr_send_table_status(struct connmgr *mgr, + } + } + ++COVERAGE_DEFINE(connmgr_async_unsent); ++ + /* Given 'pin', sends an OFPT_PACKET_IN message to each OpenFlow controller as + * necessary according to their individual configurations. */ + void +@@ -1656,6 +1658,7 @@ connmgr_send_async_msg(struct connmgr *mgr, + const struct ofproto_async_msg *am) + { + struct ofconn *ofconn; ++ bool sent = false; + + LIST_FOR_EACH (ofconn, connmgr_node, &mgr->conns) { + enum ofputil_protocol protocol = ofconn_get_protocol(ofconn); +@@ -1677,6 +1680,11 @@ connmgr_send_async_msg(struct connmgr *mgr, + am->pin.up.base.flow_metadata.flow.in_port.ofp_port, + msg, &txq); + do_send_packet_ins(ofconn, &txq); ++ sent = true; ++ } ++ ++ if (!sent) { ++ COVERAGE_INC(connmgr_async_unsent); + } + } + diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c index 742eed399..f13478a88 100644 --- a/ofproto/ofproto-dpif-ipfix.c diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 22faf96..bce9310 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 50%{?dist} +Release: 51%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -757,6 +757,12 @@ exit 0 %endif %changelog +* Tue Aug 15 2023 Open vSwitch CI - 3.1.0-51 +- Merging upstream branch-3.1 [RH git: 7f523f24fb] + Commit list: + d653fd1986 connmgr: Count unsent async messages. + + * Mon Aug 14 2023 Open vSwitch CI - 3.1.0-50 - Merging upstream branch-3.1 [RH git: 779079ec3f] Commit list: