diff options
| author | Yi-Hung Wei <yihung.wei@gmail.com> | 2017-05-15 10:04:55 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-05-31 14:54:09 -0700 |
| commit | 35eb6326d5d0f04fe7916b018eeb110a6018843f (patch) | |
| tree | fd3bec96a8beb6b54bf22ac982fa530da6611f55 /ovn | |
| parent | 07ed329cb6f0f7dcf4f70bf9b7a419f924b6dde4 (diff) | |
| download | openvswitch-35eb6326d5d0f04fe7916b018eeb110a6018843f.tar.gz | |
ofp-util: Add flow metadata to ofputil_packet_out
This patch adds flow metadata to ofputil_packet_out. It does not make any
functional change. The flow metadata will be useful to support new packet-out
message format in OpenFlow 1.5.
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ovn')
| -rw-r--r-- | ovn/controller/ofctrl.c | 2 | ||||
| -rw-r--r-- | ovn/controller/pinctrl.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c index 417fdc9f5..804b162b5 100644 --- a/ovn/controller/ofctrl.c +++ b/ovn/controller/ofctrl.c @@ -1165,10 +1165,10 @@ ofctrl_inject_pkt(const struct ovsrec_bridge *br_int, const char *flow_s, .packet = dp_packet_data(&packet), .packet_len = dp_packet_size(&packet), .buffer_id = UINT32_MAX, - .in_port = uflow.in_port.ofp_port, .ofpacts = ofpacts.data, .ofpacts_len = ofpacts.size, }; + match_set_in_port(&po.flow_metadata, uflow.in_port.ofp_port); enum ofputil_protocol proto = ofputil_protocol_from_ofp_version(version); queue_msg(ofputil_encode_packet_out(&po, proto)); dp_packet_uninit(&packet); diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c index 225f6a756..a77f85f2f 100644 --- a/ovn/controller/pinctrl.c +++ b/ovn/controller/pinctrl.c @@ -183,10 +183,10 @@ pinctrl_handle_arp(const struct flow *ip_flow, const struct match *md, .packet = dp_packet_data(&packet), .packet_len = dp_packet_size(&packet), .buffer_id = UINT32_MAX, - .in_port = OFPP_CONTROLLER, .ofpacts = ofpacts.data, .ofpacts_len = ofpacts.size, }; + match_set_in_port(&po.flow_metadata, OFPP_CONTROLLER); enum ofputil_protocol proto = ofputil_protocol_from_ofp_version(version); queue_msg(ofputil_encode_packet_out(&po, proto)); @@ -1391,10 +1391,10 @@ send_garp(struct garp_data *garp, long long int current_time) .packet = dp_packet_data(&packet), .packet_len = dp_packet_size(&packet), .buffer_id = UINT32_MAX, - .in_port = OFPP_CONTROLLER, .ofpacts = ofpacts.data, .ofpacts_len = ofpacts.size, }; + match_set_in_port(&po.flow_metadata, OFPP_CONTROLLER); enum ofputil_protocol proto = ofputil_protocol_from_ofp_version(version); queue_msg(ofputil_encode_packet_out(&po, proto)); dp_packet_uninit(&packet); @@ -1790,10 +1790,10 @@ pinctrl_handle_nd_na(const struct flow *ip_flow, const struct match *md, .packet = dp_packet_data(&packet), .packet_len = dp_packet_size(&packet), .buffer_id = UINT32_MAX, - .in_port = OFPP_CONTROLLER, .ofpacts = ofpacts.data, .ofpacts_len = ofpacts.size, }; + match_set_in_port(&po.flow_metadata, OFPP_CONTROLLER); queue_msg(ofputil_encode_packet_out(&po, proto)); |