Special-case CTL_ALIAS instead of CTL_DNS in udp loopback test.
At the same time remove a bogus test (tested by Jason Wessel). Quiet some gcc4 warnings from slirp compilation. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4402 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
e62ab7a153
commit
242acf3af4
|
@ -291,7 +291,7 @@ if_start(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Encapsulate the packet for sending */
|
/* Encapsulate the packet for sending */
|
||||||
if_encap(ifm->m_data, ifm->m_len);
|
if_encap((uint8_t *)ifm->m_data, ifm->m_len);
|
||||||
|
|
||||||
m_free(ifm);
|
m_free(ifm);
|
||||||
|
|
||||||
|
|
|
@ -304,7 +304,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
|
||||||
{
|
{
|
||||||
int s;
|
int s;
|
||||||
struct sockaddr_in addr;
|
struct sockaddr_in addr;
|
||||||
int addrlen = sizeof(addr);
|
socklen_t addrlen = sizeof(addr);
|
||||||
int opt;
|
int opt;
|
||||||
int master = -1;
|
int master = -1;
|
||||||
char *argv[256];
|
char *argv[256];
|
||||||
|
|
|
@ -392,7 +392,7 @@ sorecvfrom(so)
|
||||||
struct socket *so;
|
struct socket *so;
|
||||||
{
|
{
|
||||||
struct sockaddr_in addr;
|
struct sockaddr_in addr;
|
||||||
int addrlen = sizeof(struct sockaddr_in);
|
socklen_t addrlen = sizeof(struct sockaddr_in);
|
||||||
|
|
||||||
DEBUG_CALL("sorecvfrom");
|
DEBUG_CALL("sorecvfrom");
|
||||||
DEBUG_ARG("so = %lx", (long)so);
|
DEBUG_ARG("so = %lx", (long)so);
|
||||||
|
@ -545,7 +545,8 @@ solisten(port, laddr, lport, flags)
|
||||||
{
|
{
|
||||||
struct sockaddr_in addr;
|
struct sockaddr_in addr;
|
||||||
struct socket *so;
|
struct socket *so;
|
||||||
int s, addrlen = sizeof(addr), opt = 1;
|
int s, opt = 1;
|
||||||
|
socklen_t addrlen = sizeof(addr);
|
||||||
|
|
||||||
DEBUG_CALL("solisten");
|
DEBUG_CALL("solisten");
|
||||||
DEBUG_ARG("port = %d", port);
|
DEBUG_ARG("port = %d", port);
|
||||||
|
|
|
@ -322,7 +322,7 @@ int udp_output(struct socket *so, struct mbuf *m,
|
||||||
if ((so->so_faddr.s_addr & htonl(0x000000ff)) == htonl(0xff))
|
if ((so->so_faddr.s_addr & htonl(0x000000ff)) == htonl(0xff))
|
||||||
saddr.sin_addr.s_addr = alias_addr.s_addr;
|
saddr.sin_addr.s_addr = alias_addr.s_addr;
|
||||||
else if (addr->sin_addr.s_addr == loopback_addr.s_addr ||
|
else if (addr->sin_addr.s_addr == loopback_addr.s_addr ||
|
||||||
((so->so_faddr.s_addr & htonl(CTL_DNS)) == htonl(CTL_DNS)))
|
(ntohl(so->so_faddr.s_addr) & 0xff) != CTL_ALIAS)
|
||||||
saddr.sin_addr.s_addr = so->so_faddr.s_addr;
|
saddr.sin_addr.s_addr = so->so_faddr.s_addr;
|
||||||
}
|
}
|
||||||
daddr.sin_addr = so->so_laddr;
|
daddr.sin_addr = so->so_laddr;
|
||||||
|
@ -410,7 +410,7 @@ static void
|
||||||
udp_emu(struct socket *so, struct mbuf *m)
|
udp_emu(struct socket *so, struct mbuf *m)
|
||||||
{
|
{
|
||||||
struct sockaddr_in addr;
|
struct sockaddr_in addr;
|
||||||
int addrlen = sizeof(addr);
|
socklen_t addrlen = sizeof(addr);
|
||||||
#ifdef EMULATE_TALK
|
#ifdef EMULATE_TALK
|
||||||
CTL_MSG_OLD *omsg;
|
CTL_MSG_OLD *omsg;
|
||||||
CTL_MSG *nmsg;
|
CTL_MSG *nmsg;
|
||||||
|
@ -641,7 +641,7 @@ udp_listen(port, laddr, lport, flags)
|
||||||
{
|
{
|
||||||
struct sockaddr_in addr;
|
struct sockaddr_in addr;
|
||||||
struct socket *so;
|
struct socket *so;
|
||||||
int addrlen = sizeof(struct sockaddr_in), opt = 1;
|
socklen_t addrlen = sizeof(struct sockaddr_in), opt = 1;
|
||||||
|
|
||||||
if ((so = socreate()) == NULL) {
|
if ((so = socreate()) == NULL) {
|
||||||
free(so);
|
free(so);
|
||||||
|
|
Loading…
Reference in New Issue