motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

sockets: add unix_listen_opts

Browse source 
Add unix_listen_opts().  Does the same as unix_listen(), but uses
QemuOpts.  unix_listen() is a compatibility wrapper for
unix_listen_opts() now and should go away some day.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-09-10 10:58:38 +02:00 • committed by Anthony Liguori
parent 2af2bf6760
commit 62b6adfbe0
2 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

47
qemu-sockets.c
View file

@ -329,11 +329,11 @@ int inet_connect(const char *str, int socktype)
#ifndef _WIN32 #ifndef _WIN32
int unix_listen(const char *str, char *ostr, int olen) int unix_listen_opts(QemuOpts *opts)
{ {
struct sockaddr_un un; struct sockaddr_un un;
char *path, *opts; const char *path = qemu_opt_get(opts, "path");
int sock, fd, len; int sock, fd;
sock = socket(PF_UNIX, SOCK_STREAM, 0); sock = socket(PF_UNIX, SOCK_STREAM, 0);
if (sock < 0) { if (sock < 0) {
@ -341,14 +341,6 @@ int unix_listen(const char *str, char *ostr, int olen)
return -1; return -1;
} }
opts = strchr(str, ',');
if (opts) {
len = opts - str;
path = qemu_malloc(len+1);
snprintf(path, len+1, "%.*s", len, str);
} else
path = qemu_strdup(str);
memset(&un, 0, sizeof(un)); memset(&un, 0, sizeof(un));
un.sun_family = AF_UNIX; un.sun_family = AF_UNIX;
if (path && strlen(path)) { if (path && strlen(path)) {
@ -365,8 +357,8 @@ int unix_listen(const char *str, char *ostr, int olen)
* worst case possible is bind() failing, i.e. a DoS attack. * worst case possible is bind() failing, i.e. a DoS attack.
*/ */
fd = mkstemp(un.sun_path); close(fd); fd = mkstemp(un.sun_path); close(fd);
qemu_opt_set(opts, "path", un.sun_path);
} }
snprintf(ostr, olen, "%s%s", un.sun_path, opts ? opts : "");
unlink(un.sun_path); unlink(un.sun_path);
if (bind(sock, (struct sockaddr*) &un, sizeof(un)) < 0) { if (bind(sock, (struct sockaddr*) &un, sizeof(un)) < 0) {
@ -380,11 +372,9 @@ int unix_listen(const char *str, char *ostr, int olen)
if (sockets_debug) if (sockets_debug)
fprintf(stderr, "bind(unix:%s): OK\n", un.sun_path); fprintf(stderr, "bind(unix:%s): OK\n", un.sun_path);
qemu_free(path);
return sock; return sock;
err: err:
qemu_free(path);
closesocket(sock); closesocket(sock);
return -1; return -1;
} }
@ -420,6 +410,35 @@ int unix_connect_opts(QemuOpts *opts)
} }
/* compatibility wrapper */ /* compatibility wrapper */
int unix_listen(const char *str, char *ostr, int olen)
{
QemuOpts *opts;
char *path, *optstr;
int sock, len;
opts = qemu_opts_create(&dummy_opts, NULL, 0);
optstr = strchr(str, ',');
if (optstr) {
len = optstr - str;
if (len) {
path = qemu_malloc(len+1);
snprintf(path, len+1, "%.*s", len, str);
qemu_opt_set(opts, "path", path);
qemu_free(path);
}
} else {
qemu_opt_set(opts, "path", str);
}
sock = unix_listen_opts(opts);
if (sock != -1 && ostr)
snprintf(ostr, olen, "%s%s", qemu_opt_get(opts, "path"), optstr ? optstr : "");
qemu_opts_del(opts);
return sock;
}
int unix_connect(const char *path) int unix_connect(const char *path)
{ {
QemuOpts *opts; QemuOpts *opts;

1
qemu_socket.h
View file

@ -40,6 +40,7 @@ int inet_listen(const char *str, char *ostr, int olen,
int socktype, int port_offset); int socktype, int port_offset);
int inet_connect(const char *str, int socktype); int inet_connect(const char *str, int socktype);
int unix_listen_opts(QemuOpts *opts);
int unix_listen(const char *path, char *ostr, int olen); int unix_listen(const char *path, char *ostr, int olen);
int unix_connect_opts(QemuOpts *opts); int unix_connect_opts(QemuOpts *opts);
int unix_connect(const char *path); int unix_connect(const char *path);