projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif.at: Add test for normal action with OFPP_NONE in_port.
[openvswitch]
/
lib
/
ofp-print.c
diff --git
a/lib/ofp-print.c
b/lib/ofp-print.c
index 7bdbc220dccaba4e94328a1bda94fd1bd64df849..fe852b4ee172344f8246755b7a2829bafc4dbedd 100644
(file)
--- a/
lib/ofp-print.c
+++ b/
lib/ofp-print.c
@@
-140,7
+140,7
@@
ofp_print_packet_in(struct ds *string, const struct ofp_packet_in *op,
struct ofpbuf packet;
ofpbuf_use_const(&packet, op->data, data_len);
struct ofpbuf packet;
ofpbuf_use_const(&packet, op->data, data_len);
- flow_extract(&packet, 0, ntohs(op->in_port), &flow);
+ flow_extract(&packet, 0,
0,
ntohs(op->in_port), &flow);
flow_format(string, &flow);
ds_put_char(string, '\n');
}
flow_format(string, &flow);
ds_put_char(string, '\n');
}
@@
-338,6
+338,10
@@
ofp_print_action(struct ds *s, const union ofp_action *a,
learn_format((const struct nx_action_learn *) a, s);
break;
learn_format((const struct nx_action_learn *) a, s);
break;
+ case OFPUTIL_NXAST_EXIT:
+ ds_put_cstr(s, "exit");
+ break;
+
default:
break;
}
default:
break;
}
@@
-935,15
+939,11
@@
ofp_print_error_msg(struct ds *string, const struct ofp_error_msg *oem)
ds_put_printable(string, payload, payload_len);
break;
ds_put_printable(string, payload, payload_len);
break;
-
case OFPET_BAD_REQUEST
:
+
default
:
s = ofp_to_string(payload, payload_len, 1);
ds_put_cstr(string, s);
free(s);
break;
s = ofp_to_string(payload, payload_len, 1);
ds_put_cstr(string, s);
free(s);
break;
-
- default:
- ds_put_hex_dump(string, payload, payload_len, 0, true);
- break;
}
}
}
}