Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/udhcp/options.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/udhcp/options.c (modified) (7 diffs)

branches/2.2.5/mindi-busybox/networking/udhcp/options.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * options.c -- DHCP server option packet tools
@@ -4 +5 @@
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "common.h"
 #include "dhcpd.h"
 #include "options.h"
-#include "files.h"
 
 
 /* supported options are easily added here */
-struct dhcp_option dhcp_options[] = {
-    /* name[10] flags                   code */
-    {"subnet",  OPTION_IP | OPTION_REQ,         0x01},
-    {"timezone",    OPTION_S32,             0x02},
-    {"router",  OPTION_IP | OPTION_LIST | OPTION_REQ,   0x03},
-    {"timesvr", OPTION_IP | OPTION_LIST,        0x04},
-    {"namesvr", OPTION_IP | OPTION_LIST,        0x05},
-    {"dns",     OPTION_IP | OPTION_LIST | OPTION_REQ,   0x06},
-    {"logsvr",  OPTION_IP | OPTION_LIST,        0x07},
-    {"cookiesvr",   OPTION_IP | OPTION_LIST,        0x08},
-    {"lprsvr",  OPTION_IP | OPTION_LIST,        0x09},
-    {"hostname",    OPTION_STRING | OPTION_REQ,     0x0c},
-    {"bootsize",    OPTION_U16,             0x0d},
-    {"domain",  OPTION_STRING | OPTION_REQ,     0x0f},
-    {"swapsvr", OPTION_IP,              0x10},
-    {"rootpath",    OPTION_STRING,              0x11},
-    {"ipttl",   OPTION_U8,              0x17},
-    {"mtu",     OPTION_U16,             0x1a},
-    {"broadcast",   OPTION_IP | OPTION_REQ,         0x1c},
-    {"nisdomain",   OPTION_STRING | OPTION_REQ,     0x28},
-    {"nissrv",  OPTION_IP | OPTION_LIST | OPTION_REQ,   0x29},
-    {"ntpsrv",  OPTION_IP | OPTION_LIST | OPTION_REQ,   0x2a},
-    {"wins",    OPTION_IP | OPTION_LIST,        0x2c},
-    {"requestip",   OPTION_IP,              0x32},
-    {"lease",   OPTION_U32,             0x33},
-    {"dhcptype",    OPTION_U8,              0x35},
-    {"serverid",    OPTION_IP,              0x36},
-    {"message", OPTION_STRING,              0x38},
-    {"tftp",    OPTION_STRING,              0x42},
-    {"bootfile",    OPTION_STRING,              0x43},
-    {"",        0x00,               0x00}
+const struct dhcp_option dhcp_options[] = {
+    /* name[12]     flags                                   code */
+    {"subnet",      OPTION_IP | OPTION_REQ,                 0x01},
+    {"timezone",    OPTION_S32,                             0x02},
+    {"router",      OPTION_IP | OPTION_LIST | OPTION_REQ,   0x03},
+    {"timesvr",     OPTION_IP | OPTION_LIST,                0x04},
+    {"namesvr",     OPTION_IP | OPTION_LIST,                0x05},
+    {"dns",         OPTION_IP | OPTION_LIST | OPTION_REQ,   0x06},
+    {"logsvr",      OPTION_IP | OPTION_LIST,                0x07},
+    {"cookiesvr",   OPTION_IP | OPTION_LIST,                0x08},
+    {"lprsvr",      OPTION_IP | OPTION_LIST,                0x09},
+    {"hostname",    OPTION_STRING | OPTION_REQ,             0x0c},
+    {"bootsize",    OPTION_U16,                             0x0d},
+    {"domain",      OPTION_STRING | OPTION_LIST | OPTION_REQ, 0x0f},
+    {"swapsvr",     OPTION_IP,                              0x10},
+    {"rootpath",    OPTION_STRING,                          0x11},
+    {"ipttl",       OPTION_U8,                              0x17},
+    {"mtu",         OPTION_U16,                             0x1a},
+    {"broadcast",   OPTION_IP | OPTION_REQ,                 0x1c},
+    {"nisdomain",   OPTION_STRING | OPTION_REQ,             0x28},
+    {"nissrv",      OPTION_IP | OPTION_LIST | OPTION_REQ,   0x29},
+    {"ntpsrv",      OPTION_IP | OPTION_LIST | OPTION_REQ,   0x2a},
+    {"wins",        OPTION_IP | OPTION_LIST,                0x2c},
+    {"requestip",   OPTION_IP,                              0x32},
+    {"lease",       OPTION_U32,                             0x33},
+    {"dhcptype",    OPTION_U8,                              0x35},
+    {"serverid",    OPTION_IP,                              0x36},
+    {"message",     OPTION_STRING,                          0x38},
+    {"vendorclass", OPTION_STRING,                          0x3C},
+    {"clientid",    OPTION_STRING,                          0x3D},
+    {"tftp",        OPTION_STRING,                          0x42},
+    {"bootfile",    OPTION_STRING,                          0x43},
+    {"userclass",   OPTION_STRING,                          0x4D},
+#if ENABLE_FEATURE_RFC3397
+    {"search",      OPTION_STR1035 | OPTION_LIST | OPTION_REQ, 0x77},
+#endif
+    /* MSIE's "Web Proxy Autodiscovery Protocol" support */
+    {"wpad",        OPTION_STRING,                          0xfc},
+    {"",            0x00,                                   0x00}
 };
 
 /* Lengths of the different option types */
-int option_lengths[] = {
-    [OPTION_IP] =       4,
-    [OPTION_IP_PAIR] =  8,
-    [OPTION_BOOLEAN] =  1,
-    [OPTION_STRING] =   1,
-    [OPTION_U8] =       1,
-    [OPTION_U16] =      2,
-    [OPTION_S16] =      2,
-    [OPTION_U32] =      4,
-    [OPTION_S32] =      4
+const unsigned char option_lengths[] ALIGN1 = {
+    [OPTION_IP] =      4,
+    [OPTION_IP_PAIR] = 8,
+    [OPTION_BOOLEAN] = 1,
+    [OPTION_STRING] =  1,
+#if ENABLE_FEATURE_RFC3397
+    [OPTION_STR1035] = 1,
+#endif
+    [OPTION_U8] =      1,
+    [OPTION_U16] =     2,
+    [OPTION_S16] =     2,
+    [OPTION_U32] =     4,
+    [OPTION_S32] =     4
 };
 
@@ -73 +81 @@
     while (!done) {
         if (i >= length) {
-            LOG(LOG_WARNING, "bogus packet, option fields too long.");
+            bb_error_msg("bogus packet, option fields too long");
             return NULL;
         }
         if (optionptr[i + OPT_CODE] == code) {
             if (i + 1 + optionptr[i + OPT_LEN] >= length) {
-                LOG(LOG_WARNING, "bogus packet, option fields too long.");
+                bb_error_msg("bogus packet, option fields too long");
                 return NULL;
             }
@@ -89 +97 @@
         case DHCP_OPTION_OVER:
             if (i + 1 + optionptr[i + OPT_LEN] >= length) {
-                LOG(LOG_WARNING, "bogus packet, option fields too long.");
+                bb_error_msg("bogus packet, option fields too long");
                 return NULL;
             }
@@ -137 +145 @@
     /* end position + string length + option code/length + end option */
     if (end + string[OPT_LEN] + 2 + 1 >= 308) {
-        LOG(LOG_ERR, "Option 0x%02x did not fit into the packet!", string[OPT_CODE]);
+        bb_error_msg("option 0x%02x did not fit into the packet",
+                string[OPT_CODE]);
         return 0;
     }
-    DEBUG(LOG_INFO, "adding option 0x%02x", string[OPT_CODE]);
+    DEBUG("adding option 0x%02x", string[OPT_CODE]);
     memcpy(optionptr + end, string, string[OPT_LEN] + 2);
     optionptr[end + string[OPT_LEN] + 2] = DHCP_END;
@@ -150 +159 @@
 int add_simple_option(uint8_t *optionptr, uint8_t code, uint32_t data)
 {
-    struct dhcp_option *dh;
+    const struct dhcp_option *dh;
 
-    for (dh=dhcp_options; dh->code; dh++) {
+    for (dh = dhcp_options; dh->code; dh++) {
         if (dh->code == code) {
             uint8_t option[6], len;
@@ -167 +176 @@
     }
 
-    DEBUG(LOG_ERR, "Could not add option 0x%02x", code);
+    bb_error_msg("cannot add option 0x%02x", code);
     return 0;
 }