X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fudhcp%2Foptions.c;h=3168fc69aa68d9e6d60c306b0831c7190934fc4f;hb=bb23c069191f18ed11b826371ed3571e214b41e3;hp=e81d0a7575d266a71afc338abefea217f562f9e5;hpb=b6f71645f452572640a0529fb091f71cf8a30c3e;p=oweals%2Fbusybox.git diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c index e81d0a757..3168fc69a 100644 --- a/networking/udhcp/options.c +++ b/networking/udhcp/options.c @@ -1,62 +1,70 @@ +/* vi: set sw=4 ts=4: */ /* * options.c -- DHCP server option packet tools * Rewrite by Russ Dill July 2001 */ -#include -#include - +#include "common.h" #include "dhcpd.h" #include "options.h" -#include "files.h" -#include "common.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 }; @@ -72,12 +80,12 @@ uint8_t *get_option(struct dhcpMessage *packet, int code) length = 308; 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; } return optionptr + i + 2; @@ -88,7 +96,7 @@ uint8_t *get_option(struct dhcpMessage *packet, int code) break; 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; } over = optionptr[i + 3]; @@ -136,10 +144,11 @@ int add_option_string(uint8_t *optionptr, uint8_t *string) /* 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; return string[OPT_LEN] + 2; @@ -149,17 +158,16 @@ int add_option_string(uint8_t *optionptr, uint8_t *string) /* add a one to four byte option to a packet */ 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; - + option[OPT_CODE] = code; len = option_lengths[dh->flags & TYPE_MASK]; option[OPT_LEN] = len; - if (__BYTE_ORDER == __BIG_ENDIAN) - data <<= 8 * (4 - len); + if (BB_BIG_ENDIAN) data <<= 8 * (4 - len); /* This memcpy is for broken processors which can't * handle a simple unaligned 32-bit assignment */ memcpy(&option[OPT_DATA], &data, 4); @@ -167,7 +175,6 @@ int add_simple_option(uint8_t *optionptr, uint8_t code, uint32_t data) } } - DEBUG(LOG_ERR, "Could not add option 0x%02x", code); + bb_error_msg("cannot add option 0x%02x", code); return 0; } -