Changeset 16214 in vbox

Timestamp:

Jan 24, 2009 8:23:29 AM (16 years ago)

Author:

vboxsync

Message:

NAT:bootp more readable

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -139 +139 @@
     int send_nak = 0;
 
+#define FILL_BOOTP_EXT(q, tag, len, pvalue)                     \
+    do {                                                        \
+        struct bootp_ext *be = (struct bootp_ext *)(q);         \
+        be->bpe_tag = (tag);                                    \
+        be->bpe_len = (len);                                    \
+        memcpy(&be[1], (pvalue), (len));                        \
+        (q) = (uint8_t *)(&be[1]) + (len);                      \
+    }while(0)
+
     /* extract exact DHCP msg type */
     requested_ip.s_addr = 0xffffffff;
@@ -251 +260 @@
         LogRel(("NAT: DHCP offered IP address %R[IP4]\n",
                 &daddr.sin_addr));
-
     if (   dhcp_msg_type == DHCPDISCOVER
         || dhcp_msg_type == DHCPREQUEST)
     {
-        *q++ = RFC2132_SRV_ID;
-        *q++ = 4;
-        memcpy(q, &saddr.sin_addr, 4);
-        q += 4;
+        FILL_BOOTP_EXT(q, RFC2132_SRV_ID, 4, &saddr.sin_addr);
     }
 
@@ -265 +270 @@
          || dhcp_msg_type == DHCPREQUEST))
     {
-        *q++ = RFC1533_NETMASK;
-        *q++ = 4;
-        *q++ = (pData->netmask & 0xff000000) >> 24;
-        *q++ = (pData->netmask & 0x00ff0000) >> 16;
-        *q++ = (pData->netmask & 0x0000ff00) >>  8;
-        *q++ = (pData->netmask & 0x000000ff);
-
-        *q++ = RFC1533_GATEWAY;
-        *q++ = 4;
-        memcpy(q, &saddr.sin_addr, 4);
-        q += 4;
-
-        *q++ = RFC1533_DNS;
-        *q++ = 4;
+        uint32_t lease_time = htonl(LEASE_TIME);
+        uint32_t netmask = htonl(pData->netmask);
+
+        FILL_BOOTP_EXT(q, RFC1533_NETMASK, 4, &netmask);
+        FILL_BOOTP_EXT(q, RFC1533_GATEWAY, 4, &saddr.sin_addr);
+
         dns_addr_dhcp.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_DNS);
-        memcpy(q, &dns_addr_dhcp, 4);
-        q += 4;
-
-        *q++ = RFC2132_LEASE_TIME;
-        *q++ = 4;
-        val = htonl(LEASE_TIME);
-        memcpy(q, &val, 4);
-        q += 4;
+        FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &dns_addr_dhcp.s_addr);
+
+        FILL_BOOTP_EXT(q, RFC2132_LEASE_TIME, 4, &lease_time);
 
         if (*slirp_hostname)
         {
             val = (int)strlen(slirp_hostname);
-            *q++ = RFC1533_HOSTNAME;
-            *q++ = val;
-            memcpy(q, slirp_hostname, val);
-            q += val;
+            FILL_BOOTP_EXT(q, RFC1533_HOSTNAME, val, slirp_hostname);
         }
 
@@ -301 +290 @@
         {
             val = (int)strlen(pData->pszDomain);
-            *q++ = RFC1533_DOMAINNAME;
-            *q++ = val;
-            memcpy(q, pData->pszDomain, val);
-            q += val;
+            FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, val, pData->pszDomain);
         }
     }

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

@@ -114 +114 @@
 };
 
+struct bootp_ext
+{
+    uint8_t bpe_tag;
+    uint8_t bpe_len;
+};
+
 void bootp_input(PNATState, struct mbuf *m);