Changeset 22478 in vbox

Timestamp:

Aug 26, 2009 4:39:10 PM (15 years ago)

Author:

vboxsync

Message:

NAT: fix of save/restore problem (some todo still required)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (2 diffs)
• ip_output.c (modified) (1 diff)
• slirp.c (modified) (3 diffs)

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

@@ -47 +47 @@
     return NULL; 
 }
-static BOOTPClient *alloc_addr(PNATState pData)
+BOOTPClient *alloc_addr(PNATState pData)
 {
     int i;
@@ -74 +74 @@
     bc->addr.s_addr = paddr->s_addr;
     return bc;
-    return NULL;
 }
 

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

@@ -60 +60 @@
             return &bootp_clients[i].macaddr[0];
     }
-
-    if (dst != 0)
-        return pData->slirp_ethaddr;
-
+    /* 
+     * no chance to send this packet, sorry, we will request ether address via ARP 
+     */
+    slirp_arp_who_has(pData, dst); 
     return NULL; 
 }

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

@@ -550 +550 @@
         }
         flags = LibAliasSetMode(pData->proxy_alias, 0, 0);
+#ifndef NO_FW_PUNCH
+        flags |= PKT_ALIAS_PUNCH_FW;
+#endif
         flags |= PKT_ALIAS_LOG; /* set logging */
         flags = LibAliasSetMode(pData->proxy_alias, flags, ~0);
@@ -1367 +1370 @@
             }
             break;
+        case ARPOP_REPLY:
+        /* @todo check if we already have requested address */
+        /* if no*/
+        {
+            BOOTPClient *bc = alloc_addr(pData);
+            bc->addr.s_addr = *(uint32_t *)ah->ar_sip;
+            memcpy(bc->macaddr, ah->ar_sha, ETH_ALEN);
+            m_free(pData, m);
+        }
+        break;
         default:
             break;
@@ -1783 +1796 @@
 }
 
+void slirp_arp_who_has(PNATState pData, uint32_t dst)
+{
+    struct mbuf *m;
+    struct ethhdr *ehdr;
+    struct arphdr *ahdr;
+
+    m = m_get(pData);
+    if (m == NULL)
+    {   
+        LogRel(("NAT: Can't alloc mbuf for ARP request\n")); 
+        return;
+    }
+    ehdr = mtod(m, struct ethhdr *);
+    memset(ehdr->h_source, 0xff, ETH_ALEN);
+    ahdr = (struct ahdr *)&ehdr[1];
+    ahdr->ar_hrd = htons(1);
+    ahdr->ar_pro = htons(ETH_P_IP);
+    ahdr->ar_hln = ETH_ALEN;
+    ahdr->ar_pln = 4;
+    ahdr->ar_op = htons(ARPOP_REQUEST);
+    memcpy(ahdr->ar_sha, special_ethaddr, ETH_ALEN);
+    *(uint32_t *)ahdr->ar_sip = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
+    memset(ahdr->ar_tha, 0xff, ETH_ALEN); /*broadcast*/
+    *(uint32_t *)ahdr->ar_tip = dst;
+    m->m_data += if_maxlinkhdr;
+    m->m_len = sizeof(struct arphdr);
+    if_encap(pData, ETH_P_ARP, m);
+    LogRel(("NAT: ARP request sent\n"));
+}