2
0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00

netdev-linux, netdev-bsd: Make access to AF_INET socket thread-safe.

The only uses of 'af_inet_sock', in both drivers, were ioctls, so it seemed
like a good abstraction to write a function that just does such an ioctl,
and to factor out shared code into socket-util.

Signed-off-by: Ben Pfaff <blp@nicira.com>
CC: Ed Maste <emaste@freebsd.org>
This commit is contained in:
Ben Pfaff
2013-08-09 21:14:23 -07:00
parent 86f1d0326b
commit 259e0b1ad1
6 changed files with 128 additions and 143 deletions

View File

@@ -26,6 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/resource.h>
#include <sys/socket.h>
#include <sys/stat.h>
@@ -1353,3 +1354,42 @@ error:
*n_fdsp = 0;
return EPROTO;
}
/* Calls ioctl() on an AF_INET sock, passing the specified 'command' and
* 'arg'. Returns 0 if successful, otherwise a positive errno value. */
int
af_inet_ioctl(unsigned long int command, const void *arg)
{
static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
static int sock;
if (ovsthread_once_start(&once)) {
sock = socket(AF_INET, SOCK_DGRAM, 0);
if (sock < 0) {
sock = -errno;
VLOG_ERR("failed to create inet socket: %s", ovs_strerror(errno));
}
ovsthread_once_done(&once);
}
return (sock < 0 ? -sock
: ioctl(sock, command, arg) == -1 ? errno
: 0);
}
int
af_inet_ifreq_ioctl(const char *name, struct ifreq *ifr, unsigned long int cmd,
const char *cmd_name)
{
int error;
ovs_strzcpy(ifr->ifr_name, name, sizeof ifr->ifr_name);
error = af_inet_ioctl(cmd, ifr);
if (error) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
VLOG_DBG_RL(&rl, "%s: ioctl(%s) failed: %s", name, cmd_name,
ovs_strerror(error));
}
return error;
}