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

Timestamp:

Jan 27, 2009 7:01:51 AM (16 years ago)

Author:

vboxsync

Message:

NAT: returning router to CTL_ALIAS, next server now is CTL_TFTP

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -215 +215 @@
         RTStrPrintf((char*)rbp->bp_file, sizeof(rbp->bp_file), "%s", bootp_filename);
 
-    saddr.sin_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_TFTP);
+    saddr.sin_addr.s_addr = pData->tftp_server.s_addr; 
     saddr.sin_port = htons(BOOTP_SERVER);
 
@@ -228 +228 @@
     rbp->bp_yiaddr = daddr.sin_addr; /* Client IP address */
     rbp->bp_siaddr = saddr.sin_addr; /* Server IP address */
+
+    /*XXX: latter it used for initialization of gateway*/
+    saddr.sin_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS); 
 
     q = rbp->bp_vend;

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

@@ -374 +374 @@
     bootp_filename = pszBootFile;
     pData->netmask = u32Netmask;
+    /* @todo: add ability to configurate this staff */
+    pData->tftp_server.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_TFTP);
 
 #ifdef RT_OS_WINDOWS

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

@@ -105 +105 @@
     struct dns_list_head dns_list_head;
 #endif
+    struct in_addr tftp_server;
     struct in_addr loopback_addr;
     uint32_t netmask;