VLOG_DEFINE_THIS_MODULE(netdev_pltap);
-struct netdev_dev_pltap {
- struct netdev_dev up;
+struct netdev_pltap {
+ struct netdev up;
char *real_name;
struct netdev_stats stats;
enum netdev_flags new_flags;
static struct list sync_list;
-struct netdev_pltap {
- struct netdev up;
-};
-
struct netdev_rx_pltap {
struct netdev_rx up;
int fd;
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
-static struct shash pltap_netdev_devs = SHASH_INITIALIZER(&pltap_netdev_devs);
+static struct shash pltap_netdevs = SHASH_INITIALIZER(&pltap_netdevs);
static int netdev_pltap_create(const struct netdev_class *, const char *,
- struct netdev_dev **);
+ struct netdev **);
-static void netdev_pltap_update_seq(struct netdev_dev_pltap *);
-static int get_flags(struct netdev_dev_pltap *dev, enum netdev_flags *flags);
+static void netdev_pltap_update_seq(struct netdev_pltap *);
+static int get_flags(struct netdev_pltap *dev, enum netdev_flags *flags);
static bool
-netdev_pltap_finalized(struct netdev_dev_pltap *dev)
+netdev_pltap_finalized(struct netdev_pltap *dev)
{
return dev->valid_local_ip && dev->valid_local_netmask;
}
return class->create == netdev_pltap_create;
}
-static struct netdev_dev_pltap *
-netdev_dev_pltap_cast(const struct netdev_dev *netdev_dev)
-{
- ovs_assert(is_netdev_pltap_class(netdev_dev_get_class(netdev_dev)));
- return CONTAINER_OF(netdev_dev, struct netdev_dev_pltap, up);
-}
-
static struct netdev_pltap *
netdev_pltap_cast(const struct netdev *netdev)
{
- struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
- ovs_assert(is_netdev_pltap_class(netdev_dev_get_class(netdev_dev)));
+ ovs_assert(is_netdev_pltap_class(netdev_get_class(netdev)));
return CONTAINER_OF(netdev, struct netdev_pltap, up);
}
return CONTAINER_OF(rx, struct netdev_rx_pltap, up);
}
-static void sync_needed(struct netdev_dev_pltap *dev)
+static void sync_needed(struct netdev_pltap *dev)
{
if (dev->sync_flags_needed)
return;
}
-static void sync_done(struct netdev_dev_pltap *dev)
+static void sync_done(struct netdev_pltap *dev)
{
if (!dev->sync_flags_needed)
return;
static int
netdev_pltap_create(const struct netdev_class *class OVS_UNUSED, const char *name,
- struct netdev_dev **netdev_devp)
+ struct netdev **netdevp)
{
- struct netdev_dev_pltap *netdev_dev;
+ struct netdev_pltap *netdev;
int error;
- netdev_dev = xzalloc(sizeof *netdev_dev);
+ netdev = xzalloc(sizeof *netdev);
- netdev_dev->real_name = xzalloc(IFNAMSIZ + 1);
- memset(&netdev_dev->local_addr, 0, sizeof(netdev_dev->local_addr));
- netdev_dev->valid_local_ip = false;
- netdev_dev->valid_local_netmask = false;
- netdev_dev->flags = 0;
- netdev_dev->sync_flags_needed = false;
- list_init(&netdev_dev->sync_list);
+ netdev->real_name = xzalloc(IFNAMSIZ + 1);
+ memset(&netdev->local_addr, 0, sizeof(netdev->local_addr));
+ netdev->valid_local_ip = false;
+ netdev->valid_local_netmask = false;
+ netdev->flags = 0;
+ netdev->sync_flags_needed = false;
+ list_init(&netdev->sync_list);
/* Open tap device. */
- netdev_dev->fd = tun_alloc(IFF_TAP, netdev_dev->real_name);
- if (netdev_dev->fd < 0) {
+ netdev->fd = tun_alloc(IFF_TAP, netdev->real_name);
+ if (netdev->fd < 0) {
error = errno;
VLOG_WARN("tun_alloc(IFF_TAP, %s) failed: %s", name, strerror(error));
goto cleanup;
}
- VLOG_DBG("real_name = %s", netdev_dev->real_name);
+ VLOG_DBG("real_name = %s", netdev->real_name);
/* Make non-blocking. */
- error = set_nonblocking(netdev_dev->fd);
+ error = set_nonblocking(netdev->fd);
if (error) {
goto cleanup;
}
- netdev_dev_init(&netdev_dev->up, name, &netdev_pltap_class);
- shash_add(&pltap_netdev_devs, name, netdev_dev);
- *netdev_devp = &netdev_dev->up;
+ netdev_init(&netdev->up, name, &netdev_pltap_class);
+ shash_add(&pltap_netdevs, name, netdev);
+ *netdevp = &netdev->up;
return 0;
cleanup:
- free(netdev_dev);
+ free(netdev);
return error;
}
static void
-netdev_pltap_destroy(struct netdev_dev *netdev_dev_)
+netdev_pltap_destroy(struct netdev *netdev_)
{
- struct netdev_dev_pltap *netdev_dev = netdev_dev_pltap_cast(netdev_dev_);
-
- if (netdev_dev->fd != -1)
- close(netdev_dev->fd);
-
- sync_done(netdev_dev);
-
- shash_find_and_delete(&pltap_netdev_devs,
- netdev_dev_get_name(netdev_dev_));
- free(netdev_dev);
-}
-
-static int
-netdev_pltap_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp)
-{
- struct netdev_pltap *netdev;
+ struct netdev_pltap *netdev = netdev_pltap_cast(netdev_);
- netdev = xmalloc(sizeof *netdev);
- netdev_init(&netdev->up, netdev_dev_);
+ if (netdev->fd != -1)
+ close(netdev->fd);
- *netdevp = &netdev->up;
- return 0;
-}
+ sync_done(netdev);
-static void
-netdev_pltap_close(struct netdev *netdev_)
-{
- struct netdev_pltap *netdev = netdev_pltap_cast(netdev_);
+ shash_find_and_delete(&pltap_netdevs,
+ netdev_get_name(netdev_));
free(netdev);
}
-
-static int netdev_pltap_up(struct netdev_dev_pltap *dev);
+static int netdev_pltap_up(struct netdev_pltap *dev);
static int
netdev_pltap_rx_open(struct netdev *netdev_, struct netdev_rx **rxp)
{
- struct netdev_dev_pltap *netdev_dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
+ struct netdev_pltap *netdev =
+ netdev_pltap_cast(netdev_);
struct netdev_rx_pltap *rx;
int err;
rx = xmalloc(sizeof *rx);
- netdev_rx_init(&rx->up, netdev_get_dev(netdev_), &netdev_rx_pltap_class);
- rx->fd = netdev_dev->fd;
+ netdev_rx_init(&rx->up, netdev_, &netdev_rx_pltap_class);
+ rx->fd = netdev->fd;
*rxp = &rx->up;
- if (!netdev_pltap_finalized(netdev_dev))
+ if (!netdev_pltap_finalized(netdev))
return 0;
- err = netdev_pltap_up(netdev_dev);
+ err = netdev_pltap_up(netdev);
if (err) {
free(rx);
*rxp = NULL;
}
static int
-netdev_pltap_up(struct netdev_dev_pltap *dev)
+netdev_pltap_up(struct netdev_pltap *dev)
{
if (!netdev_pltap_finalized(dev)) {
return 0;
}
static int
-netdev_pltap_down(struct netdev_dev_pltap *dev)
+netdev_pltap_down(struct netdev_pltap *dev)
{
if (!netdev_pltap_finalized(dev)) {
return 0;
}
static int
-netdev_pltap_promisc(struct netdev_dev_pltap *dev, bool promisc)
+netdev_pltap_promisc(struct netdev_pltap *dev, bool promisc)
{
if (!netdev_pltap_finalized(dev)) {
return 0;
}
static void
-netdev_pltap_sync_flags(struct netdev_dev_pltap *dev)
+netdev_pltap_sync_flags(struct netdev_pltap *dev)
{
if (dev->fd < 0 || !netdev_pltap_finalized(dev)) {
static int
-netdev_pltap_get_config(struct netdev_dev *dev_, struct smap *args)
+netdev_pltap_get_config(const struct netdev *dev_, struct smap *args)
{
- struct netdev_dev_pltap *netdev_dev = netdev_dev_pltap_cast(dev_);
+ struct netdev_pltap *netdev = netdev_pltap_cast(dev_);
- if (netdev_dev->valid_local_ip)
+ if (netdev->valid_local_ip)
smap_add_format(args, "local_ip", IP_FMT,
- IP_ARGS(netdev_dev->local_addr.sin_addr.s_addr));
- if (netdev_dev->valid_local_netmask)
+ IP_ARGS(netdev->local_addr.sin_addr.s_addr));
+ if (netdev->valid_local_netmask)
smap_add_format(args, "local_netmask", "%"PRIu32,
- ntohs(netdev_dev->local_netmask));
+ ntohs(netdev->local_netmask));
return 0;
}
static int
-netdev_pltap_set_config(struct netdev_dev *dev_, const struct smap *args)
+netdev_pltap_set_config(struct netdev *dev_, const struct smap *args)
{
- struct netdev_dev_pltap *netdev_dev = netdev_dev_pltap_cast(dev_);
+ struct netdev_pltap *netdev = netdev_pltap_cast(dev_);
struct shash_node *node;
- VLOG_DBG("pltap_set_config(%s)", netdev_dev_get_name(dev_));
+ VLOG_DBG("pltap_set_config(%s)", netdev_get_name(dev_));
SMAP_FOR_EACH(node, args) {
VLOG_DBG("arg: %s->%s", node->name, (char*)node->data);
if (!strcmp(node->name, "local_ip")) {
if (lookup_ip(node->data, &addr)) {
VLOG_WARN("%s: bad 'local_ip'", node->name);
} else {
- netdev_dev->local_addr.sin_addr = addr;
- netdev_dev->valid_local_ip = true;
+ netdev->local_addr.sin_addr = addr;
+ netdev->valid_local_ip = true;
}
} else if (!strcmp(node->name, "local_netmask")) {
- netdev_dev->local_netmask = atoi(node->data);
+ netdev->local_netmask = atoi(node->data);
// XXX check valididy
- netdev_dev->valid_local_netmask = true;
+ netdev->valid_local_netmask = true;
} else {
VLOG_WARN("%s: unknown argument '%s'",
- netdev_dev_get_name(dev_), node->name);
+ netdev_get_name(dev_), node->name);
}
}
- if (netdev_pltap_finalized(netdev_dev)) {
- netdev_dev->new_flags |= NETDEV_UP;
- sync_needed(netdev_dev);
+ if (netdev_pltap_finalized(netdev)) {
+ netdev->new_flags |= NETDEV_UP;
+ sync_needed(netdev);
}
return 0;
}
netdev_rx_pltap_wait(struct netdev_rx *rx_)
{
struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
- struct netdev_dev_pltap *netdev_dev =
- netdev_dev_pltap_cast(rx->up.netdev_dev);
- if (rx->fd >= 0 && netdev_pltap_finalized(netdev_dev)) {
+ struct netdev_pltap *netdev =
+ netdev_pltap_cast(rx->up.netdev);
+ if (rx->fd >= 0 && netdev_pltap_finalized(netdev)) {
poll_fd_wait(rx->fd, POLLIN);
}
}
static int
netdev_pltap_send(struct netdev *netdev_, const void *buffer, size_t size)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
+ struct netdev_pltap *dev =
+ netdev_pltap_cast(netdev_);
char prefix[4] = { 0, 0, 8, 6 };
struct iovec iov[2] = {
{ .iov_base = prefix, .iov_len = 4 },
static void
netdev_pltap_send_wait(struct netdev *netdev_)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
+ struct netdev_pltap *dev =
+ netdev_pltap_cast(netdev_);
if (dev->fd >= 0 && netdev_pltap_finalized(dev)) {
poll_fd_wait(dev->fd, POLLOUT);
}
// XXX from netdev-linux.c
static int
-get_etheraddr(struct netdev_dev_pltap *dev, uint8_t ea[ETH_ADDR_LEN])
+get_etheraddr(struct netdev_pltap *dev, uint8_t ea[ETH_ADDR_LEN])
{
struct ifreq ifr;
int hwaddr_family;
}
static int
-get_flags(struct netdev_dev_pltap *dev, enum netdev_flags *flags)
+get_flags(struct netdev_pltap *dev, enum netdev_flags *flags)
{
struct ifreq ifr;
netdev_pltap_get_etheraddr(const struct netdev *netdev,
uint8_t mac[ETH_ADDR_LEN])
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev));
+ struct netdev_pltap *dev =
+ netdev_pltap_cast(netdev);
if (dev->fd < 0)
return EAGAIN;
return get_etheraddr(dev, mac);
static int
-netdev_pltap_update_flags(struct netdev_dev *dev_,
+netdev_pltap_update_flags(struct netdev *dev_,
enum netdev_flags off, enum netdev_flags on,
enum netdev_flags *old_flagsp)
{
- struct netdev_dev_pltap *netdev_dev =
- netdev_dev_pltap_cast(dev_);
+ struct netdev_pltap *netdev =
+ netdev_pltap_cast(dev_);
int error = 0;
if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
return EINVAL;
}
- if (netdev_pltap_finalized(netdev_dev)) {
- error = get_flags(netdev_dev, &netdev_dev->flags);
+ if (netdev_pltap_finalized(netdev)) {
+ error = get_flags(netdev, &netdev->flags);
}
- *old_flagsp = netdev_dev->flags;
- netdev_dev->new_flags |= on;
- netdev_dev->new_flags &= ~off;
- if (netdev_dev->flags != netdev_dev->new_flags) {
+ *old_flagsp = netdev->flags;
+ netdev->new_flags |= on;
+ netdev->new_flags &= ~off;
+ if (netdev->flags != netdev->new_flags) {
/* we cannot sync here, since we may be in a signal handler */
- sync_needed(netdev_dev);
+ sync_needed(netdev);
}
return error;
static unsigned int
netdev_pltap_change_seq(const struct netdev *netdev)
{
- return netdev_dev_pltap_cast(netdev_get_dev(netdev))->change_seq;
+ return netdev_pltap_cast(netdev)->change_seq;
}
\f
/* Helper functions. */
static void
-netdev_pltap_update_seq(struct netdev_dev_pltap *dev)
+netdev_pltap_update_seq(struct netdev_pltap *dev)
{
dev->change_seq++;
if (!dev->change_seq) {
netdev_pltap_get_real_name(struct unixctl_conn *conn,
int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED)
{
- struct netdev_dev_pltap *pltap_dev;
+ struct netdev_pltap *pltap_dev;
- pltap_dev = shash_find_data(&pltap_netdev_devs, argv[1]);
+ pltap_dev = shash_find_data(&pltap_netdevs, argv[1]);
if (!pltap_dev) {
unixctl_command_reply_error(conn, "no such pltap netdev");
return;
static void
netdev_pltap_run(void)
{
- struct netdev_dev_pltap *iter, *next;
+ struct netdev_pltap *iter, *next;
LIST_FOR_EACH_SAFE(iter, next, sync_list, &sync_list) {
netdev_pltap_sync_flags(iter);
}
netdev_pltap_set_config,
NULL, /* get_tunnel_config */
- netdev_pltap_open,
- netdev_pltap_close,
-
netdev_pltap_rx_open,
netdev_pltap_send,
VLOG_DEFINE_THIS_MODULE(netdev_tunnel);
-struct netdev_dev_tunnel {
- struct netdev_dev up;
+struct netdev_tunnel {
+ struct netdev up;
uint8_t hwaddr[ETH_ADDR_LEN];
struct netdev_stats stats;
enum netdev_flags flags;
unsigned int change_seq;
};
-struct netdev_tunnel {
- struct netdev up;
-};
-
struct netdev_rx_tunnel {
struct netdev_rx up;
int fd;
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
-static struct shash tunnel_netdev_devs = SHASH_INITIALIZER(&tunnel_netdev_devs);
+static struct shash tunnel_netdevs = SHASH_INITIALIZER(&tunnel_netdevs);
static int netdev_tunnel_create(const struct netdev_class *, const char *,
- struct netdev_dev **);
-static void netdev_tunnel_update_seq(struct netdev_dev_tunnel *);
+ struct netdev **);
+static void netdev_tunnel_update_seq(struct netdev_tunnel *);
static bool
is_netdev_tunnel_class(const struct netdev_class *class)
return class->create == netdev_tunnel_create;
}
-static struct netdev_dev_tunnel *
-netdev_dev_tunnel_cast(const struct netdev_dev *netdev_dev)
-{
- ovs_assert(is_netdev_tunnel_class(netdev_dev_get_class(netdev_dev)));
- return CONTAINER_OF(netdev_dev, struct netdev_dev_tunnel, up);
-}
-
static struct netdev_tunnel *
netdev_tunnel_cast(const struct netdev *netdev)
{
- struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
- ovs_assert(is_netdev_tunnel_class(netdev_dev_get_class(netdev_dev)));
+ ovs_assert(is_netdev_tunnel_class(netdev_get_class(netdev)));
return CONTAINER_OF(netdev, struct netdev_tunnel, up);
}
static int
netdev_tunnel_create(const struct netdev_class *class, const char *name,
- struct netdev_dev **netdev_devp)
+ struct netdev **netdevp)
{
static unsigned int n = 0;
- struct netdev_dev_tunnel *netdev_dev;
+ struct netdev_tunnel *netdev;
int error;
- netdev_dev = xzalloc(sizeof *netdev_dev);
- netdev_dev_init(&netdev_dev->up, name, class);
- netdev_dev->hwaddr[0] = 0xfe;
- netdev_dev->hwaddr[1] = 0xff;
- netdev_dev->hwaddr[2] = 0xff;
- netdev_dev->hwaddr[3] = n >> 16;
- netdev_dev->hwaddr[4] = n >> 8;
- netdev_dev->hwaddr[5] = n;
- netdev_dev->flags = 0;
- netdev_dev->change_seq = 1;
- memset(&netdev_dev->remote_addr, 0, sizeof(netdev_dev->remote_addr));
- netdev_dev->valid_remote_ip = false;
- netdev_dev->valid_remote_port = false;
- netdev_dev->connected = false;
-
-
- netdev_dev->sockfd = inet_open_passive(SOCK_DGRAM, "", 0, &netdev_dev->local_addr, 0);
- if (netdev_dev->sockfd < 0) {
- error = netdev_dev->sockfd;
+ netdev = xzalloc(sizeof *netdev);
+ netdev_init(&netdev->up, name, class);
+ netdev->hwaddr[0] = 0xfe;
+ netdev->hwaddr[1] = 0xff;
+ netdev->hwaddr[2] = 0xff;
+ netdev->hwaddr[3] = n >> 16;
+ netdev->hwaddr[4] = n >> 8;
+ netdev->hwaddr[5] = n;
+ netdev->flags = 0;
+ netdev->change_seq = 1;
+ memset(&netdev->remote_addr, 0, sizeof(netdev->remote_addr));
+ netdev->valid_remote_ip = false;
+ netdev->valid_remote_port = false;
+ netdev->connected = false;
+
+
+ netdev->sockfd = inet_open_passive(SOCK_DGRAM, "", 0, &netdev->local_addr, 0);
+ if (netdev->sockfd < 0) {
+ error = netdev->sockfd;
goto error;
}
- shash_add(&tunnel_netdev_devs, name, netdev_dev);
+ shash_add(&tunnel_netdevs, name, netdev);
n++;
- *netdev_devp = &netdev_dev->up;
+ *netdevp = &netdev->up;
- VLOG_DBG("tunnel_create: name=%s, fd=%d, port=%d", name, netdev_dev->sockfd, netdev_dev->local_addr.sin_port);
+ VLOG_DBG("tunnel_create: name=%s, fd=%d, port=%d", name, netdev->sockfd, netdev->local_addr.sin_port);
return 0;
error:
- free(netdev_dev);
+ free(netdev);
return error;
}
static void
-netdev_tunnel_destroy(struct netdev_dev *netdev_dev_)
-{
- struct netdev_dev_tunnel *netdev_dev = netdev_dev_tunnel_cast(netdev_dev_);
-
- if (netdev_dev->sockfd != -1)
- close(netdev_dev->sockfd);
-
- shash_find_and_delete(&tunnel_netdev_devs,
- netdev_dev_get_name(netdev_dev_));
- free(netdev_dev);
-}
-
-static int
-netdev_tunnel_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp)
+netdev_tunnel_destroy(struct netdev *netdev_)
{
- struct netdev_tunnel *netdev;
-
- netdev = xmalloc(sizeof *netdev);
- netdev_init(&netdev->up, netdev_dev_);
+ struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
- *netdevp = &netdev->up;
- return 0;
-}
+ if (netdev->sockfd != -1)
+ close(netdev->sockfd);
-static void
-netdev_tunnel_close(struct netdev *netdev_)
-{
- struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
+ shash_find_and_delete(&tunnel_netdevs,
+ netdev_get_name(netdev_));
free(netdev);
}
static int
-netdev_tunnel_get_config(struct netdev_dev *dev_, struct smap *args)
+netdev_tunnel_get_config(const struct netdev *dev_, struct smap *args)
{
- struct netdev_dev_tunnel *netdev_dev = netdev_dev_tunnel_cast(dev_);
+ struct netdev_tunnel *netdev = netdev_tunnel_cast(dev_);
- if (netdev_dev->valid_remote_ip)
+ if (netdev->valid_remote_ip)
smap_add_format(args, "remote_ip", IP_FMT,
- IP_ARGS(netdev_dev->remote_addr.sin_addr.s_addr));
- if (netdev_dev->valid_remote_port)
+ IP_ARGS(netdev->remote_addr.sin_addr.s_addr));
+ if (netdev->valid_remote_port)
smap_add_format(args, "remote_port", "%"PRIu16,
- ntohs(netdev_dev->remote_addr.sin_port));
+ ntohs(netdev->remote_addr.sin_port));
return 0;
}
static int
-netdev_tunnel_connect(struct netdev_dev_tunnel *dev)
+netdev_tunnel_connect(struct netdev_tunnel *dev)
{
if (dev->sockfd < 0)
return EBADF;
}
dev->connected = true;
netdev_tunnel_update_seq(dev);
- VLOG_DBG("%s: connected to (%s, %d)", netdev_dev_get_name(&dev->up),
+ VLOG_DBG("%s: connected to (%s, %d)", netdev_get_name(&dev->up),
inet_ntoa(dev->remote_addr.sin_addr), ntohs(dev->remote_addr.sin_port));
return 0;
}
static int
-netdev_tunnel_set_config(struct netdev_dev *dev_, const struct smap *args)
+netdev_tunnel_set_config(struct netdev *dev_, const struct smap *args)
{
- struct netdev_dev_tunnel *netdev_dev = netdev_dev_tunnel_cast(dev_);
+ struct netdev_tunnel *netdev = netdev_tunnel_cast(dev_);
struct shash_node *node;
- VLOG_DBG("tunnel_set_config(%s)", netdev_dev_get_name(dev_));
+ VLOG_DBG("tunnel_set_config(%s)", netdev_get_name(dev_));
SMAP_FOR_EACH(node, args) {
VLOG_DBG("arg: %s->%s", node->name, (char*)node->data);
if (!strcmp(node->name, "remote_ip")) {
if (lookup_ip(node->data, &addr)) {
VLOG_WARN("%s: bad 'remote_ip'", node->name);
} else {
- netdev_dev->remote_addr.sin_addr = addr;
- netdev_dev->valid_remote_ip = true;
+ netdev->remote_addr.sin_addr = addr;
+ netdev->valid_remote_ip = true;
}
} else if (!strcmp(node->name, "remote_port")) {
- netdev_dev->remote_addr.sin_port = htons(atoi(node->data));
- netdev_dev->valid_remote_port = true;
+ netdev->remote_addr.sin_port = htons(atoi(node->data));
+ netdev->valid_remote_port = true;
} else {
VLOG_WARN("%s: unknown argument '%s'",
- netdev_dev_get_name(dev_), node->name);
+ netdev_get_name(dev_), node->name);
}
}
- return netdev_tunnel_connect(netdev_dev);
+ return netdev_tunnel_connect(netdev);
}
static int
netdev_tunnel_rx_open(struct netdev *netdev_, struct netdev_rx **rxp)
{
- struct netdev_dev_tunnel *netdev_dev =
- netdev_dev_tunnel_cast(netdev_get_dev(netdev_));
+ struct netdev_tunnel *netdev =
+ netdev_tunnel_cast(netdev_);
struct netdev_rx_tunnel *rx;
rx = xmalloc(sizeof *rx);
- netdev_rx_init(&rx->up, netdev_get_dev(netdev_), &netdev_rx_tunnel_class);
- rx->fd = netdev_dev->sockfd;
+ netdev_rx_init(&rx->up, netdev_, &netdev_rx_tunnel_class);
+ rx->fd = netdev->sockfd;
*rxp = &rx->up;
return 0;
}
netdev_rx_tunnel_recv(struct netdev_rx *rx_, void *buffer, size_t size)
{
struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_);
- struct netdev_dev_tunnel *netdev_dev =
- netdev_dev_tunnel_cast(rx_->netdev_dev);
- if (!netdev_dev->connected)
+ struct netdev_tunnel *netdev =
+ netdev_tunnel_cast(rx_->netdev);
+ if (!netdev->connected)
return -EAGAIN;
for (;;) {
ssize_t retval;
VLOG_DBG("%s: recv(%"PRIxPTR", %zu, MSG_TRUNC) = %zd",
netdev_rx_get_name(rx_), (uintptr_t)buffer, size, retval);
if (retval >= 0) {
- netdev_dev->stats.rx_packets++;
- netdev_dev->stats.rx_bytes += retval;
+ netdev->stats.rx_packets++;
+ netdev->stats.rx_bytes += retval;
if (retval <= size) {
return retval;
} else {
- netdev_dev->stats.rx_errors++;
- netdev_dev->stats.rx_length_errors++;
+ netdev->stats.rx_errors++;
+ netdev->stats.rx_length_errors++;
return -EMSGSIZE;
}
} else if (errno != EINTR) {
if (errno != EAGAIN) {
VLOG_WARN_RL(&rl, "error receiveing Ethernet packet on %s: %s",
netdev_rx_get_name(rx_), strerror(errno));
- netdev_dev->stats.rx_errors++;
+ netdev->stats.rx_errors++;
}
return -errno;
}
static int
netdev_tunnel_send(struct netdev *netdev_, const void *buffer, size_t size)
{
- struct netdev_dev_tunnel *dev =
- netdev_dev_tunnel_cast(netdev_get_dev(netdev_));
+ struct netdev_tunnel *dev =
+ netdev_tunnel_cast(netdev_);
if (!dev->connected)
return EAGAIN;
for (;;) {
static void
netdev_tunnel_send_wait(struct netdev *netdev_)
{
- struct netdev_dev_tunnel *dev =
- netdev_dev_tunnel_cast(netdev_get_dev(netdev_));
+ struct netdev_tunnel *dev = netdev_tunnel_cast(netdev_);
if (dev->sockfd >= 0) {
poll_fd_wait(dev->sockfd, POLLOUT);
}
static int
netdev_rx_tunnel_drain(struct netdev_rx *rx_)
{
- struct netdev_dev_tunnel *netdev_dev =
- netdev_dev_tunnel_cast(rx_->netdev_dev);
+ struct netdev_tunnel *netdev =
+ netdev_tunnel_cast(rx_->netdev);
struct netdev_rx_tunnel *rx =
netdev_rx_tunnel_cast(rx_);
char buffer[128];
int error;
- if (!netdev_dev->connected)
+ if (!netdev->connected)
return 0;
for (;;) {
error = recv(rx->fd, buffer, 128, MSG_TRUNC);
netdev_tunnel_set_etheraddr(struct netdev *netdev,
const uint8_t mac[ETH_ADDR_LEN])
{
- struct netdev_dev_tunnel *dev =
- netdev_dev_tunnel_cast(netdev_get_dev(netdev));
+ struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
if (!eth_addr_equals(dev->hwaddr, mac)) {
memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
netdev_tunnel_get_etheraddr(const struct netdev *netdev,
uint8_t mac[ETH_ADDR_LEN])
{
- const struct netdev_dev_tunnel *dev =
- netdev_dev_tunnel_cast(netdev_get_dev(netdev));
+ const struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
memcpy(mac, dev->hwaddr, ETH_ADDR_LEN);
return 0;
static int
netdev_tunnel_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
{
- const struct netdev_dev_tunnel *dev =
- netdev_dev_tunnel_cast(netdev_get_dev(netdev));
+ const struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
*stats = dev->stats;
return 0;
static int
netdev_tunnel_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
{
- struct netdev_dev_tunnel *dev =
- netdev_dev_tunnel_cast(netdev_get_dev(netdev));
+ struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
dev->stats = *stats;
return 0;
}
static int
-netdev_tunnel_update_flags(struct netdev_dev *dev_,
+netdev_tunnel_update_flags(struct netdev *dev_,
enum netdev_flags off, enum netdev_flags on,
enum netdev_flags *old_flagsp)
{
- struct netdev_dev_tunnel *netdev_dev =
- netdev_dev_tunnel_cast(dev_);
+ struct netdev_tunnel *netdev =
+ netdev_tunnel_cast(dev_);
if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
return EINVAL;
}
// XXX should we actually do something with these flags?
- *old_flagsp = netdev_dev->flags;
- netdev_dev->flags |= on;
- netdev_dev->flags &= ~off;
- if (*old_flagsp != netdev_dev->flags) {
- netdev_tunnel_update_seq(netdev_dev);
+ *old_flagsp = netdev->flags;
+ netdev->flags |= on;
+ netdev->flags &= ~off;
+ if (*old_flagsp != netdev->flags) {
+ netdev_tunnel_update_seq(netdev);
}
return 0;
}
static unsigned int
netdev_tunnel_change_seq(const struct netdev *netdev)
{
- return netdev_dev_tunnel_cast(netdev_get_dev(netdev))->change_seq;
+ return netdev_tunnel_cast(netdev)->change_seq;
}
\f
/* Helper functions. */
static void
-netdev_tunnel_update_seq(struct netdev_dev_tunnel *dev)
+netdev_tunnel_update_seq(struct netdev_tunnel *dev)
{
dev->change_seq++;
if (!dev->change_seq) {
netdev_tunnel_get_port(struct unixctl_conn *conn,
int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED)
{
- struct netdev_dev_tunnel *tunnel_dev;
+ struct netdev_tunnel *tunnel_dev;
char buf[6];
- tunnel_dev = shash_find_data(&tunnel_netdev_devs, argv[1]);
+ tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
if (!tunnel_dev) {
unixctl_command_reply_error(conn, "no such tunnel netdev");
return;
netdev_tunnel_get_tx_bytes(struct unixctl_conn *conn,
int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED)
{
- struct netdev_dev_tunnel *tunnel_dev;
+ struct netdev_tunnel *tunnel_dev;
char buf[128];
- tunnel_dev = shash_find_data(&tunnel_netdev_devs, argv[1]);
+ tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
if (!tunnel_dev) {
unixctl_command_reply_error(conn, "no such tunnel netdev");
return;
netdev_tunnel_get_rx_bytes(struct unixctl_conn *conn,
int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED)
{
- struct netdev_dev_tunnel *tunnel_dev;
+ struct netdev_tunnel *tunnel_dev;
char buf[128];
- tunnel_dev = shash_find_data(&tunnel_netdev_devs, argv[1]);
+ tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
if (!tunnel_dev) {
unixctl_command_reply_error(conn, "no such tunnel netdev");
return;
netdev_tunnel_set_config,
NULL, /* get_tunnel_config */
- netdev_tunnel_open,
- netdev_tunnel_close,
-
netdev_tunnel_rx_open,
netdev_tunnel_send,
git://git.onelab.eu / sliver-openvswitch.git / commitdiff