/*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
static bool
get_port_number(struct dpif *dpif, const char *name, uint16_t *port)
{
- struct odp_port odp_port;
+ struct dpif_port dpif_port;
- if (!dpif_port_query_by_name(dpif, name, &odp_port)) {
- *port = odp_port.port;
+ if (!dpif_port_query_by_name(dpif, name, &dpif_port)) {
+ *port = dpif_port.port_no;
+ dpif_port_destroy(&dpif_port);
return true;
} else {
ovs_error(0, "no port named %s", name);
show_dpif(struct dpif *dpif)
{
struct dpif_port_dump dump;
- struct odp_port odp_port;
+ struct dpif_port dpif_port;
struct odp_stats stats;
printf("%s:\n", dpif_name(dpif));
if (!dpif_get_dp_stats(dpif, &stats)) {
- printf("\tflows: cur:%"PRIu32", soft-max:%"PRIu32", "
- "hard-max:%"PRIu32"\n",
- stats.n_flows, stats.cur_capacity, stats.max_capacity);
- printf("\tports: cur:%"PRIu32", max:%"PRIu32"\n",
- stats.n_ports, stats.max_ports);
printf("\tlookups: frags:%llu, hit:%llu, missed:%llu, lost:%llu\n",
(unsigned long long int) stats.n_frags,
(unsigned long long int) stats.n_hit,
(unsigned long long int) stats.n_missed,
(unsigned long long int) stats.n_lost);
- printf("\tqueues: max-miss:%"PRIu16", max-action:%"PRIu16"\n",
- stats.max_miss_queue, stats.max_action_queue);
}
- DPIF_PORT_FOR_EACH (&odp_port, &dump, dpif) {
- struct ds ds;
+ DPIF_PORT_FOR_EACH (&dpif_port, &dump, dpif) {
+ printf("\tport %u: %s", dpif_port.port_no, dpif_port.name);
- printf("\tport %u: %s", odp_port.port, odp_port.devname);
+ if (strcmp(dpif_port.type, "system")) {
+ struct netdev_options netdev_options;
+ struct netdev *netdev;
+ int error;
- ds_init(&ds);
- format_odp_port_type(&ds, &odp_port);
- printf("%s\n", ds_cstr(&ds));
- ds_destroy(&ds);
+ printf (" (%s", dpif_port.type);
+
+ netdev_options.name = dpif_port.name;
+ netdev_options.type = dpif_port.type;
+ netdev_options.args = NULL;
+ netdev_options.ethertype = NETDEV_ETH_TYPE_NONE;
+ error = netdev_open(&netdev_options, &netdev);
+ if (!error) {
+ const struct shash_node **nodes;
+ const struct shash *config;
+ size_t i;
+
+ config = netdev_get_config(netdev);
+ nodes = shash_sort(config);
+ for (i = 0; i < shash_count(config); i++) {
+ const struct shash_node *node = nodes[i];
+ printf("%c %s=%s", i ? ',' : ':',
+ node->name, (char *) node->data);
+ }
+ free(nodes);
+
+ netdev_close(netdev);
+ } else {
+ printf(": open failed (%s)", strerror(error));
+ }
+ putchar(')');
+ }
+ putchar('\n');
}
dpif_close(dpif);
}