mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-01 23:05:29 +00:00
Code Issues Releases Wiki Activity

ofp-util: Make ofputil_port_from_ofp11() return OFPP_NONE on error.

Browse Source 
This makes life easier for a few callers, and it agrees with my usual
preference that a function should fill in its output parameters whether it
succeeds or not.

CC: Jarno Rajahalme <jarno.rajahalme@nsn.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2013-05-20 12:21:51 -07:00
parent 7233306575
commit bc146369d5
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/meta-flow.c
View File

@@ -1203,9 +1203,7 @@ mf_set_value(const struct mf_field *mf,
case MFF_IN_PORT_OXM: {
uint16_t port;
if (ofputil_port_from_ofp11(value->be32, &port)) {
port = OFPP_NONE;
}
ofputil_port_from_ofp11(value->be32, &port);
match_set_in_port(match, port);
break;
}
@@ -1395,9 +1393,7 @@ mf_set_flow_value(const struct mf_field *mf,
case MFF_IN_PORT_OXM: {
uint16_t port;
if (ofputil_port_from_ofp11(value->be32, &port)) {
port = OFPP_NONE;
}
ofputil_port_from_ofp11(value->be32, &port);
flow->in_port = port;
break;
}
@@ -2481,9 +2477,7 @@ mf_format(const struct mf_field *mf,
case MFS_OFP_PORT_OXM:
if (!mask) {
uint16_t port;
if (ofputil_port_from_ofp11(value->be32, &port)) {
port = OFPP_NONE;
}
ofputil_port_from_ofp11(value->be32, &port);
ofputil_format_port(port, s);
break;
}

3
lib/ofp-util.c
View File

@@ -4029,7 +4029,7 @@ ofputil_frag_handling_from_string(const char *s, enum ofp_config_flags *flags)
/* Converts the OpenFlow 1.1+ port number 'ofp11_port' into an OpenFlow 1.0
* port number and stores the latter in '*ofp10_port', for the purpose of
* decoding OpenFlow 1.1+ protocol messages. Returns 0 if successful,
* otherwise an OFPERR_* number.
* otherwise an OFPERR_* number. On error, stores OFPP_NONE in '*ofp10_port'.
*
* See the definition of OFP11_MAX for an explanation of the mapping. */
enum ofperr
@@ -4044,6 +4044,7 @@ ofputil_port_from_ofp11(ovs_be32 ofp11_port, uint16_t *ofp10_port)
*ofp10_port = ofp11_port_h - OFPP11_OFFSET;
return 0;
} else {
*ofp10_port = OFPP_NONE;
VLOG_WARN_RL(&bad_ofmsg_rl, "port %"PRIu32" is outside the supported "
"range 0 through %d or 0x%"PRIx32" through 0x%"PRIx32,
ofp11_port_h, OFPP_MAX - 1,