struct pinsched_stats stats;
pinsched_get_stats(ofconn->schedulers[i], &stats);
- packets += stats.n_queued;;
+ packets += stats.n_queued;
}
packets += pktbuf_count_packets(ofconn->pktbuf);
}
/* OFPR_GROUP is not supported before OF1.4 */
master[OAM_PACKET_IN] &= ~(1u << OFPR_GROUP);
slave [OAM_PACKET_IN] &= ~(1u << OFPR_GROUP);
+
+ /* OFPR_PACKET_OUT is not supported before OF1.4 */
+ master[OAM_PACKET_IN] &= ~(1u << OFPR_PACKET_OUT);
+ slave [OAM_PACKET_IN] &= ~(1u << OFPR_PACKET_OUT);
+
+ /* OFPRR_GROUP_DELETE is not supported before OF1.4 */
+ master[OAM_FLOW_REMOVED] &= ~(1u << OFPRR_GROUP_DELETE);
+ slave [OAM_FLOW_REMOVED] &= ~(1u << OFPRR_GROUP_DELETE);
+
+ /* OFPRR_METER_DELETE is not supported before OF1.4 */
+ master[OAM_FLOW_REMOVED] &= ~(1u << OFPRR_METER_DELETE);
+ slave [OAM_FLOW_REMOVED] &= ~(1u << OFPRR_METER_DELETE);
+
+ /* OFPRR_EVICTION is not supported before OF1.4 */
+ master[OAM_FLOW_REMOVED] &= ~(1u << OFPRR_EVICTION);
+ slave [OAM_FLOW_REMOVED] &= ~(1u << OFPRR_EVICTION);
}
}
master[OAM_PACKET_IN] = ((1u << OFPR_NO_MATCH)
| (1u << OFPR_ACTION)
| (1u << OFPR_ACTION_SET)
- | (1u << OFPR_GROUP));
+ | (1u << OFPR_GROUP)
+ | (1u << OFPR_PACKET_OUT));
master[OAM_PORT_STATUS] = ((1u << OFPPR_ADD)
| (1u << OFPPR_DELETE)
| (1u << OFPPR_MODIFY));
master[OAM_FLOW_REMOVED] = ((1u << OFPRR_IDLE_TIMEOUT)
| (1u << OFPRR_HARD_TIMEOUT)
- | (1u << OFPRR_DELETE));
-
+ | (1u << OFPRR_DELETE)
+ | (1u << OFPRR_GROUP_DELETE)
+ | (1u << OFPRR_METER_DELETE)
+ | (1u << OFPRR_EVICTION));
+ master[OAM_ROLE_STATUS] = 0;
+ master[OAM_TABLE_STATUS] = 0;
+ master[OAM_REQUESTFORWARD] = 0;
/* "slave" role gets port status updates by default. */
slave[OAM_PACKET_IN] = 0;
slave[OAM_PORT_STATUS] = ((1u << OFPPR_ADD)
| (1u << OFPPR_DELETE)
| (1u << OFPPR_MODIFY));
slave[OAM_FLOW_REMOVED] = 0;
+ slave[OAM_ROLE_STATUS] = 0;
+ slave[OAM_TABLE_STATUS] = 0;
+ slave[OAM_REQUESTFORWARD] = 0;
} else {
memset(ofconn->master_async_config, 0,
sizeof ofconn->master_async_config);
* 'ofconn'. */
static bool
ofconn_receives_async_msg(const struct ofconn *ofconn,
- enum ofconn_async_msg_type type,
+ enum ofputil_async_msg_type type,
unsigned int reason)
{
const uint32_t *async_config;
}
}
+/* Sends an OFPT_REQUESTFORWARD message with 'request' and 'reason' to
+ * appropriate controllers managed by 'mgr'. For messages caused by a
+ * controller OFPT_GROUP_MOD and OFPT_METER_MOD, specify 'source' as the
+ * controller connection that sent the request; otherwise, specify 'source'
+ * as NULL. */
+void
+connmgr_send_requestforward(struct connmgr *mgr, const struct ofconn *source,
+ const struct ofputil_requestforward *rf)
+{
+ struct ofconn *ofconn;
+
+ LIST_FOR_EACH (ofconn, node, &mgr->all_conns) {
+ if (ofconn_receives_async_msg(ofconn, OAM_REQUESTFORWARD, rf->reason)
+ && rconn_get_version(ofconn->rconn) >= OFP14_VERSION
+ && ofconn != source) {
+ enum ofputil_protocol protocol = ofconn_get_protocol(ofconn);
+ ofconn_send(ofconn, ofputil_encode_requestforward(rf, protocol),
+ NULL);
+ }
+ }
+}
+
/* Sends an OFPT_FLOW_REMOVED or NXT_FLOW_REMOVED message based on 'fr' to
* appropriate controllers managed by 'mgr'. */
void
} else {
pin.up.buffer_id = pktbuf_save(ofconn->pktbuf,
pin.up.packet, pin.up.packet_len,
- pin.up.fmd.in_port);
+ pin.up.flow_metadata.flow.in_port.ofp_port);
}
/* Figure out how much of the packet to send.
/* Make OFPT_PACKET_IN and hand over to packet scheduler. */
pinsched_send(ofconn->schedulers[pin.up.reason == OFPR_NO_MATCH ? 0 : 1],
- pin.up.fmd.in_port,
+ pin.up.flow_metadata.flow.in_port.ofp_port,
ofputil_encode_packet_in(&pin.up,
ofconn_get_protocol(ofconn),
ofconn->packet_in_format),
ofpbuf_init(&ofpacts, OFPACT_OUTPUT_SIZE);
ofpact_put_OUTPUT(&ofpacts)->port = OFPP_NORMAL;
- ofpact_pad(&ofpacts);
match_init_catchall(&match);
ofproto_add_flow(mgr->ofproto, &match, 0, ofpacts.data,
/* Returns the number of hidden rules created by the in-band and fail-open
* implementations in table 0. (Subtracting this count from the number of
- * rules in the table 0 classifier, as returned by classifier_count(), yields
+ * rules in the table 0 classifier, as maintained in struct oftable, yields
* the number of flows that OVS should report via OpenFlow for table 0.) */
int
connmgr_count_hidden_rules(const struct connmgr *mgr)