Changeset 1824 in vbox

Timestamp:

Mar 30, 2007 11:41:34 AM (18 years ago)

Author:

vboxsync

Message:

Disable NAT UDP broadcast resend to local address. Removed the inline declarations and the useless _MSC_VER checks. And eliminated a few compiler warnings.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• misc.c (modified) (4 diffs)
• misc.h (modified) (2 diffs)
• slirp.c (modified) (1 diff)
• slirp.h (modified) (2 diffs)
• socket.c (modified) (2 diffs)
• udp.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/slirp/misc.c

@@ -104 +104 @@
 };
 
-#ifndef _MSC_VER
-inline
-#endif
 void
 insque_32(PNATState pData, void *a, void *b)
@@ -120 +117 @@
 }
 
-#ifndef _MSC_VER
-inline
-#endif
 void
 remque_32(PNATState pData, void *a)
@@ -143 +137 @@
 };
 
-#ifdef _MSC_VER
-void
-#else
-inline void
-#endif
+void
 insque(PNATState pData, void *a, void *b)
 {
@@ -159 +149 @@
 }
 
-#ifdef _MSC_VER
-void
-#else
-inline void
-#endif
+void
 remque(PNATState pData, void *a)
 {

trunk/src/VBox/Devices/Network/slirp/misc.h

@@ -66 +66 @@
 void redir_x _P((u_int32_t, int, int, int));
 void getouraddr _P((PNATState));
-inline  void slirp_insque  _P((PNATState, void *, void *));
-inline  void slirp_remque  _P((PNATState, void *));
+void slirp_insque  _P((PNATState, void *, void *));
+void slirp_remque  _P((PNATState, void *));
 int add_exec _P((struct ex_list **, int, char *, int, int));
 int slirp_openpty _P((int *, int *));
@@ -80 +80 @@
 int rsh_exec _P((struct socket *, struct socket *, char *, char *, char *));
 
-#ifdef _MSC_VER
-void insque(void *a, void *b);
-void remque(void *a);
 #endif
-
-#endif

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -470 +470 @@
                             so->so_state &= ~SS_ISFCONNECTING;
 
-                            ret = send(so->s, &ret, 0, 0);
+                            ret = send(so->s, (const char *)&ret, 0, 0);
                             if (ret < 0) {
                               /* XXXXX Must fix, zero bytes is a NOP */

trunk/src/VBox/Devices/Network/slirp/slirp.h

@@ -215 +215 @@
 #include <sys/stat.h>
 
-#ifndef _MSC_VER
+#if 1 /* ndef _MSC_VER */
 /* Avoid conflicting with the libc insque() and remque(), which
    have different prototypes. */
@@ -306 +306 @@
 # define remque_32 remque
 #else
-# ifdef _MSC_VER
- extern void insque_32 _P((PNATState, void *, void *));
- extern void remque_32 _P((PNATState, void *));
-# else
- inline void insque_32 _P((PNATState, void *, void *));
- inline void remque_32 _P((PNATState, void *));
-# endif
+extern void insque_32 _P((PNATState, void *, void *));
+extern void remque_32 _P((PNATState, void *));
 #endif
 

trunk/src/VBox/Devices/Network/slirp/socket.c

@@ -496 +496 @@
           case CTL_BROADCAST:
             addr.sin_addr.s_addr = INADDR_BROADCAST;
+#if 0
             /* Send the packet to host to fully emulate broadcast */
             /** @todo r=klaus: on Linux host this causes the host to receive
@@ -503 +504 @@
             host_addr.sin_family = AF_INET;
             host_addr.sin_port = so->so_fport;
-            host_addr.sin_addr = loopback_addr;
+            host_addr.sin_addr = our_addr;
             sendto(so->s, m->m_data, m->m_len, 0,
                   (struct sockaddr *)&host_addr, sizeof (struct sockaddr));
+#endif
             break;
           case CTL_DNS:

trunk/src/VBox/Devices/Network/slirp/udp.c

@@ -341 +341 @@
       so->so_expire = curtime + SO_EXPIRE;
       /* enable broadcast for later use */
-      setsockopt(so->s, SOL_SOCKET, SO_BROADCAST, &opt, sizeof(opt));
+      setsockopt(so->s, SOL_SOCKET, SO_BROADCAST, (const char *)&opt, sizeof(opt));
       insque(pData, so,&udb);
     }