Special-case CTL_ALIAS instead of CTL_DNS in udp loopback test.

[qemu.git] / slirp / udp.c

diff --git a/slirp/udp.c b/slirp/udp.c
index 3f0c08b3b1f70820aef53e9f46688bec31133d8c..0583d7e9795645504f89d09c93dfdc17b810c5bd 100644 (file)
--- a/slirp/udp.c
+++ b/slirp/udp.c
@@ -322,7 +322,7 @@ int udp_output(struct socket *so, struct mbuf *m,
         if ((so->so_faddr.s_addr & htonl(0x000000ff)) == htonl(0xff))
             saddr.sin_addr.s_addr = alias_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;
     }
     daddr.sin_addr = so->so_laddr;
@@ -410,7 +410,7 @@ static void
 udp_emu(struct socket *so, struct mbuf *m)
 {
        struct sockaddr_in addr;
-        int addrlen = sizeof(addr);
+       socklen_t addrlen = sizeof(addr);
 #ifdef EMULATE_TALK
        CTL_MSG_OLD *omsg;
        CTL_MSG *nmsg;
@@ -641,7 +641,7 @@ udp_listen(port, laddr, lport, flags)
 {
        struct sockaddr_in addr;
        struct socket *so;
-       int addrlen = sizeof(struct sockaddr_in), opt = 1;
+       socklen_t addrlen = sizeof(struct sockaddr_in), opt = 1;
 
        if ((so = socreate()) == NULL) {
                free(so);