folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SLIRP: Fix Coverity complaints

Browse source
This commit is contained in:
Mark Pizzolato 2019-04-11 21:37:59 -07:00
parent 0d894613f9
commit 71abd2896c
7 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
slirp/misc.c
View file

@ -297,7 +297,7 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
if (so->so_state & SS_HOSTFWD) { if (so->so_state & SS_HOSTFWD) {
snprintf(buf, sizeof(buf), " UDP[HOST_FORWARD]"); snprintf(buf, sizeof(buf), " UDP[HOST_FORWARD]");
src_len = sizeof(src); src_len = sizeof(src);
getsockname(so->s, (struct sockaddr *)&src, &src_len); (void)getsockname(so->s, (struct sockaddr *)&src, &src_len);
dst_addr = so->so_laddr; dst_addr = so->so_laddr;
dst_port = so->so_lport; dst_port = so->so_lport;
} else { } else {

2
slirp/sbuf.c
View file

@ -90,7 +90,7 @@ sbappend(struct socket *so, struct mbuf *m)
if (so->so_urgc) { if (so->so_urgc) {
sbappendsb(&so->so_rcv, m); sbappendsb(&so->so_rcv, m);
m_free(m); m_free(m);
sosendoob(so); (void)sosendoob(so);
return; return;
} }

2
slirp/slirp.c
View file

@ -545,7 +545,7 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error)
so->so_state &= ~SS_ISFCONNECTING; so->so_state &= ~SS_ISFCONNECTING;
ret = send(so->s, (const char *) &ret, 0, 0); ret = send(so->s, (const char *) &ret, 0, 0);
if (ret < 0) { if (ret == SOCKET_ERROR) {
/* XXXXX Must fix, zero bytes is a NOP */ /* XXXXX Must fix, zero bytes is a NOP */
if (errno == EAGAIN || errno == EWOULDBLOCK || if (errno == EAGAIN || errno == EWOULDBLOCK ||
errno == EINPROGRESS || errno == ENOTCONN) { errno == EINPROGRESS || errno == ENOTCONN) {

14
slirp/socket.c
View file

@ -354,7 +354,7 @@ sowrite(struct socket *so)
DEBUG_ARG("so = %lx", (long)so); DEBUG_ARG("so = %lx", (long)so);
if (so->so_urgc) { if (so->so_urgc) {
sosendoob(so); (void)sosendoob(so);
if (sb->sb_cc == 0) if (sb->sb_cc == 0)
return 0; return 0;
} }
@ -626,10 +626,10 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr,
addr.sin_addr.s_addr = haddr; addr.sin_addr.s_addr = haddr;
addr.sin_port = hport; addr.sin_port = hport;
if (((s = qemu_socket(AF_INET,SOCK_STREAM,0)) < 0) || if (((s = qemu_socket(AF_INET,SOCK_STREAM,0)) == SOCKET_ERROR) ||
(socket_set_fast_reuse(s) < 0) || (socket_set_fast_reuse(s) == SOCKET_ERROR) ||
(bind(s,(struct sockaddr *)&addr, sizeof(addr)) < 0) || (bind(s,(struct sockaddr *)&addr, sizeof(addr)) == SOCKET_ERROR) ||
(listen(s,1) < 0)) { (listen(s,1) == SOCKET_ERROR)) {
int tmperrno = errno; /* Don't clobber the real reason we failed */ int tmperrno = errno; /* Don't clobber the real reason we failed */
closesocket(s); closesocket(s);
@ -643,9 +643,9 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr,
#endif #endif
return NULL; return NULL;
} }
qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int)); (void)qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));
getsockname(s,(struct sockaddr *)&addr,&addrlen); (void)getsockname(s,(struct sockaddr *)&addr,&addrlen);
so->so_fport = addr.sin_port; so->so_fport = addr.sin_port;
if (addr.sin_addr.s_addr == 0 || addr.sin_addr.s_addr == loopback_addr.s_addr) if (addr.sin_addr.s_addr == 0 || addr.sin_addr.s_addr == loopback_addr.s_addr)
so->so_faddr = slirp->vhost_addr; so->so_faddr = slirp->vhost_addr;

10
slirp/tcp_subr.c
View file

@ -336,10 +336,10 @@ int tcp_fconnect(struct socket *so)
int opt, s=so->s; int opt, s=so->s;
struct sockaddr_in addr; struct sockaddr_in addr;
qemu_set_nonblock(s); (void)qemu_set_nonblock(s);
socket_set_fast_reuse(s); socket_set_fast_reuse(s);
opt = 1; opt = 1;
qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt)); (void)qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt));
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
if ((so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) == if ((so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) ==
@ -425,10 +425,10 @@ void tcp_connect(struct socket *inso)
return; return;
} }
qemu_set_nonblock(s); qemu_set_nonblock(s);
socket_set_fast_reuse(s); (void)socket_set_fast_reuse(s);
opt = 1; opt = 1;
qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int)); (void)qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));
socket_set_nodelay(s); (void)socket_set_nodelay(s);
so->so_fport = addr.sin_port; so->so_fport = addr.sin_port;
so->so_faddr = addr.sin_addr; so->so_faddr = addr.sin_addr;

2
slirp/tftp.c
View file

@ -111,7 +111,7 @@ static int tftp_read_data(struct tftp_session *spt, uint32_t block_nr,
} }
if (len) { if (len) {
fseek(spt->f, block_nr * 512, SEEK_SET); (void)fseek(spt->f, block_nr * 512, SEEK_SET);
bytes_read = fread(buf, 1, len, spt->f); bytes_read = fread(buf, 1, len, spt->f);
} }

6
slirp/udp.c
View file

@ -368,13 +368,13 @@ udp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr,
addr.sin_addr.s_addr = haddr; addr.sin_addr.s_addr = haddr;
addr.sin_port = hport; addr.sin_port = hport;
if (bind(so->s,(struct sockaddr *)&addr, addrlen) < 0) { if (bind(so->s,(struct sockaddr *)&addr, addrlen) == SOCKET_ERROR) {
udp_detach(so); udp_detach(so);
return NULL; return NULL;
} }
socket_set_fast_reuse(so->s); (void)socket_set_fast_reuse(so->s);
getsockname(so->s,(struct sockaddr *)&addr,&addrlen); (void)getsockname(so->s,(struct sockaddr *)&addr,&addrlen);
so->so_fport = addr.sin_port; so->so_fport = addr.sin_port;
if (addr.sin_addr.s_addr == 0 || if (addr.sin_addr.s_addr == 0 ||
addr.sin_addr.s_addr == loopback_addr.s_addr) { addr.sin_addr.s_addr == loopback_addr.s_addr) {