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

Timestamp:

Jan 23, 2009 10:26:21 PM (16 years ago)

Author:

vboxsync

Message:

NAT:

1. introduces TFTP special_address | CTL_TFTP(4) for built-in address
2. can connect to other then built-in tftp

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -206 +206 @@
         RTStrPrintf((char*)rbp->bp_file, sizeof(rbp->bp_file), "%s", bootp_filename);
 
-    saddr.sin_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
+    saddr.sin_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_TFTP);
     saddr.sin_port = htons(BOOTP_SERVER);
 

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

@@ -3 +3 @@
 #define CTL_ALIAS       2
 #define CTL_DNS         3
+#define CTL_TFTP        4
 #define CTL_BROADCAST   255
 
+#define CTL_CHECK(x, ctl) (((x) & ~pData->netmask) == (ctl))

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

@@ -1000 +1000 @@
             if ((htip & pData->netmask) == ntohl(special_addr.s_addr))
             {
-                if (   (htip & ~pData->netmask) == CTL_DNS
-                    || (htip & ~pData->netmask) == CTL_ALIAS)
+                if (   CTL_CHECK(htip,CTL_DNS)
+                    || CTL_CHECK(htip, CTL_ALIAS)
+                    || CTL_CHECK(htip, CTL_TFTP))
                     goto arp_ok;
                 for (ex_ptr = exec_list; ex_ptr; ex_ptr = ex_ptr->ex_next)

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

@@ -45 +45 @@
 #include <slirp.h>
 #include "ip_icmp.h"
+#include "ctl.h"
 
 
@@ -159 +160 @@
      *  handle TFTP
      */
-    if (ntohs(uh->uh_dport) == TFTP_SERVER)
+    if (   ntohs(uh->uh_dport) == TFTP_SERVER 
+            && CTL_CHECK(ntohl(ip->ip_dst.s_addr), CTL_TFTP))
     {
         tftp_input(pData, m);