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

Timestamp:

Jan 26, 2010 7:50:32 AM (15 years ago)

Author:

vboxsync

Message:

NAT: xtracker 4630 (respect the bootp BROADCAST flags)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -189 +189 @@
     rbp->bp_op = BOOTP_REPLY;
     rbp->bp_xid = bp->bp_xid; /* see table 3 of rfc2131*/
-    rbp->bp_flags = bp->bp_flags;
+    rbp->bp_flags = bp->bp_flags; /* figure 2 of rfc2131 */
     rbp->bp_giaddr.s_addr = bp->bp_giaddr.s_addr;
 #if 0 /*check flags*/
@@ -421 +421 @@
         else
         {
-            /*see table 4 rfc2131*/
-            if (bp->bp_flags & DHCP_FLAGS_B)
+            /* table 4 of rfc2131 */
+            if (bp->bp_flags & RT_H2N_U16_C(DHCP_FLAGS_B))
                 dhcp_stat = REBINDING;
             else
@@ -729 +729 @@
     m->m_data += sizeof(struct udphdr)
                + sizeof(struct ip);
-    if ((flags & DHCP_FLAGS_B) || nack != 0)
+    if (   (flags & RT_H2N_U16_C(DHCP_FLAGS_B))
+        || nack != 0)
         daddr.sin_addr.s_addr = INADDR_BROADCAST;
     else

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

@@ -95 +95 @@
 #define DHCP_OPT_LEN            312
 
+/* RFC 2131 */
 struct bootp_t
 {
-    struct ip      ip;
-    struct udphdr  udp;
-    uint8_t        bp_op;
-    uint8_t        bp_htype;
-    uint8_t        bp_hlen;
-    uint8_t        bp_hops;
-    uint32_t       bp_xid;
-    uint16_t       bp_secs;
-    uint16_t       bp_flags;
-    struct in_addr bp_ciaddr;
-    struct in_addr bp_yiaddr;
-    struct in_addr bp_siaddr;
-    struct in_addr bp_giaddr;
-    uint8_t        bp_hwaddr[16];
-    uint8_t        bp_sname[64];
-    uint8_t        bp_file[128];
-    uint8_t        bp_vend[DHCP_OPT_LEN];
+    struct ip      ip;                          /**< header: IP header */
+    struct udphdr  udp;                         /**< header: UDP header */
+    uint8_t        bp_op;                       /**< opcode (BOOTP_REQUEST, BOOTP_REPLY) */
+    uint8_t        bp_htype;                    /**< hardware type */
+    uint8_t        bp_hlen;                     /**< hardware address length */
+    uint8_t        bp_hops;                     /**< hop count */
+    uint32_t       bp_xid;                      /**< transaction ID */
+    uint16_t       bp_secs;                     /**< numnber of seconds */
+    uint16_t       bp_flags;                    /**< flags (DHCP_FLAGS_B) */
+    struct in_addr bp_ciaddr;                   /**< client IP address */
+    struct in_addr bp_yiaddr;                   /**< your IP address */
+    struct in_addr bp_siaddr;                   /**< server IP address */
+    struct in_addr bp_giaddr;                   /**< gateway IP address */
+    uint8_t        bp_hwaddr[16];               /** client hardware address */
+    uint8_t        bp_sname[64];                /** server host name */
+    uint8_t        bp_file[128];                /** boot filename */
+    uint8_t        bp_vend[DHCP_OPT_LEN];       /**< vendor specific info */
 };
 
 
-#define DHCP_FLAGS_B (1<<15)
+#define DHCP_FLAGS_B (1<<15)                    /**< B, broadcast */
 struct bootp_ext
 {