in_port_s = strsep(&arg, ",");
if (in_port_s && in_port_s[0]) {
- resubmit->in_port = ofputil_port_from_string(in_port_s);
- if (!resubmit->in_port) {
+ if (!ofputil_port_from_string(in_port_s, &resubmit->in_port)) {
ovs_fatal(0, "%s: resubmit to unknown port", in_port_s);
}
} else {
break;
case OFPUTIL_OFPAT10_STRIP_VLAN:
+ case OFPUTIL_OFPAT11_POP_VLAN:
ofpact_put_STRIP_VLAN(ofpacts);
break;
break;
case OFPUTIL_OFPAT11_DEC_NW_TTL:
- parse_noargs_dec_ttl(ofpacts, code);
- break;
+ NOT_REACHED();
case OFPUTIL_OFPAT10_SET_TP_SRC:
case OFPUTIL_OFPAT11_SET_TP_SRC:
}
return false;
} else {
- uint16_t port = ofputil_port_from_string(act);
- if (port) {
+ uint16_t port;
+ if (ofputil_port_from_string(act, &port)) {
ofpact_put_OUTPUT(ofpacts)->port = port;
} else {
ovs_fatal(0, "Unknown action: %s", act);
if (!strcmp(name, "table")) {
fm->table_id = str_to_table_id(value);
} else if (!strcmp(name, "out_port")) {
- fm->out_port = ofputil_port_from_string(name);
- if (!fm->out_port) {
+ if (!ofputil_port_from_string(name, &fm->out_port)) {
ofp_fatal(str_, verbose, "%s is not a valid OpenFlow port",
name);
}