Changeset 22014 in vbox

Timestamp:

Aug 6, 2009 4:30:36 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

50751

Message:

NAT: clearing no-service calculation

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (1 diff)
• slirp.h (modified) (1 diff)
• udp.c (modified) (1 diff)

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

@@ -1655 +1655 @@
 #endif
 
-uint16_t slirp_get_service(int proto, uint16_t dport, uint16_t sport)
-{
-    uint16_t hdport, hsport, service;
-    hdport = ntohs(dport);
-    hsport = ntohs(sport);
-    Log2(("proto: %d, dport: %d sport: %d\n", proto, hdport, hsport));
-    service = 0;
-#if 0
-    /* Always return 0 here */
-    switch (hdport)
-    {
-        case 500:
-                if (hsport != 500) /* vpnc by default try operate in src:500/dst:500 mode*/
-                /* Not sure why this make Cisco VPN client's connection more stable,
-                 * at least on some servers
-                 */
-                    service = sport;
-        break;
-    }
-#endif
-    Log2(("service : %d\n", service));
-    return htons(service);
-}
-
 void slirp_set_dhcp_TFTP_prefix(PNATState pData, const char *tftpPrefix)
 {

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

@@ -307 +307 @@
 int tcp_ctl (PNATState, struct socket *);
 struct tcpcb *tcp_drop(PNATState, struct tcpcb *tp, int err);
-
-uint16_t slirp_get_service(int proto, uint16_t dport, uint16_t sport);
 
 #define MIN_MRU 128

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

@@ -204 +204 @@
         if ((so = socreate()) == NULL)
             goto bad;
-        if (udp_attach(pData, so, slirp_get_service(IPPROTO_UDP, uh->uh_dport, uh->uh_sport)) == -1)
+        if (udp_attach(pData, so, 0) == -1)
         {
             DEBUG_MISC((dfd," udp_attach errno = %d-%s\n",