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

1 files changed, 3 insertions, 3 deletions

diff --git a/udp.c b/udp.c
index e2dcbe1..e2d6741 100644
--- a/udp.c
+++ b/udp.c
@@ -321,7 +321,7 @@ int udp_output(struct socket *so, struct mbuf *m, struct sockaddr_in *addr)
         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;
@@ -403,7 +403,7 @@ static u_int8_t udp_tos(struct socket *so)
 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;
@@ -631,7 +631,7 @@ int 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);