* to set up the flow table. */
const struct ofputil_flow_mod *default_flows;
size_t n_default_flows;
+ enum ofputil_protocol usable_protocols;
};
/* The log messages here could actually be useful in debugging, so keep the
sw->default_flows = cfg->default_flows;
sw->n_default_flows = cfg->n_default_flows;
+ sw->usable_protocols = cfg->usable_protocols;
sw->queued = rconn_packet_counter_create();
protocol = ofputil_protocol_from_ofp_version(rconn_get_version(sw->rconn));
if (sw->default_flows) {
- enum ofputil_protocol usable_protocols;
struct ofpbuf *msg = NULL;
int error = 0;
size_t i;
* This could be improved by actually negotiating a mutually acceptable
* flow format with the switch, but that would require an asynchronous
* state machine. This version ought to work fine in practice. */
- usable_protocols = ofputil_flow_mod_usable_protocols(
- sw->default_flows, sw->n_default_flows);
- if (!(protocol & usable_protocols)) {
- enum ofputil_protocol want = rightmost_1bit(usable_protocols);
+ if (!(protocol & sw->usable_protocols)) {
+ enum ofputil_protocol want = rightmost_1bit(sw->usable_protocols);
while (!error) {
msg = ofputil_encode_set_protocol(protocol, want, &protocol);
if (!msg) {
error = rconn_send(sw->rconn, msg, NULL);
}
}
- if (protocol & usable_protocols) {
+ if (protocol & sw->usable_protocols) {
for (i = 0; !error && i < sw->n_default_flows; i++) {
msg = ofputil_encode_flow_mod(&sw->default_flows[i], protocol);
error = rconn_send(sw->rconn, msg, NULL);
case OFPTYPE_PORT_STATUS:
case OFPTYPE_PACKET_OUT:
case OFPTYPE_FLOW_MOD:
+ case OFPTYPE_GROUP_MOD:
case OFPTYPE_PORT_MOD:
+ case OFPTYPE_TABLE_MOD:
case OFPTYPE_BARRIER_REQUEST:
case OFPTYPE_BARRIER_REPLY:
case OFPTYPE_QUEUE_GET_CONFIG_REQUEST:
case OFPTYPE_PORT_DESC_STATS_REPLY:
case OFPTYPE_ROLE_REQUEST:
case OFPTYPE_ROLE_REPLY:
+ case OFPTYPE_ROLE_STATUS:
case OFPTYPE_SET_FLOW_FORMAT:
case OFPTYPE_FLOW_MOD_TABLE_ID:
case OFPTYPE_SET_PACKET_IN_FORMAT:
ofp_port_t out_port;
/* Learn the source MAC. */
- ovs_rwlock_wrlock(&sw->ml->rwlock);
- if (mac_learning_may_learn(sw->ml, flow->dl_src, 0)) {
- struct mac_entry *mac = mac_learning_insert(sw->ml, flow->dl_src, 0);
- if (mac->port.ofp_port != flow->in_port.ofp_port) {
- VLOG_DBG_RL(&rl, "%016llx: learned that "ETH_ADDR_FMT" is on "
- "port %"PRIu16, sw->datapath_id,
- ETH_ADDR_ARGS(flow->dl_src), flow->in_port.ofp_port);
-
- mac->port.ofp_port = flow->in_port.ofp_port;
- mac_learning_changed(sw->ml);
+ if (sw->ml) {
+ ovs_rwlock_wrlock(&sw->ml->rwlock);
+ if (mac_learning_may_learn(sw->ml, flow->dl_src, 0)) {
+ struct mac_entry *mac = mac_learning_insert(sw->ml, flow->dl_src,
+ 0);
+ if (mac->port.ofp_port != flow->in_port.ofp_port) {
+ VLOG_DBG_RL(&rl, "%016llx: learned that "ETH_ADDR_FMT" is on "
+ "port %"PRIu16, sw->datapath_id,
+ ETH_ADDR_ARGS(flow->dl_src),
+ flow->in_port.ofp_port);
+
+ mac->port.ofp_port = flow->in_port.ofp_port;
+ mac_learning_changed(sw->ml);
+ }
}
+ ovs_rwlock_unlock(&sw->ml->rwlock);
}
- ovs_rwlock_unlock(&sw->ml->rwlock);
/* Drop frames for reserved multicast addresses. */
if (eth_addr_is_reserved(flow->dl_dst)) {