VLOG_DEFINE_THIS_MODULE(netdev_pltap);
struct netdev_dev_pltap {
- struct netdev_dev netdev_dev;
+ struct netdev_dev up;
char *real_name;
struct netdev_stats stats;
enum netdev_flags new_flags;
unsigned int change_seq;
};
+static const struct netdev_rx_class netdev_rx_pltap_class;
+
static struct list sync_list;
struct netdev_pltap {
- struct netdev netdev;
+ struct netdev up;
+};
+
+struct netdev_rx_pltap {
+ struct netdev_rx up;
+ int fd;
};
static int af_inet_sock = -1;
}
static bool
-is_pltap_class(const struct netdev_class *class)
+is_netdev_pltap_class(const struct netdev_class *class)
{
return class->create == netdev_pltap_create;
}
static struct netdev_dev_pltap *
netdev_dev_pltap_cast(const struct netdev_dev *netdev_dev)
{
- assert(is_pltap_class(netdev_dev_get_class(netdev_dev)));
- return CONTAINER_OF(netdev_dev, struct netdev_dev_pltap, 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);
- assert(is_pltap_class(netdev_dev_get_class(netdev_dev)));
- return CONTAINER_OF(netdev, struct netdev_pltap, netdev);
+ ovs_assert(is_netdev_pltap_class(netdev_dev_get_class(netdev_dev)));
+ return CONTAINER_OF(netdev, struct netdev_pltap, up);
+}
+
+static struct netdev_rx_pltap*
+netdev_rx_pltap_cast(const struct netdev_rx *rx)
+{
+ netdev_rx_assert_class(rx, &netdev_rx_pltap_class);
+ return CONTAINER_OF(rx, struct netdev_rx_pltap, up);
}
static void sync_needed(struct netdev_dev_pltap *dev)
goto cleanup;
}
- netdev_dev_init(&netdev_dev->netdev_dev, name, &netdev_pltap_class);
+ netdev_dev_init(&netdev_dev->up, name, &netdev_pltap_class);
shash_add(&pltap_netdev_devs, name, netdev_dev);
- *netdev_devp = &netdev_dev->netdev_dev;
+ *netdev_devp = &netdev_dev->up;
return 0;
cleanup:
struct netdev_pltap *netdev;
netdev = xmalloc(sizeof *netdev);
- netdev_init(&netdev->netdev, netdev_dev_);
+ netdev_init(&netdev->up, netdev_dev_);
- *netdevp = &netdev->netdev;
+ *netdevp = &netdev->up;
return 0;
}
free(netdev);
}
+
+static int netdev_pltap_up(struct netdev_dev_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_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;
+ *rxp = &rx->up;
+ if (!netdev_pltap_finalized(netdev_dev))
+ return 0;
+ err = netdev_pltap_up(netdev_dev);
+ if (err) {
+ free(rx);
+ *rxp = NULL;
+ return err;
+ }
+ return 0;
+}
+
+static void
+netdev_rx_pltap_destroy(struct netdev_rx *rx_)
+{
+ struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
+ free(rx);
+}
+
static int vsys_transaction(const char *script,
- const char *msg, char *reply, size_t reply_size)
+ const char **preply, char *format, ...)
{
+ char *msg = NULL, *reply = NULL;
+ const size_t reply_size = 1024;
int ifd = -1, ofd = -1, maxfd;
size_t bytes_to_write, bytes_to_read,
bytes_written = 0, bytes_read = 0;
int error = 0;
char *ofname = NULL, *ifname = NULL;
+ va_list args;
+
+ va_start(args, format);
+ msg = xvasprintf(format, args);
+ va_end(args);
+ reply = (char*)xmalloc(reply_size);
+ if (!msg || !reply) {
+ VLOG_ERR("Out of memory");
+ error = ENOMEM;
+ goto cleanup;
+ }
ofname = xasprintf("/vsys/%s.out", script);
ifname = xasprintf("/vsys/%s.in", script);
}
if (bytes_read) {
reply[bytes_read] = '\0';
- VLOG_ERR("%s returned: %s", script, reply);
+ if (preply) {
+ *preply = reply;
+ reply = NULL; /* prevent freeing the reply msg */
+ } else {
+ VLOG_ERR("%s returned: %s", script, reply);
+ }
error = EAGAIN;
goto cleanup;
}
cleanup:
+ free(msg);
+ free(reply);
free(ofname);
free(ifname);
close(ifd);
static int
netdev_pltap_up(struct netdev_dev_pltap *dev)
{
- int error;
- char *msg = NULL, *reply = NULL;
- const size_t reply_size = 1024;
-
if (!netdev_pltap_finalized(dev)) {
return 0;
}
- msg = xasprintf("%s\n"IP_FMT"\n%d\n",
- dev->real_name,
- IP_ARGS(&dev->local_addr.sin_addr),
- dev->local_netmask);
- reply = (char*)xmalloc(reply_size);
- if (!msg || !reply) {
- VLOG_ERR("Out of memory\n");
- error = ENOMEM;
- goto cleanup;
- }
- error = vsys_transaction("vif_up", msg, reply, reply_size);
- if (error) {
- goto cleanup;
- }
- netdev_pltap_update_seq(dev);
-
-cleanup:
- free(msg);
- free(reply);
-
- return error;
+ return vsys_transaction("vif_up", NULL, "%s\n"IP_FMT"\n%d\n",
+ dev->real_name,
+ IP_ARGS(dev->local_addr.sin_addr.s_addr),
+ dev->local_netmask);
}
static int
netdev_pltap_down(struct netdev_dev_pltap *dev)
{
- int error;
- char *msg = NULL, *reply = NULL;
- const size_t reply_size = 1024;
-
if (!netdev_pltap_finalized(dev)) {
return 0;
}
- msg = xasprintf("%s\n", dev->real_name);
- reply = (char*)xmalloc(reply_size);
- if (!msg || !reply) {
- VLOG_ERR("Out of memory\n");
- error = ENOMEM;
- goto cleanup;
- }
- error = vsys_transaction("vif_down", msg, reply, reply_size);
- if (error) {
- goto cleanup;
- }
- netdev_pltap_update_seq(dev);
-
-cleanup:
- free(msg);
- free(reply);
-
- return error;
+ return vsys_transaction("vif_down", NULL, "%s\n", dev->real_name);
}
static int
netdev_pltap_promisc(struct netdev_dev_pltap *dev, bool promisc)
{
- int error = 0;
- char *msg = NULL, *reply = NULL;
- const size_t reply_size = 1024;
-
if (!netdev_pltap_finalized(dev)) {
return 0;
}
- msg = xasprintf("%s\n%s",
- dev->real_name,
- (promisc ? "" : "-\n"));
- reply = (char*)xmalloc(reply_size);
- if (!msg || !reply) {
- VLOG_ERR("Out of memory\n");
- goto cleanup;
- }
- error = vsys_transaction("promisc", msg, reply, reply_size);
- if (error) {
- goto cleanup;
- }
- netdev_pltap_update_seq(dev);
-
-cleanup:
- free(msg);
- free(reply);
-
- return error;
+ return vsys_transaction("promisc", NULL, "%s\n%s",
+ dev->real_name,
+ (promisc ? "" : "-\n"));
}
static void
netdev_pltap_sync_flags(struct netdev_dev_pltap *dev)
{
- if (dev->fd < 0 || !netdev_pltap_finalized(dev))
+ if (dev->fd < 0 || !netdev_pltap_finalized(dev)) {
+ sync_done(dev);
return;
+ }
VLOG_DBG("sync_flags(%s): current: %s %s target: %s %s",
dev->real_name,
(void) netdev_pltap_promisc(dev, dev->new_flags & NETDEV_PROMISC);
}
+ netdev_pltap_update_seq(dev);
sync_done(dev);
}
if (netdev_dev->valid_local_ip)
smap_add_format(args, "local_ip", IP_FMT,
- IP_ARGS(&netdev_dev->local_addr.sin_addr));
+ IP_ARGS(netdev_dev->local_addr.sin_addr.s_addr));
if (netdev_dev->valid_local_netmask)
smap_add_format(args, "local_netmask", "%"PRIu32,
ntohs(netdev_dev->local_netmask));
}
static int
-netdev_pltap_listen(struct netdev *netdev_ OVS_UNUSED)
-{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
- if (!netdev_pltap_finalized(dev))
- return 0;
- return netdev_pltap_up(dev);
-}
-
-static int
-netdev_pltap_recv(struct netdev *netdev_, void *buffer, size_t size)
+netdev_rx_pltap_recv(struct netdev_rx *rx_, void *buffer, size_t size)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
+ struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
char prefix[4];
struct iovec iov[2] = {
{ .iov_base = prefix, .iov_len = 4 },
};
for (;;) {
ssize_t retval;
- retval = readv(dev->fd, iov, 2);
+ retval = readv(rx->fd, iov, 2);
if (retval >= 0) {
if (retval <= size) {
return retval;
} else if (errno != EINTR) {
if (errno != EAGAIN) {
VLOG_WARN_RL(&rl, "error receiveing Ethernet packet on %s: %s",
- netdev_get_name(netdev_), strerror(errno));
+ netdev_rx_get_name(rx_), strerror(errno));
}
return -errno;
}
}
static void
-netdev_pltap_recv_wait(struct netdev *netdev_)
+netdev_rx_pltap_wait(struct netdev_rx *rx_)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
- if (dev->fd >= 0 && netdev_pltap_finalized(dev)) {
- poll_fd_wait(dev->fd, POLLIN);
+ 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)) {
+ poll_fd_wait(rx->fd, POLLIN);
}
}
}
static int
-netdev_pltap_drain(struct netdev *netdev_)
+netdev_rx_pltap_drain(struct netdev_rx *rx_)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
+ struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
char buffer[128];
int error;
- if (dev->fd < 0)
+ if (rx->fd < 0)
return EAGAIN;
for (;;) {
- error = recv(dev->fd, buffer, 128, MSG_TRUNC);
+ error = recv(rx->fd, buffer, 128, MSG_TRUNC);
if (error) {
if (error == -EAGAIN)
break;
static int
-netdev_pltap_update_flags(struct netdev *netdev,
+netdev_pltap_update_flags(struct netdev_dev *dev_,
enum netdev_flags off, enum netdev_flags on,
enum netdev_flags *old_flagsp)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev));
+ struct netdev_dev_pltap *netdev_dev =
+ netdev_dev_pltap_cast(dev_);
int error = 0;
if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
return EINVAL;
}
- if (netdev_pltap_finalized(dev)) {
- error = get_flags(dev, &dev->flags);
+ if (netdev_pltap_finalized(netdev_dev)) {
+ error = get_flags(netdev_dev, &netdev_dev->flags);
}
- *old_flagsp = dev->flags;
- dev->new_flags |= on;
- dev->new_flags &= ~off;
- if (dev->flags != dev->new_flags) {
+ *old_flagsp = netdev_dev->flags;
+ netdev_dev->new_flags |= on;
+ netdev_dev->new_flags &= ~off;
+ if (netdev_dev->flags != netdev_dev->new_flags) {
/* we cannot sync here, since we may be in a signal handler */
- sync_needed(dev);
+ sync_needed(netdev_dev);
}
return error;
netdev_pltap_destroy,
netdev_pltap_get_config,
netdev_pltap_set_config,
+ NULL, /* get_tunnel_config */
netdev_pltap_open,
netdev_pltap_close,
- netdev_pltap_listen,
- netdev_pltap_recv,
- netdev_pltap_recv_wait,
- netdev_pltap_drain,
+ netdev_pltap_rx_open,
netdev_pltap_send,
netdev_pltap_send_wait,
netdev_pltap_change_seq
};
+
+static const struct netdev_rx_class netdev_rx_pltap_class = {
+ netdev_rx_pltap_destroy,
+ netdev_rx_pltap_recv,
+ netdev_rx_pltap_wait,
+ netdev_rx_pltap_drain,
+
+};