Changeset 22494 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Aug 27, 2009 6:11:12 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

51514

Message:

NAT: some pollish of r51498

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -47 +47 @@
     return NULL; 
 }
-BOOTPClient *alloc_addr(PNATState pData)
+BOOTPClient *bc_alloc_client(PNATState pData)
 {
     int i;
@@ -68 +68 @@
 {
     BOOTPClient *bc;
-    bc = alloc_addr(pData);
+    bc = bc_alloc_client(pData);
     if (bc == NULL)
         return NULL;
@@ -419 +419 @@
                     return off;
                }
-               bc = alloc_addr(pData);
+               bc = bc_alloc_client(pData);
                if (bc == NULL)
                {
@@ -441 +441 @@
                  return off;
             }
-            bc = alloc_addr(pData);
+            bc = bc_alloc_client(pData);
             if (bc == NULL)
             {

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

@@ -114 +114 @@
     uint8_t        bp_vend[DHCP_OPT_LEN];
 };
+
+/** Entry in the table of known DHCP clients. */
+typedef struct
+{
+    uint32_t xid;
+    bool allocated;
+    uint8_t macaddr[6];
+    struct in_addr addr;
+    int number;
+} BOOTPClient;
+
 #define DHCP_FLAGS_B (1<<15)
 struct bootp_ext
@@ -122 +133 @@
 
 void bootp_input(PNATState, struct mbuf *m);
+BOOTPClient *bc_alloc_client(PNATState pData);

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

@@ -1374 +1374 @@
         /* if no*/
         {
-            BOOTPClient *bc = alloc_addr(pData);
+            BOOTPClient *bc = bc_alloc_client(pData);
             bc->addr.s_addr = *(uint32_t *)ah->ar_sip;
             memcpy(bc->macaddr, ah->ar_sha, ETH_ALEN);

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

@@ -308 +308 @@
 struct tcpcb *tcp_drop(PNATState, struct tcpcb *tp, int err);
 
+/*slirp.c*/
+void slirp_arp_who_has(PNATState pData, uint32_t dst);
 #define MIN_MRU 128
 #define MAX_MRU 16384
@@ -384 +386 @@
     RTStrPrintfV(buffer, 1024, format, args);
 
+#if defined(DEBUG_vvl) && 0
+    LogRel(("NAT:ALIAS: %s\n", buffer));
+#else
     Log2(("NAT:ALIAS: %s\n", buffer));
+#endif
 }
 static void vbox_slirp_printf(char *format, ...)

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

@@ -38 +38 @@
 /** DHCP Lease time. */
 #define LEASE_TIME (24 * 3600)
-
-/** Entry in the table of known DHCP clients. */
-typedef struct
-{
-    uint32_t xid;
-    bool allocated;
-    uint8_t macaddr[6];
-    struct in_addr addr;
-    int number;
-} BOOTPClient;
-
 
 /** TFTP session entry. */