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

Timestamp:

Jan 27, 2009 10:09:55 AM (16 years ago)

Author:

vboxsync

Message:

NAT: clean up dhcp a bit, and fox the TFTP server address calculation

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (2 diffs)
• slirp.c (modified) (12 diffs)

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 = pData->tftp_server.s_addr; 
+    /* Address/port of the DHCP server. */
+    saddr.sin_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
     saddr.sin_port = htons(BOOTP_SERVER);
 
@@ -227 +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); 
+    rbp->bp_siaddr = pData->tftp_server; /* Next Server IP address, i.e. TFTP */
 
     q = rbp->bp_vend;

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

@@ -204 +204 @@
     inet_aton("255.0.0.0", &local_mask);
     inet_aton("127.0.0.0", &local_network);
-    for (pIPAddr = &FixedInfo->DnsServerList; pIPAddr != NULL; pIPAddr = pIPAddr->Next) 
-    {
-        struct dns_entry *da = RTMemAllocZ(sizeof (struct dns_entry));  
-        if (da == NULL) 
+    for (pIPAddr = &FixedInfo->DnsServerList; pIPAddr != NULL; pIPAddr = pIPAddr->Next)
+    {
+        struct dns_entry *da = RTMemAllocZ(sizeof (struct dns_entry));
+        if (da == NULL)
         {
             LogRel(("can't alloc memory for DNS entry\n"));
@@ -215 +215 @@
         inet_aton(pIPAddr->IpAddress.String, &da->de_addr);
         if ((ntohl(da->de_addr.s_addr) & ntohl(local_mask.s_addr)) == ntohl(local_network.s_addr)) {
-            da->de_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS); 
+            da->de_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
         }
         LIST_INSERT_HEAD(&pData->dns_list_head, da, de_list);
@@ -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
@@ -399 +397 @@
     inet_aton(pszNetAddr, &special_addr);
     alias_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS);
+    /* @todo: add ability to configure this staff */
+    pData->tftp_server.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_TFTP);
 
     /* set default addresses */
@@ -747 +747 @@
     {
 #if defined(RT_OS_WINDOWS)
-        /*XXX: before renaming please make see define 
+        /*XXX: before renaming please make see define
          * fIcmp in slirp_state.h
          */
@@ -1010 +1010 @@
     eh = (struct ethhdr *)pkt;
 #else
-    struct mbuf *mr; 
+    struct mbuf *mr;
     eh = mtod(m, struct ethhdr *);
 #endif
@@ -1057 +1057 @@
                 memcpy(rah->ar_sha, special_ethaddr, ETH_ALEN);
 
-                switch (htip & ~pData->netmask) 
+                switch (htip & ~pData->netmask)
                 {
                     case CTL_DNS:
@@ -1065 +1065 @@
                     default:;
                 }
-                
+
                 memcpy(rah->ar_sip, ah->ar_tip, 4);
                 memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
@@ -1088 +1088 @@
     static bool fWarnedIpv6;
 
-    if (pkt_len < ETH_HLEN) 
+    if (pkt_len < ETH_HLEN)
     {
         LogRel(("NAT: packet having size %d has been ingnored\n", pkt_len));
         return;
     }
-    
+
     m = m_get(pData);
     if (!m)
@@ -1157 +1157 @@
     eh = mtod(m, struct ethhdr *);
 #else
-    uint8_t buf[1600]; 
+    uint8_t buf[1600];
     struct ethhdr *eh = (struct ethhdr *)buf;
 
     if (ip_data_len + ETH_HLEN > sizeof(buf))
         return;
-    
+
     memcpy(buf + sizeof(struct ethhdr), ip_data, ip_data_len);
 #endif
@@ -1176 +1176 @@
     slirp_output(pData->pvUser, m, mtod(m, uint8_t *), m->m_len);
 #else
-    memcpy(buf, mtod(m, uint8_t *), m->m_len); 
+    memcpy(buf, mtod(m, uint8_t *), m->m_len);
     slirp_output(pData->pvUser, NULL, buf, m->m_len);
     m_free(pData, m);
@@ -1244 +1244 @@
 void slirp_post_sent(PNATState pData, void *pvArg)
 {
-    struct socket *so = 0; 
+    struct socket *so = 0;
     struct tcpcb *tp = 0;
     struct mbuf *m = (struct mbuf *)pvArg;
-    m_free(pData, m); 
-}
+    m_free(pData, m);
+}