* [Qemu-devel] [4402] Special-case CTL_ALIAS instead of CTL_DNS in udp loopback test.
@ 2008-05-10 1:49 Andrzej Zaborowski
2008-05-12 17:58 ` Eduardo Felipe
0 siblings, 1 reply; 2+ messages in thread
From: Andrzej Zaborowski @ 2008-05-10 1:49 UTC (permalink / raw)
To: qemu-devel
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);
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [4402] Special-case CTL_ALIAS instead of CTL_DNS in udp loopback test.
2008-05-10 1:49 [Qemu-devel] [4402] Special-case CTL_ALIAS instead of CTL_DNS in udp loopback test Andrzej Zaborowski
@ 2008-05-12 17:58 ` Eduardo Felipe
0 siblings, 0 replies; 2+ messages in thread
From: Eduardo Felipe @ 2008-05-12 17:58 UTC (permalink / raw)
To: qemu-devel
Hi,
This commit breaks compilation in win32. Fix attached:
--- slirp/slirp.h Mon May 12 19:44:40 2008
+++ slirp/slirp.h Mon May 12 19:44:05 2008
@@ -32,6 +32,7 @@
#define WIN32_LEAN_AND_MEAN
# include <windows.h>
# include <winsock2.h>
+# include <ws2tcpip.h>
# include <sys/timeb.h>
# include <iphlpapi.h>
Regards,
Edu
2008/5/10 Andrzej Zaborowski <balrogg@gmail.com>:
> 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);
>
>
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-05-12 17:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-10 1:49 [Qemu-devel] [4402] Special-case CTL_ALIAS instead of CTL_DNS in udp loopback test Andrzej Zaborowski
2008-05-12 17:58 ` Eduardo Felipe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).