From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JueDl-0003sj-Vz for qemu-devel@nongnu.org; Fri, 09 May 2008 21:49:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JueDk-0003sX-GW for qemu-devel@nongnu.org; Fri, 09 May 2008 21:49:56 -0400 Received: from [199.232.76.173] (port=42546 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JueDk-0003sU-AX for qemu-devel@nongnu.org; Fri, 09 May 2008 21:49:56 -0400 Received: from savannah.gnu.org ([199.232.41.3]:49639 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JueDj-0000f1-W5 for qemu-devel@nongnu.org; Fri, 09 May 2008 21:49:56 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1JueDi-0007VB-V2 for qemu-devel@nongnu.org; Sat, 10 May 2008 01:49:55 +0000 Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1JueDi-0007V6-JD for qemu-devel@nongnu.org; Sat, 10 May 2008 01:49:54 +0000 MIME-Version: 1.0 Errors-To: balrog Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Andrzej Zaborowski Message-Id: Date: Sat, 10 May 2008 01:49:54 +0000 Subject: [Qemu-devel] [4402] Special-case CTL_ALIAS instead of CTL_DNS in udp loopback test. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 4402 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4402 Author: balrog Date: 2008-05-10 01:49:53 +0000 (Sat, 10 May 2008) Log Message: ----------- 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. Modified Paths: -------------- trunk/slirp/if.c trunk/slirp/misc.c trunk/slirp/socket.c trunk/slirp/udp.c Modified: trunk/slirp/if.c =================================================================== --- trunk/slirp/if.c 2008-05-09 22:17:18 UTC (rev 4401) +++ trunk/slirp/if.c 2008-05-10 01:49:53 UTC (rev 4402) @@ -291,7 +291,7 @@ } /* 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); Modified: trunk/slirp/misc.c =================================================================== --- trunk/slirp/misc.c 2008-05-09 22:17:18 UTC (rev 4401) +++ trunk/slirp/misc.c 2008-05-10 01:49:53 UTC (rev 4402) @@ -304,7 +304,7 @@ { int s; struct sockaddr_in addr; - int addrlen = sizeof(addr); + socklen_t addrlen = sizeof(addr); int opt; int master = -1; char *argv[256]; Modified: trunk/slirp/socket.c =================================================================== --- trunk/slirp/socket.c 2008-05-09 22:17:18 UTC (rev 4401) +++ trunk/slirp/socket.c 2008-05-10 01:49:53 UTC (rev 4402) @@ -392,7 +392,7 @@ struct socket *so; { struct sockaddr_in addr; - int addrlen = sizeof(struct sockaddr_in); + socklen_t addrlen = sizeof(struct sockaddr_in); DEBUG_CALL("sorecvfrom"); DEBUG_ARG("so = %lx", (long)so); @@ -545,7 +545,8 @@ { struct sockaddr_in addr; struct socket *so; - int s, addrlen = sizeof(addr), opt = 1; + int s, opt = 1; + socklen_t addrlen = sizeof(addr); DEBUG_CALL("solisten"); DEBUG_ARG("port = %d", port); Modified: trunk/slirp/udp.c =================================================================== --- trunk/slirp/udp.c 2008-05-09 22:17:18 UTC (rev 4401) +++ trunk/slirp/udp.c 2008-05-10 01:49:53 UTC (rev 4402) @@ -322,7 +322,7 @@ 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 @@ 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 @@ { 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);