Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/udhcp/common.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/udhcp/common.c (modified) (11 diffs)

branches/3.3/mindi-busybox/networking/udhcp/common.c

@@ -63 +63 @@
     { OPTION_U8                               , 0x85 }, /* DHCP_VLAN_PRIORITY */
 #endif
+    { OPTION_STRING                           , 0xd1 }, /* DHCP_PXE_CONF_FILE */
+    { OPTION_STRING                           , 0xd2 }, /* DHCP_PXE_PATH_PREFIX */
     { OPTION_6RD                              , 0xd4 }, /* DHCP_6RD           */
     { OPTION_STATIC_ROUTES | OPTION_LIST      , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
@@ -129 +131 @@
     "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY  */
 #endif
+    "pxeconffile" "\0" /* DHCP_PXE_CONF_FILE  */
+    "pxepathprefix" "\0" /* DHCP_PXE_PATH_PREFIX  */
     "ip6rd" "\0"       /* DHCP_6RD            */
     "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
@@ -139 +143 @@
  * xmalloc_optname_optval: to estimate string length
  * from binary option length: (option[LEN] / dhcp_option_lengths[opt_type])
- * is the number of elements, multiply in by one element's string width
+ * is the number of elements, multiply it by one element's string width
  * (len_of_option_as_string[opt_type]) and you know how wide string you need.
  */
@@ -159 +163 @@
     /* Just like OPTION_STRING, we use minimum length here */
     [OPTION_STATIC_ROUTES] = 5,
-    [OPTION_6RD] =    22,  /* ignored by udhcp_str2optset */
+    [OPTION_6RD] =    12,  /* ignored by udhcp_str2optset */
+    /* The above value was chosen as follows:
+     * len_of_option_as_string[] for this option is >60: it's a string of the form
+     * "32 128 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 ".
+     * Each additional ipv4 address takes 4 bytes in binary option and appends
+     * another "255.255.255.255 " 16-byte string. We can set [OPTION_6RD] = 4
+     * but this severely overestimates string length: instead of 16 bytes,
+     * it adds >60 for every 4 bytes in binary option.
+     * We cheat and declare here that option is in units of 12 bytes.
+     * This adds more than 60 bytes for every three ipv4 addresses - more than enough.
+     * (Even 16 instead of 12 should work, but let's be paranoid).
+     */
 };
 
@@ -169 +184 @@
         char buf[256 * 2 + 2];
         *bin2hex(buf, (void*) (opt + OPT_DATA), opt[OPT_LEN]) = '\0';
-        bb_info_msg("%s: 0x%02x %s", pfx, opt[OPT_CODE], buf);
+        bb_error_msg("%s: 0x%02x %s", pfx, opt[OPT_CODE], buf);
     }
 }
@@ -243 +258 @@
 
         if (optionptr[OPT_CODE] == code) {
-            log_option("Option found", optionptr);
+            log_option("option found", optionptr);
             return optionptr + OPT_DATA;
         }
@@ -255 +270 @@
 
     /* log3 because udhcpc uses it a lot - very noisy */
-    log3("Option 0x%02x not found", code);
+    log3("option 0x%02x not found", code);
     return NULL;
 }
@@ -289 +304 @@
         return;
     }
-    log_option("Adding option", addopt);
+    log_option("adding option", addopt);
     memcpy(optionptr + end, addopt, len);
     optionptr[end + len] = DHCP_END;
@@ -372 +387 @@
         int length)
 {
-    struct option_set *existing, *new, **curr;
-    char *allocated = NULL;
+    struct option_set *existing;
+    char *allocated;
+
+    allocated = allocate_tempopt_if_needed(optflag, buffer, &length);
+#if ENABLE_FEATURE_UDHCP_RFC3397
+    if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_DNS_STRING) {
+        /* reuse buffer and length for RFC1035-formatted string */
+        allocated = buffer = (char *)dname_enc(NULL, 0, buffer, &length);
+    }
+#endif
 
     existing = udhcp_find_option(*opt_list, optflag->code);
     if (!existing) {
-        log2("Attaching option %02x to list", optflag->code);
-        allocated = allocate_tempopt_if_needed(optflag, buffer, &length);
-#if ENABLE_FEATURE_UDHCP_RFC3397
-        if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_DNS_STRING) {
-            /* reuse buffer and length for RFC1035-formatted string */
-            allocated = buffer = (char *)dname_enc(NULL, 0, buffer, &length);
-        }
-#endif
+        struct option_set *new, **curr;
+
         /* make a new option */
+        log2("attaching option %02x to list", optflag->code);
         new = xmalloc(sizeof(*new));
         new->data = xmalloc(length + OPT_DATA);
@@ -405 +423 @@
 
         /* add it to an existing option */
-        log2("Attaching option %02x to existing member of list", optflag->code);
-        allocated = allocate_tempopt_if_needed(optflag, buffer, &length);
+        log2("attaching option %02x to existing member of list", optflag->code);
         old_len = existing->data[OPT_LEN];
-#if ENABLE_FEATURE_UDHCP_RFC3397
-        if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_DNS_STRING) {
-            /* reuse buffer and length for RFC1035-formatted string */
-            allocated = buffer = (char *)dname_enc(existing->data + OPT_DATA, old_len, buffer, &length);
-        }
-#endif
         if (old_len + length < 255) {
             /* actually 255 is ok too, but adding a space can overlow it */
@@ -425 +436 @@
                 old_len++;
             }
-            memcpy(existing->data + OPT_DATA + old_len, buffer, length);
+            memcpy(existing->data + OPT_DATA + old_len, (allocated ? allocated : buffer), length);
             existing->data[OPT_LEN] = old_len + length;
         } /* else, ignore the data, we could put this in a second option in the future */