<div dir="ltr">branch can also be downloaded from :<div><br></div><div><a href="https://github.com/alexw-nicira/alexw-ovs/branches/ofp_odp_naming">https://github.com/alexw-nicira/alexw-ovs/branches/ofp_odp_naming</a><br></div>
</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Jun 18, 2013 at 10:32 AM, Alex Wang <span dir="ltr"><<a href="mailto:alexw@nicira.com" target="_blank">alexw@nicira.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Currently datapath ports and openflow ports are both represented by unsigned<br>
integers of various sizes. With implicit casts, etc. it is easy to mix them<br>
up and use one where the other is expected. This commit creates two typedefs<br>
ofp_port_t and odp_port_t. Both of these two types are marked by<br>
"__attribute__((bitwise))" so that Sparse can be used to detect any misuse.<br>
<br>
Signed-off-by: Alex Wang <<a href="mailto:alexw@nicira.com">alexw@nicira.com</a>><br>
<br>
---<br>
<br>
v1 -> v2:<br>
- Adds ofp_to_u16 / odp_to_u32 functions for conversion from ofp/odp_port_t<br>
to corresponding uint types<br>
- Adds uint_to_ofp / uint_to_odp functions for conversion from uint variables<br>
to corresponding ofp_port_t, odp_port_t types<br>
- Rebases to current master<br>
<br>
SOME DESIGN IDEAS:<br>
<br>
include/openvswitch/types.h :<br>
- Typedefs ofp_port_t, odp_port_t and ofp11_port_t<br>
<br>
include/openflow/openflow-1.0.h, openflow-1.1.h :<br>
- Defines Openflow related macros e.g. OFPP_NONE, OFPP_MAX<br>
<br>
lib/dpif-linux.c, dpif-netdev.c :<br>
- Explicitly casts odp_port_t to uint32_t, since the odp_port variable is used<br>
as array index<br>
- The MAX_PORT macro is not converted to odp_port_t, since it is compared with<br>
other UINT types and used as array size<br>
<br>
lib/flow.h, flow.c :<br>
- Defines "union flow_in_port", which can be ofp_port_t, odp_port_t or<br>
ofp11_port_t. And each "struct flow" contains a "union flow_in_port in_port"<br>
- Defines ofp/odp_port_t related utility functions, e.g. ofp_htons, odp_htonl<br>
- The in_port argument of "flow_extract()" function is changed to of type<br>
"union flow_in_port *", since it is called with both odp/ofp port number<br>
<br>
lib/odp-util.c, ofp-util.c :<br>
- Nasty, a lot of conversions between Openflow protocol data structures and<br>
internal abstract data structures. Also a lot of explicity cast using<br>
OVS_FORCE macro<br>
<br>
ofproto/ofproto.c ofproto-dpif.c, vswitch/bridge.c :<br>
- A lot of changes in struct element and function headers. Convert from uint<br>
to corresponding ofp/odp_port_t type<br>
<br>
---<br>
include/linux/openvswitch.h | 2 +-<br>
include/openflow/openflow-1.0.h | 56 ++++++++-----<br>
include/openflow/openflow-1.1.h | 4 +-<br>
include/openvswitch/types.h | 6 ++<br>
lib/bundle.c | 22 ++---<br>
lib/bundle.h | 6 +-<br>
lib/dpif-linux.c | 60 +++++++------<br>
lib/dpif-linux.h | 4 +-<br>
lib/dpif-netdev.c | 88 ++++++++++---------<br>
lib/dpif-provider.h | 10 +--<br>
lib/dpif.c | 22 ++---<br>
lib/dpif.h | 14 ++--<br>
lib/flow.c | 8 +-<br>
lib/flow.h | 177 +++++++++++++++++++++++++++++++++++++--<br>
lib/learn.c | 4 +-<br>
lib/learning-switch.c | 30 ++++---<br>
lib/mac-learning.h | 2 +-<br>
lib/match.c | 10 +--<br>
lib/match.h | 2 +-<br>
lib/meta-flow.c | 35 ++++----<br>
lib/meta-flow.h | 2 +-<br>
lib/nx-match.c | 6 +-<br>
lib/odp-util.c | 10 ++-<br>
lib/odp-util.h | 4 +-<br>
lib/ofp-actions.c | 34 ++++----<br>
lib/ofp-actions.h | 12 +--<br>
lib/ofp-parse.c | 12 +--<br>
lib/ofp-print.c | 17 ++--<br>
lib/ofp-util.c | 144 ++++++++++++++++---------------<br>
lib/ofp-util.h | 34 ++++----<br>
lib/sflow.h | 2 +<br>
lib/sflow_api.h | 6 +-<br>
lib/sflow_poller.c | 4 +-<br>
ofproto/connmgr.c | 4 +-<br>
ofproto/connmgr.h | 6 +-<br>
ofproto/in-band.c | 4 +-<br>
ofproto/in-band.h | 3 +-<br>
ofproto/netflow.c | 12 +--<br>
ofproto/netflow.h | 10 +--<br>
ofproto/ofproto-dpif-sflow.c | 17 ++--<br>
ofproto/ofproto-dpif-sflow.h | 9 +-<br>
ofproto/ofproto-dpif-xlate.c | 89 ++++++++++----------<br>
ofproto/ofproto-dpif-xlate.h | 2 +-<br>
ofproto/ofproto-dpif.c | 136 ++++++++++++++++--------------<br>
ofproto/ofproto-dpif.h | 17 ++--<br>
ofproto/ofproto-provider.h | 18 ++--<br>
ofproto/ofproto.c | 102 ++++++++++++----------<br>
ofproto/ofproto.h | 37 ++++----<br>
ofproto/pinsched.c | 9 +-<br>
ofproto/pinsched.h | 3 +-<br>
ofproto/pktbuf.c | 10 +--<br>
ofproto/pktbuf.h | 4 +-<br>
ofproto/tunnel.c | 12 +--<br>
ofproto/tunnel.h | 8 +-<br>
tests/test-bundle.c | 16 ++--<br>
tests/test-classifier.c | 12 +--<br>
tests/test-flows.c | 5 +-<br>
tests/test-odp.c | 2 +-<br>
utilities/ovs-dpctl.c | 14 ++--<br>
utilities/ovs-ofctl.c | 19 +++--<br>
vswitchd/bridge.c | 52 +++++++-----<br>
61 files changed, 867 insertions(+), 614 deletions(-)<br>
<br>
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h<br>
index e890fd8..add1287 100644<br>
--- a/include/linux/openvswitch.h<br>
+++ b/include/linux/openvswitch.h<br>
@@ -116,7 +116,7 @@ struct ovs_vport_stats {<br>
};<br>
<br>
/* Fixed logical ports. */<br>
-#define OVSP_LOCAL ((__u32)0)<br>
+#define OVSP_LOCAL ((OVS_FORCE odp_port_t) 0)<br>
<br>
/* Packet transfer. */<br>
<br>
diff --git a/include/openflow/openflow-1.0.h b/include/openflow/openflow-1.0.h<br>
index c30fa92..439cc91 100644<br>
--- a/include/openflow/openflow-1.0.h<br>
+++ b/include/openflow/openflow-1.0.h<br>
@@ -28,28 +28,40 @@<br>
* 0xff00...0xfff7 "reserved" but not assigned a meaning by OpenFlow 1.0<br>
* 0xfff8...0xffff "reserved" OFPP_* ports with assigned meanings<br>
*/<br>
-enum ofp_port {<br>
- /* Ranges. */<br>
- OFPP_MAX = 0xff00, /* Maximum number of physical switch ports. */<br>
- OFPP_FIRST_RESV = 0xfff8, /* First assigned reserved port number. */<br>
- OFPP_LAST_RESV = 0xffff, /* Last assigned reserved port number. */<br>
-<br>
- /* Reserved output "ports". */<br>
- OFPP_IN_PORT = 0xfff8, /* Send the packet out the input port. This<br>
- virtual port must be explicitly used<br>
- in order to send back out of the input<br>
- port. */<br>
- OFPP_TABLE = 0xfff9, /* Perform actions in flow table.<br>
- NB: This can only be the destination<br>
- port for packet-out messages. */<br>
- OFPP_NORMAL = 0xfffa, /* Process with normal L2/L3 switching. */<br>
- OFPP_FLOOD = 0xfffb, /* All physical ports except input port and<br>
- those disabled by STP. */<br>
- OFPP_ALL = 0xfffc, /* All physical ports except input port. */<br>
- OFPP_CONTROLLER = 0xfffd, /* Send to controller. */<br>
- OFPP_LOCAL = 0xfffe, /* Local openflow "port". */<br>
- OFPP_NONE = 0xffff /* Not associated with a physical port. */<br>
-};<br>
+<br>
+/* Ranges. */<br>
+/* Maximum number of physical switch ports. */<br>
+#define OFPP_MAX ((OVS_FORCE ofp_port_t) 0xff00)<br>
+<br>
+/* First assigned reserved port number. */<br>
+#define OFPP_FIRST_RESV ((OVS_FORCE ofp_port_t) 0xfff8)<br>
+<br>
+/* Last assigned reserved port number. */<br>
+#define OFPP_LAST_RESV ((OVS_FORCE ofp_port_t) 0xffff)<br>
+<br>
+/* Reserved output "ports". */<br>
+/* Send the packet out the input port. This virtual port must be explicitly<br>
+ * used in order to send back out of the input port. */<br>
+#define OFPP_IN_PORT ((OVS_FORCE ofp_port_t) 0xfff8)<br>
+<br>
+/* Perform actions in flow table. NB: This can only be the destination port<br>
+ * for packet-out messages. */<br>
+#define OFPP_TABLE ((OVS_FORCE ofp_port_t) 0xfff9)<br>
+<br>
+/* Process with normal L2/L3 switching. */<br>
+#define OFPP_NORMAL ((OVS_FORCE ofp_port_t) 0xfffa)<br>
+<br>
+/* All physical ports except input port and those disabled by STP. */<br>
+#define OFPP_FLOOD ((OVS_FORCE ofp_port_t) 0xfffb)<br>
+<br>
+/* All physical ports except input port. */<br>
+#define OFPP_ALL ((OVS_FORCE ofp_port_t) 0xfffc)<br>
+/* Send to controller. */<br>
+#define OFPP_CONTROLLER ((OVS_FORCE ofp_port_t) 0xfffd)<br>
+/* Local openflow "port". */<br>
+#define OFPP_LOCAL ((OVS_FORCE ofp_port_t) 0xfffe)<br>
+/* Not associated with a physical port. */<br>
+#define OFPP_NONE ((OVS_FORCE ofp_port_t) 0xffff)<br>
<br>
/* OpenFlow 1.0 specific capabilities supported by the datapath (struct<br>
* ofp_switch_features, member capabilities). */<br>
diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h<br>
index ec94cee..6ed2400 100644<br>
--- a/include/openflow/openflow-1.1.h<br>
+++ b/include/openflow/openflow-1.1.h<br>
@@ -67,8 +67,8 @@<br>
* an OpenFlow 1.0 reserved port number to or from, respectively, the<br>
* corresponding OpenFlow 1.1 reserved port number.<br>
*/<br>
-#define OFPP11_MAX 0xffffff00<br>
-#define OFPP11_OFFSET (OFPP11_MAX - OFPP_MAX)<br>
+#define OFPP11_MAX ((OVS_FORCE ofp11_port_t) 0xffffff00)<br>
+#define OFPP11_OFFSET 0xffff0000 /* OFPP11_MAX - OFPP_MAX */<br>
<br>
/* Reserved wildcard port used only for flow mod (delete) and flow stats<br>
* requests. Selects all flows regardless of output port<br>
diff --git a/include/openvswitch/types.h b/include/openvswitch/types.h<br>
index 72caa5c..7e1e59d 100644<br>
--- a/include/openvswitch/types.h<br>
+++ b/include/openvswitch/types.h<br>
@@ -60,4 +60,10 @@ typedef struct {<br>
ovs_be32 hi, lo;<br>
} ovs_32aligned_be64;<br>
<br>
+/* ofp_port_t represents the port number of a OpenFlow switch.<br>
+ * odp_port_t represents the port number on the datapath. */<br>
+typedef uint16_t OVS_BITWISE ofp_port_t;<br>
+typedef uint32_t OVS_BITWISE odp_port_t;<br>
+typedef uint32_t OVS_BITWISE ofp11_port_t;<br>
+<br>
#endif /* openvswitch/types.h */<br>
diff --git a/lib/bundle.c b/lib/bundle.c<br>
index b3821e8..248f2af 100644<br>
--- a/lib/bundle.c<br>
+++ b/lib/bundle.c<br>
@@ -35,14 +35,14 @@<br>
<br>
VLOG_DEFINE_THIS_MODULE(bundle);<br>
<br>
-static uint16_t<br>
+static ofp_port_t<br>
execute_ab(const struct ofpact_bundle *bundle,<br>
- bool (*slave_enabled)(uint16_t ofp_port, void *aux), void *aux)<br>
+ bool (*slave_enabled)(ofp_port_t ofp_port, void *aux), void *aux)<br>
{<br>
size_t i;<br>
<br>
for (i = 0; i < bundle->n_slaves; i++) {<br>
- uint16_t slave = bundle->slaves[i];<br>
+ ofp_port_t slave = bundle->slaves[i];<br>
if (slave_enabled(slave, aux)) {<br>
return slave;<br>
}<br>
@@ -51,10 +51,10 @@ execute_ab(const struct ofpact_bundle *bundle,<br>
return OFPP_NONE;<br>
}<br>
<br>
-static uint16_t<br>
+static ofp_port_t<br>
execute_hrw(const struct ofpact_bundle *bundle,<br>
const struct flow *flow, struct flow_wildcards *wc,<br>
- bool (*slave_enabled)(uint16_t ofp_port, void *aux), void *aux)<br>
+ bool (*slave_enabled)(ofp_port_t ofp_port, void *aux), void *aux)<br>
{<br>
uint32_t flow_hash, best_hash;<br>
int best, i;<br>
@@ -85,10 +85,10 @@ execute_hrw(const struct ofpact_bundle *bundle,<br>
* calculate the result. Uses 'slave_enabled' to determine if the slave<br>
* designated by 'ofp_port' is up. Returns the chosen slave, or<br>
* OFPP_NONE if none of the slaves are acceptable. */<br>
-uint16_t<br>
+ofp_port_t<br>
bundle_execute(const struct ofpact_bundle *bundle,<br>
const struct flow *flow, struct flow_wildcards *wc,<br>
- bool (*slave_enabled)(uint16_t ofp_port, void *aux), void *aux)<br>
+ bool (*slave_enabled)(ofp_port_t ofp_port, void *aux), void *aux)<br>
{<br>
switch (bundle->algorithm) {<br>
case NX_BD_ALG_HRW:<br>
@@ -186,7 +186,7 @@ bundle_from_openflow(const struct nx_action_bundle *nab,<br>
}<br>
<br>
enum ofperr<br>
-bundle_check(const struct ofpact_bundle *bundle, int max_ports,<br>
+bundle_check(const struct ofpact_bundle *bundle, ofp_port_t max_ports,<br>
const struct flow *flow)<br>
{<br>
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);<br>
@@ -200,7 +200,7 @@ bundle_check(const struct ofpact_bundle *bundle, int max_ports,<br>
}<br>
<br>
for (i = 0; i < bundle->n_slaves; i++) {<br>
- uint16_t ofp_port = bundle->slaves[i];<br>
+ ofp_port_t ofp_port = bundle->slaves[i];<br>
enum ofperr error;<br>
<br>
error = ofputil_check_output_port(ofp_port, max_ports);<br>
@@ -246,7 +246,7 @@ bundle_to_nxast(const struct ofpact_bundle *bundle, struct ofpbuf *openflow)<br>
<br>
slaves = ofpbuf_put_zeros(openflow, slaves_len);<br>
for (i = 0; i < bundle->n_slaves; i++) {<br>
- slaves[i] = htons(bundle->slaves[i]);<br>
+ slaves[i] = ofp_htons(bundle->slaves[i]);<br>
}<br>
}<br>
<br>
@@ -271,7 +271,7 @@ bundle_parse__(const char *s, char **save_ptr,<br>
bundle = ofpact_put_BUNDLE(ofpacts);<br>
<br>
for (;;) {<br>
- uint16_t slave_port;<br>
+ ofp_port_t slave_port;<br>
char *slave;<br>
<br>
slave = strtok_r(NULL, ", []", save_ptr);<br>
diff --git a/lib/bundle.h b/lib/bundle.h<br>
index 2619aeb..3e92374 100644<br>
--- a/lib/bundle.h<br>
+++ b/lib/bundle.h<br>
@@ -35,13 +35,13 @@ struct ofpbuf;<br>
*<br>
* See include/openflow/nicira-ext.h for NXAST_BUNDLE specification. */<br>
<br>
-uint16_t bundle_execute(const struct ofpact_bundle *, const struct flow *,<br>
+ofp_port_t bundle_execute(const struct ofpact_bundle *, const struct flow *,<br>
struct flow_wildcards *wc,<br>
- bool (*slave_enabled)(uint16_t ofp_port, void *aux),<br>
+ bool (*slave_enabled)(ofp_port_t ofp_port, void *aux),<br>
void *aux);<br>
enum ofperr bundle_from_openflow(const struct nx_action_bundle *,<br>
struct ofpbuf *ofpact);<br>
-enum ofperr bundle_check(const struct ofpact_bundle *, int max_ports,<br>
+enum ofperr bundle_check(const struct ofpact_bundle *, ofp_port_t max_ports,<br>
const struct flow *);<br>
void bundle_to_nxast(const struct ofpact_bundle *, struct ofpbuf *of10);<br>
void bundle_parse(const char *, struct ofpbuf *ofpacts);<br>
diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c<br>
index 1383b58..f8302fc 100644<br>
--- a/lib/dpif-linux.c<br>
+++ b/lib/dpif-linux.c<br>
@@ -167,7 +167,7 @@ static int dpif_linux_init(void);<br>
static void open_dpif(const struct dpif_linux_dp *, struct dpif **);<br>
static bool dpif_linux_nln_parse(struct ofpbuf *, void *);<br>
static void dpif_linux_port_changed(const void *vport, void *dpif);<br>
-static uint32_t dpif_linux_port_get_pid(const struct dpif *, uint32_t port_no);<br>
+static uint32_t dpif_linux_port_get_pid(const struct dpif *, odp_port_t port_no);<br>
<br>
static void dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *,<br>
struct ofpbuf *);<br>
@@ -259,7 +259,7 @@ open_dpif(const struct dpif_linux_dp *dp, struct dpif **dpifp)<br>
static void<br>
destroy_channels(struct dpif_linux *dpif)<br>
{<br>
- int i;<br>
+ unsigned int i;<br>
<br>
if (dpif->epoll_fd < 0) {<br>
return;<br>
@@ -278,7 +278,7 @@ destroy_channels(struct dpif_linux *dpif)<br>
dpif_linux_vport_init(&vport_request);<br>
vport_request.cmd = OVS_VPORT_CMD_SET;<br>
vport_request.dp_ifindex = dpif->dp_ifindex;<br>
- vport_request.port_no = i;<br>
+ vport_request.port_no = uint_to_odp(i);<br>
vport_request.upcall_pid = &upcall_pid;<br>
dpif_linux_vport_transact(&vport_request, NULL, NULL);<br>
<br>
@@ -298,9 +298,10 @@ destroy_channels(struct dpif_linux *dpif)<br>
}<br>
<br>
static int<br>
-add_channel(struct dpif_linux *dpif, uint32_t port_no, struct nl_sock *sock)<br>
+add_channel(struct dpif_linux *dpif, odp_port_t port_no, struct nl_sock *sock)<br>
{<br>
struct epoll_event event;<br>
+ uint32_t port_idx = odp_to_u32(port_no);<br>
<br>
if (dpif->epoll_fd < 0) {<br>
return 0;<br>
@@ -308,9 +309,9 @@ add_channel(struct dpif_linux *dpif, uint32_t port_no, struct nl_sock *sock)<br>
<br>
/* We assume that the datapath densely chooses port numbers, which<br>
* can therefore be used as an index into an array of channels. */<br>
- if (port_no >= dpif->uc_array_size) {<br>
- int new_size = port_no + 1;<br>
- int i;<br>
+ if (port_idx >= dpif->uc_array_size) {<br>
+ uint32_t new_size = port_idx + 1;<br>
+ uint32_t i;<br>
<br>
if (new_size > MAX_PORTS) {<br>
VLOG_WARN_RL(&error_rl, "%s: datapath port %"PRIu32" too big",<br>
@@ -331,29 +332,31 @@ add_channel(struct dpif_linux *dpif, uint32_t port_no, struct nl_sock *sock)<br>
<br>
memset(&event, 0, sizeof event);<br>
event.events = EPOLLIN;<br>
- event.data.u32 = port_no;<br>
+ event.data.u32 = port_idx;<br>
if (epoll_ctl(dpif->epoll_fd, EPOLL_CTL_ADD, nl_sock_fd(sock),<br>
&event) < 0) {<br>
return errno;<br>
}<br>
<br>
- nl_sock_destroy(dpif->channels[port_no].sock);<br>
- dpif->channels[port_no].sock = sock;<br>
- dpif->channels[port_no].last_poll = LLONG_MIN;<br>
+ nl_sock_destroy(dpif->channels[port_idx].sock);<br>
+ dpif->channels[port_idx].sock = sock;<br>
+ dpif->channels[port_idx].last_poll = LLONG_MIN;<br>
<br>
return 0;<br>
}<br>
<br>
static void<br>
-del_channel(struct dpif_linux *dpif, uint32_t port_no)<br>
+del_channel(struct dpif_linux *dpif, odp_port_t port_no)<br>
{<br>
struct dpif_channel *ch;<br>
+ uint32_t port_idx = odp_to_u32(port_no);<br>
<br>
- if (dpif->epoll_fd < 0 || port_no >= dpif->uc_array_size) {<br>
+ if (dpif->epoll_fd < 0<br>
+ || port_idx >= dpif->uc_array_size) {<br>
return;<br>
}<br>
<br>
- ch = &dpif->channels[port_no];<br>
+ ch = &dpif->channels[port_idx];<br>
if (!ch->sock) {<br>
return;<br>
}<br>
@@ -480,7 +483,7 @@ netdev_to_ovs_vport_type(const struct netdev *netdev)<br>
<br>
static int<br>
dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev,<br>
- uint32_t *port_nop)<br>
+ odp_port_t *port_nop)<br>
{<br>
struct dpif_linux *dpif = dpif_linux_cast(dpif_);<br>
const struct netdev_tunnel_config *tnl_cfg;<br>
@@ -539,7 +542,7 @@ dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev,<br>
VLOG_DBG("%s: assigning port %"PRIu32" to netlink pid %"PRIu32,<br>
dpif_name(dpif_), reply.port_no, upcall_pid);<br>
} else {<br>
- if (error == EBUSY && *port_nop != UINT32_MAX) {<br>
+ if (error == EBUSY && *port_nop != OVSP_NONE) {<br>
VLOG_INFO("%s: requested port %"PRIu32" is in use",<br>
dpif_name(dpif_), *port_nop);<br>
}<br>
@@ -571,7 +574,7 @@ dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev,<br>
}<br>
<br>
static int<br>
-dpif_linux_port_del(struct dpif *dpif_, uint32_t port_no)<br>
+dpif_linux_port_del(struct dpif *dpif_, odp_port_t port_no)<br>
{<br>
struct dpif_linux *dpif = dpif_linux_cast(dpif_);<br>
struct dpif_linux_vport vport;<br>
@@ -589,7 +592,7 @@ dpif_linux_port_del(struct dpif *dpif_, uint32_t port_no)<br>
}<br>
<br>
static int<br>
-dpif_linux_port_query__(const struct dpif *dpif, uint32_t port_no,<br>
+dpif_linux_port_query__(const struct dpif *dpif, odp_port_t port_no,<br>
const char *port_name, struct dpif_port *dpif_port)<br>
{<br>
struct dpif_linux_vport request;<br>
@@ -620,7 +623,7 @@ dpif_linux_port_query__(const struct dpif *dpif, uint32_t port_no,<br>
}<br>
<br>
static int<br>
-dpif_linux_port_query_by_number(const struct dpif *dpif, uint32_t port_no,<br>
+dpif_linux_port_query_by_number(const struct dpif *dpif, odp_port_t port_no,<br>
struct dpif_port *dpif_port)<br>
{<br>
return dpif_linux_port_query__(dpif, port_no, NULL, dpif_port);<br>
@@ -633,23 +636,24 @@ dpif_linux_port_query_by_name(const struct dpif *dpif, const char *devname,<br>
return dpif_linux_port_query__(dpif, 0, devname, dpif_port);<br>
}<br>
<br>
-static int<br>
+static odp_port_t<br>
dpif_linux_get_max_ports(const struct dpif *dpif OVS_UNUSED)<br>
{<br>
- return MAX_PORTS;<br>
+ return uint_to_odp(MAX_PORTS);<br>
}<br>
<br>
static uint32_t<br>
-dpif_linux_port_get_pid(const struct dpif *dpif_, uint32_t port_no)<br>
+dpif_linux_port_get_pid(const struct dpif *dpif_, odp_port_t port_no)<br>
{<br>
struct dpif_linux *dpif = dpif_linux_cast(dpif_);<br>
+ uint32_t port_idx = odp_to_u32(port_no);<br>
<br>
if (dpif->epoll_fd < 0) {<br>
return 0;<br>
} else {<br>
/* The UINT32_MAX "reserved" port number uses the "ovs-system"'s<br>
* channel, since it is not heavily loaded. */<br>
- int idx = (port_no >= dpif->uc_array_size) ? 0 : port_no;<br>
+ uint32_t idx = port_idx >= dpif->uc_array_size ? 0 : port_idx;<br>
return nl_sock_pid(dpif->channels[idx].sock);<br>
}<br>
}<br>
@@ -1553,7 +1557,8 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport,<br>
<br>
vport->cmd = genl->cmd;<br>
vport->dp_ifindex = ovs_header->dp_ifindex;<br>
- vport->port_no = nl_attr_get_u32(a[OVS_VPORT_ATTR_PORT_NO]);<br>
+ vport->port_no = uint_to_odp(<br>
+ nl_attr_get_u32(a[OVS_VPORT_ATTR_PORT_NO]));<br>
vport->type = nl_attr_get_u32(a[OVS_VPORT_ATTR_TYPE]);<br>
vport->name = nl_attr_get_string(a[OVS_VPORT_ATTR_NAME]);<br>
if (a[OVS_VPORT_ATTR_UPCALL_PID]) {<br>
@@ -1583,8 +1588,9 @@ dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport,<br>
ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header);<br>
ovs_header->dp_ifindex = vport->dp_ifindex;<br>
<br>
- if (vport->port_no != UINT32_MAX) {<br>
- nl_msg_put_u32(buf, OVS_VPORT_ATTR_PORT_NO, vport->port_no);<br>
+ if (vport->port_no != OVSP_NONE) {<br>
+ nl_msg_put_u32(buf, OVS_VPORT_ATTR_PORT_NO,<br>
+ odp_to_u32(vport->port_no));<br>
}<br>
<br>
if (vport->type != OVS_VPORT_TYPE_UNSPEC) {<br>
@@ -1615,7 +1621,7 @@ void<br>
dpif_linux_vport_init(struct dpif_linux_vport *vport)<br>
{<br>
memset(vport, 0, sizeof *vport);<br>
- vport->port_no = UINT32_MAX;<br>
+ vport->port_no = OVSP_NONE;<br>
}<br>
<br>
/* Executes 'request' in the kernel datapath. If the command fails, returns a<br>
diff --git a/lib/dpif-linux.h b/lib/dpif-linux.h<br>
index 81062aa..492e543 100644<br>
--- a/lib/dpif-linux.h<br>
+++ b/lib/dpif-linux.h<br>
@@ -22,6 +22,8 @@<br>
#include <stdint.h><br>
#include <linux/openvswitch.h><br>
<br>
+#include "flow.h"<br>
+<br>
struct ofpbuf;<br>
<br>
struct dpif_linux_vport {<br>
@@ -30,7 +32,7 @@ struct dpif_linux_vport {<br>
<br>
/* ovs_vport header. */<br>
int dp_ifindex;<br>
- uint32_t port_no; /* UINT32_MAX if unknown. */<br>
+ odp_port_t port_no; /* OVSP_NONE if unknown. */<br>
enum ovs_vport_type type;<br>
<br>
/* Attributes.<br>
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c<br>
index 52aedb6..58435d7 100644<br>
--- a/lib/dpif-netdev.c<br>
+++ b/lib/dpif-netdev.c<br>
@@ -104,7 +104,7 @@ struct dp_netdev {<br>
<br>
/* A port in a netdev-based datapath. */<br>
struct dp_netdev_port {<br>
- int port_no; /* Index into dp_netdev's 'ports'. */<br>
+ odp_port_t port_no; /* Index into dp_netdev's 'ports'. */<br>
struct list node; /* Element in dp_netdev's 'port_list'. */<br>
struct netdev *netdev;<br>
struct netdev_saved_flags *sf;<br>
@@ -141,15 +141,15 @@ static struct shash dp_netdevs = SHASH_INITIALIZER(&dp_netdevs);<br>
/* Maximum port MTU seen so far. */<br>
static int max_mtu = ETH_PAYLOAD_MAX;<br>
<br>
-static int get_port_by_number(struct dp_netdev *, uint32_t port_no,<br>
+static int get_port_by_number(struct dp_netdev *, odp_port_t port_no,<br>
struct dp_netdev_port **portp);<br>
static int get_port_by_name(struct dp_netdev *, const char *devname,<br>
struct dp_netdev_port **portp);<br>
static void dp_netdev_free(struct dp_netdev *);<br>
static void dp_netdev_flow_flush(struct dp_netdev *);<br>
static int do_add_port(struct dp_netdev *, const char *devname,<br>
- const char *type, uint32_t port_no);<br>
-static int do_del_port(struct dp_netdev *, uint32_t port_no);<br>
+ const char *type, odp_port_t port_no);<br>
+static int do_del_port(struct dp_netdev *, odp_port_t port_no);<br>
static int dpif_netdev_open(const struct dpif_class *, const char *name,<br>
bool create, struct dpif **);<br>
static int dp_netdev_output_userspace(struct dp_netdev *, const struct ofpbuf *,<br>
@@ -218,10 +218,12 @@ create_dpif_netdev(struct dp_netdev *dp)<br>
return &dpif->dpif;<br>
}<br>
<br>
-static int<br>
+/* Choose an unused, non-zero port number and return it on success.<br>
+ * Return 0 on failure. */<br>
+static uint32_t<br>
choose_port(struct dp_netdev *dp, const char *name)<br>
{<br>
- int port_no;<br>
+ uint32_t port_no;<br>
<br>
if (dp->class != &dpif_netdev_class) {<br>
const char *p;<br>
@@ -254,7 +256,7 @@ choose_port(struct dp_netdev *dp, const char *name)<br>
}<br>
}<br>
<br>
- return -1;<br>
+ return 0;<br>
}<br>
<br>
static int<br>
@@ -379,13 +381,14 @@ dpif_netdev_get_stats(const struct dpif *dpif, struct dpif_dp_stats *stats)<br>
<br>
static int<br>
do_add_port(struct dp_netdev *dp, const char *devname, const char *type,<br>
- uint32_t port_no)<br>
+ odp_port_t port_no)<br>
{<br>
struct netdev_saved_flags *sf;<br>
struct dp_netdev_port *port;<br>
struct netdev *netdev;<br>
struct netdev_rx *rx;<br>
const char *open_type;<br>
+ uint32_t port_idx = odp_to_u32(port_no);<br>
int mtu;<br>
int error;<br>
<br>
@@ -429,7 +432,7 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,<br>
}<br>
<br>
list_push_back(&dp->port_list, &port->node);<br>
- dp->ports[port_no] = port;<br>
+ dp->ports[port_idx] = port;<br>
dp->serial++;<br>
<br>
return 0;<br>
@@ -437,53 +440,56 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,<br>
<br>
static int<br>
dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev,<br>
- uint32_t *port_nop)<br>
+ odp_port_t *port_nop)<br>
{<br>
struct dp_netdev *dp = get_dp_netdev(dpif);<br>
char namebuf[NETDEV_VPORT_NAME_BUFSIZE];<br>
const char *dpif_port;<br>
- int port_no;<br>
+ uint32_t port_no = odp_to_u32(*port_nop);<br>
<br>
dpif_port = netdev_vport_get_dpif_port(netdev, namebuf, sizeof namebuf);<br>
- if (*port_nop != UINT32_MAX) {<br>
- if (*port_nop >= MAX_PORTS) {<br>
+ if (port_no != UINT32_MAX) {<br>
+ if (port_no >= MAX_PORTS) {<br>
return EFBIG;<br>
- } else if (dp->ports[*port_nop]) {<br>
+ } else if (dp->ports[port_no]) {<br>
return EBUSY;<br>
}<br>
- port_no = *port_nop;<br>
} else {<br>
port_no = choose_port(dp, dpif_port);<br>
}<br>
if (port_no >= 0) {<br>
- *port_nop = port_no;<br>
- return do_add_port(dp, dpif_port, netdev_get_type(netdev), port_no);<br>
+ *port_nop = uint_to_odp(port_no);<br>
+ return do_add_port(dp, dpif_port, netdev_get_type(netdev), *port_nop);<br>
}<br>
return EFBIG;<br>
}<br>
<br>
static int<br>
-dpif_netdev_port_del(struct dpif *dpif, uint32_t port_no)<br>
+dpif_netdev_port_del(struct dpif *dpif, odp_port_t port_no)<br>
{<br>
struct dp_netdev *dp = get_dp_netdev(dpif);<br>
- return port_no == OVSP_LOCAL ? EINVAL : do_del_port(dp, port_no);<br>
+ return (port_no == OVSP_LOCAL ?<br>
+ EINVAL : do_del_port(dp, port_no));<br>
}<br>
<br>
static bool<br>
-is_valid_port_number(uint32_t port_no)<br>
+is_valid_port_number(odp_port_t port_no)<br>
{<br>
- return port_no < MAX_PORTS;<br>
+ uint32_t port_no_ = odp_to_u32(port_no);<br>
+ return port_no_ < MAX_PORTS;<br>
}<br>
<br>
static int<br>
get_port_by_number(struct dp_netdev *dp,<br>
- uint32_t port_no, struct dp_netdev_port **portp)<br>
+ odp_port_t port_no, struct dp_netdev_port **portp)<br>
{<br>
+ uint32_t port_idx = odp_to_u32(port_no);<br>
+<br>
if (!is_valid_port_number(port_no)) {<br>
*portp = NULL;<br>
return EINVAL;<br>
} else {<br>
- *portp = dp->ports[port_no];<br>
+ *portp = dp->ports[port_idx];<br>
return *portp ? 0 : ENOENT;<br>
}<br>
}<br>
@@ -504,9 +510,10 @@ get_port_by_name(struct dp_netdev *dp,<br>
}<br>
<br>
static int<br>
-do_del_port(struct dp_netdev *dp, uint32_t port_no)<br>
+do_del_port(struct dp_netdev *dp, odp_port_t port_no)<br>
{<br>
struct dp_netdev_port *port;<br>
+ uint32_t port_idx = odp_to_u32(port_no);<br>
int error;<br>
<br>
error = get_port_by_number(dp, port_no, &port);<br>
@@ -515,7 +522,7 @@ do_del_port(struct dp_netdev *dp, uint32_t port_no)<br>
}<br>
<br>
list_remove(&port->node);<br>
- dp->ports[port->port_no] = NULL;<br>
+ dp->ports[port_idx] = NULL;<br>
dp->serial++;<br>
<br>
netdev_close(port->netdev);<br>
@@ -537,7 +544,7 @@ answer_port_query(const struct dp_netdev_port *port,<br>
}<br>
<br>
static int<br>
-dpif_netdev_port_query_by_number(const struct dpif *dpif, uint32_t port_no,<br>
+dpif_netdev_port_query_by_number(const struct dpif *dpif, odp_port_t port_no,<br>
struct dpif_port *dpif_port)<br>
{<br>
struct dp_netdev *dp = get_dp_netdev(dpif);<br>
@@ -566,10 +573,10 @@ dpif_netdev_port_query_by_name(const struct dpif *dpif, const char *devname,<br>
return error;<br>
}<br>
<br>
-static int<br>
+static odp_port_t<br>
dpif_netdev_get_max_ports(const struct dpif *dpif OVS_UNUSED)<br>
{<br>
- return MAX_PORTS;<br>
+ return uint_to_odp(MAX_PORTS);<br>
}<br>
<br>
static void<br>
@@ -599,7 +606,7 @@ dpif_netdev_flow_flush(struct dpif *dpif)<br>
}<br>
<br>
struct dp_netdev_port_state {<br>
- uint32_t port_no;<br>
+ odp_port_t port_no;<br>
char *name;<br>
};<br>
<br>
@@ -616,17 +623,18 @@ dpif_netdev_port_dump_next(const struct dpif *dpif, void *state_,<br>
{<br>
struct dp_netdev_port_state *state = state_;<br>
struct dp_netdev *dp = get_dp_netdev(dpif);<br>
- uint32_t port_no;<br>
+ uint32_t port_idx;<br>
<br>
- for (port_no = state->port_no; port_no < MAX_PORTS; port_no++) {<br>
- struct dp_netdev_port *port = dp->ports[port_no];<br>
+ for (port_idx = odp_to_u32(state->port_no);<br>
+ port_idx < MAX_PORTS; port_idx++) {<br>
+ struct dp_netdev_port *port = dp->ports[port_idx];<br>
if (port) {<br>
free(state->name);<br>
state->name = xstrdup(netdev_get_name(port->netdev));<br>
dpif_port->name = state->name;<br>
dpif_port->type = port->type;<br>
dpif_port->port_no = port->port_no;<br>
- state->port_no = port_no + 1;<br>
+ state->port_no = uint_to_odp(port_idx + 1);<br>
return 0;<br>
}<br>
}<br>
@@ -708,9 +716,7 @@ dpif_netdev_flow_from_nlattrs(const struct nlattr *key, uint32_t key_len,<br>
return EINVAL;<br>
}<br>
<br>
- if (flow->in_port < OFPP_MAX<br>
- ? flow->in_port >= MAX_PORTS<br>
- : flow->in_port != OFPP_LOCAL && flow->in_port != OFPP_NONE) {<br>
+ if (flow->in_port.port32 >= MAX_PORTS) {<br>
return EINVAL;<br>
}<br>
<br>
@@ -898,7 +904,7 @@ dpif_netdev_flow_dump_next(const struct dpif *dpif, void *state_,<br>
struct ofpbuf buf;<br>
<br>
ofpbuf_use_stack(&buf, &state->keybuf, sizeof state->keybuf);<br>
- odp_flow_key_from_flow(&buf, &flow->key, flow->key.in_port);<br>
+ odp_flow_key_from_flow(&buf, &flow->key, flow->key.in_port.odp_port);<br>
<br>
*key = buf.data;<br>
*key_len = buf.size;<br>
@@ -948,7 +954,7 @@ dpif_netdev_execute(struct dpif *dpif, const struct dpif_execute *execute)<br>
ofpbuf_reserve(&copy, DP_NETDEV_HEADROOM);<br>
ofpbuf_put(&copy, execute->packet->data, execute->packet->size);<br>
<br>
- flow_extract(&copy, 0, 0, NULL, -1, &key);<br>
+ flow_extract(&copy, 0, 0, NULL, NULL, &key);<br>
error = dpif_netdev_flow_from_nlattrs(execute->key, execute->key_len,<br>
&key);<br>
if (!error) {<br>
@@ -1043,11 +1049,13 @@ dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port,<br>
{<br>
struct dp_netdev_flow *flow;<br>
struct flow key;<br>
+ union flow_in_port in_port_;<br>
<br>
if (packet->size < ETH_HEADER_LEN) {<br>
return;<br>
}<br>
- flow_extract(packet, skb_priority, skb_mark, tnl, port->port_no, &key);<br>
+ in_port_.odp_port = port->port_no;<br>
+ flow_extract(packet, skb_priority, skb_mark, tnl, &in_port_, &key);<br>
flow = dp_netdev_lookup_flow(dp, &key);<br>
if (flow) {<br>
dp_netdev_flow_used(flow, packet);<br>
@@ -1134,7 +1142,7 @@ dp_netdev_output_userspace(struct dp_netdev *dp, const struct ofpbuf *packet,<br>
ofpbuf_init(buf, buf_size);<br>
<br>
/* Put ODP flow. */<br>
- odp_flow_key_from_flow(buf, flow, flow->in_port);<br>
+ odp_flow_key_from_flow(buf, flow, flow->in_port.odp_port);<br>
upcall->key = buf->data;<br>
upcall->key_len = buf->size;<br>
<br>
diff --git a/lib/dpif-provider.h b/lib/dpif-provider.h<br>
index bea822f..6af6733 100644<br>
--- a/lib/dpif-provider.h<br>
+++ b/lib/dpif-provider.h<br>
@@ -127,10 +127,10 @@ struct dpif_class {<br>
* port number. Returns EBUSY if caller attempted to choose a port<br>
* number, and it was in use. */<br>
int (*port_add)(struct dpif *dpif, struct netdev *netdev,<br>
- uint32_t *port_no);<br>
+ odp_port_t *port_no);<br>
<br>
/* Removes port numbered 'port_no' from 'dpif'. */<br>
- int (*port_del)(struct dpif *dpif, uint32_t port_no);<br>
+ int (*port_del)(struct dpif *dpif, odp_port_t port_no);<br>
<br>
/* Queries 'dpif' for a port with the given 'port_no' or 'devname'.<br>
* If 'port' is not null, stores information about the port into<br>
@@ -139,14 +139,14 @@ struct dpif_class {<br>
* If 'port' is not null, the caller takes ownership of data in<br>
* 'port' and must free it with dpif_port_destroy() when it is no<br>
* longer needed. */<br>
- int (*port_query_by_number)(const struct dpif *dpif, uint32_t port_no,<br>
+ int (*port_query_by_number)(const struct dpif *dpif, odp_port_t port_no,<br>
struct dpif_port *port);<br>
int (*port_query_by_name)(const struct dpif *dpif, const char *devname,<br>
struct dpif_port *port);<br>
<br>
/* Returns one greater than the largest port number accepted in flow<br>
* actions. */<br>
- int (*get_max_ports)(const struct dpif *dpif);<br>
+ odp_port_t (*get_max_ports)(const struct dpif *dpif);<br>
<br>
/* Returns the Netlink PID value to supply in OVS_ACTION_ATTR_USERSPACE<br>
* actions as the OVS_USERSPACE_ATTR_PID attribute's value, for use in<br>
@@ -162,7 +162,7 @@ struct dpif_class {<br>
*<br>
* A dpif provider that doesn't have meaningful Netlink PIDs can use NULL<br>
* for this function. This is equivalent to always returning 0. */<br>
- uint32_t (*port_get_pid)(const struct dpif *dpif, uint32_t port_no);<br>
+ uint32_t (*port_get_pid)(const struct dpif *dpif, odp_port_t port_no);<br>
<br>
/* Attempts to begin dumping the ports in a dpif. On success, returns 0<br>
* and initializes '*statep' with any data needed for iteration. On<br>
diff --git a/lib/dpif.c b/lib/dpif.c<br>
index 6aa52d5..0b616b0 100644<br>
--- a/lib/dpif.c<br>
+++ b/lib/dpif.c<br>
@@ -434,18 +434,18 @@ dpif_port_open_type(const char *datapath_type, const char *port_type)<br>
}<br>
<br>
/* Attempts to add 'netdev' as a port on 'dpif'. If 'port_nop' is<br>
- * non-null and its value is not UINT32_MAX, then attempts to use the<br>
+ * non-null and its value is not OVSP_NONE, then attempts to use the<br>
* value as the port number.<br>
*<br>
* If successful, returns 0 and sets '*port_nop' to the new port's port<br>
* number (if 'port_nop' is non-null). On failure, returns a positive<br>
- * errno value and sets '*port_nop' to UINT32_MAX (if 'port_nop' is<br>
+ * errno value and sets '*port_nop' to OVSP_NONE (if 'port_nop' is<br>
* non-null). */<br>
int<br>
-dpif_port_add(struct dpif *dpif, struct netdev *netdev, uint32_t *port_nop)<br>
+dpif_port_add(struct dpif *dpif, struct netdev *netdev, odp_port_t *port_nop)<br>
{<br>
const char *netdev_name = netdev_get_name(netdev);<br>
- uint32_t port_no = UINT32_MAX;<br>
+ odp_port_t port_no = OVSP_NONE;<br>
int error;<br>
<br>
COVERAGE_INC(dpif_port_add);<br>
@@ -461,7 +461,7 @@ dpif_port_add(struct dpif *dpif, struct netdev *netdev, uint32_t *port_nop)<br>
} else {<br>
VLOG_WARN_RL(&error_rl, "%s: failed to add %s as port: %s",<br>
dpif_name(dpif), netdev_name, strerror(error));<br>
- port_no = UINT32_MAX;<br>
+ port_no = OVSP_NONE;<br>
}<br>
if (port_nop) {<br>
*port_nop = port_no;<br>
@@ -472,7 +472,7 @@ dpif_port_add(struct dpif *dpif, struct netdev *netdev, uint32_t *port_nop)<br>
/* Attempts to remove 'dpif''s port number 'port_no'. Returns 0 if successful,<br>
* otherwise a positive errno value. */<br>
int<br>
-dpif_port_del(struct dpif *dpif, uint32_t port_no)<br>
+dpif_port_del(struct dpif *dpif, odp_port_t port_no)<br>
{<br>
int error;<br>
<br>
@@ -530,7 +530,7 @@ dpif_port_exists(const struct dpif *dpif, const char *devname)<br>
* The caller owns the data in 'port' and must free it with<br>
* dpif_port_destroy() when it is no longer needed. */<br>
int<br>
-dpif_port_query_by_number(const struct dpif *dpif, uint32_t port_no,<br>
+dpif_port_query_by_number(const struct dpif *dpif, odp_port_t port_no,<br>
struct dpif_port *port)<br>
{<br>
int error = dpif->dpif_class->port_query_by_number(dpif, port_no, port);<br>
@@ -576,7 +576,7 @@ dpif_port_query_by_name(const struct dpif *dpif, const char *devname,<br>
<br>
/* Returns one greater than the maximum port number accepted in flow<br>
* actions. */<br>
-int<br>
+odp_port_t<br>
dpif_get_max_ports(const struct dpif *dpif)<br>
{<br>
return dpif->dpif_class->get_max_ports(dpif);<br>
@@ -586,7 +586,7 @@ dpif_get_max_ports(const struct dpif *dpif)<br>
* as the OVS_USERSPACE_ATTR_PID attribute's value, for use in flows whose<br>
* packets arrived on port 'port_no'.<br>
*<br>
- * A 'port_no' of UINT32_MAX is a special case: it returns a reserved PID, not<br>
+ * A 'port_no' of OVSP_NONE is a special case: it returns a reserved PID, not<br>
* allocated to any port, that the client may use for special purposes.<br>
*<br>
* The return value is only meaningful when DPIF_UC_ACTION has been enabled in<br>
@@ -595,7 +595,7 @@ dpif_get_max_ports(const struct dpif *dpif)<br>
* update all of the flows that it installed that contain<br>
* OVS_ACTION_ATTR_USERSPACE actions. */<br>
uint32_t<br>
-dpif_port_get_pid(const struct dpif *dpif, uint32_t port_no)<br>
+dpif_port_get_pid(const struct dpif *dpif, odp_port_t port_no)<br>
{<br>
return (dpif->dpif_class->port_get_pid<br>
? (dpif->dpif_class->port_get_pid)(dpif, port_no)<br>
@@ -607,7 +607,7 @@ dpif_port_get_pid(const struct dpif *dpif, uint32_t port_no)<br>
* result is null-terminated. On failure, returns a positive errno value and<br>
* makes 'name' the empty string. */<br>
int<br>
-dpif_port_get_name(struct dpif *dpif, uint32_t port_no,<br>
+dpif_port_get_name(struct dpif *dpif, odp_port_t port_no,<br>
char *name, size_t name_size)<br>
{<br>
struct dpif_port port;<br>
diff --git a/lib/dpif.h b/lib/dpif.h<br>
index fd05b2f..12e5ad0 100644<br>
--- a/lib/dpif.h<br>
+++ b/lib/dpif.h<br>
@@ -377,8 +377,8 @@ int dpif_get_dp_stats(const struct dpif *, struct dpif_dp_stats *);<br>
<br>
const char *dpif_port_open_type(const char *datapath_type,<br>
const char *port_type);<br>
-int dpif_port_add(struct dpif *, struct netdev *, uint32_t *port_nop);<br>
-int dpif_port_del(struct dpif *, uint32_t port_no);<br>
+int dpif_port_add(struct dpif *, struct netdev *, odp_port_t *port_nop);<br>
+int dpif_port_del(struct dpif *, odp_port_t port_no);<br>
<br>
/* A port within a datapath.<br>
*<br>
@@ -386,19 +386,19 @@ int dpif_port_del(struct dpif *, uint32_t port_no);<br>
struct dpif_port {<br>
char *name; /* Network device name, e.g. "eth0". */<br>
char *type; /* Network device type, e.g. "system". */<br>
- uint32_t port_no; /* Port number within datapath. */<br>
+ odp_port_t port_no; /* Port number within datapath. */<br>
};<br>
void dpif_port_clone(struct dpif_port *, const struct dpif_port *);<br>
void dpif_port_destroy(struct dpif_port *);<br>
bool dpif_port_exists(const struct dpif *dpif, const char *devname);<br>
-int dpif_port_query_by_number(const struct dpif *, uint32_t port_no,<br>
+int dpif_port_query_by_number(const struct dpif *, odp_port_t port_no,<br>
struct dpif_port *);<br>
int dpif_port_query_by_name(const struct dpif *, const char *devname,<br>
struct dpif_port *);<br>
-int dpif_port_get_name(struct dpif *, uint32_t port_no,<br>
+int dpif_port_get_name(struct dpif *, odp_port_t port_no,<br>
char *name, size_t name_size);<br>
-int dpif_get_max_ports(const struct dpif *);<br>
-uint32_t dpif_port_get_pid(const struct dpif *, uint32_t port_no);<br>
+odp_port_t dpif_get_max_ports(const struct dpif *);<br>
+uint32_t dpif_port_get_pid(const struct dpif *, odp_port_t port_no);<br>
<br>
struct dpif_port_dump {<br>
const struct dpif *dpif;<br>
diff --git a/lib/flow.c b/lib/flow.c<br>
index d38e3ab..cbb32c2 100644<br>
--- a/lib/flow.c<br>
+++ b/lib/flow.c<br>
@@ -337,7 +337,7 @@ invalid:<br>
}<br>
<br>
/* Initializes 'flow' members from 'packet', 'skb_priority', 'tnl', and<br>
- * 'ofp_in_port'.<br>
+ * 'in_port'.<br>
*<br>
* Initializes 'packet' header pointers as follows:<br>
*<br>
@@ -357,7 +357,7 @@ invalid:<br>
*/<br>
void<br>
flow_extract(struct ofpbuf *packet, uint32_t skb_priority, uint32_t skb_mark,<br>
- const struct flow_tnl *tnl, uint16_t ofp_in_port,<br>
+ const struct flow_tnl *tnl, const union flow_in_port *in_port,<br>
struct flow *flow)<br>
{<br>
struct ofpbuf b = *packet;<br>
@@ -371,7 +371,7 @@ flow_extract(struct ofpbuf *packet, uint32_t skb_priority, uint32_t skb_mark,<br>
ovs_assert(tnl != &flow->tunnel);<br>
flow->tunnel = *tnl;<br>
}<br>
- flow->in_port = ofp_in_port;<br>
+ flow->in_port = in_port ? *in_port : flow->in_port;<br>
flow->skb_priority = skb_priority;<br>
flow->skb_mark = skb_mark;<br>
<br>
@@ -498,7 +498,7 @@ flow_get_metadata(const struct flow *flow, struct flow_metadata *fmd)<br>
fmd->tun_dst = flow->tunnel.ip_dst;<br>
fmd->metadata = flow->metadata;<br>
memcpy(fmd->regs, flow->regs, sizeof fmd->regs);<br>
- fmd->in_port = flow->in_port;<br>
+ fmd->in_port = flow->in_port.ofp_port;<br>
}<br>
<br>
char *<br>
diff --git a/lib/flow.h b/lib/flow.h<br>
index b07b9ed..081dd5a 100644<br>
--- a/lib/flow.h<br>
+++ b/lib/flow.h<br>
@@ -68,6 +68,13 @@ struct flow_tnl {<br>
uint8_t ip_ttl;<br>
};<br>
<br>
+union flow_in_port { /* Input port union. The port can be either */<br>
+ ofp_port_t ofp_port; /* OpenFlow port number or the datapath port */<br>
+ odp_port_t odp_port; /* number. */<br>
+ ofp11_port_t ofp11_port; /* For the OpenFlow-1.1 or above protocols. */<br>
+ uint32_t port32; /* For using in arithmetic opertions */<br>
+};<br>
+<br>
/*<br>
* A flow in the network.<br>
*<br>
@@ -82,14 +89,12 @@ struct flow {<br>
struct in6_addr ipv6_src; /* IPv6 source address. */<br>
struct in6_addr ipv6_dst; /* IPv6 destination address. */<br>
struct in6_addr nd_target; /* IPv6 neighbor discovery (ND) target. */<br>
+ union flow_in_port in_port; /* Input port union.*/<br>
uint32_t skb_priority; /* Packet priority for QoS. */<br>
uint32_t regs[FLOW_N_REGS]; /* Registers. */<br>
ovs_be32 nw_src; /* IPv4 source address. */<br>
ovs_be32 nw_dst; /* IPv4 destination address. */<br>
ovs_be32 ipv6_label; /* IPv6 flow label. */<br>
- uint32_t in_port; /* Input port. OpenFlow port number<br>
- unless in DPIF code, in which case it<br>
- is the datapath port number. */<br>
uint32_t skb_mark; /* Packet mark. */<br>
ovs_be32 mpls_lse; /* MPLS label stack entry. */<br>
uint16_t mpls_depth; /* Depth of MPLS stack. */<br>
@@ -122,11 +127,12 @@ struct flow_metadata {<br>
ovs_be32 tun_dst; /* Tunnel outer IPv4 dst addr */<br>
ovs_be64 metadata; /* OpenFlow 1.1+ metadata field. */<br>
uint32_t regs[FLOW_N_REGS]; /* Registers. */<br>
- uint16_t in_port; /* OpenFlow port or zero. */<br>
+ ofp_port_t in_port; /* OpenFlow port or zero. */<br>
};<br>
<br>
void flow_extract(struct ofpbuf *, uint32_t priority, uint32_t mark,<br>
- const struct flow_tnl *, uint16_t in_port, struct flow *);<br>
+ const struct flow_tnl *, const union flow_in_port *in_port,<br>
+ struct flow *);<br>
<br>
void flow_zero_wildcards(struct flow *, const struct flow_wildcards *);<br>
void flow_get_metadata(const struct flow *, struct flow_metadata *);<br>
@@ -170,6 +176,167 @@ flow_hash(const struct flow *flow, uint32_t basis)<br>
return hash_words((const uint32_t *) flow, sizeof *flow / 4, basis);<br>
}<br>
<br>
+/* ofp/odp port related utility functions. */<br>
+static inline uint16_t ofp_to_u16(const ofp_port_t ofp_port);<br>
+static inline uint32_t odp_to_u32(const odp_port_t odp_port);<br>
+static inline uint32_t ofp11_to_u32(const ofp11_port_t ofp11_port);<br>
+static inline ofp_port_t uint_to_ofp(const unsigned int port);<br>
+static inline odp_port_t uint_to_odp(const unsigned int port);<br>
+static inline ofp11_port_t uint_to_ofp11(const unsigned int port);<br>
+<br>
+static inline ovs_be16 ofp_htons(ofp_port_t ofp_port);<br>
+static inline ovs_be32 odp_htonl(odp_port_t odp_port);<br>
+static inline ovs_be32 ofp11_htonl(ofp11_port_t ofp11_port);<br>
+static inline ofp_port_t ofp_ntohs(ovs_be16 netshort);<br>
+static inline odp_port_t odp_ntohl(ovs_be32 netlong);<br>
+static inline ofp11_port_t ofp11_ntohl(ovs_be32 netlong);<br>
+<br>
+static inline uint32_t hash_ofp_port(ofp_port_t ofp_port,<br>
+ uint32_t basis);<br>
+static inline uint32_t hash_odp_port(odp_port_t odp_port_t,<br>
+ uint32_t basis);<br>
+static inline uint32_t hash_ofp11_port(ofp11_port_t ofp11_port,<br>
+ uint32_t basis);<br>
+<br>
+static inline void ofp_port_increment(ofp_port_t *ofp_portp,<br>
+ uint16_t incr);<br>
+static inline void odp_port_increment(odp_port_t *odp_portp,<br>
+ uint32_t incr);<br>
+<br>
+static inline int ofp11_port_to_ofp_port(ofp11_port_t ofp11_port,<br>
+ ofp_port_t *ofp_portp);<br>
+static inline void ofp_port_to_ofp11_port(ofp_port_t ofp_port,<br>
+ ofp11_port_t *ofp11_portp);<br>
+<br>
+static inline uint16_t<br>
+ofp_to_u16(const ofp_port_t ofp_port)<br>
+{<br>
+ return (OVS_FORCE uint16_t) ofp_port;<br>
+}<br>
+<br>
+static inline uint32_t<br>
+odp_to_u32(const odp_port_t odp_port)<br>
+{<br>
+ return (OVS_FORCE uint32_t) odp_port;<br>
+}<br>
+<br>
+static inline uint32_t<br>
+ofp11_to_u32(const ofp11_port_t ofp11_port)<br>
+{<br>
+ return (OVS_FORCE uint32_t) ofp11_port;<br>
+}<br>
+<br>
+static inline ofp_port_t<br>
+uint_to_ofp(const unsigned int port)<br>
+{<br>
+ return (OVS_FORCE ofp_port_t) port;<br>
+}<br>
+<br>
+static inline odp_port_t<br>
+uint_to_odp(const unsigned int port)<br>
+{<br>
+ return (OVS_FORCE odp_port_t) port;<br>
+}<br>
+<br>
+static inline ofp11_port_t<br>
+uint_to_ofp11(const unsigned int port)<br>
+{<br>
+ return (OVS_FORCE ofp11_port_t) port;<br>
+}<br>
+<br>
+static inline ovs_be16<br>
+ofp_htons(ofp_port_t ofp_port)<br>
+{<br>
+ return htons(ofp_to_u16(ofp_port));<br>
+}<br>
+<br>
+static inline ovs_be32<br>
+odp_htonl(odp_port_t odp_port)<br>
+{<br>
+ return htonl(odp_to_u32(odp_port));<br>
+}<br>
+<br>
+static inline ovs_be32<br>
+ofp11_htonl(ofp11_port_t ofp11_port)<br>
+{<br>
+ return htonl(ofp11_to_u32(ofp11_port));<br>
+}<br>
+<br>
+static inline ofp_port_t<br>
+ofp_ntohs(ovs_be16 netshort)<br>
+{<br>
+ return uint_to_ofp(ntohs(netshort));<br>
+}<br>
+<br>
+static inline odp_port_t<br>
+odp_ntohl(ovs_be32 netlong)<br>
+{<br>
+ return uint_to_odp(ntohl(netlong));<br>
+}<br>
+<br>
+static inline ofp11_port_t<br>
+ofp11_ntohl(ovs_be32 netlong)<br>
+{<br>
+ return uint_to_ofp11(ntohl(netlong));<br>
+}<br>
+<br>
+static inline uint32_t<br>
+hash_ofp_port(ofp_port_t ofp_port, uint32_t basis)<br>
+{<br>
+ return hash_int(ofp_to_u16(ofp_port), basis);<br>
+}<br>
+<br>
+static inline uint32_t<br>
+hash_odp_port(odp_port_t odp_port, uint32_t basis)<br>
+{<br>
+ return hash_int(odp_to_u32(odp_port), basis);<br>
+}<br>
+<br>
+static inline uint32_t<br>
+hash_ofp11_port(ofp11_port_t ofp11_port, uint32_t basis)<br>
+{<br>
+ return hash_int(ofp11_to_u32(ofp11_port), basis);<br>
+}<br>
+<br>
+static inline void<br>
+ofp_port_increment(ofp_port_t *ofp_portp, uint16_t incr)<br>
+{<br>
+ *ofp_portp = uint_to_ofp(ofp_to_u16(*ofp_portp) + incr);<br>
+}<br>
+<br>
+static inline void<br>
+odp_port_increment(odp_port_t *odp_portp, uint32_t incr)<br>
+{<br>
+ *odp_portp = uint_to_odp(odp_to_u32(*odp_portp) + incr);<br>
+}<br>
+<br>
+/* Convert ofp11_port to ofp_port. Return 0 on success and set *ofp_portp<br>
+ * to the corresponding ofp_port number. Return -1 on failure. */<br>
+static inline int<br>
+ofp11_port_to_ofp_port(ofp11_port_t ofp11_port, ofp_port_t *ofp_portp)<br>
+{<br>
+ if (ofp11_to_u32(ofp11_port) < ofp_to_u16(OFPP_MAX)) {<br>
+ *ofp_portp = (OVS_FORCE ofp_port_t) ofp11_port;<br>
+ } else if (ofp11_to_u32(ofp11_port) >= ofp11_to_u32(OFPP11_MAX)) {<br>
+ *ofp_portp = uint_to_ofp(ofp11_to_u32(ofp11_port) - OFPP11_OFFSET);<br>
+ } else {<br>
+ return -1;<br>
+ }<br>
+ return 0;<br>
+}<br>
+<br>
+/* Convert ofp_port to ofp11_port. This function is always successful and sets<br>
+ * *ofp11_portp to the corresponding ofp11_port number. */<br>
+static inline void<br>
+ofp_port_to_ofp11_port(ofp_port_t ofp_port, ofp11_port_t *ofp11_portp)<br>
+{<br>
+ if (ofp_to_u16(ofp_port) < ofp_to_u16(OFPP_MAX)) {<br>
+ *ofp11_portp = (OVS_FORCE ofp11_port_t) ofp_port;<br>
+ } else {<br>
+ *ofp11_portp = uint_to_ofp11(ofp_to_u16(ofp_port) + OFPP11_OFFSET);<br>
+ }<br>
+}<br>
+<br>
uint32_t flow_hash_in_minimask(const struct flow *, const struct minimask *,<br>
uint32_t basis);<br>
<br>
diff --git a/lib/learn.c b/lib/learn.c<br>
index 606ea9e..fa1182a 100644<br>
--- a/lib/learn.c<br>
+++ b/lib/learn.c<br>
@@ -355,9 +355,9 @@ learn_execute(const struct ofpact_learn *learn, const struct flow *flow,<br>
case NX_LEARN_DST_OUTPUT:<br>
if (spec->n_bits <= 16<br>
|| is_all_zeros(value.u8, sizeof value - 2)) {<br>
- uint16_t port = ntohs(value.be16[7]);<br>
+ ofp_port_t port = ofp_ntohs(value.be16[7]);<br>
<br>
- if (port < OFPP_MAX<br>
+ if (ofp_to_u16(port) < ofp_to_u16(OFPP_MAX)<br>
|| port == OFPP_IN_PORT<br>
|| port == OFPP_FLOOD<br>
|| port == OFPP_LOCAL<br>
diff --git a/lib/learning-switch.c b/lib/learning-switch.c<br>
index ab37dcc..9930ebf 100644<br>
--- a/lib/learning-switch.c<br>
+++ b/lib/learning-switch.c<br>
@@ -48,7 +48,7 @@ VLOG_DEFINE_THIS_MODULE(learning_switch);<br>
<br>
struct lswitch_port {<br>
struct hmap_node hmap_node; /* Hash node for port number. */<br>
- uint16_t port_no; /* OpenFlow port number, in host byte order. */<br>
+ ofp_port_t port_no; /* OpenFlow port number, in host byte order. */<br>
uint32_t queue_id; /* OpenFlow queue number. */<br>
};<br>
<br>
@@ -460,26 +460,27 @@ process_switch_features(struct lswitch *sw, struct ofp_header *oh)<br>
if (lp && hmap_node_is_null(&lp->hmap_node)) {<br>
lp->port_no = port.port_no;<br>
hmap_insert(&sw->queue_numbers, &lp->hmap_node,<br>
- hash_int(lp->port_no, 0));<br>
+ hash_ofp_port(lp->port_no, 0));<br>
}<br>
}<br>
return 0;<br>
}<br>
<br>
-static uint16_t<br>
+static ofp_port_t<br>
lswitch_choose_destination(struct lswitch *sw, const struct flow *flow)<br>
{<br>
- uint16_t out_port;<br>
+ ofp_port_t out_port;<br>
<br>
/* Learn the source MAC. */<br>
if (mac_learning_may_learn(sw->ml, flow->dl_src, 0)) {<br>
struct mac_entry *mac = mac_learning_insert(sw->ml, flow->dl_src, 0);<br>
- if (mac_entry_is_new(mac) || mac->port.ofp_port != flow->in_port) {<br>
+ if (mac_entry_is_new(mac)<br>
+ || mac->port.ofp_port != flow->in_port.ofp_port) {<br>
VLOG_DBG_RL(&rl, "%016llx: learned that "ETH_ADDR_FMT" is on "<br>
"port %"PRIu16, sw->datapath_id,<br>
- ETH_ADDR_ARGS(flow->dl_src), flow->in_port);<br>
+ ETH_ADDR_ARGS(flow->dl_src), flow->in_port.ofp_port);<br>
<br>
- mac->port.ofp_port = flow->in_port;<br>
+ mac->port.ofp_port = flow->in_port.ofp_port;<br>
mac_learning_changed(sw->ml, mac);<br>
}<br>
}<br>
@@ -496,7 +497,7 @@ lswitch_choose_destination(struct lswitch *sw, const struct flow *flow)<br>
mac = mac_learning_lookup(sw->ml, flow->dl_dst, 0, NULL);<br>
if (mac) {<br>
out_port = mac->port.ofp_port;<br>
- if (out_port == flow->in_port) {<br>
+ if (out_port == flow->in_port.ofp_port) {<br>
/* Don't send a packet back out its input port. */<br>
return OFPP_NONE;<br>
}<br>
@@ -512,11 +513,11 @@ lswitch_choose_destination(struct lswitch *sw, const struct flow *flow)<br>
}<br>
<br>
static uint32_t<br>
-get_queue_id(const struct lswitch *sw, uint16_t in_port)<br>
+get_queue_id(const struct lswitch *sw, ofp_port_t in_port)<br>
{<br>
const struct lswitch_port *port;<br>
<br>
- HMAP_FOR_EACH_WITH_HASH (port, hmap_node, hash_int(in_port, 0),<br>
+ HMAP_FOR_EACH_WITH_HASH (port, hmap_node, hash_ofp_port(in_port, 0),<br>
&sw->queue_numbers) {<br>
if (port->port_no == in_port) {<br>
return port->queue_id;<br>
@@ -531,7 +532,7 @@ process_packet_in(struct lswitch *sw, const struct ofp_header *oh)<br>
{<br>
struct ofputil_packet_in pi;<br>
uint32_t queue_id;<br>
- uint16_t out_port;<br>
+ ofp_port_t out_port;<br>
<br>
uint64_t ofpacts_stub[64 / 8];<br>
struct ofpbuf ofpacts;<br>
@@ -541,6 +542,7 @@ process_packet_in(struct lswitch *sw, const struct ofp_header *oh)<br>
<br>
struct ofpbuf pkt;<br>
struct flow flow;<br>
+ union flow_in_port in_port_;<br>
<br>
error = ofputil_decode_packet_in(&pi, oh);<br>
if (error) {<br>
@@ -558,7 +560,8 @@ process_packet_in(struct lswitch *sw, const struct ofp_header *oh)<br>
<br>
/* Extract flow data from 'opi' into 'flow'. */<br>
ofpbuf_use_const(&pkt, pi.packet, pi.packet_len);<br>
- flow_extract(&pkt, 0, 0, NULL, pi.fmd.in_port, &flow);<br>
+ in_port_.ofp_port = pi.fmd.in_port;<br>
+ flow_extract(&pkt, 0, 0, NULL, &in_port_, &flow);<br>
flow.tunnel.tun_id = pi.fmd.tun_id;<br>
<br>
/* Choose output port. */<br>
@@ -569,7 +572,8 @@ process_packet_in(struct lswitch *sw, const struct ofp_header *oh)<br>
ofpbuf_use_stack(&ofpacts, ofpacts_stub, sizeof ofpacts_stub);<br>
if (out_port == OFPP_NONE) {<br>
/* No actions. */<br>
- } else if (queue_id == UINT32_MAX || out_port >= OFPP_MAX) {<br>
+ } else if (queue_id == UINT32_MAX<br>
+ || ofp_to_u16(out_port) >= ofp_to_u16(OFPP_MAX)) {<br>
ofpact_put_OUTPUT(&ofpacts)->port = out_port;<br>
} else {<br>
struct ofpact_enqueue *enqueue = ofpact_put_ENQUEUE(&ofpacts);<br>
diff --git a/lib/mac-learning.h b/lib/mac-learning.h<br>
index 1cbacfe..9feca00 100644<br>
--- a/lib/mac-learning.h<br>
+++ b/lib/mac-learning.h<br>
@@ -49,7 +49,7 @@ struct mac_entry {<br>
/* Learned port. */<br>
union {<br>
void *p;<br>
- uint16_t ofp_port;<br>
+ ofp_port_t ofp_port;<br>
} port;<br>
};<br>
<br>
diff --git a/lib/match.c b/lib/match.c<br>
index 512253e..4ee8ed6 100644<br>
--- a/lib/match.c<br>
+++ b/lib/match.c<br>
@@ -271,10 +271,10 @@ match_set_tun_flags_masked(struct match *match, uint16_t flags, uint16_t mask)<br>
}<br>
<br>
void<br>
-match_set_in_port(struct match *match, uint16_t ofp_port)<br>
+match_set_in_port(struct match *match, ofp_port_t ofp_port)<br>
{<br>
- match->wc.masks.in_port = UINT16_MAX;<br>
- match->flow.in_port = ofp_port;<br>
+ match->wc.masks.in_port.ofp_port = OFPP_NONE;<br>
+ match->flow.in_port.ofp_port = ofp_port;<br>
}<br>
<br>
void<br>
@@ -916,9 +916,9 @@ match_format(const struct match *match, struct ds *s, unsigned int priority)<br>
ntohll(f->metadata), ntohll(wc->masks.metadata));<br>
break;<br>
}<br>
- if (wc->masks.in_port) {<br>
+ if (wc->masks.in_port.ofp_port) {<br>
ds_put_cstr(s, "in_port=");<br>
- ofputil_format_port(f->in_port, s);<br>
+ ofputil_format_port(f->in_port.ofp_port, s);<br>
ds_put_char(s, ',');<br>
}<br>
if (wc->masks.vlan_tci) {<br>
diff --git a/lib/match.h b/lib/match.h<br>
index d435aa4..0ea1f2d 100644<br>
--- a/lib/match.h<br>
+++ b/lib/match.h<br>
@@ -60,7 +60,7 @@ void match_set_tun_tos(struct match *match, uint8_t tos);<br>
void match_set_tun_tos_masked(struct match *match, uint8_t tos, uint8_t mask);<br>
void match_set_tun_flags(struct match *match, uint16_t flags);<br>
void match_set_tun_flags_masked(struct match *match, uint16_t flags, uint16_t mask);<br>
-void match_set_in_port(struct match *, uint16_t ofp_port);<br>
+void match_set_in_port(struct match *, ofp_port_t ofp_port);<br>
void match_set_skb_mark(struct match *, uint32_t skb_mark);<br>
void match_set_skb_priority(struct match *, uint32_t skb_priority);<br>
void match_set_dl_type(struct match *, ovs_be16);<br>
diff --git a/lib/meta-flow.c b/lib/meta-flow.c<br>
index f9e044d..8e623ee 100644<br>
--- a/lib/meta-flow.c<br>
+++ b/lib/meta-flow.c<br>
@@ -698,7 +698,7 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc)<br>
return !wc->masks.metadata;<br>
case MFF_IN_PORT:<br>
case MFF_IN_PORT_OXM:<br>
- return !wc->masks.in_port;<br>
+ return !wc->masks.in_port.ofp_port;<br>
case MFF_SKB_PRIORITY:<br>
return !wc->masks.skb_priority;<br>
case MFF_SKB_MARK:<br>
@@ -937,7 +937,7 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value)<br>
return true;<br>
<br>
case MFF_IN_PORT_OXM: {<br>
- uint16_t port;<br>
+ ofp_port_t port;<br>
return !ofputil_port_from_ofp11(value->be32, &port);<br>
}<br>
<br>
@@ -1011,11 +1011,10 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow,<br>
break;<br>
<br>
case MFF_IN_PORT:<br>
- value->be16 = htons(flow->in_port);<br>
+ value->be16 = ofp_htons(flow->in_port.ofp_port);<br>
break;<br>
-<br>
case MFF_IN_PORT_OXM:<br>
- value->be32 = ofputil_port_to_ofp11(flow->in_port);<br>
+ value->be32 = ofputil_port_to_ofp11(flow->in_port.ofp_port);<br>
break;<br>
<br>
case MFF_SKB_PRIORITY:<br>
@@ -1198,11 +1197,11 @@ mf_set_value(const struct mf_field *mf,<br>
break;<br>
<br>
case MFF_IN_PORT:<br>
- match_set_in_port(match, ntohs(value->be16));<br>
+ match_set_in_port(match, ofp_ntohs(value->be16));<br>
break;<br>
<br>
case MFF_IN_PORT_OXM: {<br>
- uint16_t port;<br>
+ ofp_port_t port;<br>
ofputil_port_from_ofp11(value->be32, &port);<br>
match_set_in_port(match, port);<br>
break;<br>
@@ -1387,13 +1386,13 @@ mf_set_flow_value(const struct mf_field *mf,<br>
break;<br>
<br>
case MFF_IN_PORT:<br>
- flow->in_port = ntohs(value->be16);<br>
+ flow->in_port.ofp_port = ofp_ntohs(value->be16);<br>
break;<br>
<br>
case MFF_IN_PORT_OXM: {<br>
- uint16_t port;<br>
+ ofp_port_t port;<br>
ofputil_port_from_ofp11(value->be32, &port);<br>
- flow->in_port = port;<br>
+ flow->in_port.ofp_port = port;<br>
break;<br>
}<br>
<br>
@@ -1594,8 +1593,8 @@ mf_set_wild(const struct mf_field *mf, struct match *match)<br>
<br>
case MFF_IN_PORT:<br>
case MFF_IN_PORT_OXM:<br>
- match->flow.in_port = 0;<br>
- match->wc.masks.in_port = 0;<br>
+ match->flow.in_port.ofp_port = 0;<br>
+ match->wc.masks.in_port.ofp_port = 0;<br>
break;<br>
<br>
case MFF_SKB_PRIORITY:<br>
@@ -2012,7 +2011,7 @@ mf_random_value(const struct mf_field *mf, union mf_value *value)<br>
break;<br>
<br>
case MFF_IN_PORT_OXM:<br>
- value->be32 = ofputil_port_to_ofp11(ntohs(value->be16));<br>
+ value->be32 = ofputil_port_to_ofp11(ofp_ntohs(value->be16));<br>
break;<br>
<br>
case MFF_IPV6_LABEL:<br>
@@ -2203,12 +2202,12 @@ static char *<br>
mf_from_ofp_port_string(const struct mf_field *mf, const char *s,<br>
ovs_be16 *valuep, ovs_be16 *maskp)<br>
{<br>
- uint16_t port;<br>
+ ofp_port_t port;<br>
<br>
ovs_assert(mf->n_bytes == sizeof(ovs_be16));<br>
<br>
if (ofputil_port_from_string(s, &port)) {<br>
- *valuep = htons(port);<br>
+ *valuep = ofp_htons(port);<br>
*maskp = htons(UINT16_MAX);<br>
return NULL;<br>
}<br>
@@ -2219,7 +2218,7 @@ static char *<br>
mf_from_ofp_port_string32(const struct mf_field *mf, const char *s,<br>
ovs_be32 *valuep, ovs_be32 *maskp)<br>
{<br>
- uint16_t port;<br>
+ ofp_port_t port;<br>
<br>
ovs_assert(mf->n_bytes == sizeof(ovs_be32));<br>
if (ofputil_port_from_string(s, &port)) {<br>
@@ -2475,7 +2474,7 @@ mf_format(const struct mf_field *mf,<br>
switch (mf->string) {<br>
case MFS_OFP_PORT_OXM:<br>
if (!mask) {<br>
- uint16_t port;<br>
+ ofp_port_t port;<br>
ofputil_port_from_ofp11(value->be32, &port);<br>
ofputil_format_port(port, s);<br>
break;<br>
@@ -2483,7 +2482,7 @@ mf_format(const struct mf_field *mf,<br>
/* fall through */<br>
case MFS_OFP_PORT:<br>
if (!mask) {<br>
- ofputil_format_port(ntohs(value->be16), s);<br>
+ ofputil_format_port(ofp_ntohs(value->be16), s);<br>
break;<br>
}<br>
/* fall through */<br>
diff --git a/lib/meta-flow.h b/lib/meta-flow.h<br>
index a85a193..dc54899 100644<br>
--- a/lib/meta-flow.h<br>
+++ b/lib/meta-flow.h<br>
@@ -276,7 +276,7 @@ struct mf_field {<br>
uint32_t nxm_header; /* An NXM_* (or OXM_*) constant. */<br>
const char *nxm_name; /* The nxm_header constant's name. */<br>
uint32_t oxm_header; /* An OXM_* (or NXM_*) constant. */<br>
- const char *oxm_name; /* The oxm_header constant's name */<br>
+ const char *oxm_name; /* The oxm_header constant's name */<br>
};<br>
<br>
/* The representation of a field's value. */<br>
diff --git a/lib/nx-match.c b/lib/nx-match.c<br>
index ecdaa65..99e938d 100644<br>
--- a/lib/nx-match.c<br>
+++ b/lib/nx-match.c<br>
@@ -568,12 +568,12 @@ nx_put_raw(struct ofpbuf *b, bool oxm, const struct match *match,<br>
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 20);<br>
<br>
/* Metadata. */<br>
- if (match->wc.masks.in_port) {<br>
- uint16_t in_port = flow->in_port;<br>
+ if (match->wc.masks.in_port.ofp_port) {<br>
+ ofp_port_t in_port = flow->in_port.ofp_port;<br>
if (oxm) {<br>
nxm_put_32(b, OXM_OF_IN_PORT, ofputil_port_to_ofp11(in_port));<br>
} else {<br>
- nxm_put_16(b, NXM_OF_IN_PORT, htons(in_port));<br>
+ nxm_put_16(b, NXM_OF_IN_PORT, ofp_htons(in_port));<br>
}<br>
}<br>
<br>
diff --git a/lib/odp-util.c b/lib/odp-util.c<br>
index 588b3b6..d4535eb 100644<br>
--- a/lib/odp-util.c<br>
+++ b/lib/odp-util.c<br>
@@ -1560,7 +1560,7 @@ ovs_to_odp_frag(uint8_t nw_frag)<br>
* capable of being expanded to allow for that much space. */<br>
void<br>
odp_flow_key_from_flow(struct ofpbuf *buf, const struct flow *flow,<br>
- uint32_t odp_in_port)<br>
+ odp_port_t odp_in_port)<br>
{<br>
struct ovs_key_ethernet *eth_key;<br>
size_t encap;<br>
@@ -1578,7 +1578,8 @@ odp_flow_key_from_flow(struct ofpbuf *buf, const struct flow *flow,<br>
}<br>
<br>
if (odp_in_port != OVSP_NONE) {<br>
- nl_msg_put_u32(buf, OVS_KEY_ATTR_IN_PORT, odp_in_port);<br>
+ nl_msg_put_u32(buf, OVS_KEY_ATTR_IN_PORT,<br>
+ odp_to_u32(odp_in_port));<br>
}<br>
<br>
eth_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_ETHERNET,<br>
@@ -2109,10 +2110,11 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len,<br>
}<br>
<br>
if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_IN_PORT)) {<br>
- flow->in_port = nl_attr_get_u32(attrs[OVS_KEY_ATTR_IN_PORT]);<br>
+ flow->in_port.odp_port<br>
+ = uint_to_odp(nl_attr_get_u32(attrs[OVS_KEY_ATTR_IN_PORT]));<br>
expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_IN_PORT;<br>
} else {<br>
- flow->in_port = OVSP_NONE;<br>
+ flow->in_port.odp_port = OVSP_NONE;<br>
}<br>
<br>
/* Ethernet header. */<br>
diff --git a/lib/odp-util.h b/lib/odp-util.h<br>
index 6213418..307ac76 100644<br>
--- a/lib/odp-util.h<br>
+++ b/lib/odp-util.h<br>
@@ -33,7 +33,7 @@ struct nlattr;<br>
struct ofpbuf;<br>
struct simap;<br>
<br>
-#define OVSP_NONE UINT32_MAX<br>
+#define OVSP_NONE ((OVS_FORCE odp_port_t) UINT32_MAX)<br>
<br>
void format_odp_actions(struct ds *, const struct nlattr *odp_actions,<br>
size_t actions_len);<br>
@@ -95,7 +95,7 @@ int odp_flow_key_from_string(const char *s, const struct simap *port_names,<br>
struct ofpbuf *);<br>
<br>
void odp_flow_key_from_flow(struct ofpbuf *, const struct flow *,<br>
- uint32_t odp_in_port);<br>
+ odp_port_t odp_in_port);<br>
<br>
uint32_t odp_flow_key_hash(const struct nlattr *, size_t);<br>
<br>
diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c<br>
index c9e000f..325513a 100644<br>
--- a/lib/ofp-actions.c<br>
+++ b/lib/ofp-actions.c<br>
@@ -42,7 +42,7 @@ output_from_openflow10(const struct ofp10_action_output *oao,<br>
struct ofpact_output *output;<br>
<br>
output = ofpact_put_OUTPUT(out);<br>
- output->port = ntohs(oao->port);<br>
+ output->port = ofp_ntohs(oao->port);<br>
output->max_len = ntohs(oao->max_len);<br>
<br>
return ofputil_check_output_port(output->port, OFPP_MAX);<br>
@@ -55,9 +55,10 @@ enqueue_from_openflow10(const struct ofp10_action_enqueue *oae,<br>
struct ofpact_enqueue *enqueue;<br>
<br>
enqueue = ofpact_put_ENQUEUE(out);<br>
- enqueue->port = ntohs(oae->port);<br>
+ enqueue->port = ofp_ntohs(oae->port);<br>
enqueue->queue = ntohl(oae->queue_id);<br>
- if (enqueue->port >= OFPP_MAX && enqueue->port != OFPP_IN_PORT<br>
+ if (ofp_to_u16(enqueue->port) >= ofp_to_u16(OFPP_MAX)<br>
+ && enqueue->port != OFPP_IN_PORT<br>
&& enqueue->port != OFPP_LOCAL) {<br>
return OFPERR_OFPBAC_BAD_OUT_PORT;<br>
}<br>
@@ -72,7 +73,7 @@ resubmit_from_openflow(const struct nx_action_resubmit *nar,<br>
<br>
resubmit = ofpact_put_RESUBMIT(out);<br>
resubmit->ofpact.compat = OFPUTIL_NXAST_RESUBMIT;<br>
- resubmit->in_port = ntohs(nar->in_port);<br>
+ resubmit->in_port = ofp_ntohs(nar->in_port);<br>
resubmit->table_id = 0xff;<br>
}<br>
<br>
@@ -88,7 +89,7 @@ resubmit_table_from_openflow(const struct nx_action_resubmit *nar,<br>
<br>
resubmit = ofpact_put_RESUBMIT(out);<br>
resubmit->ofpact.compat = OFPUTIL_NXAST_RESUBMIT_TABLE;<br>
- resubmit->in_port = ntohs(nar->in_port);<br>
+ resubmit->in_port = ofp_ntohs(nar->in_port);<br>
resubmit->table_id = nar->table;<br>
return 0;<br>
}<br>
@@ -1142,8 +1143,8 @@ exit:<br>
}<br>
<br>
static enum ofperr<br>
-ofpact_check__(const struct ofpact *a, const struct flow *flow, int max_ports,<br>
- ovs_be16 *dl_type)<br>
+ofpact_check__(const struct ofpact *a, const struct flow *flow,<br>
+ ofp_port_t max_ports, ovs_be16 *dl_type)<br>
{<br>
const struct ofpact_enqueue *enqueue;<br>
<br>
@@ -1157,7 +1158,8 @@ ofpact_check__(const struct ofpact *a, const struct flow *flow, int max_ports,<br>
<br>
case OFPACT_ENQUEUE:<br>
enqueue = ofpact_get_ENQUEUE(a);<br>
- if (enqueue->port >= max_ports && enqueue->port != OFPP_IN_PORT<br>
+ if (ofp_to_u16(enqueue->port) >= ofp_to_u16(max_ports)<br>
+ && enqueue->port != OFPP_IN_PORT<br>
&& enqueue->port != OFPP_LOCAL) {<br>
return OFPERR_OFPBAC_BAD_OUT_PORT;<br>
}<br>
@@ -1240,7 +1242,7 @@ ofpact_check__(const struct ofpact *a, const struct flow *flow, int max_ports,<br>
* switch with no more than 'max_ports' ports. */<br>
enum ofperr<br>
ofpacts_check(const struct ofpact ofpacts[], size_t ofpacts_len,<br>
- const struct flow *flow, int max_ports)<br>
+ const struct flow *flow, ofp_port_t max_ports)<br>
{<br>
const struct ofpact *a;<br>
ovs_be16 dl_type = flow->dl_type;<br>
@@ -1339,7 +1341,7 @@ ofpact_resubmit_to_nxast(const struct ofpact_resubmit *resubmit,<br>
nar = ofputil_put_NXAST_RESUBMIT_TABLE(out);<br>
nar->table = resubmit->table_id;<br>
}<br>
- nar->in_port = htons(resubmit->in_port);<br>
+ nar->in_port = ofp_htons(resubmit->in_port);<br>
}<br>
<br>
static void<br>
@@ -1574,7 +1576,7 @@ ofpact_output_to_openflow10(const struct ofpact_output *output,<br>
struct ofp10_action_output *oao;<br>
<br>
oao = ofputil_put_OFPAT10_OUTPUT(out);<br>
- oao->port = htons(output->port);<br>
+ oao->port = ofp_htons(output->port);<br>
oao->max_len = htons(output->max_len);<br>
}<br>
<br>
@@ -1585,7 +1587,7 @@ ofpact_enqueue_to_openflow10(const struct ofpact_enqueue *enqueue,<br>
struct ofp10_action_enqueue *oae;<br>
<br>
oae = ofputil_put_OFPAT10_ENQUEUE(out);<br>
- oae->port = htons(enqueue->port);<br>
+ oae->port = ofp_htons(enqueue->port);<br>
oae->queue_id = htonl(enqueue->queue);<br>
}<br>
<br>
@@ -1929,7 +1931,7 @@ ofpacts_put_openflow11_instructions(const struct ofpact ofpacts[],<br>
<br>
/* Returns true if 'action' outputs to 'port', false otherwise. */<br>
static bool<br>
-ofpact_outputs_to_port(const struct ofpact *ofpact, uint16_t port)<br>
+ofpact_outputs_to_port(const struct ofpact *ofpact, ofp_port_t port)<br>
{<br>
switch (ofpact->type) {<br>
case OFPACT_OUTPUT:<br>
@@ -1983,7 +1985,7 @@ ofpact_outputs_to_port(const struct ofpact *ofpact, uint16_t port)<br>
* to 'port', false otherwise. */<br>
bool<br>
ofpacts_output_to_port(const struct ofpact *ofpacts, size_t ofpacts_len,<br>
- uint16_t port)<br>
+ ofp_port_t port)<br>
{<br>
const struct ofpact *a;<br>
<br>
@@ -2064,12 +2066,12 @@ ofpact_format(const struct ofpact *a, struct ds *s)<br>
const struct ofpact_metadata *metadata;<br>
const struct ofpact_tunnel *tunnel;<br>
const struct ofpact_sample *sample;<br>
- uint16_t port;<br>
+ ofp_port_t port;<br>
<br>
switch (a->type) {<br>
case OFPACT_OUTPUT:<br>
port = ofpact_get_OUTPUT(a)->port;<br>
- if (port < OFPP_MAX) {<br>
+ if (ofp_to_u16(port) < ofp_to_u16(OFPP_MAX)) {<br>
ds_put_format(s, "output:%"PRIu16, port);<br>
} else {<br>
ofputil_format_port(port, s);<br>
diff --git a/lib/ofp-actions.h b/lib/ofp-actions.h<br>
index 4e7fb5c..4fc40b3 100644<br>
--- a/lib/ofp-actions.h<br>
+++ b/lib/ofp-actions.h<br>
@@ -198,7 +198,7 @@ struct ofpact_null {<br>
* Used for OFPAT10_OUTPUT. */<br>
struct ofpact_output {<br>
struct ofpact ofpact;<br>
- uint16_t port; /* Output port. */<br>
+ ofp_port_t port; /* Output port. */<br>
uint16_t max_len; /* Max send len, for port OFPP_CONTROLLER. */<br>
};<br>
<br>
@@ -217,7 +217,7 @@ struct ofpact_controller {<br>
* Used for OFPAT10_ENQUEUE. */<br>
struct ofpact_enqueue {<br>
struct ofpact ofpact;<br>
- uint16_t port;<br>
+ ofp_port_t port;<br>
uint32_t queue;<br>
};<br>
<br>
@@ -247,7 +247,7 @@ struct ofpact_bundle {<br>
<br>
/* Slaves for output. */<br>
unsigned int n_slaves;<br>
- uint16_t slaves[];<br>
+ ofp_port_t slaves[];<br>
};<br>
<br>
/* OFPACT_SET_VLAN_VID.<br>
@@ -379,7 +379,7 @@ struct ofpact_metadata {<br>
* Used for NXAST_RESUBMIT, NXAST_RESUBMIT_TABLE. */<br>
struct ofpact_resubmit {<br>
struct ofpact ofpact;<br>
- uint16_t in_port;<br>
+ ofp_port_t in_port;<br>
uint8_t table_id;<br>
};<br>
<br>
@@ -493,7 +493,7 @@ enum ofperr ofpacts_pull_openflow11_instructions(struct ofpbuf *openflow,<br>
uint8_t table_id,<br>
struct ofpbuf *ofpacts);<br>
enum ofperr ofpacts_check(const struct ofpact[], size_t ofpacts_len,<br>
- const struct flow *, int max_ports);<br>
+ const struct flow *, ofp_port_t max_ports);<br>
enum ofperr ofpacts_verify(const struct ofpact ofpacts[], size_t ofpacts_len);<br>
<br>
/* Converting ofpacts to OpenFlow. */<br>
@@ -507,7 +507,7 @@ void ofpacts_put_openflow11_instructions(const struct ofpact[],<br>
<br>
/* Working with ofpacts. */<br>
bool ofpacts_output_to_port(const struct ofpact[], size_t ofpacts_len,<br>
- uint16_t port);<br>
+ ofp_port_t port);<br>
bool ofpacts_equal(const struct ofpact a[], size_t a_len,<br>
const struct ofpact b[], size_t b_len);<br>
<br>
diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c<br>
index 1c5c761..a730250 100644<br>
--- a/lib/ofp-parse.c<br>
+++ b/lib/ofp-parse.c<br>
@@ -135,7 +135,7 @@ parse_enqueue(char *arg, struct ofpbuf *ofpacts)<br>
}<br>
<br>
enqueue = ofpact_put_ENQUEUE(ofpacts);<br>
- enqueue->port = str_to_u32(port);<br>
+ enqueue->port = uint_to_ofp(str_to_u32(port));<br>
enqueue->queue = str_to_u32(queue);<br>
}<br>
<br>
@@ -152,7 +152,7 @@ parse_output(char *arg, struct ofpbuf *ofpacts)<br>
struct ofpact_output *output;<br>
<br>
output = ofpact_put_OUTPUT(ofpacts);<br>
- output->port = str_to_u32(arg);<br>
+ output->port = uint_to_ofp(str_to_u32(arg));<br>
output->max_len = output->port == OFPP_CONTROLLER ? UINT16_MAX : 0;<br>
}<br>
}<br>
@@ -650,7 +650,7 @@ str_to_ofpact__(char *pos, char *act, char *arg,<br>
}<br>
return false;<br>
} else {<br>
- uint16_t port;<br>
+ ofp_port_t port;<br>
if (ofputil_port_from_string(act, &port)) {<br>
ofpact_put_OUTPUT(ofpacts)->port = port;<br>
} else {<br>
@@ -1076,7 +1076,7 @@ parse_flow_monitor_request(struct ofputil_flow_monitor_request *fmr,<br>
if (!strcmp(name, "table")) {<br>
fmr->table_id = str_to_table_id(value);<br>
} else if (!strcmp(name, "out_port")) {<br>
- fmr->out_port = atoi(value);<br>
+ fmr->out_port = uint_to_ofp(atoi(value));<br>
} else if (mf_from_name(name)) {<br>
parse_field(mf_from_name(name), value, &fmr->match);<br>
} else {<br>
@@ -1229,8 +1229,8 @@ parse_ofp_exact_flow(struct flow *flow, const char *s)<br>
}<br>
}<br>
<br>
- if (!flow->in_port) {<br>
- flow->in_port = OFPP_NONE;<br>
+ if (!flow->in_port.ofp_port) {<br>
+ flow->in_port.ofp_port = OFPP_NONE;<br>
}<br>
<br>
exit:<br>
diff --git a/lib/ofp-print.c b/lib/ofp-print.c<br>
index 549616c..3cc7366 100644<br>
--- a/lib/ofp-print.c<br>
+++ b/lib/ofp-print.c<br>
@@ -62,7 +62,7 @@ ofp_packet_to_string(const void *data, size_t len)<br>
struct flow flow;<br>
<br>
ofpbuf_use_const(&buf, data, len);<br>
- flow_extract(&buf, 0, 0, NULL, 0, &flow);<br>
+ flow_extract(&buf, 0, 0, NULL, NULL, &flow);<br>
flow_format(&ds, &flow);<br>
<br>
if (buf.l7) {<br>
@@ -204,10 +204,11 @@ compare_ports(const void *a_, const void *b_)<br>
{<br>
const struct ofputil_phy_port *a = a_;<br>
const struct ofputil_phy_port *b = b_;<br>
- uint16_t ap = a->port_no;<br>
- uint16_t bp = b->port_no;<br>
+ ofp_port_t ap = a->port_no;<br>
+ ofp_port_t bp = b->port_no;<br>
<br>
- return ap < bp ? -1 : ap > bp;<br>
+ return ofp_to_u16(ap) < ofp_to_u16(bp) ? -1<br>
+ : !(ap == bp);<br>
}<br>
<br>
static void<br>
@@ -585,7 +586,7 @@ static void print_wild(struct ds *string, const char *leader, int is_wild,<br>
<br>
static void<br>
print_wild_port(struct ds *string, const char *leader, int is_wild,<br>
- int verbosity, uint16_t port)<br>
+ int verbosity, ofp_port_t port)<br>
{<br>
if (is_wild && verbosity < 2) {<br>
return;<br>
@@ -665,7 +666,7 @@ ofp10_match_to_string(const struct ofp10_match *om, int verbosity)<br>
}<br>
}<br>
print_wild_port(&f, "in_port=", w & OFPFW10_IN_PORT, verbosity,<br>
- ntohs(om->in_port));<br>
+ ofp_ntohs(om->in_port));<br>
print_wild(&f, "dl_vlan=", w & OFPFW10_DL_VLAN, verbosity,<br>
"%d", ntohs(om->dl_vlan));<br>
print_wild(&f, "dl_vlan_pcp=", w & OFPFW10_DL_VLAN_PCP, verbosity,<br>
@@ -1167,7 +1168,7 @@ print_port_stat(struct ds *string, const char *leader, uint64_t stat, int more)<br>
static void<br>
ofp_print_ofpst_port_request(struct ds *string, const struct ofp_header *oh)<br>
{<br>
- uint16_t ofp10_port;<br>
+ ofp_port_t ofp10_port;<br>
enum ofperr error;<br>
<br>
error = ofputil_decode_port_stats_request(oh, &ofp10_port);<br>
@@ -1205,7 +1206,7 @@ ofp_print_ofpst_port_reply(struct ds *string, const struct ofp_header *oh,<br>
}<br>
<br>
ds_put_cstr(string, " port ");<br>
- if (ps.port_no < 10) {<br>
+ if (ofp_to_u16(ps.port_no) < 10) {<br>
ds_put_char(string, ' ');<br>
}<br>
ofputil_format_port(ps.port_no, string);<br>
diff --git a/lib/ofp-util.c b/lib/ofp-util.c<br>
index 26da477..6011bb1 100644<br>
--- a/lib/ofp-util.c<br>
+++ b/lib/ofp-util.c<br>
@@ -90,7 +90,7 @@ ofputil_wildcard_from_ofpfw10(uint32_t ofpfw, struct flow_wildcards *wc)<br>
flow_wildcards_init_catchall(wc);<br>
<br>
if (!(ofpfw & OFPFW10_IN_PORT)) {<br>
- wc->masks.in_port = UINT16_MAX;<br>
+ wc->masks.in_port.ofp_port = OFPP_NONE;<br>
}<br>
<br>
if (!(ofpfw & OFPFW10_NW_TOS)) {<br>
@@ -145,7 +145,7 @@ ofputil_match_from_ofp10_match(const struct ofp10_match *ofmatch,<br>
/* Initialize most of match->flow. */<br>
match->flow.nw_src = ofmatch->nw_src;<br>
match->flow.nw_dst = ofmatch->nw_dst;<br>
- match->flow.in_port = ntohs(ofmatch->in_port);<br>
+ match->flow.in_port.ofp_port = ofp_ntohs(ofmatch->in_port);<br>
match->flow.dl_type = ofputil_dl_type_from_openflow(ofmatch->dl_type);<br>
match->flow.tp_src = ofmatch->tp_src;<br>
match->flow.tp_dst = ofmatch->tp_dst;<br>
@@ -190,7 +190,7 @@ ofputil_match_to_ofp10_match(const struct match *match,<br>
<br>
/* Figure out most OpenFlow wildcards. */<br>
ofpfw = 0;<br>
- if (!wc->masks.in_port) {<br>
+ if (!wc->masks.in_port.ofp_port) {<br>
ofpfw |= OFPFW10_IN_PORT;<br>
}<br>
if (!wc->masks.dl_type) {<br>
@@ -244,7 +244,7 @@ ofputil_match_to_ofp10_match(const struct match *match,<br>
<br>
/* Compose most of the match structure. */<br>
ofmatch->wildcards = htonl(ofpfw);<br>
- ofmatch->in_port = htons(match->flow.in_port);<br>
+ ofmatch->in_port = ofp_htons(match->flow.in_port.ofp_port);<br>
memcpy(ofmatch->dl_src, match->flow.dl_src, ETH_ADDR_LEN);<br>
memcpy(ofmatch->dl_dst, match->flow.dl_dst, ETH_ADDR_LEN);<br>
ofmatch->dl_type = ofputil_dl_type_to_openflow(match->flow.dl_type);<br>
@@ -311,7 +311,7 @@ ofputil_match_from_ofp11_match(const struct ofp11_match *ofmatch,<br>
match_init_catchall(match);<br>
<br>
if (!(wc & OFPFW11_IN_PORT)) {<br>
- uint16_t ofp_port;<br>
+ ofp_port_t ofp_port;<br>
enum ofperr error;<br>
<br>
error = ofputil_port_from_ofp11(ofmatch->in_port, &ofp_port);<br>
@@ -466,10 +466,10 @@ ofputil_match_to_ofp11_match(const struct match *match,<br>
ofmatch->omh.type = htons(OFPMT_STANDARD);<br>
ofmatch->omh.length = htons(OFPMT11_STANDARD_LENGTH);<br>
<br>
- if (!match->wc.masks.in_port) {<br>
+ if (!match->wc.masks.in_port.ofp_port) {<br>
wc |= OFPFW11_IN_PORT;<br>
} else {<br>
- ofmatch->in_port = ofputil_port_to_ofp11(match->flow.in_port);<br>
+ ofmatch->in_port = ofputil_port_to_ofp11(match->flow.in_port.ofp_port);<br>
}<br>
<br>
memcpy(ofmatch->dl_src, match->flow.dl_src, ETH_ADDR_LEN);<br>
@@ -1567,7 +1567,7 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm,<br>
fm->idle_timeout = ntohs(ofm->idle_timeout);<br>
fm->hard_timeout = ntohs(ofm->hard_timeout);<br>
fm->buffer_id = ntohl(ofm->buffer_id);<br>
- fm->out_port = ntohs(ofm->out_port);<br>
+ fm->out_port = ofp_ntohs(ofm->out_port);<br>
fm->flags = ntohs(ofm->flags);<br>
} else if (raw == OFPRAW_NXT_FLOW_MOD) {<br>
/* Nicira extended flow_mod. */<br>
@@ -1598,7 +1598,7 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm,<br>
fm->idle_timeout = ntohs(nfm->idle_timeout);<br>
fm->hard_timeout = ntohs(nfm->hard_timeout);<br>
fm->buffer_id = ntohl(nfm->buffer_id);<br>
- fm->out_port = ntohs(nfm->out_port);<br>
+ fm->out_port = ofp_ntohs(nfm->out_port);<br>
fm->flags = ntohs(nfm->flags);<br>
} else {<br>
NOT_REACHED();<br>
@@ -1653,7 +1653,7 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm,<br>
case OFPUTIL_P_OF13_OXM: {<br>
struct ofp11_flow_mod *ofm;<br>
<br>
- msg = ofpraw_alloc(OFPRAW_OFPT11_FLOW_MOD,<br>
+ msg = ofpraw_alloc(OFPRAW_OFPT11_FLOW_MOD,<br>
ofputil_protocol_to_ofp_version(protocol),<br>
NXM_TYPICAL_LEN + fm->ofpacts_len);<br>
ofm = ofpbuf_put_zeros(msg, sizeof *ofm);<br>
@@ -1691,7 +1691,7 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm,<br>
ofm->hard_timeout = htons(fm->hard_timeout);<br>
ofm->priority = htons(fm->priority);<br>
ofm->buffer_id = htonl(fm->buffer_id);<br>
- ofm->out_port = htons(fm->out_port);<br>
+ ofm->out_port = ofp_htons(fm->out_port);<br>
ofm->flags = htons(fm->flags);<br>
ofpacts_put_openflow10(fm->ofpacts, fm->ofpacts_len, msg);<br>
break;<br>
@@ -1713,7 +1713,7 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm,<br>
nfm->hard_timeout = htons(fm->hard_timeout);<br>
nfm->priority = htons(fm->priority);<br>
nfm->buffer_id = htonl(fm->buffer_id);<br>
- nfm->out_port = htons(fm->out_port);<br>
+ nfm->out_port = ofp_htons(fm->out_port);<br>
nfm->flags = htons(fm->flags);<br>
nfm->match_len = htons(match_len);<br>
ofpacts_put_openflow10(fm->ofpacts, fm->ofpacts_len, msg);<br>
@@ -1766,7 +1766,7 @@ ofputil_decode_ofpst10_flow_request(struct ofputil_flow_stats_request *fsr,<br>
{<br>
fsr->aggregate = aggregate;<br>
ofputil_match_from_ofp10_match(&ofsr->match, &fsr->match);<br>
- fsr->out_port = ntohs(ofsr->out_port);<br>
+ fsr->out_port = ofp_ntohs(ofsr->out_port);<br>
fsr->table_id = ofsr->table_id;<br>
fsr->cookie = fsr->cookie_mask = htonll(0);<br>
<br>
@@ -1818,7 +1818,7 @@ ofputil_decode_nxst_flow_request(struct ofputil_flow_stats_request *fsr,<br>
}<br>
<br>
fsr->aggregate = aggregate;<br>
- fsr->out_port = ntohs(nfsr->out_port);<br>
+ fsr->out_port = ofp_ntohs(nfsr->out_port);<br>
fsr->table_id = nfsr->table_id;<br>
<br>
return 0;<br>
@@ -1902,7 +1902,7 @@ ofputil_encode_flow_stats_request(const struct ofputil_flow_stats_request *fsr,<br>
ofsr = ofpbuf_put_zeros(msg, sizeof *ofsr);<br>
ofputil_match_to_ofp10_match(&fsr->match, &ofsr->match);<br>
ofsr->table_id = fsr->table_id;<br>
- ofsr->out_port = htons(fsr->out_port);<br>
+ ofsr->out_port = ofp_htons(fsr->out_port);<br>
break;<br>
}<br>
<br>
@@ -1920,7 +1920,7 @@ ofputil_encode_flow_stats_request(const struct ofputil_flow_stats_request *fsr,<br>
fsr->cookie, fsr->cookie_mask);<br>
<br>
nfsr = msg->l3;<br>
- nfsr->out_port = htons(fsr->out_port);<br>
+ nfsr->out_port = ofp_htons(fsr->out_port);<br>
nfsr->match_len = htons(match_len);<br>
nfsr->table_id = fsr->table_id;<br>
break;<br>
@@ -2443,7 +2443,7 @@ ofputil_decode_packet_in_finish(struct ofputil_packet_in *pin,<br>
pin->packet = b->data;<br>
pin->packet_len = b->size;<br>
<br>
- pin->fmd.in_port = match->flow.in_port;<br>
+ pin->fmd.in_port = match->flow.in_port.ofp_port;<br>
pin->fmd.tun_id = match->flow.tunnel.tun_id;<br>
pin->fmd.tun_src = match->flow.tunnel.ip_src;<br>
pin->fmd.tun_dst = match->flow.tunnel.ip_dst;<br>
@@ -2502,7 +2502,7 @@ ofputil_decode_packet_in(struct ofputil_packet_in *pin,<br>
pin->packet = opi->data;<br>
pin->packet_len = b.size;<br>
<br>
- pin->fmd.in_port = ntohs(opi->in_port);<br>
+ pin->fmd.in_port = ofp_ntohs(opi->in_port);<br>
pin->reason = opi->reason;<br>
pin->buffer_id = ntohl(opi->buffer_id);<br>
pin->total_len = ntohs(opi->total_len);<br>
@@ -2620,7 +2620,7 @@ ofputil_encode_packet_in(const struct ofputil_packet_in *pin,<br>
htonl(0), send_len);<br>
opi = ofpbuf_put_zeros(packet, offsetof(struct ofp10_packet_in, data));<br>
opi->total_len = htons(pin->total_len);<br>
- opi->in_port = htons(pin->fmd.in_port);<br>
+ opi->in_port = ofp_htons(pin->fmd.in_port);<br>
opi->reason = pin->reason;<br>
opi->buffer_id = htonl(pin->buffer_id);<br>
<br>
@@ -2737,7 +2737,7 @@ ofputil_decode_packet_out(struct ofputil_packet_out *po,<br>
const struct ofp10_packet_out *opo = ofpbuf_pull(&b, sizeof *opo);<br>
<br>
po->buffer_id = ntohl(opo->buffer_id);<br>
- po->in_port = ntohs(opo->in_port);<br>
+ po->in_port = ofp_ntohs(opo->in_port);<br>
<br>
error = ofpacts_pull_openflow10(&b, ntohs(opo->actions_len), ofpacts);<br>
if (error) {<br>
@@ -2747,7 +2747,8 @@ ofputil_decode_packet_out(struct ofputil_packet_out *po,<br>
NOT_REACHED();<br>
}<br>
<br>
- if (po->in_port >= OFPP_MAX && po->in_port != OFPP_LOCAL<br>
+ if (ofp_to_u16(po->in_port) >= ofp_to_u16(OFPP_MAX)<br>
+ && po->in_port != OFPP_LOCAL<br>
&& po->in_port != OFPP_NONE && po->in_port != OFPP_CONTROLLER) {<br>
VLOG_WARN_RL(&bad_ofmsg_rl, "packet-out has bad input port %#"PRIx16,<br>
po->in_port);<br>
@@ -2834,7 +2835,7 @@ ofputil_decode_ofp10_phy_port(struct ofputil_phy_port *pp,<br>
{<br>
memset(pp, 0, sizeof *pp);<br>
<br>
- pp->port_no = ntohs(opp->port_no);<br>
+ pp->port_no = ofp_ntohs(opp->port_no);<br>
memcpy(pp->hw_addr, opp->hw_addr, OFP_ETH_ALEN);<br>
ovs_strlcpy(pp->name, opp->name, OFP_MAX_PORT_NAME_LEN);<br>
<br>
@@ -2902,7 +2903,7 @@ ofputil_encode_ofp10_phy_port(const struct ofputil_phy_port *pp,<br>
{<br>
memset(opp, 0, sizeof *opp);<br>
<br>
- opp->port_no = htons(pp->port_no);<br>
+ opp->port_no = ofp_htons(pp->port_no);<br>
memcpy(opp->hw_addr, pp->hw_addr, ETH_ADDR_LEN);<br>
ovs_strlcpy(opp->name, pp->name, OFP_MAX_PORT_NAME_LEN);<br>
<br>
@@ -3312,7 +3313,7 @@ ofputil_decode_port_mod(const struct ofp_header *oh,<br>
if (raw == OFPRAW_OFPT10_PORT_MOD) {<br>
const struct ofp10_port_mod *opm = b.data;<br>
<br>
- pm->port_no = ntohs(opm->port_no);<br>
+ pm->port_no = ofp_ntohs(opm->port_no);<br>
memcpy(pm->hw_addr, opm->hw_addr, ETH_ADDR_LEN);<br>
pm->config = ntohl(opm->config) & OFPPC10_ALL;<br>
pm->mask = ntohl(opm->mask) & OFPPC10_ALL;<br>
@@ -3354,7 +3355,7 @@ ofputil_encode_port_mod(const struct ofputil_port_mod *pm,<br>
<br>
b = ofpraw_alloc(OFPRAW_OFPT10_PORT_MOD, ofp_version, 0);<br>
opm = ofpbuf_put_zeros(b, sizeof *opm);<br>
- opm->port_no = htons(pm->port_no);<br>
+ opm->port_no = ofp_htons(pm->port_no);<br>
memcpy(opm->hw_addr, pm->hw_addr, ETH_ADDR_LEN);<br>
opm->config = htonl(pm->config & OFPPC10_ALL);<br>
opm->mask = htonl(pm->mask & OFPPC10_ALL);<br>
@@ -3690,7 +3691,7 @@ ofputil_decode_flow_monitor_request(struct ofputil_flow_monitor_request *rq,<br>
<br>
rq->id = ntohl(nfmr->id);<br>
rq->flags = flags;<br>
- rq->out_port = ntohs(nfmr->out_port);<br>
+ rq->out_port = ofp_ntohs(nfmr->out_port);<br>
rq->table_id = nfmr->table_id;<br>
<br>
return nx_pull_match(msg, ntohs(nfmr->match_len), &rq->match, NULL, NULL);<br>
@@ -3715,7 +3716,7 @@ ofputil_append_flow_monitor_request(<br>
nfmr = ofpbuf_at_assert(msg, start_ofs, sizeof *nfmr);<br>
nfmr->id = htonl(rq->id);<br>
nfmr->flags = htons(rq->flags);<br>
- nfmr->out_port = htons(rq->out_port);<br>
+ nfmr->out_port = ofp_htons(rq->out_port);<br>
nfmr->match_len = htons(match_len);<br>
nfmr->table_id = rq->table_id;<br>
}<br>
@@ -3923,7 +3924,7 @@ ofputil_encode_packet_out(const struct ofputil_packet_out *po,<br>
<br>
opo = msg->l3;<br>
opo->buffer_id = htonl(po->buffer_id);<br>
- opo->in_port = htons(po->in_port);<br>
+ opo->in_port = ofp_htons(po->in_port);<br>
opo->actions_len = htons(msg->size - actions_ofs);<br>
break;<br>
}<br>
@@ -4042,22 +4043,20 @@ ofputil_frag_handling_from_string(const char *s, enum ofp_config_flags *flags)<br>
*<br>
* See the definition of OFP11_MAX for an explanation of the mapping. */<br>
enum ofperr<br>
-ofputil_port_from_ofp11(ovs_be32 ofp11_port, uint16_t *ofp10_port)<br>
+ofputil_port_from_ofp11(ovs_be32 ofp11_port, ofp_port_t *ofp10_port)<br>
{<br>
- uint32_t ofp11_port_h = ntohl(ofp11_port);<br>
+ ofp11_port_t ofp11_port_h = ofp11_ntohl(ofp11_port);<br>
+ int error;<br>
<br>
- if (ofp11_port_h < OFPP_MAX) {<br>
- *ofp10_port = ofp11_port_h;<br>
- return 0;<br>
- } else if (ofp11_port_h >= OFPP11_MAX) {<br>
- *ofp10_port = ofp11_port_h - OFPP11_OFFSET;<br>
+ error = ofp11_port_to_ofp_port(ofp11_port_h, ofp10_port);<br>
+ if (!error) {<br>
return 0;<br>
} else {<br>
*ofp10_port = OFPP_NONE;<br>
VLOG_WARN_RL(&bad_ofmsg_rl, "port %"PRIu32" is outside the supported "<br>
- "range 0 through %d or 0x%"PRIx32" through 0x%"PRIx32,<br>
- ofp11_port_h, OFPP_MAX - 1,<br>
- (uint32_t) OFPP11_MAX, UINT32_MAX);<br>
+ "range 0 through %u or 0x%"PRIx32" through 0x%"PRIx32,<br>
+ ofp11_port_h, ofp_to_u16(OFPP_MAX) - 1,<br>
+ OFPP11_MAX, UINT32_MAX);<br>
return OFPERR_OFPBAC_BAD_OUT_PORT;<br>
}<br>
}<br>
@@ -4067,18 +4066,19 @@ ofputil_port_from_ofp11(ovs_be32 ofp11_port, uint16_t *ofp10_port)<br>
*<br>
* See the definition of OFP11_MAX for an explanation of the mapping. */<br>
ovs_be32<br>
-ofputil_port_to_ofp11(uint16_t ofp10_port)<br>
+ofputil_port_to_ofp11(ofp_port_t ofp10_port)<br>
{<br>
- return htonl(ofp10_port < OFPP_MAX<br>
- ? ofp10_port<br>
- : ofp10_port + OFPP11_OFFSET);<br>
+ ofp11_port_t ofp11_port;<br>
+<br>
+ ofp_port_to_ofp11_port(ofp10_port, &ofp11_port);<br>
+ return ofp11_htonl(ofp11_port);<br>
}<br>
<br>
/* Checks that 'port' is a valid output port for the OFPAT10_OUTPUT action, given<br>
* that the switch will never have more than 'max_ports' ports. Returns 0 if<br>
* 'port' is valid, otherwise an OpenFlow return code. */<br>
enum ofperr<br>
-ofputil_check_output_port(uint16_t port, int max_ports)<br>
+ofputil_check_output_port(ofp_port_t port, ofp_port_t max_ports)<br>
{<br>
switch (port) {<br>
case OFPP_IN_PORT:<br>
@@ -4092,7 +4092,7 @@ ofputil_check_output_port(uint16_t port, int max_ports)<br>
return 0;<br>
<br>
default:<br>
- if (port < max_ports) {<br>
+ if (ofp_to_u16(port) < ofp_to_u16(max_ports)) {<br>
return 0;<br>
}<br>
return OFPERR_OFPBAC_BAD_OUT_PORT;<br>
@@ -4128,46 +4128,42 @@ ofputil_check_output_port(uint16_t port, int max_ports)<br>
* of OpenFlow 1.1+ port numbers, mapping those port numbers into the 16-bit<br>
* range as described in include/openflow/openflow-1.1.h. */<br>
bool<br>
-ofputil_port_from_string(const char *s, uint16_t *portp)<br>
+ofputil_port_from_string(const char *s, ofp_port_t *portp)<br>
{<br>
- unsigned int port32;<br>
+ uint32_t port32;<br>
<br>
*portp = 0;<br>
if (str_to_uint(s, 10, &port32)) {<br>
- if (port32 < OFPP_MAX) {<br>
- *portp = port32;<br>
- return true;<br>
- } else if (port32 < OFPP_FIRST_RESV) {<br>
+ if (port32 < ofp_to_u16(OFPP_MAX)) {<br>
+ /* Pass. */<br>
+ } else if (port32 < ofp_to_u16(OFPP_FIRST_RESV)) {<br>
VLOG_WARN("port %u is a reserved OF1.0 port number that will "<br>
"be translated to %u when talking to an OF1.1 or "<br>
"later controller", port32, port32 + OFPP11_OFFSET);<br>
- *portp = port32;<br>
- return true;<br>
- } else if (port32 <= OFPP_LAST_RESV) {<br>
+ } else if (port32 <= ofp_to_u16(OFPP_LAST_RESV)) {<br>
struct ds msg;<br>
<br>
ds_init(&msg);<br>
- ofputil_format_port(port32, &msg);<br>
+ ofputil_format_port(uint_to_ofp(port32), &msg);<br>
VLOG_WARN_ONCE("referring to port %s as %u is deprecated for "<br>
"compatibility with future versions of OpenFlow",<br>
ds_cstr(&msg), port32);<br>
ds_destroy(&msg);<br>
-<br>
- *portp = port32;<br>
- return true;<br>
- } else if (port32 < OFPP11_MAX) {<br>
+ } else if (port32 < ofp11_to_u32(OFPP11_MAX)) {<br>
VLOG_WARN("port %u is outside the supported range 0 through "<br>
"%"PRIx16" or 0x%x through 0x%"PRIx32, port32,<br>
- UINT16_MAX, (unsigned int) OFPP11_MAX, UINT32_MAX);<br>
+ UINT16_MAX, ofp11_to_u32(OFPP11_MAX), UINT32_MAX);<br>
return false;<br>
} else {<br>
- *portp = port32 - OFPP11_OFFSET;<br>
- return true;<br>
+ port32 -= OFPP11_OFFSET;<br>
}<br>
+<br>
+ *portp = uint_to_ofp(port32);<br>
+ return true;<br>
} else {<br>
struct pair {<br>
const char *name;<br>
- uint16_t value;<br>
+ ofp_port_t value;<br>
};<br>
static const struct pair pairs[] = {<br>
#define OFPUTIL_NAMED_PORT(NAME) {#NAME, OFPP_##NAME},<br>
@@ -4190,7 +4186,7 @@ ofputil_port_from_string(const char *s, uint16_t *portp)<br>
* Most ports' string representation is just the port number, but for special<br>
* ports, e.g. OFPP_LOCAL, it is the name, e.g. "LOCAL". */<br>
void<br>
-ofputil_format_port(uint16_t port, struct ds *s)<br>
+ofputil_format_port(ofp_port_t port, struct ds *s)<br>
{<br>
const char *name;<br>
<br>
@@ -4531,7 +4527,7 @@ ofputil_parse_key_value(char **stringp, char **keyp, char **valuep)<br>
* will be for Open Flow version 'ofp_version'. Returns message<br>
* as a struct ofpbuf. Returns encoded message on success, NULL on error */<br>
struct ofpbuf *<br>
-ofputil_encode_dump_ports_request(enum ofp_version ofp_version, uint16_t port)<br>
+ofputil_encode_dump_ports_request(enum ofp_version ofp_version, ofp_port_t port)<br>
{<br>
struct ofpbuf *request;<br>
<br>
@@ -4540,7 +4536,7 @@ ofputil_encode_dump_ports_request(enum ofp_version ofp_version, uint16_t port)<br>
struct ofp10_port_stats_request *req;<br>
request = ofpraw_alloc(OFPRAW_OFPST10_PORT_REQUEST, ofp_version, 0);<br>
req = ofpbuf_put_zeros(request, sizeof *req);<br>
- req->port_no = htons(port);<br>
+ req->port_no = ofp_htons(port);<br>
break;<br>
}<br>
case OFP11_VERSION:<br>
@@ -4563,7 +4559,7 @@ static void<br>
ofputil_port_stats_to_ofp10(const struct ofputil_port_stats *ops,<br>
struct ofp10_port_stats *ps10)<br>
{<br>
- ps10->port_no = htons(ops->port_no);<br>
+ ps10->port_no = ofp_htons(ops->port_no);<br>
memset(ps10->pad, 0, sizeof ps10->pad);<br>
put_32aligned_be64(&ps10->rx_packets, htonll(ops->stats.rx_packets));<br>
put_32aligned_be64(&ps10->tx_packets, htonll(ops->stats.tx_packets));<br>
@@ -4647,7 +4643,7 @@ ofputil_port_stats_from_ofp10(struct ofputil_port_stats *ops,<br>
{<br>
memset(ops, 0, sizeof *ops);<br>
<br>
- ops->port_no = ntohs(ps10->port_no);<br>
+ ops->port_no = ofp_ntohs(ps10->port_no);<br>
ops->stats.rx_packets = ntohll(get_32aligned_be64(&ps10->rx_packets));<br>
ops->stats.tx_packets = ntohll(get_32aligned_be64(&ps10->tx_packets));<br>
ops->stats.rx_bytes = ntohll(get_32aligned_be64(&ps10->rx_bytes));<br>
@@ -4787,7 +4783,7 @@ ofputil_decode_port_stats(struct ofputil_port_stats *ps, struct ofpbuf *msg)<br>
* Returns 0 if successful, otherwise an OFPERR_* number. */<br>
enum ofperr<br>
ofputil_decode_port_stats_request(const struct ofp_header *request,<br>
- uint16_t *ofp10_port)<br>
+ ofp_port_t *ofp10_port)<br>
{<br>
switch ((enum ofp_version)request->version) {<br>
case OFP13_VERSION:<br>
@@ -4799,7 +4795,7 @@ ofputil_decode_port_stats_request(const struct ofp_header *request,<br>
<br>
case OFP10_VERSION: {<br>
const struct ofp10_port_stats_request *psr10 = ofpmsg_body(request);<br>
- *ofp10_port = ntohs(psr10->port_no);<br>
+ *ofp10_port = ofp_ntohs(psr10->port_no);<br>
return 0;<br>
}<br>
<br>
@@ -4826,7 +4822,7 @@ ofputil_decode_queue_stats_request(const struct ofp_header *request,<br>
case OFP10_VERSION: {<br>
const struct ofp10_queue_stats_request *qsr10 = ofpmsg_body(request);<br>
oqsr->queue_id = ntohl(qsr10->queue_id);<br>
- oqsr->port_no = ntohs(qsr10->port_no);<br>
+ oqsr->port_no = ofp_ntohs(qsr10->port_no);<br>
/* OF 1.0 uses OFPP_ALL for OFPP_ANY */<br>
if (oqsr->port_no == OFPP_ALL) {<br>
oqsr->port_no = OFPP_ANY;<br>
@@ -4864,8 +4860,8 @@ ofputil_encode_queue_stats_request(enum ofp_version ofp_version,<br>
request = ofpraw_alloc(OFPRAW_OFPST10_QUEUE_REQUEST, ofp_version, 0);<br>
req = ofpbuf_put_zeros(request, sizeof *req);<br>
/* OpenFlow 1.0 needs OFPP_ALL instead of OFPP_ANY */<br>
- req->port_no = htons(oqsr->port_no == OFPP_ANY<br>
- ? OFPP_ALL : oqsr->port_no);<br>
+ req->port_no = ofp_htons(oqsr->port_no == OFPP_ANY<br>
+ ? OFPP_ALL : oqsr->port_no);<br>
req->queue_id = htonl(oqsr->queue_id);<br>
break;<br>
}<br>
@@ -4895,7 +4891,7 @@ static enum ofperr<br>
ofputil_queue_stats_from_ofp10(struct ofputil_queue_stats *oqs,<br>
const struct ofp10_queue_stats *qs10)<br>
{<br>
- oqs->port_no = ntohs(qs10->port_no);<br>
+ oqs->port_no = ofp_ntohs(qs10->port_no);<br>
oqs->queue_id = ntohl(qs10->queue_id);<br>
oqs->stats.tx_bytes = ntohll(get_32aligned_be64(&qs10->tx_bytes));<br>
oqs->stats.tx_packets = ntohll(get_32aligned_be64(&qs10->tx_packets));<br>
@@ -5000,7 +4996,7 @@ static void<br>
ofputil_queue_stats_to_ofp10(const struct ofputil_queue_stats *oqs,<br>
struct ofp10_queue_stats *qs10)<br>
{<br>
- qs10->port_no = htons(oqs->port_no);<br>
+ qs10->port_no = ofp_htons(oqs->port_no);<br>
memset(qs10->pad, 0, sizeof qs10->pad);<br>
qs10->queue_id = htonl(oqs->queue_id);<br>
put_32aligned_be64(&qs10->tx_bytes, htonll(oqs->stats.tx_bytes));<br>
diff --git a/lib/ofp-util.h b/lib/ofp-util.h<br>
index 1c8d6cd..22025dc 100644<br>
--- a/lib/ofp-util.h<br>
+++ b/lib/ofp-util.h<br>
@@ -32,12 +32,12 @@<br>
struct ofpbuf;<br>
<br>
/* Port numbers. */<br>
-enum ofperr ofputil_port_from_ofp11(ovs_be32 ofp11_port, uint16_t *ofp10_port);<br>
-ovs_be32 ofputil_port_to_ofp11(uint16_t ofp10_port);<br>
+enum ofperr ofputil_port_from_ofp11(ovs_be32 ofp11_port, ofp_port_t *ofp10_port);<br>
+ovs_be32 ofputil_port_to_ofp11(ofp_port_t ofp10_port);<br>
<br>
-enum ofperr ofputil_check_output_port(uint16_t ofp_port, int max_ports);<br>
-bool ofputil_port_from_string(const char *, uint16_t *portp);<br>
-void ofputil_format_port(uint16_t port, struct ds *);<br>
+enum ofperr ofputil_check_output_port(ofp_port_t ofp_port, ofp_port_t max_ports);<br>
+bool ofputil_port_from_string(const char *, ofp_port_t *portp);<br>
+void ofputil_format_port(ofp_port_t port, struct ds *);<br>
<br>
/* Converting OFPFW10_NW_SRC_MASK and OFPFW10_NW_DST_MASK wildcard bit counts<br>
* to and from IP bitmasks. */<br>
@@ -219,7 +219,7 @@ struct ofputil_flow_mod {<br>
uint16_t idle_timeout;<br>
uint16_t hard_timeout;<br>
uint32_t buffer_id;<br>
- uint16_t out_port;<br>
+ ofp_port_t out_port;<br>
uint16_t flags;<br>
struct ofpact *ofpacts; /* Series of "struct ofpact"s. */<br>
size_t ofpacts_len; /* Length of ofpacts, in bytes. */<br>
@@ -241,7 +241,7 @@ struct ofputil_flow_stats_request {<br>
struct match match;<br>
ovs_be64 cookie;<br>
ovs_be64 cookie_mask;<br>
- uint16_t out_port;<br>
+ ofp_port_t out_port;<br>
uint8_t table_id;<br>
};<br>
<br>
@@ -350,7 +350,7 @@ struct ofputil_packet_out {<br>
const void *packet; /* Packet data, if buffer_id == UINT32_MAX. */<br>
size_t packet_len; /* Length of packet data in bytes. */<br>
uint32_t buffer_id; /* Buffer id or UINT32_MAX if no buffer. */<br>
- uint16_t in_port; /* Packet's input port. */<br>
+ ofp_port_t in_port; /* Packet's input port. */<br>
struct ofpact *ofpacts; /* Actions. */<br>
size_t ofpacts_len; /* Size of ofpacts in bytes. */<br>
};<br>
@@ -390,7 +390,7 @@ enum ofputil_port_state {<br>
<br>
/* Abstract ofp10_phy_port or ofp11_port. */<br>
struct ofputil_phy_port {<br>
- uint16_t port_no;<br>
+ ofp_port_t port_no;<br>
uint8_t hw_addr[OFP_ETH_ALEN];<br>
char name[OFP_MAX_PORT_NAME_LEN];<br>
enum ofputil_port_config config;<br>
@@ -498,7 +498,7 @@ struct ofpbuf *ofputil_encode_port_status(const struct ofputil_port_status *,<br>
<br>
/* Abstract ofp_port_mod. */<br>
struct ofputil_port_mod {<br>
- uint16_t port_no;<br>
+ ofp_port_t port_no;<br>
uint8_t hw_addr[OFP_ETH_ALEN];<br>
enum ofputil_port_config config;<br>
enum ofputil_port_config mask;<br>
@@ -535,7 +535,7 @@ struct ofpbuf *ofputil_encode_table_stats_reply(<br>
struct ofputil_flow_monitor_request {<br>
uint32_t id;<br>
enum nx_flow_monitor_flags flags;<br>
- uint16_t out_port;<br>
+ ofp_port_t out_port;<br>
uint8_t table_id;<br>
struct match match;<br>
};<br>
@@ -677,7 +677,7 @@ void *ofputil_put_action(enum ofputil_action_code, struct ofpbuf *buf);<br>
#define OFP_ACTION_ALIGN 8 /* Alignment of ofp_actions. */<br>
<br>
enum ofperr validate_actions(const union ofp_action *, size_t n_actions,<br>
- const struct flow *, int max_ports);<br>
+ const struct flow *, ofp_port_t max_ports);<br>
bool action_outputs_to_port(const union ofp_action *, ovs_be16 port);<br>
<br>
enum ofperr ofputil_pull_actions(struct ofpbuf *, unsigned int actions_len,<br>
@@ -691,23 +691,23 @@ union ofp_action *ofputil_actions_clone(const union ofp_action *, size_t n);<br>
bool ofputil_parse_key_value(char **stringp, char **keyp, char **valuep);<br>
<br>
struct ofputil_port_stats {<br>
- uint16_t port_no;<br>
+ ofp_port_t port_no;<br>
struct netdev_stats stats;<br>
uint32_t duration_sec; /* UINT32_MAX if unknown. */<br>
uint32_t duration_nsec;<br>
};<br>
<br>
struct ofpbuf *ofputil_encode_dump_ports_request(enum ofp_version ofp_version,<br>
- uint16_t port);<br>
+ ofp_port_t port);<br>
void ofputil_append_port_stat(struct list *replies,<br>
const struct ofputil_port_stats *ops);<br>
size_t ofputil_count_port_stats(const struct ofp_header *);<br>
int ofputil_decode_port_stats(struct ofputil_port_stats *, struct ofpbuf *msg);<br>
enum ofperr ofputil_decode_port_stats_request(const struct ofp_header *request,<br>
- uint16_t *ofp10_port);<br>
+ ofp_port_t *ofp10_port);<br>
<br>
struct ofputil_queue_stats_request {<br>
- uint16_t port_no; /* OFPP_ANY means "all ports". */<br>
+ ofp_port_t port_no; /* OFPP_ANY means "all ports". */<br>
uint32_t queue_id;<br>
};<br>
<br>
@@ -719,7 +719,7 @@ ofputil_encode_queue_stats_request(enum ofp_version ofp_version,<br>
const struct ofputil_queue_stats_request *oqsr);<br>
<br>
struct ofputil_queue_stats {<br>
- uint16_t port_no;<br>
+ ofp_port_t port_no;<br>
uint32_t queue_id;<br>
struct netdev_queue_stats stats;<br>
};<br>
diff --git a/lib/sflow.h b/lib/sflow.h<br>
index 0d1f2b9..58288b1 100644<br>
--- a/lib/sflow.h<br>
+++ b/lib/sflow.h<br>
@@ -8,6 +8,8 @@<br>
#ifndef SFLOW_H<br>
#define SFLOW_H 1<br>
<br>
+#include "flow.h"<br>
+<br>
typedef enum {<br>
SFL_DSCLASS_IFINDEX = 0,<br>
SFL_DSCLASS_VLAN = 1,<br>
diff --git a/lib/sflow_api.h b/lib/sflow_api.h<br>
index 3cc060b..a5fa78d 100644<br>
--- a/lib/sflow_api.h<br>
+++ b/lib/sflow_api.h<br>
@@ -153,7 +153,7 @@ typedef struct _SFLPoller {<br>
struct _SFLAgent *agent; /* pointer to my agent */<br>
void *magic; /* ptr to pass back in getCountersFn() */<br>
getCountersFn_t getCountersFn;<br>
- u_int32_t bridgePort; /* port number local to bridge */<br>
+ odp_port_t bridgePort; /* port number local to bridge */<br>
/* private fields */<br>
SFLReceiver *myReceiver;<br>
time_t countersCountdown;<br>
@@ -279,8 +279,8 @@ void sfl_agent_set_agentSubId(SFLAgent *agent, u_int32_t subId);<br>
<br>
/* The poller may need a separate number to reference the local bridge port<br>
to get counters if it is not the same as the global ifIndex */<br>
-void sfl_poller_set_bridgePort(SFLPoller *poller, u_int32_t port_no);<br>
-u_int32_t sfl_poller_get_bridgePort(SFLPoller *poller);<br>
+void sfl_poller_set_bridgePort(SFLPoller *poller, odp_port_t port_no);<br>
+odp_port_t sfl_poller_get_bridgePort(SFLPoller *poller);<br>
<br>
/* call this to indicate a discontinuity with a counter like samplePool so that the<br>
sflow collector will ignore the next delta */<br>
diff --git a/lib/sflow_poller.c b/lib/sflow_poller.c<br>
index d2e4155..e0c122f 100644<br>
--- a/lib/sflow_poller.c<br>
+++ b/lib/sflow_poller.c<br>
@@ -104,11 +104,11 @@ void sfl_poller_set_sFlowCpInterval(SFLPoller *poller, u_int32_t sFlowCpInterval<br>
to get counters if it is not the same as the global ifIndex.<br>
*/<br>
<br>
-void sfl_poller_set_bridgePort(SFLPoller *poller, u_int32_t port_no) {<br>
+void sfl_poller_set_bridgePort(SFLPoller *poller, odp_port_t port_no) {<br>
poller->bridgePort = port_no;<br>
}<br>
<br>
-u_int32_t sfl_poller_get_bridgePort(SFLPoller *poller) {<br>
+odp_port_t sfl_poller_get_bridgePort(SFLPoller *poller) {<br>
return poller->bridgePort;<br>
}<br>
<br>
diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c<br>
index 0951968..9ddae5c 100644<br>
--- a/ofproto/connmgr.c<br>
+++ b/ofproto/connmgr.c<br>
@@ -1039,7 +1039,7 @@ ofconn_send_error(const struct ofconn *ofconn,<br>
/* Same as pktbuf_retrieve(), using the pktbuf owned by 'ofconn'. */<br>
enum ofperr<br>
ofconn_pktbuf_retrieve(struct ofconn *ofconn, uint32_t id,<br>
- struct ofpbuf **bufferp, uint16_t *in_port)<br>
+ struct ofpbuf **bufferp, ofp_port_t *in_port)<br>
{<br>
return pktbuf_retrieve(ofconn->pktbuf, id, bufferp, in_port);<br>
}<br>
@@ -1646,7 +1646,7 @@ any_extras_changed(const struct connmgr *mgr,<br>
<br>
bool<br>
connmgr_must_output_local(struct connmgr *mgr, const struct flow *flow,<br>
- uint32_t local_odp_port,<br>
+ odp_port_t local_odp_port,<br>
const struct nlattr *odp_actions,<br>
size_t actions_len)<br>
{<br>
diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h<br>
index 429e678..0242116 100644<br>
--- a/ofproto/connmgr.h<br>
+++ b/ofproto/connmgr.h<br>
@@ -125,7 +125,7 @@ void ofconn_send_error(const struct ofconn *, const struct ofp_header *request,<br>
enum ofperr);<br>
<br>
enum ofperr ofconn_pktbuf_retrieve(struct ofconn *, uint32_t id,<br>
- struct ofpbuf **bufferp, uint16_t *in_port);<br>
+ struct ofpbuf **bufferp, ofp_port_t *in_port);<br>
<br>
bool ofconn_has_pending_opgroups(const struct ofconn *);<br>
void ofconn_add_opgroup(struct ofconn *, struct list *);<br>
@@ -157,7 +157,7 @@ void connmgr_set_in_band_queue(struct connmgr *, int queue_id);<br>
<br>
/* In-band implementation. */<br>
bool connmgr_must_output_local(struct connmgr *, const struct flow *,<br>
- uint32_t local_odp_port,<br>
+ odp_port_t local_odp_port,<br>
const struct nlattr *odp_actions,<br>
size_t actions_len);<br>
<br>
@@ -173,7 +173,7 @@ struct ofmonitor {<br>
enum nx_flow_monitor_flags flags;<br>
<br>
/* Matching. */<br>
- uint16_t out_port;<br>
+ ofp_port_t out_port;<br>
uint8_t table_id;<br>
struct minimatch match;<br>
};<br>
diff --git a/ofproto/in-band.c b/ofproto/in-band.c<br>
index ba6fc54..6afc1f3 100644<br>
--- a/ofproto/in-band.c<br>
+++ b/ofproto/in-band.c<br>
@@ -225,7 +225,7 @@ refresh_local(struct in_band *ib)<br>
/* Returns true if the rule that would match 'flow' with 'actions' is<br>
* allowed to be set up in the datapath. */<br>
bool<br>
-in_band_rule_check(const struct flow *flow, uint32_t local_odp_port,<br>
+in_band_rule_check(const struct flow *flow, odp_port_t local_odp_port,<br>
const struct nlattr *actions, size_t actions_len)<br>
{<br>
/* Don't allow flows that would prevent DHCP replies from being seen<br>
@@ -239,7 +239,7 @@ in_band_rule_check(const struct flow *flow, uint32_t local_odp_port,<br>
<br>
NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) {<br>
if (nl_attr_type(a) == OVS_ACTION_ATTR_OUTPUT<br>
- && nl_attr_get_u32(a) == local_odp_port) {<br>
+ && nl_attr_get_u32(a) == odp_to_u32(local_odp_port)) {<br>
return true;<br>
}<br>
}<br>
diff --git a/ofproto/in-band.h b/ofproto/in-band.h<br>
index 4f52e00..5449312 100644<br>
--- a/ofproto/in-band.h<br>
+++ b/ofproto/in-band.h<br>
@@ -21,6 +21,7 @@<br>
#include <stddef.h><br>
#include <sys/socket.h><br>
#include <netinet/in.h><br>
+#include "flow.h"<br>
<br>
struct flow;<br>
struct in_band;<br>
@@ -39,7 +40,7 @@ void in_band_set_remotes(struct in_band *,<br>
bool in_band_run(struct in_band *);<br>
void in_band_wait(struct in_band *);<br>
<br>
-bool in_band_rule_check(const struct flow *, uint32_t local_odp_port,<br>
+bool in_band_rule_check(const struct flow *, odp_port_t local_odp_port,<br>
const struct nlattr *odp_actions, size_t actions_len);<br>
<br>
#endif /* in-band.h */<br>
diff --git a/ofproto/netflow.c b/ofproto/netflow.c<br>
index 7366986..854d873 100644<br>
--- a/ofproto/netflow.c<br>
+++ b/ofproto/netflow.c<br>
@@ -85,11 +85,13 @@ gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow,<br>
nf_rec->nexthop = htonl(0);<br>
if (nf->add_id_to_iface) {<br>
uint16_t iface = (nf->engine_id & 0x7f) << 9;<br>
- nf_rec->input = htons(iface | (expired->flow.in_port & 0x1ff));<br>
- nf_rec->output = htons(iface | (nf_flow->output_iface & 0x1ff));<br>
+ nf_rec->input = htons(iface<br>
+ | (ofp_to_u16(expired->flow.in_port.ofp_port) & 0x1ff));<br>
+ nf_rec->output = htons(iface<br>
+ | (ofp_to_u16(nf_flow->output_iface) & 0x1ff));<br>
} else {<br>
- nf_rec->input = htons(expired->flow.in_port);<br>
- nf_rec->output = htons(nf_flow->output_iface);<br>
+ nf_rec->input = ofp_htons(expired->flow.in_port.ofp_port);<br>
+ nf_rec->output = ofp_htons(nf_flow->output_iface);<br>
}<br>
nf_rec->packet_count = htonl(packet_count);<br>
nf_rec->byte_count = htonl(byte_count);<br>
@@ -263,7 +265,7 @@ netflow_flow_init(struct netflow_flow *nf_flow OVS_UNUSED)<br>
void<br>
netflow_flow_clear(struct netflow_flow *nf_flow)<br>
{<br>
- uint16_t output_iface = nf_flow->output_iface;<br>
+ ofp_port_t output_iface = nf_flow->output_iface;<br>
<br>
memset(nf_flow, 0, sizeof *nf_flow);<br>
nf_flow->output_iface = output_iface;<br>
diff --git a/ofproto/netflow.h b/ofproto/netflow.h<br>
index c01ff15..67d75bf 100644<br>
--- a/ofproto/netflow.h<br>
+++ b/ofproto/netflow.h<br>
@@ -38,11 +38,9 @@ struct netflow_options {<br>
bool add_id_to_iface;<br>
};<br>
<br>
-enum netflow_output_ports {<br>
- NF_OUT_FLOOD = UINT16_MAX,<br>
- NF_OUT_MULTI = UINT16_MAX - 1,<br>
- NF_OUT_DROP = UINT16_MAX - 2<br>
-};<br>
+#define NF_OUT_FLOOD OFPP_NONE<br>
+#define NF_OUT_MULTI (uint_to_ofp(ofp_to_u16(OFPP_NONE) - 1))<br>
+#define NF_OUT_DROP (uint_to_ofp(ofp_to_u16(OFPP_NONE) - 2))<br>
<br>
struct netflow_flow {<br>
long long int last_expired; /* Time this flow last timed out. */<br>
@@ -51,7 +49,7 @@ struct netflow_flow {<br>
uint64_t packet_count_off; /* Packet count at last time out. */<br>
uint64_t byte_count_off; /* Byte count at last time out. */<br>
<br>
- uint16_t output_iface; /* Output interface index. */<br>
+ ofp_port_t output_iface; /* Output interface index. */<br>
uint8_t tcp_flags; /* Bitwise-OR of all TCP flags seen. */<br>
};<br>
<br>
diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c<br>
index 9ad0eaf..d5a9524 100644<br>
--- a/ofproto/ofproto-dpif-sflow.c<br>
+++ b/ofproto/ofproto-dpif-sflow.c<br>
@@ -46,7 +46,7 @@ struct dpif_sflow_port {<br>
struct hmap_node hmap_node; /* In struct dpif_sflow's "ports" hmap. */<br>
SFLDataSource_instance dsi; /* sFlow library's notion of port number. */<br>
struct ofport *ofport; /* To retrive port stats. */<br>
- uint32_t odp_port;<br>
+ odp_port_t odp_port;<br>
};<br>
<br>
struct dpif_sflow {<br>
@@ -142,12 +142,13 @@ sflow_agent_send_packet_cb(void *ds_, SFLAgent *agent OVS_UNUSED,<br>
}<br>
<br>
static struct dpif_sflow_port *<br>
-dpif_sflow_find_port(const struct dpif_sflow *ds, uint32_t odp_port)<br>
+dpif_sflow_find_port(const struct dpif_sflow *ds, odp_port_t odp_port)<br>
{<br>
struct dpif_sflow_port *dsp;<br>
<br>
HMAP_FOR_EACH_IN_BUCKET (dsp, hmap_node,<br>
- hash_int(odp_port, 0), &ds->ports) {<br>
+ hash_odp_port(odp_port, 0),<br>
+ &ds->ports) {<br>
if (dsp->odp_port == odp_port) {<br>
return dsp;<br>
}<br>
@@ -343,7 +344,7 @@ dpif_sflow_add_poller(struct dpif_sflow *ds, struct dpif_sflow_port *dsp)<br>
<br>
void<br>
dpif_sflow_add_port(struct dpif_sflow *ds, struct ofport *ofport,<br>
- uint32_t odp_port)<br>
+ odp_port_t odp_port)<br>
{<br>
struct dpif_sflow_port *dsp;<br>
int ifindex;<br>
@@ -362,7 +363,7 @@ dpif_sflow_add_port(struct dpif_sflow *ds, struct ofport *ofport,<br>
dsp->ofport = ofport;<br>
dsp->odp_port = odp_port;<br>
SFL_DS_SET(dsp->dsi, SFL_DSCLASS_IFINDEX, ifindex, 0);<br>
- hmap_insert(&ds->ports, &dsp->hmap_node, hash_int(odp_port, 0));<br>
+ hmap_insert(&ds->ports, &dsp->hmap_node, hash_odp_port(odp_port, 0));<br>
<br>
/* Add poller. */<br>
if (ds->sflow_agent) {<br>
@@ -382,7 +383,7 @@ dpif_sflow_del_port__(struct dpif_sflow *ds, struct dpif_sflow_port *dsp)<br>
}<br>
<br>
void<br>
-dpif_sflow_del_port(struct dpif_sflow *ds, uint32_t odp_port)<br>
+dpif_sflow_del_port(struct dpif_sflow *ds, odp_port_t odp_port)<br>
{<br>
struct dpif_sflow_port *dsp = dpif_sflow_find_port(ds, odp_port);<br>
if (dsp) {<br>
@@ -488,7 +489,7 @@ dpif_sflow_set_options(struct dpif_sflow *ds,<br>
<br>
int<br>
dpif_sflow_odp_port_to_ifindex(const struct dpif_sflow *ds,<br>
- uint32_t odp_port)<br>
+ odp_port_t odp_port)<br>
{<br>
struct dpif_sflow_port *dsp = dpif_sflow_find_port(ds, odp_port);<br>
return dsp ? SFL_DS_INDEX(dsp->dsi) : 0;<br>
@@ -496,7 +497,7 @@ dpif_sflow_odp_port_to_ifindex(const struct dpif_sflow *ds,<br>
<br>
void<br>
dpif_sflow_received(struct dpif_sflow *ds, struct ofpbuf *packet,<br>
- const struct flow *flow, uint32_t odp_in_port,<br>
+ const struct flow *flow, odp_port_t odp_in_port,<br>
const union user_action_cookie *cookie)<br>
{<br>
SFL_FLOW_SAMPLE_TYPE fs;<br>
diff --git a/ofproto/ofproto-dpif-sflow.h b/ofproto/ofproto-dpif-sflow.h<br>
index 02a0f17..d0f83bc 100644<br>
--- a/ofproto/ofproto-dpif-sflow.h<br>
+++ b/ofproto/ofproto-dpif-sflow.h<br>
@@ -38,8 +38,8 @@ void dpif_sflow_clear(struct dpif_sflow *);<br>
bool dpif_sflow_is_enabled(const struct dpif_sflow *);<br>
<br>
void dpif_sflow_add_port(struct dpif_sflow *ds, struct ofport *ofport,<br>
- uint32_t odp_port);<br>
-void dpif_sflow_del_port(struct dpif_sflow *, uint32_t odp_port);<br>
+ odp_port_t odp_port);<br>
+void dpif_sflow_del_port(struct dpif_sflow *, odp_port_t odp_port);<br>
<br>
void dpif_sflow_run(struct dpif_sflow *);<br>
void dpif_sflow_wait(struct dpif_sflow *);<br>
@@ -47,9 +47,10 @@ void dpif_sflow_wait(struct dpif_sflow *);<br>
void dpif_sflow_received(struct dpif_sflow *,<br>
struct ofpbuf *,<br>
const struct flow *,<br>
- uint32_t odp_port,<br>
+ odp_port_t odp_port,<br>
const union user_action_cookie *);<br>
<br>
-int dpif_sflow_odp_port_to_ifindex(const struct dpif_sflow *, uint32_t);<br>
+int dpif_sflow_odp_port_to_ifindex(const struct dpif_sflow *,<br>
+ odp_port_t odp_port);<br>
<br>
#endif /* ofproto/ofproto-dpif-sflow.h */<br>
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c<br>
index f5877a4..040be49 100644<br>
--- a/ofproto/ofproto-dpif-xlate.c<br>
+++ b/ofproto/ofproto-dpif-xlate.c<br>
@@ -80,7 +80,7 @@ struct xlate_ctx {<br>
uint32_t orig_skb_priority; /* Priority when packet arrived. */<br>
uint8_t table_id; /* OpenFlow table ID where flow was found. */<br>
uint32_t sflow_n_outputs; /* Number of output ports. */<br>
- uint32_t sflow_odp_port; /* Output port for composing sFlow action. */<br>
+ odp_port_t sflow_odp_port; /* Output port for composing sFlow action. */<br>
uint16_t user_cookie_offset;/* Used for user_action_cookie fixup. */<br>
bool exit; /* No further actions should be processed. */<br>
};<br>
@@ -100,13 +100,13 @@ static void do_xlate_actions(const struct ofpact *, size_t ofpacts_len,<br>
struct xlate_ctx *);<br>
static void xlate_normal(struct xlate_ctx *);<br>
static void xlate_report(struct xlate_ctx *, const char *);<br>
-static void xlate_table_action(struct xlate_ctx *, uint16_t in_port,<br>
+static void xlate_table_action(struct xlate_ctx *, ofp_port_t in_port,<br>
uint8_t table_id, bool may_packet_in);<br>
static bool input_vid_is_valid(uint16_t vid, struct ofbundle *, bool warn);<br>
static uint16_t input_vid_to_vlan(const struct ofbundle *, uint16_t vid);<br>
static void output_normal(struct xlate_ctx *, const struct ofbundle *,<br>
uint16_t vlan);<br>
-static void compose_output_action(struct xlate_ctx *, uint16_t ofp_port);<br>
+static void compose_output_action(struct xlate_ctx *, ofp_port_t ofp_port);<br>
<br>
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);<br>
<br>
@@ -130,7 +130,7 @@ vlan_is_mirrored(const struct ofmirror *m, int vlan)<br>
}<br>
<br>
static struct ofbundle *<br>
-lookup_input_bundle(const struct ofproto_dpif *ofproto, uint16_t in_port,<br>
+lookup_input_bundle(const struct ofproto_dpif *ofproto, ofp_port_t in_port,<br>
bool warn, struct ofport_dpif **in_ofportp)<br>
{<br>
struct ofport_dpif *ofport;<br>
@@ -183,7 +183,7 @@ add_mirror_actions(struct xlate_ctx *ctx, const struct flow *orig_flow)<br>
const struct nlattr *a;<br>
size_t left;<br>
<br>
- in_bundle = lookup_input_bundle(ctx->ofproto, orig_flow->in_port,<br>
+ in_bundle = lookup_input_bundle(ctx->ofproto, orig_flow->in_port.ofp_port,<br>
ctx->xin->packet != NULL, NULL);<br>
if (!in_bundle) {<br>
return;<br>
@@ -219,7 +219,7 @@ add_mirror_actions(struct xlate_ctx *ctx, const struct flow *orig_flow)<br>
continue;<br>
}<br>
<br>
- ofport = get_odp_port(ofproto, nl_attr_get_u32(a));<br>
+ ofport = get_odp_port(ofproto, uint_to_odp(nl_attr_get_u32(a)));<br>
if (ofport && ofport->bundle) {<br>
mirrors |= ofport->bundle->dst_mirrors;<br>
}<br>
@@ -554,7 +554,7 @@ xlate_normal(struct xlate_ctx *ctx)<br>
memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst);<br>
memset(&wc->masks.vlan_tci, 0xff, sizeof wc->masks.vlan_tci);<br>
<br>
- in_bundle = lookup_input_bundle(ctx->ofproto, flow->in_port,<br>
+ in_bundle = lookup_input_bundle(ctx->ofproto, flow->in_port.ofp_port,<br>
ctx->xin->packet != NULL, &in_port);<br>
if (!in_bundle) {<br>
xlate_report(ctx, "no input bundle, dropping");<br>
@@ -660,7 +660,7 @@ compose_sample_action(const struct ofproto_dpif *ofproto,<br>
<br>
static void<br>
compose_sflow_cookie(const struct ofproto_dpif *ofproto,<br>
- ovs_be16 vlan_tci, uint32_t odp_port,<br>
+ ovs_be16 vlan_tci, odp_port_t odp_port,<br>
unsigned int n_outputs, union user_action_cookie *cookie)<br>
{<br>
int ifindex;<br>
@@ -695,12 +695,12 @@ static size_t<br>
compose_sflow_action(const struct ofproto_dpif *ofproto,<br>
struct ofpbuf *odp_actions,<br>
const struct flow *flow,<br>
- uint32_t odp_port)<br>
+ odp_port_t odp_port)<br>
{<br>
uint32_t probability;<br>
union user_action_cookie cookie;<br>
<br>
- if (!ofproto->sflow || flow->in_port == OFPP_NONE) {<br>
+ if (!ofproto->sflow || flow->in_port.ofp_port == OFPP_NONE) {<br>
return 0;<br>
}<br>
<br>
@@ -739,7 +739,7 @@ compose_ipfix_action(const struct ofproto_dpif *ofproto,<br>
uint32_t probability;<br>
union user_action_cookie cookie;<br>
<br>
- if (!ofproto->ipfix || flow->in_port == OFPP_NONE) {<br>
+ if (!ofproto->ipfix || flow->in_port.ofp_port == OFPP_NONE) {<br>
return;<br>
}<br>
<br>
@@ -829,7 +829,7 @@ process_special(struct xlate_ctx *ctx, const struct flow *flow,<br>
}<br>
<br>
static void<br>
-compose_output_action__(struct xlate_ctx *ctx, uint16_t ofp_port,<br>
+compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port,<br>
bool check_stp)<br>
{<br>
const struct ofport_dpif *ofport = get_ofp_port(ctx->ofproto, ofp_port);<br>
@@ -837,7 +837,7 @@ compose_output_action__(struct xlate_ctx *ctx, uint16_t ofp_port,<br>
ovs_be16 flow_vlan_tci;<br>
uint32_t flow_skb_mark;<br>
uint8_t flow_nw_tos;<br>
- uint32_t out_port, odp_port;<br>
+ odp_port_t out_port, odp_port;<br>
uint8_t dscp;<br>
<br>
/* If 'struct flow' gets additional metadata, we'll need to zero it out<br>
@@ -866,7 +866,7 @@ compose_output_action__(struct xlate_ctx *ctx, uint16_t ofp_port,<br>
}<br>
<br>
ctx->ofproto = ofproto_dpif_cast(peer->up.ofproto);<br>
- flow->in_port = peer->up.ofp_port;<br>
+ flow->in_port.ofp_port = peer->up.ofp_port;<br>
flow->metadata = htonll(0);<br>
memset(&flow->tunnel, 0, sizeof flow->tunnel);<br>
memset(flow->regs, 0, sizeof flow->regs);<br>
@@ -877,13 +877,13 @@ compose_output_action__(struct xlate_ctx *ctx, uint16_t ofp_port,<br>
ctx->xout->slow = special;<br>
} else if (may_receive(peer, ctx)) {<br>
if (stp_forward_in_state(peer->stp_state)) {<br>
- xlate_table_action(ctx, flow->in_port, 0, true);<br>
+ xlate_table_action(ctx, flow->in_port.ofp_port, 0, true);<br>
} else {<br>
/* Forwarding is disabled by STP. Let OFPP_NORMAL and the<br>
* learning action look at the packet, then drop it. */<br>
struct flow old_base_flow = ctx->base_flow;<br>
size_t old_size = ctx->xout->odp_actions.size;<br>
- xlate_table_action(ctx, flow->in_port, 0, true);<br>
+ xlate_table_action(ctx, flow->in_port.ofp_port, 0, true);<br>
ctx->base_flow = old_base_flow;<br>
ctx->xout->odp_actions.size = old_size;<br>
}<br>
@@ -932,7 +932,7 @@ compose_output_action__(struct xlate_ctx *ctx, uint16_t ofp_port,<br>
&ctx->xout->odp_actions);<br>
flow->tunnel = flow_tnl; /* Restore tunnel metadata */<br>
} else {<br>
- uint16_t vlandev_port;<br>
+ ofp_port_t vlandev_port;<br>
odp_port = ofport->odp_port;<br>
vlandev_port = vsp_realdev_to_vlandev(ctx->ofproto, ofp_port,<br>
flow->vlan_tci);<br>
@@ -945,7 +945,8 @@ compose_output_action__(struct xlate_ctx *ctx, uint16_t ofp_port,<br>
flow->skb_mark &= ~IPSEC_MARK;<br>
}<br>
commit_odp_actions(flow, &ctx->base_flow, &ctx->xout->odp_actions);<br>
- nl_msg_put_u32(&ctx->xout->odp_actions, OVS_ACTION_ATTR_OUTPUT, out_port);<br>
+ nl_msg_put_u32(&ctx->xout->odp_actions, OVS_ACTION_ATTR_OUTPUT,<br>
+ odp_to_u32(out_port));<br>
<br>
ctx->sflow_odp_port = odp_port;<br>
ctx->sflow_n_outputs++;<br>
@@ -959,7 +960,7 @@ compose_output_action__(struct xlate_ctx *ctx, uint16_t ofp_port,<br>
}<br>
<br>
static void<br>
-compose_output_action(struct xlate_ctx *ctx, uint16_t ofp_port)<br>
+compose_output_action(struct xlate_ctx *ctx, ofp_port_t ofp_port)<br>
{<br>
compose_output_action__(ctx, ofp_port, true);<br>
}<br>
@@ -1008,17 +1009,17 @@ ctx_rule_hooks(struct xlate_ctx *ctx, struct rule_dpif *rule,<br>
<br>
static void<br>
xlate_table_action(struct xlate_ctx *ctx,<br>
- uint16_t in_port, uint8_t table_id, bool may_packet_in)<br>
+ ofp_port_t in_port, uint8_t table_id, bool may_packet_in)<br>
{<br>
if (ctx->recurse < MAX_RESUBMIT_RECURSION) {<br>
struct rule_dpif *rule;<br>
- uint16_t old_in_port = ctx->xin->flow.in_port;<br>
+ ofp_port_t old_in_port = ctx->xin->flow.in_port.ofp_port;<br>
uint8_t old_table_id = ctx->table_id;<br>
<br>
ctx->table_id = table_id;<br>
<br>
/* Look up a flow with 'in_port' as the input port. */<br>
- ctx->xin->flow.in_port = in_port;<br>
+ ctx->xin->flow.in_port.ofp_port = in_port;<br>
rule = rule_dpif_lookup_in_table(ctx->ofproto, &ctx->xin->flow,<br>
&ctx->xout->wc, table_id);<br>
<br>
@@ -1026,7 +1027,7 @@ xlate_table_action(struct xlate_ctx *ctx,<br>
<br>
/* Restore the original input port. Otherwise OFPP_NORMAL and<br>
* OFPP_IN_PORT will have surprising behavior. */<br>
- ctx->xin->flow.in_port = old_in_port;<br>
+ ctx->xin->flow.in_port.ofp_port = old_in_port;<br>
<br>
rule = ctx_rule_hooks(ctx, rule, may_packet_in);<br>
<br>
@@ -1054,12 +1055,12 @@ static void<br>
xlate_ofpact_resubmit(struct xlate_ctx *ctx,<br>
const struct ofpact_resubmit *resubmit)<br>
{<br>
- uint16_t in_port;<br>
+ ofp_port_t in_port;<br>
uint8_t table_id;<br>
<br>
in_port = resubmit->in_port;<br>
if (in_port == OFPP_IN_PORT) {<br>
- in_port = ctx->xin->flow.in_port;<br>
+ in_port = ctx->xin->flow.in_port.ofp_port;<br>
}<br>
<br>
table_id = resubmit->table_id;<br>
@@ -1076,9 +1077,9 @@ flood_packets(struct xlate_ctx *ctx, bool all)<br>
struct ofport_dpif *ofport;<br>
<br>
HMAP_FOR_EACH (ofport, up.hmap_node, &ctx->ofproto->up.ports) {<br>
- uint16_t ofp_port = ofport->up.ofp_port;<br>
+ ofp_port_t ofp_port = ofport->up.ofp_port;<br>
<br>
- if (ofp_port == ctx->xin->flow.in_port) {<br>
+ if (ofp_port == ctx->xin->flow.in_port.ofp_port) {<br>
continue;<br>
}<br>
<br>
@@ -1247,18 +1248,19 @@ compose_dec_mpls_ttl_action(struct xlate_ctx *ctx)<br>
<br>
static void<br>
xlate_output_action(struct xlate_ctx *ctx,<br>
- uint16_t port, uint16_t max_len, bool may_packet_in)<br>
+ ofp_port_t port, uint16_t max_len, bool may_packet_in)<br>
{<br>
- uint16_t prev_nf_output_iface = ctx->xout->nf_output_iface;<br>
+ ofp_port_t prev_nf_output_iface = ctx->xout->nf_output_iface;<br>
<br>
ctx->xout->nf_output_iface = NF_OUT_DROP;<br>
<br>
switch (port) {<br>
case OFPP_IN_PORT:<br>
- compose_output_action(ctx, ctx->xin->flow.in_port);<br>
+ compose_output_action(ctx, ctx->xin->flow.in_port.ofp_port);<br>
break;<br>
case OFPP_TABLE:<br>
- xlate_table_action(ctx, ctx->xin->flow.in_port, 0, may_packet_in);<br>
+ xlate_table_action(ctx, ctx->xin->flow.in_port.ofp_port,<br>
+ 0, may_packet_in);<br>
break;<br>
case OFPP_NORMAL:<br>
xlate_normal(ctx);<br>
@@ -1276,7 +1278,7 @@ xlate_output_action(struct xlate_ctx *ctx,<br>
break;<br>
case OFPP_LOCAL:<br>
default:<br>
- if (port != ctx->xin->flow.in_port) {<br>
+ if (port != ctx->xin->flow.in_port.ofp_port) {<br>
compose_output_action(ctx, port);<br>
} else {<br>
xlate_report(ctx, "skipping output to input port");<br>
@@ -1304,7 +1306,8 @@ xlate_output_reg_action(struct xlate_ctx *ctx,<br>
<br>
memset(&value, 0xff, sizeof value);<br>
mf_write_subfield_flow(&or->src, &value, &ctx->xout->wc.masks);<br>
- xlate_output_action(ctx, port, or->max_len, false);<br>
+ xlate_output_action(ctx, uint_to_ofp(port),<br>
+ or->max_len, false);<br>
}<br>
}<br>
<br>
@@ -1312,7 +1315,7 @@ static void<br>
xlate_enqueue_action(struct xlate_ctx *ctx,<br>
const struct ofpact_enqueue *enqueue)<br>
{<br>
- uint16_t ofp_port = enqueue->port;<br>
+ ofp_port_t ofp_port = enqueue->port;<br>
uint32_t queue_id = enqueue->queue;<br>
uint32_t flow_priority, priority;<br>
int error;<br>
@@ -1327,8 +1330,8 @@ xlate_enqueue_action(struct xlate_ctx *ctx,<br>
<br>
/* Check output port. */<br>
if (ofp_port == OFPP_IN_PORT) {<br>
- ofp_port = ctx->xin->flow.in_port;<br>
- } else if (ofp_port == ctx->xin->flow.in_port) {<br>
+ ofp_port = ctx->xin->flow.in_port.ofp_port;<br>
+ } else if (ofp_port == ctx->xin->flow.in_port.ofp_port) {<br>
return;<br>
}<br>
<br>
@@ -1361,7 +1364,7 @@ xlate_set_queue_action(struct xlate_ctx *ctx, uint32_t queue_id)<br>
}<br>
<br>
static bool<br>
-slave_enabled_cb(uint16_t ofp_port, void *ofproto_)<br>
+slave_enabled_cb(ofp_port_t ofp_port, void *ofproto_)<br>
{<br>
struct ofproto_dpif *ofproto = ofproto_;<br>
struct ofport_dpif *port;<br>
@@ -1386,12 +1389,12 @@ static void<br>
xlate_bundle_action(struct xlate_ctx *ctx,<br>
const struct ofpact_bundle *bundle)<br>
{<br>
- uint16_t port;<br>
+ ofp_port_t port;<br>
<br>
port = bundle_execute(bundle, &ctx->xin->flow, &ctx->xout->wc,<br>
slave_enabled_cb, ctx->ofproto);<br>
if (bundle->dst.field) {<br>
- nxm_reg_load(&bundle->dst, port, &ctx->xin->flow);<br>
+ nxm_reg_load(&bundle->dst, ofp_to_u16(port), &ctx->xin->flow);<br>
} else {<br>
xlate_output_action(ctx, port, 0, false);<br>
}<br>
@@ -1968,17 +1971,17 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout)<br>
}<br>
}<br>
<br>
- in_port = get_ofp_port(ctx.ofproto, flow->in_port);<br>
+ in_port = get_ofp_port(ctx.ofproto, flow->in_port.ofp_port);<br>
special = process_special(&ctx, flow, in_port, ctx.xin->packet);<br>
if (special) {<br>
ctx.xout->slow = special;<br>
} else {<br>
static struct vlog_rate_limit trace_rl = VLOG_RATE_LIMIT_INIT(1, 1);<br>
size_t sample_actions_len;<br>
- uint32_t local_odp_port;<br>
+ odp_port_t local_odp_port;<br>
<br>
- if (flow->in_port<br>
- != vsp_realdev_to_vlandev(ctx.ofproto, flow->in_port,<br>
+ if (flow->in_port.ofp_port<br>
+ != vsp_realdev_to_vlandev(ctx.ofproto, flow->in_port.ofp_port,<br>
flow->vlan_tci)) {<br>
ctx.base_flow.vlan_tci = 0;<br>
}<br>
diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h<br>
index 9ee9b33..f5f0cd0 100644<br>
--- a/ofproto/ofproto-dpif-xlate.h<br>
+++ b/ofproto/ofproto-dpif-xlate.h<br>
@@ -37,7 +37,7 @@ struct xlate_out {<br>
bool has_learn; /* Actions include NXAST_LEARN? */<br>
bool has_normal; /* Actions output to OFPP_NORMAL? */<br>
bool has_fin_timeout; /* Actions include NXAST_FIN_TIMEOUT? */<br>
- uint16_t nf_output_iface; /* Output interface index for NetFlow. */<br>
+ ofp_port_t nf_output_iface; /* Output interface index for NetFlow. */<br>
mirror_mask_t mirrors; /* Bitmap of associated mirrors. */<br>
<br>
uint64_t odp_actions_stub[256 / 8];<br>
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c<br>
index 194f5bd..d09318a 100644<br>
--- a/ofproto/ofproto-dpif.c<br>
+++ b/ofproto/ofproto-dpif.c<br>
@@ -277,17 +277,17 @@ struct priority_to_dscp {<br>
struct vlan_splinter {<br>
struct hmap_node realdev_vid_node;<br>
struct hmap_node vlandev_node;<br>
- uint16_t realdev_ofp_port;<br>
- uint16_t vlandev_ofp_port;<br>
+ ofp_port_t realdev_ofp_port;<br>
+ ofp_port_t vlandev_ofp_port;<br>
int vid;<br>
};<br>
<br>
static bool vsp_adjust_flow(const struct ofproto_dpif *, struct flow *);<br>
static void vsp_remove(struct ofport_dpif *);<br>
-static void vsp_add(struct ofport_dpif *, uint16_t realdev_ofp_port, int vid);<br>
+static void vsp_add(struct ofport_dpif *, ofp_port_t realdev_ofp_port, int vid);<br>
<br>
-static uint16_t odp_port_to_ofp_port(const struct ofproto_dpif *,<br>
- uint32_t odp_port);<br>
+static ofp_port_t odp_port_to_ofp_port(const struct ofproto_dpif *,<br>
+ odp_port_t odp_port);<br>
<br>
static struct ofport_dpif *<br>
ofport_dpif_cast(const struct ofport *ofport)<br>
@@ -395,7 +395,7 @@ static struct shash all_dpif_backers = SHASH_INITIALIZER(&all_dpif_backers);<br>
<br>
static void drop_key_clear(struct dpif_backer *);<br>
static struct ofport_dpif *<br>
-odp_port_to_ofport(const struct dpif_backer *, uint32_t odp_port);<br>
+odp_port_to_ofport(const struct dpif_backer *, odp_port_t odp_port);<br>
static void update_moving_averages(struct dpif_backer *backer);<br>
<br>
/* Defer flow mod completion until "ovs-appctl ofproto/unclog"? (Useful only<br>
@@ -419,7 +419,6 @@ static void send_netflow_active_timeouts(struct ofproto_dpif *);<br>
<br>
/* Utilities. */<br>
static int send_packet(const struct ofport_dpif *, struct ofpbuf *packet);<br>
-<br>
/* Global variables. */<br>
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);<br>
<br>
@@ -583,17 +582,19 @@ type_run(const char *type)<br>
} else {<br>
node = simap_find(&backer->tnl_backers, dp_port);<br>
if (!node) {<br>
- uint32_t odp_port = UINT32_MAX;<br>
+ odp_port_t odp_port = OVSP_NONE;<br>
<br>
if (!dpif_port_add(backer->dpif, iter->up.netdev,<br>
&odp_port)) {<br>
- simap_put(&backer->tnl_backers, dp_port, odp_port);<br>
+ simap_put(&backer->tnl_backers, dp_port,<br>
+ odp_to_u32(odp_port));<br>
node = simap_find(&backer->tnl_backers, dp_port);<br>
}<br>
}<br>
}<br>
<br>
- iter->odp_port = node ? node->data : OVSP_NONE;<br>
+ iter->odp_port = node ? uint_to_odp(node->data)<br>
+ : OVSP_NONE;<br>
if (tnl_port_reconfigure(&iter->up, iter->odp_port,<br>
&iter->tnl_port)) {<br>
backer->need_revalidate = REV_RECONFIGURE;<br>
@@ -602,7 +603,7 @@ type_run(const char *type)<br>
}<br>
<br>
SIMAP_FOR_EACH (node, &tmp_backers) {<br>
- dpif_port_del(backer->dpif, node->data);<br>
+ dpif_port_del(backer->dpif, uint_to_odp(node->data));<br>
}<br>
simap_destroy(&tmp_backers);<br>
<br>
@@ -876,7 +877,7 @@ close_dpif_backer(struct dpif_backer *backer)<br>
/* Datapath port slated for removal from datapath. */<br>
struct odp_garbage {<br>
struct list list_node;<br>
- uint32_t odp_port;<br>
+ odp_port_t odp_port;<br>
};<br>
<br>
static int<br>
@@ -1002,7 +1003,7 @@ construct(struct ofproto *ofproto_)<br>
{<br>
struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_);<br>
struct shash_node *node, *next;<br>
- int max_ports;<br>
+ odp_port_t max_ports;<br>
int error;<br>
int i;<br>
<br>
@@ -1012,7 +1013,8 @@ construct(struct ofproto *ofproto_)<br>
}<br>
<br>
max_ports = dpif_get_max_ports(ofproto->backer->dpif);<br>
- ofproto_init_max_ports(ofproto_, MIN(max_ports, OFPP_MAX));<br>
+ ofproto_init_max_ports(ofproto_, uint_to_ofp(MIN(odp_to_u32(max_ports),<br>
+ ofp_to_u16(OFPP_MAX))));<br>
<br>
ofproto->netflow = NULL;<br>
ofproto->sflow = NULL;<br>
@@ -1493,7 +1495,7 @@ port_construct(struct ofport *port_)<br>
}<br>
<br>
hmap_insert(&ofproto->backer->odp_to_ofport_map, &port->odp_port_node,<br>
- hash_int(port->odp_port, 0));<br>
+ hash_odp_port(port->odp_port, 0));<br>
}<br>
dpif_port_destroy(&dpif_port);<br>
<br>
@@ -2162,7 +2164,7 @@ bundle_del_port(struct ofport_dpif *port)<br>
}<br>
<br>
static bool<br>
-bundle_add_port(struct ofbundle *bundle, uint16_t ofp_port,<br>
+bundle_add_port(struct ofbundle *bundle, ofp_port_t ofp_port,<br>
struct lacp_slave_settings *lacp)<br>
{<br>
struct ofport_dpif *port;<br>
@@ -2805,14 +2807,14 @@ set_mac_table_config(struct ofproto *ofproto_, unsigned int idle_time,<br>
/* Ports. */<br>
<br>
struct ofport_dpif *<br>
-get_ofp_port(const struct ofproto_dpif *ofproto, uint16_t ofp_port)<br>
+get_ofp_port(const struct ofproto_dpif *ofproto, ofp_port_t ofp_port)<br>
{<br>
struct ofport *ofport = ofproto_get_port(&ofproto->up, ofp_port);<br>
return ofport ? ofport_dpif_cast(ofport) : NULL;<br>
}<br>
<br>
struct ofport_dpif *<br>
-get_odp_port(const struct ofproto_dpif *ofproto, uint32_t odp_port)<br>
+get_odp_port(const struct ofproto_dpif *ofproto, odp_port_t odp_port)<br>
{<br>
struct ofport_dpif *port = odp_port_to_ofport(ofproto->backer, odp_port);<br>
return port && &ofproto->up == port->up.ofproto ? port : NULL;<br>
@@ -2993,7 +2995,7 @@ port_add(struct ofproto *ofproto_, struct netdev *netdev)<br>
<br>
dp_port_name = netdev_vport_get_dpif_port(netdev, namebuf, sizeof namebuf);<br>
if (!dpif_port_exists(ofproto->backer->dpif, dp_port_name)) {<br>
- uint32_t port_no = UINT32_MAX;<br>
+ odp_port_t port_no = OVSP_NONE;<br>
int error;<br>
<br>
error = dpif_port_add(ofproto->backer->dpif, netdev, &port_no);<br>
@@ -3001,7 +3003,8 @@ port_add(struct ofproto *ofproto_, struct netdev *netdev)<br>
return error;<br>
}<br>
if (netdev_get_tunnel_config(netdev)) {<br>
- simap_put(&ofproto->backer->tnl_backers, dp_port_name, port_no);<br>
+ simap_put(&ofproto->backer->tnl_backers,<br>
+ dp_port_name, odp_to_u32(port_no));<br>
}<br>
}<br>
<br>
@@ -3014,7 +3017,7 @@ port_add(struct ofproto *ofproto_, struct netdev *netdev)<br>
}<br>
<br>
static int<br>
-port_del(struct ofproto *ofproto_, uint16_t ofp_port)<br>
+port_del(struct ofproto *ofproto_, ofp_port_t ofp_port)<br>
{<br>
struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_);<br>
struct ofport_dpif *ofport = get_ofp_port(ofproto, ofp_port);<br>
@@ -3260,8 +3263,8 @@ static void<br>
init_flow_miss_execute_op(struct flow_miss *miss, struct ofpbuf *packet,<br>
struct flow_miss_op *op)<br>
{<br>
- if (miss->flow.in_port<br>
- != vsp_realdev_to_vlandev(miss->ofproto, miss->flow.in_port,<br>
+ if (miss->flow.in_port.ofp_port<br>
+ != vsp_realdev_to_vlandev(miss->ofproto, miss->flow.in_port.ofp_port,<br>
miss->flow.vlan_tci)) {<br>
/* This packet was received on a VLAN splinter port. We<br>
* added a VLAN to the packet to make the packet resemble<br>
@@ -3566,7 +3569,7 @@ static int<br>
ofproto_receive(const struct dpif_backer *backer, struct ofpbuf *packet,<br>
const struct nlattr *key, size_t key_len,<br>
struct flow *flow, enum odp_key_fitness *fitnessp,<br>
- struct ofproto_dpif **ofproto, uint32_t *odp_in_port)<br>
+ struct ofproto_dpif **ofproto, odp_port_t *odp_in_port)<br>
{<br>
const struct ofport_dpif *port;<br>
enum odp_key_fitness fitness;<br>
@@ -3579,13 +3582,13 @@ ofproto_receive(const struct dpif_backer *backer, struct ofpbuf *packet,<br>
}<br>
<br>
if (odp_in_port) {<br>
- *odp_in_port = flow->in_port;<br>
+ *odp_in_port = flow->in_port.odp_port;<br>
}<br>
<br>
port = (tnl_port_should_receive(flow)<br>
? ofport_dpif_cast(tnl_port_receive(flow))<br>
- : odp_port_to_ofport(backer, flow->in_port));<br>
- flow->in_port = port ? port->up.ofp_port : OFPP_NONE;<br>
+ : odp_port_to_ofport(backer, flow->in_port.odp_port));<br>
+ flow->in_port.ofp_port = port ? port->up.ofp_port : OFPP_NONE;<br>
if (!port) {<br>
goto exit;<br>
}<br>
@@ -3660,7 +3663,7 @@ handle_miss_upcalls(struct dpif_backer *backer, struct dpif_upcall *upcalls,<br>
struct flow_miss *miss = &misses[n_misses];<br>
struct flow_miss *existing_miss;<br>
struct ofproto_dpif *ofproto;<br>
- uint32_t odp_in_port;<br>
+ odp_port_t odp_in_port;<br>
struct flow flow;<br>
uint32_t hash;<br>
int error;<br>
@@ -3699,7 +3702,7 @@ handle_miss_upcalls(struct dpif_backer *backer, struct dpif_upcall *upcalls,<br>
<br>
ofproto->n_missed++;<br>
flow_extract(upcall->packet, flow.skb_priority, flow.skb_mark,<br>
- &flow.tunnel, flow.in_port, &miss->flow);<br>
+ &flow.tunnel, &flow.in_port, &miss->flow);<br>
<br>
/* Add other packets to a to-do list. */<br>
hash = flow_hash(&miss->flow, 0);<br>
@@ -3803,7 +3806,7 @@ handle_sflow_upcall(struct dpif_backer *backer,<br>
struct ofproto_dpif *ofproto;<br>
union user_action_cookie cookie;<br>
struct flow flow;<br>
- uint32_t odp_in_port;<br>
+ odp_port_t odp_in_port;<br>
<br>
if (ofproto_receive(backer, upcall->packet, upcall->key, upcall->key_len,<br>
&flow, NULL, &ofproto, &odp_in_port)<br>
@@ -4347,7 +4350,7 @@ execute_odp_actions(struct ofproto_dpif *ofproto, const struct flow *flow,<br>
<br>
ofpbuf_use_stack(&key, &keybuf, sizeof keybuf);<br>
odp_flow_key_from_flow(&key, flow,<br>
- ofp_port_to_odp_port(ofproto, flow->in_port));<br>
+ ofp_port_to_odp_port(ofproto, flow->in_port.ofp_port));<br>
<br>
error = dpif_execute(ofproto->backer->dpif, key.data, key.size,<br>
odp_actions, actions_len, packet);<br>
@@ -4445,7 +4448,8 @@ facet_account(struct facet *facet)<br>
<br>
switch (nl_attr_type(a)) {<br>
case OVS_ACTION_ATTR_OUTPUT:<br>
- port = get_odp_port(ofproto, nl_attr_get_u32(a));<br>
+ port = get_odp_port(ofproto,<br>
+ uint_to_odp(nl_attr_get_u32(a)));<br>
if (port && port->bundle && port->bundle->bond) {<br>
bond_account(port->bundle->bond, &facet->flow,<br>
vlan_tci_to_vid(vlan_tci), n_bytes);<br>
@@ -4768,7 +4772,7 @@ facet_push_stats(struct facet *facet, bool may_learn)<br>
facet->prev_byte_count = facet->byte_count;<br>
facet->prev_used = facet->used;<br>
<br>
- in_port = get_ofp_port(ofproto, facet->flow.in_port);<br>
+ in_port = get_ofp_port(ofproto, facet->flow.in_port.ofp_port);<br>
if (in_port && in_port->tnl_port) {<br>
netdev_vport_inc_rx(in_port->up.netdev, &stats);<br>
}<br>
@@ -5122,9 +5126,10 @@ rule_dpif_miss_rule(struct ofproto_dpif *ofproto, const struct flow *flow)<br>
{<br>
struct ofport_dpif *port;<br>
<br>
- port = get_ofp_port(ofproto, flow->in_port);<br>
+ port = get_ofp_port(ofproto, flow->in_port.ofp_port);<br>
if (!port) {<br>
- VLOG_WARN_RL(&rl, "packet-in on unknown port %"PRIu16, flow->in_port);<br>
+ VLOG_WARN_RL(&rl, "packet-in on unknown OpenFlow port %"PRIu16,<br>
+ flow->in_port.ofp_port);<br>
return ofproto->miss_rule;<br>
}<br>
<br>
@@ -5296,13 +5301,15 @@ send_packet(const struct ofport_dpif *ofport, struct ofpbuf *packet)<br>
struct xlate_out xout;<br>
struct xlate_in xin;<br>
struct flow flow;<br>
+ union flow_in_port in_port_;<br>
int error;<br>
<br>
ofpbuf_use_stub(&odp_actions, odp_actions_stub, sizeof odp_actions_stub);<br>
ofpbuf_use_stack(&key, &keybuf, sizeof keybuf);<br>
<br>
/* Use OFPP_NONE as the in_port to avoid special packet processing. */<br>
- flow_extract(packet, 0, 0, NULL, OFPP_NONE, &flow);<br>
+ in_port_.ofp_port = OFPP_NONE;<br>
+ flow_extract(packet, 0, 0, NULL, &in_port_, &flow);<br>
odp_flow_key_from_flow(&key, &flow, ofp_port_to_odp_port(ofproto,<br>
OFPP_LOCAL));<br>
dpif_flow_stats_extract(&flow, packet, time_msec(), &stats);<br>
@@ -5359,7 +5366,8 @@ compose_slow_path(const struct ofproto_dpif *ofproto, const struct flow *flow,<br>
<br>
ofpbuf_use_stack(&buf, stub, stub_size);<br>
if (slow & (SLOW_CFM | SLOW_BFD | SLOW_LACP | SLOW_STP)) {<br>
- uint32_t pid = dpif_port_get_pid(ofproto->backer->dpif, UINT32_MAX);<br>
+ uint32_t pid = dpif_port_get_pid(ofproto->backer->dpif,<br>
+ OVSP_NONE);<br>
odp_put_userspace_action(pid, &cookie, sizeof cookie.slow_path, &buf);<br>
} else {<br>
put_userspace_action(ofproto, &buf, flow, &cookie,<br>
@@ -5379,7 +5387,8 @@ put_userspace_action(const struct ofproto_dpif *ofproto,<br>
uint32_t pid;<br>
<br>
pid = dpif_port_get_pid(ofproto->backer->dpif,<br>
- ofp_port_to_odp_port(ofproto, flow->in_port));<br>
+ ofp_port_to_odp_port(ofproto,<br>
+ flow->in_port.ofp_port));<br>
<br>
return odp_put_userspace_action(pid, cookie, cookie_size, odp_actions);<br>
}<br>
@@ -5555,7 +5564,8 @@ packet_out(struct ofproto *ofproto_, struct ofpbuf *packet,<br>
<br>
ofpbuf_use_stack(&key, &keybuf, sizeof keybuf);<br>
odp_flow_key_from_flow(&key, flow,<br>
- ofp_port_to_odp_port(ofproto, flow->in_port));<br>
+ ofp_port_to_odp_port(ofproto,<br>
+ flow->in_port.ofp_port));<br>
<br>
dpif_flow_stats_extract(flow, packet, time_msec(), &stats);<br>
<br>
@@ -5887,6 +5897,9 @@ ofproto_unixctl_trace(struct unixctl_conn *conn, int argc, const char *argv[],<br>
if (!packet->size) {<br>
flow_compose(packet, &flow);<br>
} else {<br>
+ union flow_in_port in_port_;<br>
+<br>
+ in_port_ = flow.in_port;<br>
ds_put_cstr(&result, "Packet: ");<br>
s = ofp_packet_to_string(packet->data, packet->size);<br>
ds_put_cstr(&result, s);<br>
@@ -5895,7 +5908,7 @@ ofproto_unixctl_trace(struct unixctl_conn *conn, int argc, const char *argv[],<br>
/* Use the metadata from the flow and the packet argument<br>
* to reconstruct the flow. */<br>
flow_extract(packet, flow.skb_priority, flow.skb_mark, NULL,<br>
- flow.in_port, &flow);<br>
+ &in_port_, &flow);<br>
}<br>
}<br>
<br>
@@ -6160,7 +6173,7 @@ dpif_show_backer(const struct dpif_backer *backer, struct ds *ds)<br>
const struct shash_node *node = ports[j];<br>
struct ofport *ofport = node->data;<br>
struct smap config;<br>
- uint32_t odp_port;<br>
+ odp_port_t odp_port;<br>
<br>
ds_put_format(ds, "\t\t%s %u/", netdev_get_name(ofport->netdev),<br>
ofport->ofp_port);<br>
@@ -6393,7 +6406,7 @@ ofproto_dpif_unixctl_init(void)<br>
* widespread use, we will delete these interfaces. */<br>
<br>
static int<br>
-set_realdev(struct ofport *ofport_, uint16_t realdev_ofp_port, int vid)<br>
+set_realdev(struct ofport *ofport_, ofp_port_t realdev_ofp_port, int vid)<br>
{<br>
struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofport_->ofproto);<br>
struct ofport_dpif *ofport = ofport_dpif_cast(ofport_);<br>
@@ -6425,9 +6438,9 @@ set_realdev(struct ofport *ofport_, uint16_t realdev_ofp_port, int vid)<br>
}<br>
<br>
static uint32_t<br>
-hash_realdev_vid(uint16_t realdev_ofp_port, int vid)<br>
+hash_realdev_vid(ofp_port_t realdev_ofp_port, int vid)<br>
{<br>
- return hash_2words(realdev_ofp_port, vid);<br>
+ return hash_2words(ofp_to_u16(realdev_ofp_port), vid);<br>
}<br>
<br>
/* Returns the OFP port number of the Linux VLAN device that corresponds to<br>
@@ -6437,9 +6450,9 @@ hash_realdev_vid(uint16_t realdev_ofp_port, int vid)<br>
*<br>
* Unless VLAN splinters are enabled for port 'realdev_ofp_port', this<br>
* function just returns its 'realdev_ofp_port' argument. */<br>
-uint16_t<br>
+ofp_port_t<br>
vsp_realdev_to_vlandev(const struct ofproto_dpif *ofproto,<br>
- uint16_t realdev_ofp_port, ovs_be16 vlan_tci)<br>
+ ofp_port_t realdev_ofp_port, ovs_be16 vlan_tci)<br>
{<br>
if (!hmap_is_empty(&ofproto->realdev_vid_map)) {<br>
int vid = vlan_tci_to_vid(vlan_tci);<br>
@@ -6458,11 +6471,12 @@ vsp_realdev_to_vlandev(const struct ofproto_dpif *ofproto,<br>
}<br>
<br>
static struct vlan_splinter *<br>
-vlandev_find(const struct ofproto_dpif *ofproto, uint16_t vlandev_ofp_port)<br>
+vlandev_find(const struct ofproto_dpif *ofproto, ofp_port_t vlandev_ofp_port)<br>
{<br>
struct vlan_splinter *vsp;<br>
<br>
- HMAP_FOR_EACH_WITH_HASH (vsp, vlandev_node, hash_int(vlandev_ofp_port, 0),<br>
+ HMAP_FOR_EACH_WITH_HASH (vsp, vlandev_node,<br>
+ hash_ofp_port(vlandev_ofp_port, 0),<br>
&ofproto->vlandev_map) {<br>
if (vsp->vlandev_ofp_port == vlandev_ofp_port) {<br>
return vsp;<br>
@@ -6481,9 +6495,9 @@ vlandev_find(const struct ofproto_dpif *ofproto, uint16_t vlandev_ofp_port)<br>
* Returns 0 and does not modify '*vid' if 'vlandev_ofp_port' is not a Linux<br>
* VLAN device. Unless VLAN splinters are enabled, this is what this function<br>
* always does.*/<br>
-static uint16_t<br>
+static ofp_port_t<br>
vsp_vlandev_to_realdev(const struct ofproto_dpif *ofproto,<br>
- uint16_t vlandev_ofp_port, int *vid)<br>
+ ofp_port_t vlandev_ofp_port, int *vid)<br>
{<br>
if (!hmap_is_empty(&ofproto->vlandev_map)) {<br>
const struct vlan_splinter *vsp;<br>
@@ -6508,17 +6522,17 @@ vsp_vlandev_to_realdev(const struct ofproto_dpif *ofproto,<br>
static bool<br>
vsp_adjust_flow(const struct ofproto_dpif *ofproto, struct flow *flow)<br>
{<br>
- uint16_t realdev;<br>
+ ofp_port_t realdev;<br>
int vid;<br>
<br>
- realdev = vsp_vlandev_to_realdev(ofproto, flow->in_port, &vid);<br>
+ realdev = vsp_vlandev_to_realdev(ofproto, flow->in_port.ofp_port, &vid);<br>
if (!realdev) {<br>
return false;<br>
}<br>
<br>
/* Cause the flow to be processed as if it came in on the real device with<br>
* the VLAN device's VLAN ID. */<br>
- flow->in_port = realdev;<br>
+ flow->in_port.ofp_port = realdev;<br>
flow->vlan_tci = htons((vid & VLAN_VID_MASK) | VLAN_CFI);<br>
return true;<br>
}<br>
@@ -6542,7 +6556,7 @@ vsp_remove(struct ofport_dpif *port)<br>
}<br>
<br>
static void<br>
-vsp_add(struct ofport_dpif *port, uint16_t realdev_ofp_port, int vid)<br>
+vsp_add(struct ofport_dpif *port, ofp_port_t realdev_ofp_port, int vid)<br>
{<br>
struct ofproto_dpif *ofproto = ofproto_dpif_cast(port->up.ofproto);<br>
<br>
@@ -6553,7 +6567,7 @@ vsp_add(struct ofport_dpif *port, uint16_t realdev_ofp_port, int vid)<br>
<br>
vsp = xmalloc(sizeof *vsp);<br>
hmap_insert(&ofproto->vlandev_map, &vsp->vlandev_node,<br>
- hash_int(port->up.ofp_port, 0));<br>
+ hash_ofp_port(port->up.ofp_port, 0));<br>
hmap_insert(&ofproto->realdev_vid_map, &vsp->realdev_vid_node,<br>
hash_realdev_vid(realdev_ofp_port, vid));<br>
vsp->realdev_ofp_port = realdev_ofp_port;<br>
@@ -6566,20 +6580,20 @@ vsp_add(struct ofport_dpif *port, uint16_t realdev_ofp_port, int vid)<br>
}<br>
}<br>
<br>
-uint32_t<br>
-ofp_port_to_odp_port(const struct ofproto_dpif *ofproto, uint16_t ofp_port)<br>
+odp_port_t<br>
+ofp_port_to_odp_port(const struct ofproto_dpif *ofproto, ofp_port_t ofp_port)<br>
{<br>
const struct ofport_dpif *ofport = get_ofp_port(ofproto, ofp_port);<br>
return ofport ? ofport->odp_port : OVSP_NONE;<br>
}<br>
<br>
static struct ofport_dpif *<br>
-odp_port_to_ofport(const struct dpif_backer *backer, uint32_t odp_port)<br>
+odp_port_to_ofport(const struct dpif_backer *backer, odp_port_t odp_port)<br>
{<br>
struct ofport_dpif *port;<br>
<br>
HMAP_FOR_EACH_IN_BUCKET (port, odp_port_node,<br>
- hash_int(odp_port, 0),<br>
+ hash_odp_port(odp_port, 0),<br>
&backer->odp_to_ofport_map) {<br>
if (port->odp_port == odp_port) {<br>
return port;<br>
@@ -6589,8 +6603,8 @@ odp_port_to_ofport(const struct dpif_backer *backer, uint32_t odp_port)<br>
return NULL;<br>
}<br>
<br>
-static uint16_t<br>
-odp_port_to_ofp_port(const struct ofproto_dpif *ofproto, uint32_t odp_port)<br>
+static ofp_port_t<br>
+odp_port_to_ofp_port(const struct ofproto_dpif *ofproto, odp_port_t odp_port)<br>
{<br>
struct ofport_dpif *port;<br>
<br>
diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h<br>
index 3852fa8..8b38251 100644<br>
--- a/ofproto/ofproto-dpif.h<br>
+++ b/ofproto/ofproto-dpif.h<br>
@@ -127,7 +127,7 @@ struct ofport_dpif {<br>
struct hmap_node odp_port_node; /* In dpif_backer's "odp_to_ofport_map". */<br>
struct ofport up;<br>
<br>
- uint32_t odp_port;<br>
+ odp_port_t odp_port;<br>
struct ofbundle *bundle; /* Bundle that contains this port, if any. */<br>
struct list bundle_node; /* In struct ofbundle's "ports" list. */<br>
struct cfm *cfm; /* Connectivity Fault Management, if any. */<br>
@@ -150,7 +150,7 @@ struct ofport_dpif {<br>
* drivers in old versions of Linux that do not properly support VLANs when<br>
* VLAN devices are not used. When broken device drivers are no longer in<br>
* widespread use, we will delete these interfaces. */<br>
- uint16_t realdev_ofp_port;<br>
+ ofp_port_t realdev_ofp_port;<br>
int vlandev_vid;<br>
};<br>
<br>
@@ -227,14 +227,15 @@ mirror_mask_ffs(mirror_mask_t mask)<br>
}<br>
<br>
struct ofport_dpif *get_ofp_port(const struct ofproto_dpif *,<br>
- uint16_t ofp_port);<br>
+ ofp_port_t ofp_port);<br>
<br>
struct ofport_dpif *get_odp_port(const struct ofproto_dpif *,<br>
- uint32_t odp_port);<br>
+ odp_port_t odp_port);<br>
<br>
struct ofport_dpif *ofport_get_peer(const struct ofport_dpif *);<br>
<br>
-uint32_t ofp_port_to_odp_port(const struct ofproto_dpif *, uint16_t ofp_port);<br>
+odp_port_t ofp_port_to_odp_port(const struct ofproto_dpif *,<br>
+ ofp_port_t ofp_port);<br>
<br>
struct rule_dpif *rule_dpif_lookup_in_table(struct ofproto_dpif *,<br>
const struct flow *,<br>
@@ -261,9 +262,9 @@ bool stp_should_process_flow(const struct flow *, struct flow_wildcards *);<br>
void stp_process_packet(const struct ofport_dpif *,<br>
const struct ofpbuf *packet);<br>
<br>
-uint16_t vsp_realdev_to_vlandev(const struct ofproto_dpif *,<br>
- uint16_t realdev_ofp_port,<br>
- ovs_be16 vlan_tci);<br>
+ofp_port_t vsp_realdev_to_vlandev(const struct ofproto_dpif *,<br>
+ ofp_port_t realdev_ofp_port,<br>
+ ovs_be16 vlan_tci);<br>
<br>
bool ofproto_dpif_dscp_from_priority(const struct ofport_dpif *,<br>
uint32_t priority, uint8_t *dscp);<br>
diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h<br>
index 23d9180..93b6025 100644<br>
--- a/ofproto/ofproto-provider.h<br>
+++ b/ofproto/ofproto-provider.h<br>
@@ -62,8 +62,8 @@ struct ofproto {<br>
struct shash port_by_name;<br>
unsigned long *ofp_port_ids;/* Bitmap of used OpenFlow port numbers. */<br>
struct simap ofp_requests; /* OpenFlow port number requests. */<br>
- uint16_t alloc_port_no; /* Last allocated OpenFlow port number. */<br>
- uint16_t max_ports; /* Max possible OpenFlow port num, plus one. */<br>
+ ofp_port_t alloc_port_no; /* Last allocated OpenFlow port number. */<br>
+ ofp_port_t max_ports; /* Max possible OpenFlow port num, plus one. */<br>
<br>
/* Flow tables. */<br>
struct oftable *tables;<br>
@@ -100,10 +100,10 @@ struct ofproto {<br>
};<br>
<br>
void ofproto_init_tables(struct ofproto *, int n_tables);<br>
-void ofproto_init_max_ports(struct ofproto *, uint16_t max_ports);<br>
+void ofproto_init_max_ports(struct ofproto *, ofp_port_t max_ports);<br>
<br>
struct ofproto *ofproto_lookup(const char *name);<br>
-struct ofport *ofproto_get_port(const struct ofproto *, uint16_t ofp_port);<br>
+struct ofport *ofproto_get_port(const struct ofproto *, ofp_port_t ofp_port);<br>
<br>
/* An OpenFlow port within a "struct ofproto".<br>
*<br>
@@ -114,7 +114,7 @@ struct ofport {<br>
struct ofproto *ofproto; /* The ofproto that contains this port. */<br>
struct netdev *netdev;<br>
struct ofputil_phy_port pp;<br>
- uint16_t ofp_port; /* OpenFlow port number. */<br>
+ ofp_port_t ofp_port; /* OpenFlow port number. */<br>
unsigned int change_seq;<br>
long long int created; /* Time created, in msec. */<br>
int mtu;<br>
@@ -244,12 +244,12 @@ void ofproto_rule_update_used(struct rule *, long long int used);<br>
void ofproto_rule_expire(struct rule *, uint8_t reason);<br>
void ofproto_rule_destroy(struct rule *);<br>
<br>
-bool ofproto_rule_has_out_port(const struct rule *, uint16_t out_port);<br>
+bool ofproto_rule_has_out_port(const struct rule *, ofp_port_t out_port);<br>
<br>
void ofoperation_complete(struct ofoperation *, enum ofperr);<br>
struct rule *ofoperation_get_victim(struct ofoperation *);<br>
<br>
-bool ofoperation_has_out_port(const struct ofoperation *, uint16_t out_port);<br>
+bool ofoperation_has_out_port(const struct ofoperation *, ofp_port_t out_port);<br>
<br>
bool ofproto_rule_is_hidden(const struct rule *);<br>
<br>
@@ -690,7 +690,7 @@ struct ofproto_class {<br>
* It doesn't matter whether the new port will be returned by a later call<br>
* to ->port_poll(); the implementation may do whatever is more<br>
* convenient. */<br>
- int (*port_del)(struct ofproto *ofproto, uint16_t ofp_port);<br>
+ int (*port_del)(struct ofproto *ofproto, ofp_port_t ofp_port);<br>
<br>
/* Get port stats */<br>
int (*port_get_stats)(const struct ofport *port,<br>
@@ -1316,7 +1316,7 @@ struct ofproto_class {<br>
* This function should be NULL if a an implementation does not support<br>
* it. */<br>
int (*set_realdev)(struct ofport *ofport,<br>
- uint16_t realdev_ofp_port, int vid);<br>
+ ofp_port_t realdev_ofp_port, int vid);<br>
};<br>
<br>
extern const struct ofproto_class ofproto_dpif_class;<br>
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c<br>
index 7f9a88f..22187e9 100644<br>
--- a/ofproto/ofproto.c<br>
+++ b/ofproto/ofproto.c<br>
@@ -448,7 +448,7 @@ ofproto_create(const char *datapath_name, const char *datapath_type,<br>
<br>
/* The "max_ports" member should have been set by ->construct(ofproto).<br>
* Port 0 is not a valid OpenFlow port, so mark that as unavailable. */<br>
- ofproto->ofp_port_ids = bitmap_allocate(ofproto->max_ports);<br>
+ ofproto->ofp_port_ids = bitmap_allocate(ofp_to_u16(ofproto->max_ports));<br>
bitmap_set1(ofproto->ofp_port_ids, 0);<br>
<br>
/* Check that hidden tables, if any, are at the end. */<br>
@@ -497,9 +497,9 @@ ofproto_init_tables(struct ofproto *ofproto, int n_tables)<br>
* Reserved ports numbered OFPP_MAX and higher are special and not subject to<br>
* the 'max_ports' restriction. */<br>
void<br>
-ofproto_init_max_ports(struct ofproto *ofproto, uint16_t max_ports)<br>
+ofproto_init_max_ports(struct ofproto *ofproto, ofp_port_t max_ports)<br>
{<br>
- ovs_assert(max_ports <= OFPP_MAX);<br>
+ ovs_assert(ofp_to_u16(max_ports) <= ofp_to_u16(OFPP_MAX));<br>
ofproto->max_ports = max_ports;<br>
}<br>
<br>
@@ -706,7 +706,7 @@ ofproto_get_stp_status(struct ofproto *ofproto,<br>
*<br>
* Returns 0 if successful, otherwise a positive errno value.*/<br>
int<br>
-ofproto_port_set_stp(struct ofproto *ofproto, uint16_t ofp_port,<br>
+ofproto_port_set_stp(struct ofproto *ofproto, ofp_port_t ofp_port,<br>
const struct ofproto_port_stp_settings *s)<br>
{<br>
struct ofport *ofport = ofproto_get_port(ofproto, ofp_port);<br>
@@ -727,7 +727,7 @@ ofproto_port_set_stp(struct ofproto *ofproto, uint16_t ofp_port,<br>
*<br>
* Returns 0 if successful, otherwise a positive errno value.*/<br>
int<br>
-ofproto_port_get_stp_status(struct ofproto *ofproto, uint16_t ofp_port,<br>
+ofproto_port_get_stp_status(struct ofproto *ofproto, ofp_port_t ofp_port,<br>
struct ofproto_port_stp_status *s)<br>
{<br>
struct ofport *ofport = ofproto_get_port(ofproto, ofp_port);<br>
@@ -752,7 +752,7 @@ ofproto_port_get_stp_status(struct ofproto *ofproto, uint16_t ofp_port,<br>
*<br>
* Returns 0 if successful, otherwise a positive errno value. */<br>
int<br>
-ofproto_port_set_queues(struct ofproto *ofproto, uint16_t ofp_port,<br>
+ofproto_port_set_queues(struct ofproto *ofproto, ofp_port_t ofp_port,<br>
const struct ofproto_port_queue *queues,<br>
size_t n_queues)<br>
{<br>
@@ -773,7 +773,7 @@ ofproto_port_set_queues(struct ofproto *ofproto, uint16_t ofp_port,<br>
<br>
/* Clears the CFM configuration from 'ofp_port' on 'ofproto'. */<br>
void<br>
-ofproto_port_clear_cfm(struct ofproto *ofproto, uint16_t ofp_port)<br>
+ofproto_port_clear_cfm(struct ofproto *ofproto, ofp_port_t ofp_port)<br>
{<br>
struct ofport *ofport = ofproto_get_port(ofproto, ofp_port);<br>
if (ofport && ofproto->ofproto_class->set_cfm) {<br>
@@ -788,7 +788,7 @@ ofproto_port_clear_cfm(struct ofproto *ofproto, uint16_t ofp_port)<br>
*<br>
* This function has no effect if 'ofproto' does not have a port 'ofp_port'. */<br>
void<br>
-ofproto_port_set_cfm(struct ofproto *ofproto, uint16_t ofp_port,<br>
+ofproto_port_set_cfm(struct ofproto *ofproto, ofp_port_t ofp_port,<br>
const struct cfm_settings *s)<br>
{<br>
struct ofport *ofport;<br>
@@ -817,7 +817,7 @@ ofproto_port_set_cfm(struct ofproto *ofproto, uint16_t ofp_port,<br>
/* Configures BFD on 'ofp_port' in 'ofproto'. This function has no effect if<br>
* 'ofproto' does not have a port 'ofp_port'. */<br>
void<br>
-ofproto_port_set_bfd(struct ofproto *ofproto, uint16_t ofp_port,<br>
+ofproto_port_set_bfd(struct ofproto *ofproto, ofp_port_t ofp_port,<br>
const struct smap *cfg)<br>
{<br>
struct ofport *ofport;<br>
@@ -845,7 +845,7 @@ ofproto_port_set_bfd(struct ofproto *ofproto, uint16_t ofp_port,<br>
* OVS database. Has no effect if 'ofp_port' is not na OpenFlow port in<br>
* 'ofproto'. */<br>
int<br>
-ofproto_port_get_bfd_status(struct ofproto *ofproto, uint16_t ofp_port,<br>
+ofproto_port_get_bfd_status(struct ofproto *ofproto, ofp_port_t ofp_port,<br>
struct smap *status)<br>
{<br>
struct ofport *ofport = ofproto_get_port(ofproto, ofp_port);<br>
@@ -859,7 +859,7 @@ ofproto_port_get_bfd_status(struct ofproto *ofproto, uint16_t ofp_port,<br>
* 0 if LACP partner information is not current (generally indicating a<br>
* connectivity problem), or -1 if LACP is not enabled on 'ofp_port'. */<br>
int<br>
-ofproto_port_is_lacp_current(struct ofproto *ofproto, uint16_t ofp_port)<br>
+ofproto_port_is_lacp_current(struct ofproto *ofproto, ofp_port_t ofp_port)<br>
{<br>
struct ofport *ofport = ofproto_get_port(ofproto, ofp_port);<br>
return (ofport && ofproto->ofproto_class->port_is_lacp_current<br>
@@ -1496,16 +1496,17 @@ ofproto_port_open_type(const char *datapath_type, const char *port_type)<br>
* 'ofp_portp' is non-null). */<br>
int<br>
ofproto_port_add(struct ofproto *ofproto, struct netdev *netdev,<br>
- uint16_t *ofp_portp)<br>
+ ofp_port_t *ofp_portp)<br>
{<br>
- uint16_t ofp_port = ofp_portp ? *ofp_portp : OFPP_NONE;<br>
+ ofp_port_t ofp_port = ofp_portp ? *ofp_portp : OFPP_NONE;<br>
int error;<br>
<br>
error = ofproto->ofproto_class->port_add(ofproto, netdev);<br>
if (!error) {<br>
const char *netdev_name = netdev_get_name(netdev);<br>
<br>
- simap_put(&ofproto->ofp_requests, netdev_name, ofp_port);<br>
+ simap_put(&ofproto->ofp_requests, netdev_name,<br>
+ ofp_to_u16(ofp_port));<br>
update_port(ofproto, netdev_name);<br>
}<br>
if (ofp_portp) {<br>
@@ -1541,7 +1542,7 @@ ofproto_port_query_by_name(const struct ofproto *ofproto, const char *devname,<br>
/* Deletes port number 'ofp_port' from the datapath for 'ofproto'.<br>
* Returns 0 if successful, otherwise a positive errno. */<br>
int<br>
-ofproto_port_del(struct ofproto *ofproto, uint16_t ofp_port)<br>
+ofproto_port_del(struct ofproto *ofproto, ofp_port_t ofp_port)<br>
{<br>
struct ofport *ofport = ofproto_get_port(ofproto, ofp_port);<br>
const char *name = ofport ? netdev_get_name(ofport->netdev) : "<unknown>";<br>
@@ -1678,26 +1679,28 @@ reinit_ports(struct ofproto *p)<br>
sset_destroy(&devnames);<br>
}<br>
<br>
-static uint16_t<br>
+static ofp_port_t<br>
alloc_ofp_port(struct ofproto *ofproto, const char *netdev_name)<br>
{<br>
- uint16_t ofp_port;<br>
- uint16_t end_port_no = ofproto->alloc_port_no;<br>
+ ofp_port_t ofp_port;<br>
+ ofp_port_t end_port_no = ofproto->alloc_port_no;<br>
<br>
- ofp_port = simap_get(&ofproto->ofp_requests, netdev_name);<br>
+ ofp_port = uint_to_ofp(simap_get(&ofproto->ofp_requests, netdev_name));<br>
ofp_port = ofp_port ? ofp_port : OFPP_NONE;<br>
<br>
- if (ofp_port >= ofproto->max_ports<br>
- || bitmap_is_set(ofproto->ofp_port_ids, ofp_port)) {<br>
+ if (ofp_to_u16(ofp_port) >= ofp_to_u16(ofproto->max_ports)<br>
+ || bitmap_is_set(ofproto->ofp_port_ids, ofp_to_u16(ofp_port))) {<br>
/* Search for a free OpenFlow port number. We try not to<br>
* immediately reuse them to prevent problems due to old<br>
* flows. */<br>
for (;;) {<br>
- if (++ofproto->alloc_port_no >= ofproto->max_ports) {<br>
+ ofp_port_increment(&(ofproto->alloc_port_no), 1);<br>
+ if (ofp_to_u16(ofproto->alloc_port_no)<br>
+ >= ofp_to_u16(ofproto->max_ports)) {<br>
ofproto->alloc_port_no = 0;<br>
}<br>
if (!bitmap_is_set(ofproto->ofp_port_ids,<br>
- ofproto->alloc_port_no)) {<br>
+ ofp_to_u16(ofproto->alloc_port_no))) {<br>
ofp_port = ofproto->alloc_port_no;<br>
break;<br>
}<br>
@@ -1706,15 +1709,15 @@ alloc_ofp_port(struct ofproto *ofproto, const char *netdev_name)<br>
}<br>
}<br>
}<br>
- bitmap_set1(ofproto->ofp_port_ids, ofp_port);<br>
+ bitmap_set1(ofproto->ofp_port_ids, ofp_to_u16(ofp_port));<br>
return ofp_port;<br>
}<br>
<br>
static void<br>
-dealloc_ofp_port(const struct ofproto *ofproto, uint16_t ofp_port)<br>
+dealloc_ofp_port(const struct ofproto *ofproto, ofp_port_t ofp_port)<br>
{<br>
- if (ofp_port < ofproto->max_ports) {<br>
- bitmap_set0(ofproto->ofp_port_ids, ofp_port);<br>
+ if (ofp_to_u16(ofp_port) < ofp_to_u16(ofproto->max_ports)) {<br>
+ bitmap_set0(ofproto->ofp_port_ids, ofp_to_u16(ofp_port));<br>
}<br>
}<br>
<br>
@@ -1805,7 +1808,8 @@ ofport_install(struct ofproto *p,<br>
ofport->created = time_msec();<br>
<br>
/* Add port to 'p'. */<br>
- hmap_insert(&p->ports, &ofport->hmap_node, hash_int(ofport->ofp_port, 0));<br>
+ hmap_insert(&p->ports, &ofport->hmap_node,<br>
+ hash_ofp_port(ofport->ofp_port, 0));<br>
shash_add(&p->port_by_name, netdev_name, ofport);<br>
<br>
update_mtu(p, ofport);<br>
@@ -1881,7 +1885,7 @@ ofproto_port_set_state(struct ofport *port, enum ofputil_port_state state)<br>
}<br>
<br>
void<br>
-ofproto_port_unregister(struct ofproto *ofproto, uint16_t ofp_port)<br>
+ofproto_port_unregister(struct ofproto *ofproto, ofp_port_t ofp_port)<br>
{<br>
struct ofport *port = ofproto_get_port(ofproto, ofp_port);<br>
if (port) {<br>
@@ -1925,12 +1929,13 @@ ofport_destroy(struct ofport *port)<br>
}<br>
<br>
struct ofport *<br>
-ofproto_get_port(const struct ofproto *ofproto, uint16_t ofp_port)<br>
+ofproto_get_port(const struct ofproto *ofproto, ofp_port_t ofp_port)<br>
{<br>
struct ofport *port;<br>
<br>
HMAP_FOR_EACH_IN_BUCKET (port, hmap_node,<br>
- hash_int(ofp_port, 0), &ofproto->ports) {<br>
+ hash_ofp_port(ofp_port, 0),<br>
+ &ofproto->ports) {<br>
if (port->ofp_port == ofp_port) {<br>
return port;<br>
}<br>
@@ -1967,6 +1972,7 @@ update_port(struct ofproto *ofproto, const char *name)<br>
netdev = (!ofproto_port_query_by_name(ofproto, name, &ofproto_port)<br>
? ofport_open(ofproto, &ofproto_port, &pp)<br>
: NULL);<br>
+<br>
if (netdev) {<br>
port = ofproto_get_port(ofproto, ofproto_port.ofp_port);<br>
if (port && !strcmp(netdev_get_name(port->netdev), name)) {<br>
@@ -2028,7 +2034,8 @@ init_ports(struct ofproto *p)<br>
node = shash_find(&init_ofp_ports, name);<br>
if (node) {<br>
const struct iface_hint *iface_hint = node->data;<br>
- simap_put(&p->ofp_requests, name, iface_hint->ofp_port);<br>
+ simap_put(&p->ofp_requests, name,<br>
+ ofp_to_u16(iface_hint->ofp_port));<br>
}<br>
<br>
netdev = ofport_open(p, &ofproto_port, &pp);<br>
@@ -2152,7 +2159,7 @@ ofproto_rule_destroy(struct rule *rule)<br>
/* Returns true if 'rule' has an OpenFlow OFPAT_OUTPUT or OFPAT_ENQUEUE action<br>
* that outputs to 'port' (output to OFPP_FLOOD and OFPP_ALL doesn't count). */<br>
bool<br>
-ofproto_rule_has_out_port(const struct rule *rule, uint16_t port)<br>
+ofproto_rule_has_out_port(const struct rule *rule, ofp_port_t port)<br>
{<br>
return (port == OFPP_ANY<br>
|| ofpacts_output_to_port(rule->ofpacts, rule->ofpacts_len, port));<br>
@@ -2161,7 +2168,7 @@ ofproto_rule_has_out_port(const struct rule *rule, uint16_t port)<br>
/* Returns true if a rule related to 'op' has an OpenFlow OFPAT_OUTPUT or<br>
* OFPAT_ENQUEUE action that outputs to 'out_port'. */<br>
bool<br>
-ofoperation_has_out_port(const struct ofoperation *op, uint16_t out_port)<br>
+ofoperation_has_out_port(const struct ofoperation *op, ofp_port_t out_port)<br>
{<br>
if (ofproto_rule_has_out_port(op->rule, out_port)) {<br>
return true;<br>
@@ -2190,13 +2197,15 @@ ofoperation_has_out_port(const struct ofoperation *op, uint16_t out_port)<br>
*<br>
* Takes ownership of 'packet'. */<br>
static int<br>
-rule_execute(struct rule *rule, uint16_t in_port, struct ofpbuf *packet)<br>
+rule_execute(struct rule *rule, ofp_port_t in_port, struct ofpbuf *packet)<br>
{<br>
struct flow flow;<br>
+ union flow_in_port in_port_;<br>
<br>
ovs_assert(ofpbuf_headroom(packet) >= sizeof(struct ofp10_packet_in));<br>
<br>
- flow_extract(packet, 0, 0, NULL, in_port, &flow);<br>
+ in_port_.ofp_port = in_port;<br>
+ flow_extract(packet, 0, 0, NULL, &in_port_, &flow);<br>
return rule->ofproto->ofproto_class->rule_execute(rule, &flow, packet);<br>
}<br>
<br>
@@ -2357,6 +2366,7 @@ handle_packet_out(struct ofconn *ofconn, const struct ofp_header *oh)<br>
uint64_t ofpacts_stub[1024 / 8];<br>
struct ofpbuf ofpacts;<br>
struct flow flow;<br>
+ union flow_in_port in_port_;<br>
enum ofperr error;<br>
<br>
COVERAGE_INC(ofproto_packet_out);<br>
@@ -2372,7 +2382,8 @@ handle_packet_out(struct ofconn *ofconn, const struct ofp_header *oh)<br>
if (error) {<br>
goto exit_free_ofpacts;<br>
}<br>
- if (po.in_port >= p->max_ports && po.in_port < OFPP_MAX) {<br>
+ if (ofp_to_u16(po.in_port) >= ofp_to_u16(p->max_ports)<br>
+ && ofp_to_u16(po.in_port) < ofp_to_u16(OFPP_MAX)) {<br>
error = OFPERR_OFPBRC_BAD_PORT;<br>
goto exit_free_ofpacts;<br>
}<br>
@@ -2390,7 +2401,8 @@ handle_packet_out(struct ofconn *ofconn, const struct ofp_header *oh)<br>
}<br>
<br>
/* Verify actions against packet, then send packet if successful. */<br>
- flow_extract(payload, 0, 0, NULL, po.in_port, &flow);<br>
+ in_port_.ofp_port = po.in_port;<br>
+ flow_extract(payload, 0, 0, NULL, &in_port_, &flow);<br>
error = ofpacts_check(po.ofpacts, po.ofpacts_len, &flow, p->max_ports);<br>
if (!error) {<br>
error = p->ofproto_class->packet_out(p, payload, &flow,<br>
@@ -2578,7 +2590,7 @@ handle_port_stats_request(struct ofconn *ofconn,<br>
struct ofproto *p = ofconn_get_ofproto(ofconn);<br>
struct ofport *port;<br>
struct list replies;<br>
- uint16_t port_no;<br>
+ ofp_port_t port_no;<br>
enum ofperr error;<br>
<br>
error = ofputil_decode_port_stats_request(request, &port_no);<br>
@@ -2714,7 +2726,7 @@ static enum ofperr<br>
collect_rules_loose(struct ofproto *ofproto, uint8_t table_id,<br>
const struct match *match,<br>
ovs_be64 cookie, ovs_be64 cookie_mask,<br>
- uint16_t out_port, struct list *rules)<br>
+ ofp_port_t out_port, struct list *rules)<br>
{<br>
struct oftable *table;<br>
struct cls_rule cr;<br>
@@ -2765,7 +2777,7 @@ static enum ofperr<br>
collect_rules_strict(struct ofproto *ofproto, uint8_t table_id,<br>
const struct match *match, unsigned int priority,<br>
ovs_be64 cookie, ovs_be64 cookie_mask,<br>
- uint16_t out_port, struct list *rules)<br>
+ ofp_port_t out_port, struct list *rules)<br>
{<br>
struct oftable *table;<br>
struct cls_rule cr;<br>
@@ -2922,7 +2934,7 @@ ofproto_get_netflow_ids(const struct ofproto *ofproto,<br>
* The caller must provide and owns '*status', but it does not own and must not<br>
* modify or free the array returned in 'status->rmps'. */<br>
bool<br>
-ofproto_port_get_cfm_status(const struct ofproto *ofproto, uint16_t ofp_port,<br>
+ofproto_port_get_cfm_status(const struct ofproto *ofproto, ofp_port_t ofp_port,<br>
struct ofproto_cfm_status *status)<br>
{<br>
struct ofport *ofport = ofproto_get_port(ofproto, ofp_port);<br>
@@ -4246,7 +4258,7 @@ ofopgroup_complete(struct ofopgroup *group)<br>
LIST_FOR_EACH (op, group_node, &group->ops) {<br>
if (op->type != OFOPERATION_DELETE) {<br>
struct ofpbuf *packet;<br>
- uint16_t in_port;<br>
+ ofp_port_t in_port;<br>
<br>
error = ofconn_pktbuf_retrieve(group->ofconn, group->buffer_id,<br>
&packet, &in_port);<br>
@@ -4999,8 +5011,8 @@ ofproto_has_vlan_usage_changed(const struct ofproto *ofproto)<br>
* device as a VLAN splinter for VLAN ID 'vid'. If 'realdev_ofp_port' is zero,<br>
* then the VLAN device is un-enslaved. */<br>
int<br>
-ofproto_port_set_realdev(struct ofproto *ofproto, uint16_t vlandev_ofp_port,<br>
- uint16_t realdev_ofp_port, int vid)<br>
+ofproto_port_set_realdev(struct ofproto *ofproto, ofp_port_t vlandev_ofp_port,<br>
+ ofp_port_t realdev_ofp_port, int vid)<br>
{<br>
struct ofport *ofport;<br>
int error;<br>
diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h<br>
index 5f8244c..2609c94 100644<br>
--- a/ofproto/ofproto.h<br>
+++ b/ofproto/ofproto.h<br>
@@ -158,7 +158,7 @@ void ofproto_parse_name(const char *name, char **dp_name, char **dp_type);<br>
struct iface_hint {<br>
char *br_name; /* Name of owning bridge. */<br>
char *br_type; /* Type of owning bridge. */<br>
- uint16_t ofp_port; /* OpenFlow port number. */<br>
+ ofp_port_t ofp_port; /* OpenFlow port number. */<br>
};<br>
<br>
void ofproto_init(const struct shash *iface_hints);<br>
@@ -185,7 +185,7 @@ void ofproto_get_memory_usage(const struct ofproto *, struct simap *);<br>
struct ofproto_port {<br>
char *name; /* Network device name, e.g. "eth0". */<br>
char *type; /* Network device type, e.g. "system". */<br>
- uint16_t ofp_port; /* OpenFlow port number. */<br>
+ ofp_port_t ofp_port; /* OpenFlow port number. */<br>
};<br>
void ofproto_port_clone(struct ofproto_port *, const struct ofproto_port *);<br>
void ofproto_port_destroy(struct ofproto_port *);<br>
@@ -218,8 +218,8 @@ int ofproto_port_dump_done(struct ofproto_port_dump *);<br>
<br>
const char *ofproto_port_open_type(const char *datapath_type,<br>
const char *port_type);<br>
-int ofproto_port_add(struct ofproto *, struct netdev *, uint16_t *ofp_portp);<br>
-int ofproto_port_del(struct ofproto *, uint16_t ofp_port);<br>
+int ofproto_port_add(struct ofproto *, struct netdev *, ofp_port_t *ofp_portp);<br>
+int ofproto_port_del(struct ofproto *, ofp_port_t ofp_port);<br>
int ofproto_port_get_stats(const struct ofport *, struct netdev_stats *stats);<br>
<br>
int ofproto_port_query_by_name(const struct ofproto *, const char *devname,<br>
@@ -255,21 +255,21 @@ int ofproto_set_stp(struct ofproto *, const struct ofproto_stp_settings *);<br>
int ofproto_get_stp_status(struct ofproto *, struct ofproto_stp_status *);<br>
<br>
/* Configuration of ports. */<br>
-void ofproto_port_unregister(struct ofproto *, uint16_t ofp_port);<br>
+void ofproto_port_unregister(struct ofproto *, ofp_port_t ofp_port);<br>
<br>
-void ofproto_port_clear_cfm(struct ofproto *, uint16_t ofp_port);<br>
-void ofproto_port_set_cfm(struct ofproto *, uint16_t ofp_port,<br>
+void ofproto_port_clear_cfm(struct ofproto *, ofp_port_t ofp_port);<br>
+void ofproto_port_set_cfm(struct ofproto *, ofp_port_t ofp_port,<br>
const struct cfm_settings *);<br>
-void ofproto_port_set_bfd(struct ofproto *, uint16_t ofp_port,<br>
+void ofproto_port_set_bfd(struct ofproto *, ofp_port_t ofp_port,<br>
const struct smap *cfg);<br>
-int ofproto_port_get_bfd_status(struct ofproto *, uint16_t ofp_port,<br>
+int ofproto_port_get_bfd_status(struct ofproto *, ofp_port_t ofp_port,<br>
struct smap *);<br>
-int ofproto_port_is_lacp_current(struct ofproto *, uint16_t ofp_port);<br>
-int ofproto_port_set_stp(struct ofproto *, uint16_t ofp_port,<br>
+int ofproto_port_is_lacp_current(struct ofproto *, ofp_port_t ofp_port);<br>
+int ofproto_port_set_stp(struct ofproto *, ofp_port_t ofp_port,<br>
const struct ofproto_port_stp_settings *);<br>
-int ofproto_port_get_stp_status(struct ofproto *, uint16_t ofp_port,<br>
+int ofproto_port_get_stp_status(struct ofproto *, ofp_port_t ofp_port,<br>
struct ofproto_port_stp_status *);<br>
-int ofproto_port_set_queues(struct ofproto *, uint16_t ofp_port,<br>
+int ofproto_port_set_queues(struct ofproto *, ofp_port_t ofp_port,<br>
const struct ofproto_port_queue *,<br>
size_t n_queues);<br>
<br>
@@ -298,7 +298,7 @@ enum port_vlan_mode {<br>
struct ofproto_bundle_settings {<br>
char *name; /* For use in log messages. */<br>
<br>
- uint16_t *slaves; /* OpenFlow port numbers for slaves. */<br>
+ ofp_port_t *slaves; /* OpenFlow port numbers for slaves. */<br>
size_t n_slaves;<br>
<br>
enum port_vlan_mode vlan_mode; /* Selects mode for vlan and trunks */<br>
@@ -317,7 +317,7 @@ struct ofproto_bundle_settings {<br>
* drivers in old versions of Linux that do not properly support VLANs when<br>
* VLAN devices are not used. When broken device drivers are no longer in<br>
* widespread use, we will delete these interfaces. */<br>
- uint16_t realdev_ofp_port; /* OpenFlow port number of real device. */<br>
+ ofp_port_t realdev_ofp_port;/* OpenFlow port number of real device. */<br>
};<br>
<br>
int ofproto_bundle_register(struct ofproto *, void *aux,<br>
@@ -406,7 +406,8 @@ struct ofproto_cfm_status {<br>
size_t n_rmps;<br>
};<br>
<br>
-bool ofproto_port_get_cfm_status(const struct ofproto *, uint16_t ofp_port,<br>
+bool ofproto_port_get_cfm_status(const struct ofproto *,<br>
+ ofp_port_t ofp_port,<br>
struct ofproto_cfm_status *);<br>
<br>
/* Linux VLAN device support (e.g. "eth0.10" for VLAN 10.)<br>
@@ -418,8 +419,8 @@ bool ofproto_port_get_cfm_status(const struct ofproto *, uint16_t ofp_port,<br>
<br>
void ofproto_get_vlan_usage(struct ofproto *, unsigned long int *vlan_bitmap);<br>
bool ofproto_has_vlan_usage_changed(const struct ofproto *);<br>
-int ofproto_port_set_realdev(struct ofproto *, uint16_t vlandev_ofp_port,<br>
- uint16_t realdev_ofp_port, int vid);<br>
+int ofproto_port_set_realdev(struct ofproto *, ofp_port_t vlandev_ofp_port,<br>
+ ofp_port_t realdev_ofp_port, int vid);<br>
<br>
#ifdef __cplusplus<br>
}<br>
diff --git a/ofproto/pinsched.c b/ofproto/pinsched.c<br>
index 57e8e23..95f9ca5 100644<br>
--- a/ofproto/pinsched.c<br>
+++ b/ofproto/pinsched.c<br>
@@ -21,6 +21,7 @@<br>
#include <arpa/inet.h><br>
#include <stdint.h><br>
#include <stdlib.h><br>
+#include "flow.h"<br>
#include "hash.h"<br>
#include "hmap.h"<br>
#include "ofpbuf.h"<br>
@@ -35,7 +36,7 @@<br>
<br>
struct pinqueue {<br>
struct hmap_node node; /* In struct pinsched's 'queues' hmap. */<br>
- uint16_t port_no; /* Port number. */<br>
+ ofp_port_t port_no; /* Port number. */<br>
struct list packets; /* Contains "struct ofpbuf"s. */<br>
int n; /* Number of packets in 'packets'. */<br>
};<br>
@@ -101,9 +102,9 @@ pinqueue_destroy(struct pinsched *ps, struct pinqueue *q)<br>
}<br>
<br>
static struct pinqueue *<br>
-pinqueue_get(struct pinsched *ps, uint16_t port_no)<br>
+pinqueue_get(struct pinsched *ps, ofp_port_t port_no)<br>
{<br>
- uint32_t hash = hash_int(port_no, 0);<br>
+ uint32_t hash = hash_ofp_port(port_no, 0);<br>
struct pinqueue *q;<br>
<br>
HMAP_FOR_EACH_IN_BUCKET (q, node, hash, &ps->queues) {<br>
@@ -184,7 +185,7 @@ get_token(struct pinsched *ps)<br>
}<br>
<br>
void<br>
-pinsched_send(struct pinsched *ps, uint16_t port_no,<br>
+pinsched_send(struct pinsched *ps, ofp_port_t port_no,<br>
struct ofpbuf *packet, pinsched_tx_cb *cb, void *aux)<br>
{<br>
if (!ps) {<br>
diff --git a/ofproto/pinsched.h b/ofproto/pinsched.h<br>
index 061cb01..06b22f4 100644<br>
--- a/ofproto/pinsched.h<br>
+++ b/ofproto/pinsched.h<br>
@@ -18,6 +18,7 @@<br>
#define PINSCHED_H_H 1<br>
<br>
#include <stdint.h><br>
+#include "flow.h"<br>
<br>
struct ofpbuf;<br>
<br>
@@ -27,7 +28,7 @@ void pinsched_get_limits(const struct pinsched *,<br>
int *rate_limit, int *burst_limit);<br>
void pinsched_set_limits(struct pinsched *, int rate_limit, int burst_limit);<br>
void pinsched_destroy(struct pinsched *);<br>
-void pinsched_send(struct pinsched *, uint16_t port_no, struct ofpbuf *,<br>
+void pinsched_send(struct pinsched *, ofp_port_t port_no, struct ofpbuf *,<br>
pinsched_tx_cb *, void *aux);<br>
void pinsched_run(struct pinsched *, pinsched_tx_cb *, void *aux);<br>
void pinsched_wait(struct pinsched *);<br>
diff --git a/ofproto/pktbuf.c b/ofproto/pktbuf.c<br>
index 2ec1f0d..65fcef6 100644<br>
--- a/ofproto/pktbuf.c<br>
+++ b/ofproto/pktbuf.c<br>
@@ -51,7 +51,7 @@ struct packet {<br>
struct ofpbuf *buffer;<br>
uint32_t cookie;<br>
long long int timeout;<br>
- uint16_t in_port;<br>
+ ofp_port_t in_port;<br>
};<br>
<br>
struct pktbuf {<br>
@@ -104,7 +104,7 @@ make_id(unsigned int buffer_idx, unsigned int cookie)<br>
* The caller retains ownership of 'buffer'. */<br>
uint32_t<br>
pktbuf_save(struct pktbuf *pb, const void *buffer, size_t buffer_size,<br>
- uint16_t in_port)<br>
+ ofp_port_t in_port)<br>
{<br>
struct packet *p = &pb->packets[pb->buffer_idx];<br>
pb->buffer_idx = (pb->buffer_idx + 1) & PKTBUF_MASK;<br>
@@ -161,7 +161,7 @@ pktbuf_get_null(void)<br>
* OpenFlow port number on which the packet was received in '*in_port'. The<br>
* caller becomes responsible for freeing the buffer. However, if 'id'<br>
* identifies a "null" packet buffer (created with pktbuf_get_null()), stores<br>
- * NULL in '*bufferp' and UINT16_max in '*in_port'.<br>
+ * NULL in '*bufferp' and OFPP_NONE in '*in_port'.<br>
*<br>
* 'in_port' may be NULL if the input port is not of interest.<br>
*<br>
@@ -171,7 +171,7 @@ pktbuf_get_null(void)<br>
* On failure, stores NULL in in '*bufferp' and UINT16_MAX in '*in_port'. */<br>
enum ofperr<br>
pktbuf_retrieve(struct pktbuf *pb, uint32_t id, struct ofpbuf **bufferp,<br>
- uint16_t *in_port)<br>
+ ofp_port_t *in_port)<br>
{<br>
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 20);<br>
struct packet *p;<br>
@@ -218,7 +218,7 @@ pktbuf_retrieve(struct pktbuf *pb, uint32_t id, struct ofpbuf **bufferp,<br>
error:<br>
*bufferp = NULL;<br>
if (in_port) {<br>
- *in_port = UINT16_MAX;<br>
+ *in_port = OFPP_NONE;<br>
}<br>
return error;<br>
}<br>
diff --git a/ofproto/pktbuf.h b/ofproto/pktbuf.h<br>
index ec99aea..eb1b1ff 100644<br>
--- a/ofproto/pktbuf.h<br>
+++ b/ofproto/pktbuf.h<br>
@@ -30,10 +30,10 @@ int pktbuf_capacity(void);<br>
struct pktbuf *pktbuf_create(void);<br>
void pktbuf_destroy(struct pktbuf *);<br>
uint32_t pktbuf_save(struct pktbuf *, const void *buffer, size_t buffer_size,<br>
- uint16_t in_port);<br>
+ ofp_port_t in_port);<br>
uint32_t pktbuf_get_null(void);<br>
enum ofperr pktbuf_retrieve(struct pktbuf *, uint32_t id,<br>
- struct ofpbuf **bufferp, uint16_t *in_port);<br>
+ struct ofpbuf **bufferp, ofp_port_t *in_port);<br>
void pktbuf_discard(struct pktbuf *, uint32_t id);<br>
<br>
unsigned int pktbuf_count_packets(const struct pktbuf *);<br>
diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c<br>
index 636c549..9b0eb69 100644<br>
--- a/ofproto/tunnel.c<br>
+++ b/ofproto/tunnel.c<br>
@@ -36,7 +36,7 @@ struct tnl_match {<br>
ovs_be64 in_key;<br>
ovs_be32 ip_src;<br>
ovs_be32 ip_dst;<br>
- uint32_t odp_port;<br>
+ odp_port_t odp_port;<br>
uint32_t skb_mark;<br>
bool in_key_flow;<br>
bool ip_src_flow;<br>
@@ -71,7 +71,7 @@ static void tnl_port_mod_log(const struct tnl_port *, const char *action);<br>
static const char *tnl_port_get_name(const struct tnl_port *);<br>
<br>
static struct tnl_port *<br>
-tnl_port_add__(const struct ofport *ofport, uint32_t odp_port,<br>
+tnl_port_add__(const struct ofport *ofport, odp_port_t odp_port,<br>
bool warn)<br>
{<br>
const struct netdev_tunnel_config *cfg;<br>
@@ -118,7 +118,7 @@ tnl_port_add__(const struct ofport *ofport, uint32_t odp_port,<br>
* must be added before they can be used by the module. 'ofport' must be a<br>
* tunnel. */<br>
struct tnl_port *<br>
-tnl_port_add(const struct ofport *ofport, uint32_t odp_port)<br>
+tnl_port_add(const struct ofport *ofport, odp_port_t odp_port)<br>
{<br>
return tnl_port_add__(ofport, odp_port, true);<br>
}<br>
@@ -129,7 +129,7 @@ tnl_port_add(const struct ofport *ofport, uint32_t odp_port)<br>
* 'ofport' and 'odp_port' should be the same as would be passed to<br>
* tnl_port_add(). */<br>
bool<br>
-tnl_port_reconfigure(const struct ofport *ofport, uint32_t odp_port,<br>
+tnl_port_reconfigure(const struct ofport *ofport, odp_port_t odp_port,<br>
struct tnl_port **tnl_portp)<br>
{<br>
struct tnl_port *tnl_port = *tnl_portp;<br>
@@ -173,7 +173,7 @@ tnl_port_receive(const struct flow *flow)<br>
struct tnl_match match;<br>
<br>
memset(&match, 0, sizeof match);<br>
- match.odp_port = flow->in_port;<br>
+ match.odp_port = flow->in_port.odp_port;<br>
match.ip_src = flow->tunnel.ip_dst;<br>
match.ip_dst = flow->tunnel.ip_src;<br>
match.in_key = flow->tunnel.tun_id;<br>
@@ -212,7 +212,7 @@ tnl_port_receive(const struct flow *flow)<br>
* 'tnl_port', updates 'flow''s tunnel headers and returns the actual datapath<br>
* port that the output should happen on. May return OVSP_NONE if the output<br>
* shouldn't occur. */<br>
-uint32_t<br>
+odp_port_t<br>
tnl_port_send(const struct tnl_port *tnl_port, struct flow *flow,<br>
struct flow_wildcards *wc)<br>
{<br>
diff --git a/ofproto/tunnel.h b/ofproto/tunnel.h<br>
index 803e2d9..343eb96 100644<br>
--- a/ofproto/tunnel.h<br>
+++ b/ofproto/tunnel.h<br>
@@ -31,15 +31,15 @@<br>
struct ofport;<br>
struct tnl_port;<br>
<br>
-bool tnl_port_reconfigure(const struct ofport *, uint32_t odp_port,<br>
+bool tnl_port_reconfigure(const struct ofport *, odp_port_t odp_port,<br>
struct tnl_port **);<br>
<br>
-struct tnl_port *tnl_port_add(const struct ofport *, uint32_t odp_port);<br>
+struct tnl_port *tnl_port_add(const struct ofport *, odp_port_t odp_port);<br>
void tnl_port_del(struct tnl_port *);<br>
<br>
const struct ofport *tnl_port_receive(const struct flow *);<br>
-uint32_t tnl_port_send(const struct tnl_port *, struct flow *,<br>
- struct flow_wildcards *wc);<br>
+odp_port_t tnl_port_send(const struct tnl_port *, struct flow *,<br>
+ struct flow_wildcards *wc);<br>
<br>
/* Returns true if 'flow' should be submitted to tnl_port_receive(). */<br>
static inline bool<br>
diff --git a/tests/test-bundle.c b/tests/test-bundle.c<br>
index c475991..cf3043d 100644<br>
--- a/tests/test-bundle.c<br>
+++ b/tests/test-bundle.c<br>
@@ -31,7 +31,7 @@<br>
#define MAX_SLAVES 8 /* Maximum supported by this test framework. */<br>
<br>
struct slave {<br>
- uint16_t slave_id;<br>
+ ofp_port_t slave_id;<br>
<br>
bool enabled;<br>
size_t flow_count;<br>
@@ -43,7 +43,7 @@ struct slave_group {<br>
};<br>
<br>
static struct slave *<br>
-slave_lookup(struct slave_group *sg, uint16_t slave_id)<br>
+slave_lookup(struct slave_group *sg, ofp_port_t slave_id)<br>
{<br>
size_t i;<br>
<br>
@@ -57,7 +57,7 @@ slave_lookup(struct slave_group *sg, uint16_t slave_id)<br>
}<br>
<br>
static bool<br>
-slave_enabled_cb(uint16_t slave_id, void *aux)<br>
+slave_enabled_cb(ofp_port_t slave_id, void *aux)<br>
{<br>
struct slave *slave;<br>
<br>
@@ -122,7 +122,7 @@ main(int argc, char *argv[])<br>
/* Generate 'slaves' array. */<br>
sg.n_slaves = 0;<br>
for (i = 0; i < bundle->n_slaves; i++) {<br>
- uint16_t slave_id = bundle->slaves[i];<br>
+ ofp_port_t slave_id = bundle->slaves[i];<br>
<br>
if (slave_lookup(&sg, slave_id)) {<br>
ovs_fatal(0, "Redundant slaves are not supported. ");<br>
@@ -138,7 +138,7 @@ main(int argc, char *argv[])<br>
random_bytes(&flows[i], sizeof flows[i]);<br>
memset(flows[i].zeros, 0, sizeof flows[i].zeros);<br>
flows[i].mpls_depth = 0;<br>
- flows[i].regs[0] = OFPP_NONE;<br>
+ flows[i].regs[0] = ofp_to_u16(OFPP_NONE);<br>
}<br>
<br>
/* Cycles through each possible liveness permutation for the given<br>
@@ -186,13 +186,13 @@ main(int argc, char *argv[])<br>
changed = 0;<br>
for (j = 0; j < N_FLOWS; j++) {<br>
struct flow *flow = &flows[j];<br>
- uint16_t old_slave_id, ofp_port;<br>
+ ofp_port_t old_slave_id, ofp_port;<br>
struct flow_wildcards wc;<br>
<br>
- old_slave_id = flow->regs[0];<br>
+ old_slave_id = uint_to_ofp(flow->regs[0]);<br>
ofp_port = bundle_execute(bundle, flow, &wc, slave_enabled_cb,<br>
&sg);<br>
- flow->regs[0] = ofp_port;<br>
+ flow->regs[0] = ofp_to_u16(ofp_port);<br>
<br>
if (ofp_port != OFPP_NONE) {<br>
slave_lookup(&sg, ofp_port)->flow_count++;<br>
diff --git a/tests/test-classifier.c b/tests/test-classifier.c<br>
index f616494..e6124c3 100644<br>
--- a/tests/test-classifier.c<br>
+++ b/tests/test-classifier.c<br>
@@ -240,8 +240,9 @@ match(const struct cls_rule *wild_, const struct flow *fixed)<br>
eq = !((fixed->dl_type ^ wild.flow.dl_type)<br>
& wild.wc.masks.dl_type);<br>
} else if (f_idx == CLS_F_IDX_IN_PORT) {<br>
- eq = !((fixed->in_port ^ wild.flow.in_port)<br>
- & wild.wc.masks.in_port);<br>
+ eq = !((fixed->in_port.ofp_port<br>
+ ^ wild.flow.in_port.ofp_port)<br>
+ & wild.wc.masks.in_port.ofp_port);<br>
} else {<br>
NOT_REACHED();<br>
}<br>
@@ -298,7 +299,7 @@ static ovs_be64 tun_id_values[] = {<br>
static ovs_be64 metadata_values[] = {<br>
0,<br>
CONSTANT_HTONLL(UINT64_C(0xfedcba9876543210)) };<br>
-static uint16_t in_port_values[] = { 1, OFPP_LOCAL };<br>
+static ofp_port_t in_port_values[] = { (OVS_FORCE ofp_port_t) 1, OFPP_LOCAL };<br>
static ovs_be16 vlan_tci_values[] = { CONSTANT_HTONS(101), CONSTANT_HTONS(0) };<br>
static ovs_be16 dl_type_values[]<br>
= { CONSTANT_HTONS(ETH_TYPE_IP), CONSTANT_HTONS(ETH_TYPE_ARP) };<br>
@@ -410,7 +411,8 @@ compare_classifiers(struct classifier *cls, struct tcls *tcls)<br>
flow.nw_dst = nw_dst_values[get_value(&x, N_NW_DST_VALUES)];<br>
flow.tunnel.tun_id = tun_id_values[get_value(&x, N_TUN_ID_VALUES)];<br>
flow.metadata = metadata_values[get_value(&x, N_METADATA_VALUES)];<br>
- flow.in_port = in_port_values[get_value(&x, N_IN_PORT_VALUES)];<br>
+ flow.in_port.ofp_port = in_port_values[get_value(&x,<br>
+ N_IN_PORT_VALUES)];<br>
flow.vlan_tci = vlan_tci_values[get_value(&x, N_VLAN_TCI_VALUES)];<br>
flow.dl_type = dl_type_values[get_value(&x, N_DL_TYPE_VALUES)];<br>
flow.tp_src = tp_src_values[get_value(&x, N_TP_SRC_VALUES)];<br>
@@ -546,7 +548,7 @@ make_rule(int wc_fields, unsigned int priority, int value_pat)<br>
} else if (f_idx == CLS_F_IDX_DL_TYPE) {<br>
match.wc.masks.dl_type = htons(UINT16_MAX);<br>
} else if (f_idx == CLS_F_IDX_IN_PORT) {<br>
- match.wc.masks.in_port = UINT16_MAX;<br>
+ match.wc.masks.in_port.ofp_port = OFPP_NONE;<br>
} else {<br>
NOT_REACHED();<br>
}<br>
diff --git a/tests/test-flows.c b/tests/test-flows.c<br>
index c77372f..a4953d4 100644<br>
--- a/tests/test-flows.c<br>
+++ b/tests/test-flows.c<br>
@@ -58,7 +58,7 @@ main(int argc OVS_UNUSED, char *argv[])<br>
struct ofp10_match extracted_match;<br>
struct match match;<br>
struct flow flow;<br>
-<br>
+ union flow_in_port in_port_;<br>
n++;<br>
<br>
retval = pcap_read(pcap, &packet);<br>
@@ -68,7 +68,8 @@ main(int argc OVS_UNUSED, char *argv[])<br>
ovs_fatal(retval, "error reading pcap file");<br>
}<br>
<br>
- flow_extract(packet, 0, 0, NULL, 1, &flow);<br>
+ in_port_.ofp_port = uint_to_ofp(1);<br>
+ flow_extract(packet, 0, 0, NULL, &in_port_, &flow);<br>
match_init_exact(&match, &flow);<br>
ofputil_match_to_ofp10_match(&match, &extracted_match);<br>
<br>
diff --git a/tests/test-odp.c b/tests/test-odp.c<br>
index 268a105..dc88ddf 100644<br>
--- a/tests/test-odp.c<br>
+++ b/tests/test-odp.c<br>
@@ -70,7 +70,7 @@ parse_keys(void)<br>
/* Convert cls_rule back to odp_key. */<br>
ofpbuf_uninit(&odp_key);<br>
ofpbuf_init(&odp_key, 0);<br>
- odp_flow_key_from_flow(&odp_key, &flow, flow.in_port);<br>
+ odp_flow_key_from_flow(&odp_key, &flow, flow.in_port.odp_port);<br>
<br>
if (odp_key.size > ODPUTIL_FLOW_KEY_BYTES) {<br>
printf ("too long: %zu > %d\n",<br>
diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c<br>
index 54505e8..3107ca8 100644<br>
--- a/utilities/ovs-dpctl.c<br>
+++ b/utilities/ovs-dpctl.c<br>
@@ -308,7 +308,7 @@ dpctl_add_if(int argc OVS_UNUSED, char *argv[])<br>
char *save_ptr = NULL;<br>
struct netdev *netdev = NULL;<br>
struct smap args;<br>
- uint32_t port_no = UINT32_MAX;<br>
+ odp_port_t port_no = OVSP_NONE;<br>
char *option;<br>
int error;<br>
<br>
@@ -335,7 +335,7 @@ dpctl_add_if(int argc OVS_UNUSED, char *argv[])<br>
if (!strcmp(key, "type")) {<br>
type = value;<br>
} else if (!strcmp(key, "port_no")) {<br>
- port_no = atoi(value);<br>
+ port_no = uint_to_odp(atoi(value));<br>
} else if (!smap_add_once(&args, key, value)) {<br>
ovs_error(0, "duplicate \"%s\" option", key);<br>
}<br>
@@ -388,7 +388,7 @@ dpctl_set_if(int argc, char *argv[])<br>
char *type = NULL;<br>
const char *name;<br>
struct smap args;<br>
- uint32_t port_no;<br>
+ odp_port_t port_no;<br>
char *option;<br>
int error;<br>
<br>
@@ -441,7 +441,7 @@ dpctl_set_if(int argc, char *argv[])<br>
failure = true;<br>
}<br>
} else if (!strcmp(key, "port_no")) {<br>
- if (port_no != atoi(value)) {<br>
+ if (port_no != uint_to_odp(atoi(value))) {<br>
ovs_error(0, "%s: can't change port number from "<br>
"%"PRIu32" to %d",<br>
name, port_no, atoi(value));<br>
@@ -476,7 +476,7 @@ next:<br>
}<br>
<br>
static bool<br>
-get_port_number(struct dpif *dpif, const char *name, uint32_t *port)<br>
+get_port_number(struct dpif *dpif, const char *name, odp_port_t *port)<br>
{<br>
struct dpif_port dpif_port;<br>
<br>
@@ -500,11 +500,11 @@ dpctl_del_if(int argc OVS_UNUSED, char *argv[])<br>
run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath");<br>
for (i = 2; i < argc; i++) {<br>
const char *name = argv[i];<br>
- uint32_t port;<br>
+ odp_port_t port;<br>
int error;<br>
<br>
if (!name[strspn(name, "0123456789")]) {<br>
- port = atoi(name);<br>
+ port = uint_to_odp(atoi(name));<br>
} else if (!get_port_number(dpif, name, &port)) {<br>
failure = true;<br>
continue;<br>
diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c<br>
index 48f0fbf..0d037a9 100644<br>
--- a/utilities/ovs-ofctl.c<br>
+++ b/utilities/ovs-ofctl.c<br>
@@ -632,7 +632,7 @@ ofctl_dump_tables(int argc OVS_UNUSED, char *argv[])<br>
<br>
static bool<br>
fetch_port_by_features(const char *vconn_name,<br>
- const char *port_name, unsigned int port_no,<br>
+ const char *port_name, uint32_t port_no,<br>
struct ofputil_phy_port *pp, bool *trunc)<br>
{<br>
struct ofputil_switch_features features;<br>
@@ -671,7 +671,7 @@ fetch_port_by_features(const char *vconn_name,<br>
<br>
while (!ofputil_pull_phy_port(oh->version, &b, pp)) {<br>
if (port_no != UINT_MAX<br>
- ? port_no == pp->port_no<br>
+ ? port_no == (OVS_FORCE uint32_t) pp->port_no<br>
: !strcmp(pp->name, port_name)) {<br>
found = true;<br>
goto exit;<br>
@@ -685,7 +685,7 @@ exit:<br>
<br>
static bool<br>
fetch_port_by_stats(const char *vconn_name,<br>
- const char *port_name, unsigned int port_no,<br>
+ const char *port_name, uint32_t port_no,<br>
struct ofputil_phy_port *pp)<br>
{<br>
struct ofpbuf *request;<br>
@@ -729,8 +729,9 @@ fetch_port_by_stats(const char *vconn_name,<br>
}<br>
<br>
while (!ofputil_pull_phy_port(oh->version, &b, pp)) {<br>
- if (port_no != UINT_MAX ? port_no == pp->port_no<br>
- : !strcmp(pp->name, port_name)) {<br>
+ if (port_no != UINT_MAX<br>
+ ? port_no == (OVS_FORCE uint32_t) pp->port_no<br>
+ : !strcmp(pp->name, port_name)) {<br>
found = true;<br>
break;<br>
}<br>
@@ -754,7 +755,7 @@ static void<br>
fetch_ofputil_phy_port(const char *vconn_name, const char *port_name,<br>
struct ofputil_phy_port *pp)<br>
{<br>
- unsigned int port_no;<br>
+ uint32_t port_no;<br>
bool found;<br>
bool trunc;<br>
<br>
@@ -779,10 +780,10 @@ fetch_ofputil_phy_port(const char *vconn_name, const char *port_name,<br>
<br>
/* Returns the port number corresponding to 'port_name' (which may be a port<br>
* name or number) within the switch 'vconn_name'. */<br>
-static uint16_t<br>
+static ofp_port_t<br>
str_to_port_no(const char *vconn_name, const char *port_name)<br>
{<br>
- uint16_t port_no;<br>
+ ofp_port_t port_no;<br>
<br>
if (ofputil_port_from_string(port_name, &port_no)) {<br>
return port_no;<br>
@@ -1489,7 +1490,7 @@ ofctl_dump_ports(int argc, char *argv[])<br>
{<br>
struct ofpbuf *request;<br>
struct vconn *vconn;<br>
- uint16_t port;<br>
+ ofp_port_t port;<br>
<br>
open_vconn(argv[1], &vconn);<br>
port = argc > 2 ? str_to_port_no(argv[1], argv[2]) : OFPP_ANY;<br>
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c<br>
index 3513810..41b86a7 100644<br>
--- a/vswitchd/bridge.c<br>
+++ b/vswitchd/bridge.c<br>
@@ -67,13 +67,13 @@ struct if_cfg {<br>
struct hmap_node hmap_node; /* Node in bridge's if_cfg_todo. */<br>
const struct ovsrec_interface *cfg; /* Interface record. */<br>
const struct ovsrec_port *parent; /* Parent port record. */<br>
- uint16_t ofport; /* Requested OpenFlow port number. */<br>
+ ofp_port_t ofport; /* Requested OpenFlow port number. */<br>
};<br>
<br>
/* OpenFlow port slated for removal from ofproto. */<br>
struct ofpp_garbage {<br>
struct list list_node; /* Node in bridge's ofpp_garbage. */<br>
- uint16_t ofp_port; /* Port to be deleted. */<br>
+ ofp_port_t ofp_port; /* Port to be deleted. */<br>
};<br>
<br>
struct iface {<br>
@@ -86,7 +86,7 @@ struct iface {<br>
/* These members are valid only after bridge_reconfigure() causes them to<br>
* be initialized. */<br>
struct hmap_node ofp_port_node; /* In struct bridge's "ifaces" hmap. */<br>
- uint16_t ofp_port; /* OpenFlow port number, */<br>
+ ofp_port_t ofp_port; /* OpenFlow port number, */<br>
/* OFPP_NONE if unknown. */<br>
struct netdev *netdev; /* Network device. */<br>
const char *type; /* Usually same as cfg->type. */<br>
@@ -245,7 +245,8 @@ static bool mirror_configure(struct mirror *);<br>
static void mirror_refresh_stats(struct mirror *);<br>
<br>
static void iface_configure_lacp(struct iface *, struct lacp_slave_settings *);<br>
-static bool iface_create(struct bridge *, struct if_cfg *, uint16_t ofp_port);<br>
+static bool iface_create(struct bridge *, struct if_cfg *,<br>
+ ofp_port_t ofp_port);<br>
static bool iface_is_internal(const struct ovsrec_interface *iface,<br>
const struct ovsrec_bridge *br);<br>
static const char *iface_get_type(const struct ovsrec_interface *,<br>
@@ -255,9 +256,9 @@ static struct iface *iface_lookup(const struct bridge *, const char *name);<br>
static struct iface *iface_find(const char *name);<br>
static struct if_cfg *if_cfg_lookup(const struct bridge *, const char *name);<br>
static struct iface *iface_from_ofp_port(const struct bridge *,<br>
- uint16_t ofp_port);<br>
+ ofp_port_t ofp_port);<br>
static void iface_set_mac(struct iface *);<br>
-static void iface_set_ofport(const struct ovsrec_interface *, uint16_t ofport);<br>
+static void iface_set_ofport(const struct ovsrec_interface *, ofp_port_t ofport);<br>
static void iface_clear_db_record(const struct ovsrec_interface *if_cfg);<br>
static void iface_configure_qos(struct iface *, const struct ovsrec_qos *);<br>
static void iface_configure_cfm(struct iface *);<br>
@@ -265,7 +266,7 @@ static void iface_refresh_cfm_stats(struct iface *);<br>
static void iface_refresh_stats(struct iface *);<br>
static void iface_refresh_status(struct iface *);<br>
static bool iface_is_synthetic(const struct iface *);<br>
-static uint16_t iface_pick_ofport(const struct ovsrec_interface *);<br>
+static ofp_port_t iface_pick_ofport(const struct ovsrec_interface *);<br>
<br>
/* Linux VLAN device support (e.g. "eth0.10" for VLAN 10.)<br>
*<br>
@@ -1277,13 +1278,14 @@ add_del_bridges(const struct ovsrec_open_vswitch *cfg)<br>
}<br>
<br>
static void<br>
-iface_set_ofp_port(struct iface *iface, uint16_t ofp_port)<br>
+iface_set_ofp_port(struct iface *iface, ofp_port_t ofp_port)<br>
{<br>
struct bridge *br = iface->port->bridge;<br>
<br>
ovs_assert(iface->ofp_port == OFPP_NONE && ofp_port != OFPP_NONE);<br>
iface->ofp_port = ofp_port;<br>
- hmap_insert(&br->ifaces, &iface->ofp_port_node, hash_int(ofp_port, 0));<br>
+ hmap_insert(&br->ifaces, &iface->ofp_port_node,<br>
+ hash_ofp_port(ofp_port, 0));<br>
iface_set_ofport(iface->cfg, ofp_port);<br>
}<br>
<br>
@@ -1318,7 +1320,7 @@ bridge_refresh_one_ofp_port(struct bridge *br,<br>
{<br>
const char *name = ofproto_port->name;<br>
const char *type = ofproto_port->type;<br>
- uint16_t ofp_port = ofproto_port->ofp_port;<br>
+ ofp_port_t ofp_port = ofproto_port->ofp_port;<br>
<br>
struct iface *iface = iface_lookup(br, name);<br>
if (iface) {<br>
@@ -1421,7 +1423,7 @@ bridge_refresh_ofp_port(struct bridge *br)<br>
static int<br>
iface_do_create(const struct bridge *br,<br>
const struct if_cfg *if_cfg,<br>
- uint16_t *ofp_portp, struct netdev **netdevp)<br>
+ ofp_port_t *ofp_portp, struct netdev **netdevp)<br>
{<br>
const struct ovsrec_interface *iface_cfg = if_cfg->cfg;<br>
const struct ovsrec_port *port_cfg = if_cfg->parent;<br>
@@ -1449,7 +1451,7 @@ iface_do_create(const struct bridge *br,<br>
}<br>
<br>
if (*ofp_portp == OFPP_NONE) {<br>
- uint16_t ofp_port = if_cfg->ofport;<br>
+ ofp_port_t ofp_port = if_cfg->ofport;<br>
<br>
error = ofproto_port_add(br->ofproto, netdev, &ofp_port);<br>
if (error) {<br>
@@ -1485,7 +1487,7 @@ error:<br>
*<br>
* Return true if an iface is successfully created, false otherwise. */<br>
static bool<br>
-iface_create(struct bridge *br, struct if_cfg *if_cfg, uint16_t ofp_port)<br>
+iface_create(struct bridge *br, struct if_cfg *if_cfg, ofp_port_t ofp_port)<br>
{<br>
const struct ovsrec_interface *iface_cfg = if_cfg->cfg;<br>
const struct ovsrec_port *port_cfg = if_cfg->parent;<br>
@@ -1496,6 +1498,7 @@ iface_create(struct bridge *br, struct if_cfg *if_cfg, uint16_t ofp_port)<br>
int error;<br>
bool ok = true;<br>
<br>
+ VLOG_INFO("iface_create ofp_port: %u", ofp_port);<br>
/* Do the bits that can fail up front.<br>
*<br>
* It's a bit dangerous to call bridge_run_fast() here as ofproto's<br>
@@ -1547,7 +1550,7 @@ iface_create(struct bridge *br, struct if_cfg *if_cfg, uint16_t ofp_port)<br>
<br>
error = netdev_open(port->name, "internal", &netdev);<br>
if (!error) {<br>
- uint16_t fake_ofp_port = if_cfg->ofport;<br>
+ ofp_port_t fake_ofp_port = if_cfg->ofport;<br>
<br>
ofproto_port_add(br->ofproto, netdev, &fake_ofp_port);<br>
netdev_close(netdev);<br>
@@ -3291,7 +3294,7 @@ iface_configure_lacp(struct iface *iface, struct lacp_slave_settings *s)<br>
key = smap_get_int(&iface->cfg->other_config, "lacp-aggregation-key", 0);<br>
<br>
if (portid <= 0 || portid > UINT16_MAX) {<br>
- portid = iface->ofp_port;<br>
+ portid = ofp_to_u16(iface->ofp_port);<br>
}<br>
<br>
if (priority <= 0 || priority > UINT16_MAX) {<br>
@@ -3479,12 +3482,13 @@ if_cfg_lookup(const struct bridge *br, const char *name)<br>
}<br>
<br>
static struct iface *<br>
-iface_from_ofp_port(const struct bridge *br, uint16_t ofp_port)<br>
+iface_from_ofp_port(const struct bridge *br, ofp_port_t ofp_port)<br>
{<br>
struct iface *iface;<br>
<br>
HMAP_FOR_EACH_IN_BUCKET (iface, ofp_port_node,<br>
- hash_int(ofp_port, 0), &br->ifaces) {<br>
+ hash_ofp_port(ofp_port, 0),<br>
+ &br->ifaces) {<br>
if (iface->ofp_port == ofp_port) {<br>
return iface;<br>
}<br>
@@ -3520,10 +3524,10 @@ iface_set_mac(struct iface *iface)<br>
<br>
/* Sets the ofport column of 'if_cfg' to 'ofport'. */<br>
static void<br>
-iface_set_ofport(const struct ovsrec_interface *if_cfg, uint16_t ofport)<br>
+iface_set_ofport(const struct ovsrec_interface *if_cfg, ofp_port_t ofport)<br>
{<br>
int64_t port_;<br>
- port_ = (ofport == OFPP_NONE) ? -1 : ofport;<br>
+ port_ = (ofport == OFPP_NONE) ? -1 : ofp_to_u16(ofport);<br>
if (if_cfg && !ovsdb_idl_row_is_synthetic(&if_cfg->header_)) {<br>
ovsrec_interface_set_ofport(if_cfg, &port_, 1);<br>
}<br>
@@ -3709,11 +3713,13 @@ iface_is_synthetic(const struct iface *iface)<br>
return ovsdb_idl_row_is_synthetic(&iface->cfg->header_);<br>
}<br>
<br>
-static uint16_t<br>
+static ofp_port_t<br>
iface_pick_ofport(const struct ovsrec_interface *cfg)<br>
{<br>
- uint16_t ofport = cfg->n_ofport ? *cfg->ofport : OFPP_NONE;<br>
- return cfg->n_ofport_request ? *cfg->ofport_request : ofport;<br>
+ ofp_port_t ofport = cfg->n_ofport ? uint_to_ofp(*cfg->ofport)<br>
+ : OFPP_NONE;<br>
+ return cfg->n_ofport_request ? uint_to_ofp(*cfg->ofport_request)<br>
+ : ofport;<br>
}<br>
<br>
<br>
@@ -4091,7 +4097,7 @@ static void<br>
configure_splinter_port(struct port *port)<br>
{<br>
struct ofproto *ofproto = port->bridge->ofproto;<br>
- uint16_t realdev_ofp_port;<br>
+ ofp_port_t realdev_ofp_port;<br>
const char *realdev_name;<br>
struct iface *vlandev, *realdev;<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.7.9.5<br>
<br>
</font></span></blockquote></div><br></div>