ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: expand tabs in net/socket.c 

In order to make later patches sane, expand the tab characters and
conform to QEMU coding style now.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Stefan Hajnoczi 2011-12-07 15:01:48 +00:00 committed by Anthony Liguori
parent bf95c0d55c
commit 842480d493
1 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
net/socket.c
View File

@ -161,10 +161,11 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
#endif #endif
if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) { if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {
fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) does not contain a multicast address\n", fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) "
inet_ntoa(mcastaddr->sin_addr), "does not contain a multicast address\n",
inet_ntoa(mcastaddr->sin_addr),
(int)ntohl(mcastaddr->sin_addr.s_addr)); (int)ntohl(mcastaddr->sin_addr.s_addr));
return -1; return -1;
} }
fd = qemu_socket(PF_INET, SOCK_DGRAM, 0); fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
@ -177,8 +178,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
ret=setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, ret=setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
(const char *)&val, sizeof(val)); (const char *)&val, sizeof(val));
if (ret < 0) { if (ret < 0) {
perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)"); perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)");
goto fail; goto fail;
} }
ret = bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr)); ret = bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr));
@ -198,8 +199,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
ret = setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, ret = setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
(const char *)&imr, sizeof(struct ip_mreq)); (const char *)&imr, sizeof(struct ip_mreq));
if (ret < 0) { if (ret < 0) {
perror("setsockopt(IP_ADD_MEMBERSHIP)"); perror("setsockopt(IP_ADD_MEMBERSHIP)");
goto fail; goto fail;
} }
/* Force mcast msgs to loopback (eg. several QEMUs in same host */ /* Force mcast msgs to loopback (eg. several QEMUs in same host */
@ -207,8 +208,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
ret=setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, ret=setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,
(const char *)&loop, sizeof(loop)); (const char *)&loop, sizeof(loop));
if (ret < 0) { if (ret < 0) {
perror("setsockopt(SOL_IP, IP_MULTICAST_LOOP)"); perror("setsockopt(SOL_IP, IP_MULTICAST_LOOP)");
goto fail; goto fail;
} }
/* If a bind address is given, only send packets from that address */ /* If a bind address is given, only send packets from that address */
@ -260,37 +261,38 @@ static NetSocketState *net_socket_fd_init_dgram(VLANState *vlan,
*/ */
if (is_connected) { if (is_connected) {
if (getsockname(fd, (struct sockaddr *) &saddr, &saddr_len) == 0) { if (getsockname(fd, (struct sockaddr *) &saddr, &saddr_len) == 0) {
/* must be bound */ /* must be bound */
if (saddr.sin_addr.s_addr==0) { if (saddr.sin_addr.s_addr == 0) {
fprintf(stderr, "qemu: error: init_dgram: fd=%d unbound, cannot setup multicast dst addr\n", fprintf(stderr, "qemu: error: init_dgram: fd=%d unbound, "
fd); "cannot setup multicast dst addr\n", fd);
return NULL; return NULL;
} }
/* clone dgram socket */ /* clone dgram socket */
newfd = net_socket_mcast_create(&saddr, NULL); newfd = net_socket_mcast_create(&saddr, NULL);
if (newfd < 0) { if (newfd < 0) {
/* error already reported by net_socket_mcast_create() */ /* error already reported by net_socket_mcast_create() */
close(fd); close(fd);
return NULL; return NULL;
} }
/* clone newfd to fd, close newfd */ /* clone newfd to fd, close newfd */
dup2(newfd, fd); dup2(newfd, fd);
close(newfd); close(newfd);
} else { } else {
fprintf(stderr, "qemu: error: init_dgram: fd=%d failed getsockname(): %s\n", fprintf(stderr,
fd, strerror(errno)); "qemu: error: init_dgram: fd=%d failed getsockname(): %s\n",
return NULL; fd, strerror(errno));
} return NULL;
}
} }
nc = qemu_new_net_client(&net_dgram_socket_info, vlan, NULL, model, name); nc = qemu_new_net_client(&net_dgram_socket_info, vlan, NULL, model, name);
snprintf(nc->info_str, sizeof(nc->info_str), snprintf(nc->info_str, sizeof(nc->info_str),
"socket: fd=%d (%s mcast=%s:%d)", "socket: fd=%d (%s mcast=%s:%d)",
fd, is_connected ? "cloned" : "", fd, is_connected ? "cloned" : "",
inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
s = DO_UPCAST(NetSocketState, nc, nc); s = DO_UPCAST(NetSocketState, nc, nc);
@ -349,8 +351,9 @@ static NetSocketState *net_socket_fd_init(VLANState *vlan,
if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type, if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,
(socklen_t *)&optlen)< 0) { (socklen_t *)&optlen)< 0) {
fprintf(stderr, "qemu: error: getsockopt(SO_TYPE) for fd=%d failed\n", fd); fprintf(stderr, "qemu: error: getsockopt(SO_TYPE) for fd=%d failed\n",
return NULL; fd);
return NULL;
} }
switch(so_type) { switch(so_type) {
case SOCK_DGRAM: case SOCK_DGRAM:
@ -509,7 +512,7 @@ static int net_socket_mcast_init(VLANState *vlan,
fd = net_socket_mcast_create(&saddr, param_localaddr); fd = net_socket_mcast_create(&saddr, param_localaddr);
if (fd < 0) if (fd < 0)
return -1; return -1;
s = net_socket_fd_init(vlan, model, name, fd, 0); s = net_socket_fd_init(vlan, model, name, fd, 0);
if (!s) if (!s)