{
switch (mf->id) {
case MFF_TUN_ID:
- return !wc->masks.tun_id;
+ return !wc->masks.tunnel.tun_id;
case MFF_METADATA:
return !wc->masks.metadata;
case MFF_IN_PORT:
{
switch (mf->id) {
case MFF_TUN_ID:
- mask->be64 = wc->masks.tun_id;
+ mask->be64 = wc->masks.tunnel.tun_id;
break;
case MFF_METADATA:
mask->be64 = wc->masks.metadata;
{
switch (mf->id) {
case MFF_TUN_ID:
- value->be64 = flow->tun_id;
+ value->be64 = flow->tunnel.tun_id;
break;
case MFF_METADATA:
value->be64 = flow->metadata;
{
switch (mf->id) {
case MFF_TUN_ID:
- flow->tun_id = value->be64;
+ flow->tunnel.tun_id = value->be64;
break;
case MFF_METADATA:
flow->metadata = value->be64;
uint16_t port;
assert(mf->n_bytes == sizeof(ovs_be16));
- if (ofputil_port_from_string(s, &port)) {
+ port = ofputil_port_from_string(s);
+ if (port) {
*valuep = htons(port);
*maskp = htons(UINT16_MAX);
return NULL;
union mf_value value;
mf_get_value(field, flow, &value);
- bitwise_copy(x, sizeof *x, sf->ofs, &value, field->n_bytes,
+ bitwise_copy(x, sizeof *x, 0, &value, field->n_bytes,
sf->ofs, sf->n_bits);
mf_set_flow_value(field, &value, flow);
}