Changeset 17056 in vbox for trunk

Timestamp:

Feb 24, 2009 12:06:19 PM (16 years ago)

Author:

vboxsync

Message:

NAT: introduced (port) service slection for correct bind operation.
some services require special value for source port.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (2 diffs)
• slirp.h (modified) (1 diff)
• udp.c (modified) (3 diffs)
• udp.h (modified) (1 diff)

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

@@ -1119 +1119 @@
                 int inq, outq;
                 int status;
+                socklen_t optlen = sizeof(int);
                 inq = outq = 0;
-                socklen_t optlen = sizeof(int);
                 status = getsockopt(so->s, SOL_SOCKET, SO_ERROR, &err, &optlen);
                 if (status != 0) 
@@ -1558 +1558 @@
 }
 #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;
+    switch (hdport) 
+    {
+        case 500:
+            if (hsport == 500) service = 500;
+        break;
+    } 
+    Log2(("service : %d\n", service));
+    return htons(service);
+}

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

@@ -321 +321 @@
 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
 #define MAX_MRU 16384

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

@@ -202 +202 @@
         if ((so = socreate()) == NULL)
             goto bad;
-        if (udp_attach(pData, so) == -1)
+        if (udp_attach(pData, so, slirp_get_service(IPPROTO_UDP, uh->uh_dport, uh->uh_sport)) == -1)
         {
             DEBUG_MISC((dfd," udp_attach errno = %d-%s\n",
@@ -349 +349 @@
 
 int
-udp_attach(PNATState pData, struct socket *so)
+udp_attach(PNATState pData, struct socket *so, int service_port)
 {
     struct sockaddr_in addr;
@@ -364 +364 @@
          */
         addr.sin_family = AF_INET;
-        addr.sin_port = 0;
+        addr.sin_port = service_port;
         addr.sin_addr.s_addr = INADDR_ANY;
         fd_nonblock(so->s);

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

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