return do_ioctl(dpif_, ODP_SET_DROP_FRAGS, &drop_frags_int);
}
-static void
-translate_vport_type_to_netdev_type(struct odp_port *port)
+static const char *
+vport_type_to_netdev_type(const struct odp_port *odp_port)
{
- char *type = port->type;
+ struct tnl_port_config tnl_config;
- if (!strcmp(type, "netdev")) {
- ovs_strlcpy(type, "system", sizeof port->type);
- } else if (!strcmp(type, "gre")) {
- const struct tnl_port_config *config;
+ switch (odp_port->type) {
+ case ODP_VPORT_TYPE_UNSPEC:
+ break;
- config = (struct tnl_port_config *)port->config;
- if (config->flags & TNL_F_IPSEC) {
- ovs_strlcpy(type, "ipsec_gre", sizeof port->type);
- }
+ case ODP_VPORT_TYPE_NETDEV:
+ return "system";
+
+ case ODP_VPORT_TYPE_INTERNAL:
+ return "internal";
+
+ case ODP_VPORT_TYPE_PATCH:
+ return "patch";
+
+ case ODP_VPORT_TYPE_GRE:
+ memcpy(&tnl_config, odp_port->config, sizeof tnl_config);
+ return tnl_config.flags & TNL_F_IPSEC ? "ipsec_gre" : "gre";
+
+ case ODP_VPORT_TYPE_CAPWAP:
+ return "capwap";
+
+ case __ODP_VPORT_TYPE_MAX:
+ break;
}
+
+ VLOG_WARN_RL(&error_rl, "dp%d: port `%s' has unsupported type %"PRIu32,
+ odp_port->dp_idx, odp_port->devname, odp_port->type);
+ return "unknown";
}
-static void
-translate_netdev_type_to_vport_type(struct odp_port *port)
+static enum odp_vport_type
+netdev_type_to_vport_type(const char *type)
{
- char *type = port->type;
-
- if (!strcmp(type, "system")) {
- ovs_strlcpy(type, "netdev", sizeof port->type);
- } else if (!strcmp(type, "ipsec_gre")) {
- ovs_strlcpy(type, "gre", sizeof port->type);
- }
+ return (!strcmp(type, "system") ? ODP_VPORT_TYPE_NETDEV
+ : !strcmp(type, "internal") ? ODP_VPORT_TYPE_INTERNAL
+ : !strcmp(type, "patch") ? ODP_VPORT_TYPE_PATCH
+ : (!strcmp(type, "gre")
+ || !strcmp(type, "ipsec_gre")) ? ODP_VPORT_TYPE_GRE
+ : !strcmp(type, "capwap") ? ODP_VPORT_TYPE_CAPWAP
+ : ODP_VPORT_TYPE_UNSPEC);
}
static int
memset(&port, 0, sizeof port);
strncpy(port.devname, name, sizeof port.devname);
- strncpy(port.type, type, sizeof port.type);
netdev_vport_get_config(netdev, port.config);
- translate_netdev_type_to_vport_type(&port);
+
+ port.type = netdev_type_to_vport_type(type);
+ if (port.type == ODP_VPORT_TYPE_UNSPEC) {
+ VLOG_WARN_RL(&error_rl, "%s: cannot create port `%s' because it has "
+ "unsupported type `%s'",
+ dpif_name(dpif), name, type);
+ return EINVAL;
+ }
error = do_ioctl(dpif, ODP_VPORT_ATTACH, &port);
if (!error) {
}
static int
-dpif_linux_port_query__(const struct dpif *dpif, struct odp_port *port)
+dpif_linux_port_query__(const struct dpif *dpif, uint32_t port_no,
+ const char *port_name, struct dpif_port *dpif_port)
{
- int error = do_ioctl(dpif, ODP_VPORT_QUERY, port);
- if (!error) {
- translate_vport_type_to_netdev_type(port);
+ struct odp_port odp_port;
+ int error;
+
+ memset(&odp_port, 0, sizeof odp_port);
+ odp_port.port = port_no;
+ strncpy(odp_port.devname, port_name, sizeof odp_port.devname);
+
+ error = do_ioctl(dpif, ODP_VPORT_QUERY, &odp_port);
+ if (error) {
+ return error;
+ } else if (odp_port.dp_idx != dpif_linux_cast(dpif)->minor) {
+ /* A vport named 'port_name' exists but in some other datapath. */
+ return ENOENT;
+ } else {
+ dpif_port->name = xstrdup(odp_port.devname);
+ dpif_port->type = xstrdup(vport_type_to_netdev_type(&odp_port));
+ dpif_port->port_no = odp_port.port;
+ return 0;
}
- return error;
}
static int
dpif_linux_port_query_by_number(const struct dpif *dpif, uint16_t port_no,
- struct odp_port *port)
+ struct dpif_port *dpif_port)
{
- memset(port, 0, sizeof *port);
- port->port = port_no;
- return dpif_linux_port_query__(dpif, port);
+ return dpif_linux_port_query__(dpif, port_no, "", dpif_port);
}
static int
-dpif_linux_port_query_by_name(const struct dpif *dpif_, const char *devname,
- struct odp_port *port)
+dpif_linux_port_query_by_name(const struct dpif *dpif, const char *devname,
+ struct dpif_port *dpif_port)
{
- struct dpif_linux *dpif = dpif_linux_cast(dpif_);
- int error;
-
- memset(port, 0, sizeof *port);
- strncpy(port->devname, devname, sizeof port->devname);
- error = dpif_linux_port_query__(dpif_, port);
- if (!error && port->dp_idx != dpif->minor) {
- /* A vport named 'devname' exists but in some other datapath. */
- error = ENOENT;
- }
- return error;
+ return dpif_linux_port_query__(dpif, 0, devname, dpif_port);
}
static int
static int
dpif_linux_port_dump_start(const struct dpif *dpif OVS_UNUSED, void **statep)
{
- *statep = xzalloc(sizeof(struct odp_vport_dump));
+ *statep = xzalloc(sizeof(struct odp_port));
return 0;
}
static int
dpif_linux_port_dump_next(const struct dpif *dpif, void *state,
- struct odp_port *port)
+ struct dpif_port *dpif_port)
{
- struct odp_vport_dump *dump = state;
+ struct odp_port *odp_port = state;
+ struct odp_vport_dump dump;
int error;
- dump->port = port;
- error = do_ioctl(dpif, ODP_VPORT_DUMP, dump);
+ dump.port = odp_port;
+ dump.port_no = odp_port->port;
+ error = do_ioctl(dpif, ODP_VPORT_DUMP, &dump);
if (error) {
return error;
- } else if (port->devname[0] == '\0') {
+ } else if (odp_port->devname[0] == '\0') {
return EOF;
} else {
- dump->port_no = port->port + 1;
- translate_vport_type_to_netdev_type(port);
+ dpif_port->name = odp_port->devname;
+ dpif_port->type = (char *) vport_type_to_netdev_type(odp_port);
+ dpif_port->port_no = odp_port->port;
+ odp_port->port++;
return 0;
}
}
name, strerror(errno));
}
return errno;
- } else if (!strcmp(odp_port.type, "internal")) {
+ } else if (odp_port.type == ODP_VPORT_TYPE_INTERNAL) {
*dp_idx = odp_port.dp_idx;
*port_no = odp_port.port;
return 0;
git://git.onelab.eu / sliver-openvswitch.git / blobdiff