git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: Prepare Packet Out encoder for other Open Flow versions
[sliver-openvswitch.git]
/
utilities
/
ovs-ofctl.c
diff --git
a/utilities/ovs-ofctl.c
b/utilities/ovs-ofctl.c
index
cd42b96
..
dd5f4ba
100644
(file)
--- a/
utilities/ovs-ofctl.c
+++ b/
utilities/ovs-ofctl.c
@@
-1453,6
+1453,7
@@
ofctl_probe(int argc OVS_UNUSED, char *argv[])
static void
ofctl_packet_out(int argc, char *argv[])
{
static void
ofctl_packet_out(int argc, char *argv[])
{
+ enum ofputil_protocol protocol;
struct ofputil_packet_out po;
struct ofpbuf ofpacts;
struct vconn *vconn;
struct ofputil_packet_out po;
struct ofpbuf ofpacts;
struct vconn *vconn;
@@
-1468,7
+1469,7
@@
ofctl_packet_out(int argc, char *argv[])
po.ofpacts = ofpacts.data;
po.ofpacts_len = ofpacts.size;
po.ofpacts = ofpacts.data;
po.ofpacts_len = ofpacts.size;
- open_vconn(argv[1], &vconn);
+
protocol =
open_vconn(argv[1], &vconn);
for (i = 4; i < argc; i++) {
struct ofpbuf *packet, *opo;
const char *error_msg;
for (i = 4; i < argc; i++) {
struct ofpbuf *packet, *opo;
const char *error_msg;
@@
-1480,7
+1481,7
@@
ofctl_packet_out(int argc, char *argv[])
po.packet = packet->data;
po.packet_len = packet->size;
po.packet = packet->data;
po.packet_len = packet->size;
- opo = ofputil_encode_packet_out(&po);
+ opo = ofputil_encode_packet_out(&po
, protocol
);
transact_noreply(vconn, opo);
ofpbuf_delete(packet);
}
transact_noreply(vconn, opo);
ofpbuf_delete(packet);
}