Changeset 39894 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jan 27, 2012 6:35:38 AM (13 years ago)

Author:

vboxsync

Message:

NAT: don't confuse anyone with service port. It was never used and was introduced while VPN issues investigation.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• dnsproxy/dnsproxy.c (modified) (1 diff)
• udp.c (modified) (4 diffs)
• udp.h (modified) (1 diff)

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

@@ -127 +127 @@
             return;
         }
-        if(udp_attach(pData, so1, 0) == -1)
+        if(udp_attach(pData, so1) == -1)
         {
             LogRel(("NAT: can't attach udp socket\n"));

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

@@ -179 +179 @@
     }
 
+    LogFunc(("uh src: %RTnaipv4:%d, dst: %RTnaipv4:%d\n", ip->ip_src, RT_H2N_U16_C(uh->uh_sport), ip->ip_dst, RT_H2N_U16_C(uh->uh_dport)));
     if (   pData->fUseHostResolver
         && uh->uh_dport == RT_H2N_U16_C(53)
@@ -245 +246 @@
             goto bad_free_mbuf;
         }
-        if (udp_attach(pData, so, 0) <= 0)
+        if (udp_attach(pData, so) <= 0)
         {
             Log2(("NAT: IP(id: %hd) udp_attach errno = %d (%s)\n",
@@ -447 +448 @@
 
 int
-udp_attach(PNATState pData, struct socket *so, int service_port)
+udp_attach(PNATState pData, struct socket *so)
 {
     struct sockaddr_in *addr;
@@ -468 +469 @@
 #endif
     addr->sin_family = AF_INET;
-    addr->sin_port = service_port;
     addr->sin_addr.s_addr = pData->bindIP.s_addr;
     fd_nonblock(so->s);

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

@@ -125 +125 @@
 void udp_input (PNATState, register struct mbuf *, int);
 int udp_output (PNATState, struct socket *, struct mbuf *, struct sockaddr_in *);
-int udp_attach (PNATState, struct socket *, int service_port);
+int udp_attach (PNATState, struct socket *);
 void udp_detach (PNATState, struct socket *);
 u_int8_t udp_tos (struct socket *);