#include "dynamic-string.h"
#include "netdev.h"
#include "odp-util.h"
+#include "shash.h"
#include "svec.h"
#include "timeval.h"
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(dpctl)
+VLOG_DEFINE_THIS_MODULE(dpctl);
static const struct command all_commands[];
run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath");
for (i = 2; i < argc; i++) {
char *save_ptr = NULL;
- char *devname, *suboptions;
- int flags = 0;
+ struct netdev_options options;
+ struct netdev *netdev;
+ struct shash args;
+ char *option;
int error;
- devname = strtok_r(argv[i], ",", &save_ptr);
- if (!devname) {
+ options.name = strtok_r(argv[i], ",", &save_ptr);
+ options.type = "system";
+ options.args = &args;
+ options.ethertype = NETDEV_ETH_TYPE_NONE;
+
+ if (!options.name) {
ovs_error(0, "%s is not a valid network device name", argv[i]);
continue;
}
- suboptions = strtok_r(NULL, "", &save_ptr);
- if (suboptions) {
- enum {
- AP_INTERNAL
- };
- static char *options[] = {
- "internal"
- };
-
- while (*suboptions != '\0') {
- char *value;
-
- switch (getsubopt(&suboptions, options, &value)) {
- case AP_INTERNAL:
- flags |= ODP_PORT_INTERNAL;
- break;
-
- default:
- ovs_error(0, "unknown suboption '%s'", value);
- break;
- }
+ shash_init(&args);
+ while ((option = strtok_r(NULL, "", &save_ptr)) != NULL) {
+ char *save_ptr_2 = NULL;
+ char *key, *value;
+
+ key = strtok_r(option, "=", &save_ptr_2);
+ value = strtok_r(NULL, "", &save_ptr_2);
+ if (!value) {
+ value = "";
+ }
+
+ if (!strcmp(key, "type")) {
+ options.type = value;
+ } else if (!shash_add_once(&args, key, value)) {
+ ovs_error(0, "duplicate \"%s\" option", key);
}
}
- error = dpif_port_add(dpif, devname, flags, NULL);
+ error = netdev_open(&options, &netdev);
+ if (error) {
+ ovs_error(error, "%s: failed to open network device",
+ options.name);
+ } else {
+ error = dpif_port_add(dpif, netdev, NULL);
+ if (error) {
+ ovs_error(error, "adding %s to %s failed",
+ options.name, argv[1]);
+ } else {
+ error = if_up(options.name);
+ }
+ netdev_close(netdev);
+ }
if (error) {
- ovs_error(error, "adding %s to %s failed", devname, argv[1]);
- failure = true;
- } else if (if_up(devname)) {
failure = true;
}
}
}
query_ports(dpif, &ports, &n_ports);
for (i = 0; i < n_ports; i++) {
- printf("\tport %u: %s", ports[i].port, ports[i].devname);
- if (ports[i].flags & ODP_PORT_INTERNAL) {
- printf(" (internal)");
+ const struct odp_port *p = &ports[i];
+
+ printf("\tport %u: %s", p->port, p->devname);
+ if (strcmp(p->type, "system")) {
+ printf(" (%s)", p->type);
}
printf("\n");
}
ds_init(&ds);
for (i = 0; i < n_flows; i++) {
struct odp_flow *f = &flows[i];
- enum { MAX_ACTIONS = 4096 / sizeof(union odp_action) };
- union odp_action actions[MAX_ACTIONS];
+ enum { MAX_ACTIONS = 4096 }; /* An arbitrary but large number. */
+ struct nlattr actions[MAX_ACTIONS];
f->actions = actions;
- f->n_actions = MAX_ACTIONS;
+ f->actions_len = sizeof actions;
if (!dpif_flow_get(dpif, f)) {
ds_clear(&ds);
format_odp_flow(&ds, f);