#include <errno.h>
-#include "connectivity.h"
#include "dpif-netdev.h"
+#include "dynamic-string.h"
#include "flow.h"
#include "list.h"
#include "netdev-provider.h"
#include "odp-util.h"
#include "ofp-print.h"
#include "ofpbuf.h"
+#include "packet-dpif.h"
#include "packets.h"
#include "pcap-file.h"
#include "poll-loop.h"
-#include "seq.h"
#include "shash.h"
#include "sset.h"
#include "stream.h"
struct dummy_packet_stream {
struct stream *stream;
struct ofpbuf rxbuf;
- struct list txq;
+ struct ovs_list txq;
};
enum dummy_packet_conn_type {
ACTIVE /* Connect to listener. */
};
+enum dummy_netdev_conn_state {
+ CONN_STATE_CONNECTED, /* Listener connected. */
+ CONN_STATE_NOT_CONNECTED, /* Listener not connected. */
+ CONN_STATE_UNKNOWN, /* No relavent information. */
+};
+
struct dummy_packet_pconn {
struct pstream *pstream;
struct dummy_packet_stream *streams;
static struct ovs_mutex dummy_list_mutex = OVS_MUTEX_INITIALIZER;
/* Contains all 'struct dummy_dev's. */
-static struct list dummy_list OVS_GUARDED_BY(dummy_list_mutex)
+static struct ovs_list dummy_list OVS_GUARDED_BY(dummy_list_mutex)
= LIST_INITIALIZER(&dummy_list);
struct netdev_dummy {
struct netdev up;
/* In dummy_list. */
- struct list list_node OVS_GUARDED_BY(dummy_list_mutex);
+ struct ovs_list list_node OVS_GUARDED_BY(dummy_list_mutex);
/* Protects all members below. */
struct ovs_mutex mutex OVS_ACQ_AFTER(dummy_list_mutex);
FILE *tx_pcap, *rxq_pcap OVS_GUARDED;
- struct list rxes OVS_GUARDED; /* List of child "netdev_rxq_dummy"s. */
+ struct in_addr address, netmask;
+ struct ovs_list rxes OVS_GUARDED; /* List of child "netdev_rxq_dummy"s. */
};
/* Max 'recv_queue_len' in struct netdev_dummy. */
struct netdev_rxq_dummy {
struct netdev_rxq up;
- struct list node; /* In netdev_dummy's "rxes" list. */
- struct list recv_queue;
+ struct ovs_list node; /* In netdev_dummy's "rxes" list. */
+ struct ovs_list recv_queue;
int recv_queue_len; /* list_size(&recv_queue). */
struct seq *seq; /* Reports newly queued packets. */
};
int retval;
txbuf = ofpbuf_from_list(list_front(&s->txq));
- retval = stream_send(s->stream, txbuf->data, txbuf->size);
+ retval = stream_send(s->stream, ofpbuf_data(txbuf), ofpbuf_size(txbuf));
if (retval > 0) {
ofpbuf_pull(txbuf, retval);
- if (!txbuf->size) {
+ if (!ofpbuf_size(txbuf)) {
list_remove(&txbuf->list_node);
ofpbuf_delete(txbuf);
}
}
if (!error) {
- if (s->rxbuf.size < 2) {
- n = 2 - s->rxbuf.size;
+ if (ofpbuf_size(&s->rxbuf) < 2) {
+ n = 2 - ofpbuf_size(&s->rxbuf);
} else {
uint16_t frame_len;
- frame_len = ntohs(get_unaligned_be16(s->rxbuf.data));
+ frame_len = ntohs(get_unaligned_be16(ofpbuf_data(&s->rxbuf)));
if (frame_len < ETH_HEADER_LEN) {
error = EPROTO;
n = 0;
} else {
- n = (2 + frame_len) - s->rxbuf.size;
+ n = (2 + frame_len) - ofpbuf_size(&s->rxbuf);
}
}
}
retval = stream_recv(s->stream, ofpbuf_tail(&s->rxbuf), n);
if (retval > 0) {
- s->rxbuf.size += retval;
- if (retval == n && s->rxbuf.size > 2) {
+ ofpbuf_set_size(&s->rxbuf, ofpbuf_size(&s->rxbuf) + retval);
+ if (retval == n && ofpbuf_size(&s->rxbuf) > 2) {
ofpbuf_pull(&s->rxbuf, 2);
netdev_dummy_queue_packet(dev,
ofpbuf_clone(&s->rxbuf));
}
} else if (retval != -EAGAIN) {
error = (retval < 0 ? -retval
- : s->rxbuf.size ? EPROTO
+ : ofpbuf_size(&s->rxbuf) ? EPROTO
: EOF);
}
}
}
}
+static enum dummy_netdev_conn_state
+dummy_netdev_get_conn_state(struct dummy_packet_conn *conn)
+{
+ enum dummy_netdev_conn_state state;
+
+ if (conn->type == ACTIVE) {
+ if (reconnect_is_connected(conn->u.rconn.reconnect)) {
+ state = CONN_STATE_CONNECTED;
+ } else {
+ state = CONN_STATE_NOT_CONNECTED;
+ }
+ } else {
+ state = CONN_STATE_UNKNOWN;
+ }
+
+ return state;
+}
+
static void
netdev_dummy_run(void)
{
static int
netdev_dummy_construct(struct netdev *netdev_)
{
- static atomic_uint next_n = ATOMIC_VAR_INIT(0xaa550000);
+ static atomic_count next_n = ATOMIC_COUNT_INIT(0xaa550000);
struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
unsigned int n;
- atomic_add(&next_n, 1, &n);
+ n = atomic_count_inc(&next_n);
ovs_mutex_init(&netdev->mutex);
ovs_mutex_lock(&netdev->mutex);
return 0;
}
+static int
+netdev_dummy_get_in4(const struct netdev *netdev_,
+ struct in_addr *address, struct in_addr *netmask)
+{
+ struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+
+ ovs_mutex_lock(&netdev->mutex);
+ *address = netdev->address;
+ *netmask = netdev->netmask;
+ ovs_mutex_unlock(&netdev->mutex);
+ return 0;
+}
+
+static int
+netdev_dummy_set_in4(struct netdev *netdev_, struct in_addr address,
+ struct in_addr netmask)
+{
+ struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+
+ ovs_mutex_lock(&netdev->mutex);
+ netdev->address = address;
+ netdev->netmask = netmask;
+ ovs_mutex_unlock(&netdev->mutex);
+
+ return 0;
+}
+
static int
netdev_dummy_set_config(struct netdev *netdev_, const struct smap *args)
{
}
static int
-netdev_dummy_rxq_recv(struct netdev_rxq *rxq_, struct ofpbuf **arr, int *c)
+netdev_dummy_rxq_recv(struct netdev_rxq *rxq_, struct dpif_packet **arr,
+ int *c)
{
struct netdev_rxq_dummy *rx = netdev_rxq_dummy_cast(rxq_);
struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev);
}
ovs_mutex_lock(&netdev->mutex);
netdev->stats.rx_packets++;
- netdev->stats.rx_bytes += packet->size;
+ netdev->stats.rx_bytes += ofpbuf_size(packet);
ovs_mutex_unlock(&netdev->mutex);
dp_packet_pad(packet);
- arr[0] = packet;
+
+ /* This performs a (sometimes unnecessary) copy */
+ arr[0] = dpif_packet_clone_from_ofpbuf(packet);
+ dpif_packet_set_dp_hash(arr[0], 0);
+ ofpbuf_delete(packet);
*c = 1;
return 0;
}
}
static int
-netdev_dummy_send(struct netdev *netdev, struct ofpbuf *pkt, bool may_steal)
+netdev_dummy_send(struct netdev *netdev, int qid OVS_UNUSED,
+ struct dpif_packet **pkts, int cnt, bool may_steal)
{
struct netdev_dummy *dev = netdev_dummy_cast(netdev);
- const void *buffer = pkt->data;
- size_t size = pkt->size;
+ int error = 0;
+ int i;
- if (size < ETH_HEADER_LEN) {
- return EMSGSIZE;
- } else {
- const struct eth_header *eth = buffer;
- int max_size;
+ for (i = 0; i < cnt; i++) {
+ const void *buffer = ofpbuf_data(&pkts[i]->ofpbuf);
+ size_t size = ofpbuf_size(&pkts[i]->ofpbuf);
- ovs_mutex_lock(&dev->mutex);
- max_size = dev->mtu + ETH_HEADER_LEN;
- ovs_mutex_unlock(&dev->mutex);
+ if (size < ETH_HEADER_LEN) {
+ error = EMSGSIZE;
+ break;
+ } else {
+ const struct eth_header *eth = buffer;
+ int max_size;
- if (eth->eth_type == htons(ETH_TYPE_VLAN)) {
- max_size += VLAN_HEADER_LEN;
- }
- if (size > max_size) {
- return EMSGSIZE;
+ ovs_mutex_lock(&dev->mutex);
+ max_size = dev->mtu + ETH_HEADER_LEN;
+ ovs_mutex_unlock(&dev->mutex);
+
+ if (eth->eth_type == htons(ETH_TYPE_VLAN)) {
+ max_size += VLAN_HEADER_LEN;
+ }
+ if (size > max_size) {
+ error = EMSGSIZE;
+ break;
+ }
}
- }
- ovs_mutex_lock(&dev->mutex);
- dev->stats.tx_packets++;
- dev->stats.tx_bytes += size;
+ ovs_mutex_lock(&dev->mutex);
+ dev->stats.tx_packets++;
+ dev->stats.tx_bytes += size;
- dummy_packet_conn_send(&dev->conn, buffer, size);
+ dummy_packet_conn_send(&dev->conn, buffer, size);
- if (dev->tx_pcap) {
- struct ofpbuf packet;
+ if (dev->tx_pcap) {
+ struct ofpbuf packet;
+
+ ofpbuf_use_const(&packet, buffer, size);
+ ovs_pcap_write(dev->tx_pcap, &packet);
+ fflush(dev->tx_pcap);
+ }
- ofpbuf_use_const(&packet, buffer, size);
- ovs_pcap_write(dev->tx_pcap, &packet);
- fflush(dev->tx_pcap);
+ ovs_mutex_unlock(&dev->mutex);
}
- ovs_mutex_unlock(&dev->mutex);
if (may_steal) {
- ofpbuf_delete(pkt);
+ for (i = 0; i < cnt; i++) {
+ dpif_packet_delete(pkts[i]);
+ }
}
- return 0;
+ return error;
}
static int
ovs_mutex_lock(&dev->mutex);
if (!eth_addr_equals(dev->hwaddr, mac)) {
memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
- seq_change(connectivity_seq_get());
+ netdev_change_seq_changed(netdev);
}
ovs_mutex_unlock(&dev->mutex);
return 0;
}
-static int
-netdev_dummy_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
-{
- struct netdev_dummy *dev = netdev_dummy_cast(netdev);
-
- ovs_mutex_lock(&dev->mutex);
- dev->stats = *stats;
- ovs_mutex_unlock(&dev->mutex);
-
- return 0;
-}
-
static int
netdev_dummy_get_ifindex(const struct netdev *netdev)
{
netdev->flags |= on;
netdev->flags &= ~off;
if (*old_flagsp != netdev->flags) {
- seq_change(connectivity_seq_get());
+ netdev_change_seq_changed(&netdev->up);
}
return 0;
netdev_dummy_get_config,
netdev_dummy_set_config,
NULL, /* get_tunnel_config */
+ NULL, /* build header */
+ NULL, /* push header */
+ NULL, /* pop header */
+ NULL, /* get_numa_id */
+ NULL, /* set_multiq */
netdev_dummy_send, /* send */
NULL, /* send_wait */
NULL, /* get_carrier_resets */
NULL, /* get_miimon */
netdev_dummy_get_stats,
- netdev_dummy_set_stats,
NULL, /* get_features */
NULL, /* set_advertisements */
NULL, /* queue_dump_done */
NULL, /* dump_queue_stats */
- NULL, /* get_in4 */
+ netdev_dummy_get_in4, /* get_in4 */
NULL, /* set_in4 */
NULL, /* get_in6 */
NULL, /* add_router */
}
/* Convert odp_key to flow. */
- fitness = odp_flow_key_to_flow(odp_key.data, odp_key.size, &flow);
+ fitness = odp_flow_key_to_flow(ofpbuf_data(&odp_key), ofpbuf_size(&odp_key), &flow);
if (fitness == ODP_FIT_ERROR) {
ofpbuf_uninit(&odp_key);
return NULL;
unixctl_command_reply(conn, "OK");
}
+static void
+display_conn_state__(struct ds *s, const char *name,
+ enum dummy_netdev_conn_state state)
+{
+ ds_put_format(s, "%s: ", name);
+
+ switch (state) {
+ case CONN_STATE_CONNECTED:
+ ds_put_cstr(s, "connected\n");
+ break;
+
+ case CONN_STATE_NOT_CONNECTED:
+ ds_put_cstr(s, "disconnected\n");
+ break;
+
+ case CONN_STATE_UNKNOWN:
+ default:
+ ds_put_cstr(s, "unknown\n");
+ break;
+ };
+}
+
+static void
+netdev_dummy_conn_state(struct unixctl_conn *conn, int argc,
+ const char *argv[], void *aux OVS_UNUSED)
+{
+ enum dummy_netdev_conn_state state = CONN_STATE_UNKNOWN;
+ struct ds s;
+
+ ds_init(&s);
+
+ if (argc > 1) {
+ const char *dev_name = argv[1];
+ struct netdev *netdev = netdev_from_name(dev_name);
+
+ if (netdev && is_dummy_class(netdev->netdev_class)) {
+ struct netdev_dummy *dummy_dev = netdev_dummy_cast(netdev);
+
+ ovs_mutex_lock(&dummy_dev->mutex);
+ state = dummy_netdev_get_conn_state(&dummy_dev->conn);
+ ovs_mutex_unlock(&dummy_dev->mutex);
+
+ netdev_close(netdev);
+ }
+ display_conn_state__(&s, dev_name, state);
+ } else {
+ struct netdev_dummy *netdev;
+
+ ovs_mutex_lock(&dummy_list_mutex);
+ LIST_FOR_EACH (netdev, list_node, &dummy_list) {
+ ovs_mutex_lock(&netdev->mutex);
+ state = dummy_netdev_get_conn_state(&netdev->conn);
+ ovs_mutex_unlock(&netdev->mutex);
+ if (state != CONN_STATE_UNKNOWN) {
+ display_conn_state__(&s, netdev->up.name, state);
+ }
+ }
+ ovs_mutex_unlock(&dummy_list_mutex);
+ }
+
+ unixctl_command_reply(conn, ds_cstr(&s));
+ ds_destroy(&s);
+}
+
+static void
+netdev_dummy_ip4addr(struct unixctl_conn *conn, int argc OVS_UNUSED,
+ const char *argv[], void *aux OVS_UNUSED)
+{
+ struct netdev *netdev = netdev_from_name(argv[1]);
+
+ if (netdev && is_dummy_class(netdev->netdev_class)) {
+ struct in_addr ip;
+ uint16_t plen;
+
+ if (ovs_scan(argv[2], IP_SCAN_FMT"/%"SCNi16,
+ IP_SCAN_ARGS(&ip.s_addr), &plen)) {
+ struct in_addr mask;
+
+ mask.s_addr = be32_prefix_mask(plen);
+ netdev_dummy_set_in4(netdev, ip, mask);
+ unixctl_command_reply(conn, "OK");
+ } else {
+ unixctl_command_reply(conn, "Invalid parameters");
+ }
+
+ netdev_close(netdev);
+ } else {
+ unixctl_command_reply_error(conn, "Unknown Dummy Interface");
+ netdev_close(netdev);
+ return;
+ }
+
+}
+
void
netdev_dummy_register(bool override)
{
- unixctl_command_register("netdev-dummy/receive", "NAME PACKET|FLOW...",
+ unixctl_command_register("netdev-dummy/receive", "name packet|flow...",
2, INT_MAX, netdev_dummy_receive, NULL);
unixctl_command_register("netdev-dummy/set-admin-state",
"[netdev] up|down", 1, 2,
netdev_dummy_set_admin_state, NULL);
+ unixctl_command_register("netdev-dummy/conn-state",
+ "[netdev]", 0, 1,
+ netdev_dummy_conn_state, NULL);
+ unixctl_command_register("netdev-dummy/ip4addr",
+ "[netdev] ipaddr/mask-prefix-len", 2, 2,
+ netdev_dummy_ip4addr, NULL);
+
if (override) {
struct sset types;
projects / cascardo / ovs.git / blobdiff