diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-03-01 21:21:07 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-03-01 21:21:07 +0100 |
commit | d6be9d23af062f987adcbc3adf2da7008dfc8cf7 (patch) | |
tree | 3fe5e66e900cdef6b6bae3306a69c26ac0cb9beb | |
parent | de67f49106fe22467c7617cae20264847a5a3606 (diff) | |
download | slirp-d6be9d23af062f987adcbc3adf2da7008dfc8cf7.zip slirp-d6be9d23af062f987adcbc3adf2da7008dfc8cf7.tar.gz slirp-d6be9d23af062f987adcbc3adf2da7008dfc8cf7.tar.bz2 |
udpx/tcpx_listen: Add missing const qualifier
-rw-r--r-- | src/socket.c | 14 | ||||
-rw-r--r-- | src/socket.h | 4 | ||||
-rw-r--r-- | src/udp.c | 10 | ||||
-rw-r--r-- | src/udp.h | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/socket.c b/src/socket.c index ff2d0d4..c50f866 100644 --- a/src/socket.c +++ b/src/socket.c @@ -737,8 +737,8 @@ int sosendto(struct socket *so, struct mbuf *m) * Listen for incoming TCP connections */ struct socket *tcpx_listen(Slirp *slirp, - union slirp_sockaddr *haddr, socklen_t haddrlen, - union slirp_sockaddr *laddr, socklen_t laddrlen, + const union slirp_sockaddr *haddr, socklen_t haddrlen, + const union slirp_sockaddr *laddr, socklen_t laddrlen, int flags) { struct socket *so; @@ -750,11 +750,11 @@ struct socket *tcpx_listen(Slirp *slirp, char addrstr[INET6_ADDRSTRLEN]; char portstr[6]; int ret; - ret = getnameinfo((struct sockaddr *) haddr, haddrlen, addrstr, sizeof(addrstr), portstr, sizeof(portstr), NI_NUMERICHOST|NI_NUMERICSERV); + ret = getnameinfo((const struct sockaddr *) haddr, haddrlen, addrstr, sizeof(addrstr), portstr, sizeof(portstr), NI_NUMERICHOST|NI_NUMERICSERV); g_assert(ret == 0); DEBUG_ARG("haddr = %s", addrstr); DEBUG_ARG("hport = %s", portstr); - ret = getnameinfo((struct sockaddr *) laddr, laddrlen, addrstr, sizeof(addrstr), portstr, sizeof(portstr), NI_NUMERICHOST|NI_NUMERICSERV); + ret = getnameinfo((const struct sockaddr *) laddr, laddrlen, addrstr, sizeof(addrstr), portstr, sizeof(portstr), NI_NUMERICHOST|NI_NUMERICSERV); g_assert(ret == 0); DEBUG_ARG("laddr = %s", addrstr); DEBUG_ARG("lport = %s", portstr); @@ -782,7 +782,7 @@ struct socket *tcpx_listen(Slirp *slirp, s = slirp_socket(haddr->ss.ss_family, SOCK_STREAM, 0); if ((s < 0) || (slirp_socket_set_fast_reuse(s) < 0) || - (bind(s, (struct sockaddr *)haddr, haddrlen) < 0) || + (bind(s, (const struct sockaddr *)haddr, haddrlen) < 0) || (listen(s, 1) < 0)) { int tmperrno = errno; /* Don't clobber the real reason we failed */ if (s >= 0) { @@ -823,7 +823,7 @@ struct socket *tcp_listen(Slirp *slirp, uint32_t haddr, unsigned hport, lsa.sin_addr.s_addr = laddr; lsa.sin_port = lport; - return tcpx_listen(slirp, (union slirp_sockaddr*) &hsa, sizeof(hsa), (union slirp_sockaddr*) &lsa, sizeof(lsa), flags); + return tcpx_listen(slirp, (const union slirp_sockaddr*) &hsa, sizeof(hsa), (union slirp_sockaddr*) &lsa, sizeof(lsa), flags); } struct socket * @@ -842,7 +842,7 @@ tcp6_listen(Slirp *slirp, struct in6_addr haddr, u_int hport, lsa.sin6_addr = laddr; lsa.sin6_port = lport; - return tcpx_listen(slirp, (union slirp_sockaddr*) &hsa, sizeof(hsa), (union slirp_sockaddr*) &lsa, sizeof(lsa), flags); + return tcpx_listen(slirp, (const union slirp_sockaddr*) &hsa, sizeof(hsa), (union slirp_sockaddr*) &lsa, sizeof(lsa), flags); } /* diff --git a/src/socket.h b/src/socket.h index 3a546fc..de5bd88 100644 --- a/src/socket.h +++ b/src/socket.h @@ -159,8 +159,8 @@ struct socket *tcp_listen(Slirp *, uint32_t, unsigned, uint32_t, unsigned, int); struct socket *tcp6_listen(Slirp *, struct in6_addr, u_int, struct in6_addr, u_int, int); struct socket *tcpx_listen(Slirp *slirp, - union slirp_sockaddr *haddr, socklen_t haddrlen, - union slirp_sockaddr *laddr, socklen_t laddrlen, + const union slirp_sockaddr *haddr, socklen_t haddrlen, + const union slirp_sockaddr *laddr, socklen_t laddrlen, int flags); void soisfconnecting(register struct socket *); void soisfconnected(register struct socket *); @@ -354,8 +354,8 @@ static uint8_t udp_tos(struct socket *so) } struct socket *udpx_listen(Slirp *slirp, - union slirp_sockaddr *haddr, socklen_t haddrlen, - union slirp_sockaddr *laddr, socklen_t laddrlen, + const union slirp_sockaddr *haddr, socklen_t haddrlen, + const union slirp_sockaddr *laddr, socklen_t laddrlen, int flags) { struct socket *so; @@ -370,7 +370,7 @@ struct socket *udpx_listen(Slirp *slirp, so->so_expire = curtime + SO_EXPIRE; insque(so, &slirp->udb); - if (bind(so->s, (struct sockaddr *)haddr, haddrlen) < 0) { + if (bind(so->s, (const struct sockaddr *)haddr, haddrlen) < 0) { udp_detach(so); return NULL; } @@ -405,7 +405,7 @@ struct socket *udp_listen(Slirp *slirp, uint32_t haddr, unsigned hport, lsa.sin_addr.s_addr = laddr; lsa.sin_port = lport; - return udpx_listen(slirp, (union slirp_sockaddr*) &hsa, sizeof(hsa), (union slirp_sockaddr*) &lsa, sizeof(lsa), flags); + return udpx_listen(slirp, (const union slirp_sockaddr*) &hsa, sizeof(hsa), (union slirp_sockaddr*) &lsa, sizeof(lsa), flags); } struct socket * @@ -424,5 +424,5 @@ udp6_listen(Slirp *slirp, struct in6_addr haddr, u_int hport, lsa.sin6_addr = laddr; lsa.sin6_port = lport; - return udpx_listen(slirp, (union slirp_sockaddr*) &hsa, sizeof(hsa), (union slirp_sockaddr*) &lsa, sizeof(lsa), flags); + return udpx_listen(slirp, (const union slirp_sockaddr*) &hsa, sizeof(hsa), (union slirp_sockaddr*) &lsa, sizeof(lsa), flags); } @@ -85,8 +85,8 @@ struct socket *udp_listen(Slirp *, uint32_t, unsigned, uint32_t, unsigned, int); struct socket *udp6_listen(Slirp *slirp, struct in6_addr, u_int, struct in6_addr, u_int, int); struct socket *udpx_listen(Slirp *, - union slirp_sockaddr *haddr, socklen_t haddrlen, - union slirp_sockaddr *laddr, socklen_t laddrlen, + const union slirp_sockaddr *haddr, socklen_t haddrlen, + const union slirp_sockaddr *laddr, socklen_t laddrlen, int flags); int udp_output(struct socket *so, struct mbuf *m, struct sockaddr_in *saddr, struct sockaddr_in *daddr, int iptos); |