OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix in file qemu-sockets.c 

1) Changed usage of malloc,free,strdup to qemu_malloc,qemu_free,qemu_strdup
 	2) Some coding style fixes (based on CODING_STYLE document)
 	3) Free struct addrinfo *res after failure of listen

Signed-off-by: vibi <vibi_sreenivasan@cms.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
vibi 2009-05-06 15:27:03 +05:30 committed by Anthony Liguori
parent 4e12cd946f
commit 39b6efc806
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qemu-sockets.c
View File

@ -175,7 +175,8 @@ int inet_listen(const char *str, char *ostr, int olen,
#ifdef IPV6_V6ONLY
if (e->ai_family == PF_INET6) {
/* listen on both ipv4 and ipv6 */
setsockopt(slisten,IPPROTO_IPV6,IPV6_V6ONLY,(void*)&off,sizeof(off));
setsockopt(slisten,IPPROTO_IPV6,IPV6_V6ONLY,(void*)&off,
sizeof(off));
}
#endif
@ -207,6 +208,7 @@ listen:
if (listen(slisten,1) != 0) {
perror("listen");
closesocket(slisten);
freeaddrinfo(res);
return -1;
}
if (ostr) {
@ -329,10 +331,10 @@ int unix_listen(const char *str, char *ostr, int olen)
opts = strchr(str, ',');
if (opts) {
len = opts - str;
path = malloc(len+1);
path = qemu_malloc(len+1);
snprintf(path, len+1, "%.*s", len, str);
} else
path = strdup(str);
path = qemu_strdup(str);
memset(&un, 0, sizeof(un));
un.sun_family = AF_UNIX;
@ -365,11 +367,11 @@ int unix_listen(const char *str, char *ostr, int olen)
if (sockets_debug)
fprintf(stderr, "bind(unix:%s): OK\n", un.sun_path);
free(path);
qemu_free(path);
return sock;
err:
free(path);
qemu_free(path);
closesocket(sock);
return -1;
}