emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add "wpad" DHCP option. Spotted some optimization opportunities: -80 bytes

Browse Source
This commit is contained in:
Denis Vlasenko 2006-11-23 12:57:49 +00:00
parent 48237b0c88
commit c90c3f30a8
4 changed files with 64 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
networking/udhcp/files.c
View File

@ -95,7 +95,8 @@ struct option_set *find_option(struct option_set *opt_list, char code)
/* add an option to the opt_list */ /* add an option to the opt_list */
static void attach_option(struct option_set **opt_list, struct dhcp_option *option, char *buffer, int length) static void attach_option(struct option_set **opt_list,
const struct dhcp_option *option, char *buffer, int length)
{ {
struct option_set *existing, *new, **curr; struct option_set *existing, *new, **curr;
@ -135,7 +136,7 @@ static int read_opt(const char *const_line, void *arg)
{ {
struct option_set **opt_list = arg; struct option_set **opt_list = arg;
char *opt, *val, *endptr; char *opt, *val, *endptr;
struct dhcp_option *option; const struct dhcp_option *option;
int retval = 0, length; int retval = 0, length;
char buffer[8]; char buffer[8];
char *line; char *line;
@ -144,16 +145,21 @@ static int read_opt(const char *const_line, void *arg)
/* Cheat, the only const line we'll actually get is "" */ /* Cheat, the only const line we'll actually get is "" */
line = (char *) const_line; line = (char *) const_line;
if (!(opt = strtok(line, " \t="))) return 0; opt = strtok(line, " \t=");
if (!opt) return 0;
for (option = dhcp_options; option->code; option++) option = dhcp_options;
while (1) {
if (!option->code)
return 0;
if (!strcasecmp(option->name, opt)) if (!strcasecmp(option->name, opt))
break; break;
option++;
if (!option->code) return 0; }
do { do {
if (!(val = strtok(NULL, ", \t"))) break; val = strtok(NULL, ", \t");
if (!val) break;
length = option_lengths[option->flags & TYPE_MASK]; length = option_lengths[option->flags & TYPE_MASK];
retval = 0; retval = 0;
opt = buffer; /* new meaning for variable opt */ opt = buffer; /* new meaning for variable opt */

88
networking/udhcp/options.c
View File

@ -10,53 +10,55 @@
/* supported options are easily added here */ /* supported options are easily added here */
struct dhcp_option dhcp_options[] = { const struct dhcp_option dhcp_options[] = {
/* name[10] flags code */ /* name[10] flags code */
{"subnet", OPTION_IP | OPTION_REQ, 0x01}, {"subnet", OPTION_IP | OPTION_REQ, 0x01},
{"timezone", OPTION_S32, 0x02}, {"timezone", OPTION_S32, 0x02},
{"router", OPTION_IP | OPTION_LIST | OPTION_REQ, 0x03}, {"router", OPTION_IP | OPTION_LIST | OPTION_REQ, 0x03},
{"timesvr", OPTION_IP | OPTION_LIST, 0x04}, {"timesvr", OPTION_IP | OPTION_LIST, 0x04},
{"namesvr", OPTION_IP | OPTION_LIST, 0x05}, {"namesvr", OPTION_IP | OPTION_LIST, 0x05},
{"dns", OPTION_IP | OPTION_LIST | OPTION_REQ, 0x06}, {"dns", OPTION_IP | OPTION_LIST | OPTION_REQ, 0x06},
{"logsvr", OPTION_IP | OPTION_LIST, 0x07}, {"logsvr", OPTION_IP | OPTION_LIST, 0x07},
{"cookiesvr", OPTION_IP | OPTION_LIST, 0x08}, {"cookiesvr", OPTION_IP | OPTION_LIST, 0x08},
{"lprsvr", OPTION_IP | OPTION_LIST, 0x09}, {"lprsvr", OPTION_IP | OPTION_LIST, 0x09},
{"hostname", OPTION_STRING | OPTION_REQ, 0x0c}, {"hostname", OPTION_STRING | OPTION_REQ, 0x0c},
{"bootsize", OPTION_U16, 0x0d}, {"bootsize", OPTION_U16, 0x0d},
{"domain", OPTION_STRING | OPTION_REQ, 0x0f}, {"domain", OPTION_STRING | OPTION_REQ, 0x0f},
{"swapsvr", OPTION_IP, 0x10}, {"swapsvr", OPTION_IP, 0x10},
{"rootpath", OPTION_STRING, 0x11}, {"rootpath", OPTION_STRING, 0x11},
{"ipttl", OPTION_U8, 0x17}, {"ipttl", OPTION_U8, 0x17},
{"mtu", OPTION_U16, 0x1a}, {"mtu", OPTION_U16, 0x1a},
{"broadcast", OPTION_IP | OPTION_REQ, 0x1c}, {"broadcast", OPTION_IP | OPTION_REQ, 0x1c},
{"nisdomain", OPTION_STRING | OPTION_REQ, 0x28}, {"nisdomain", OPTION_STRING | OPTION_REQ, 0x28},
{"nissrv", OPTION_IP | OPTION_LIST | OPTION_REQ, 0x29}, {"nissrv", OPTION_IP | OPTION_LIST | OPTION_REQ, 0x29},
{"ntpsrv", OPTION_IP | OPTION_LIST | OPTION_REQ, 0x2a}, {"ntpsrv", OPTION_IP | OPTION_LIST | OPTION_REQ, 0x2a},
{"wins", OPTION_IP | OPTION_LIST, 0x2c}, {"wins", OPTION_IP | OPTION_LIST, 0x2c},
{"requestip", OPTION_IP, 0x32}, {"requestip", OPTION_IP, 0x32},
{"lease", OPTION_U32, 0x33}, {"lease", OPTION_U32, 0x33},
{"dhcptype", OPTION_U8, 0x35}, {"dhcptype", OPTION_U8, 0x35},
{"serverid", OPTION_IP, 0x36}, {"serverid", OPTION_IP, 0x36},
{"message", OPTION_STRING, 0x38}, {"message", OPTION_STRING, 0x38},
{"vendorclass", OPTION_STRING, 0x3C}, {"vendorclass", OPTION_STRING, 0x3C},
{"clientid", OPTION_STRING, 0x3D}, {"clientid", OPTION_STRING, 0x3D},
{"tftp", OPTION_STRING, 0x42}, {"tftp", OPTION_STRING, 0x42},
{"bootfile", OPTION_STRING, 0x43}, {"bootfile", OPTION_STRING, 0x43},
{"userclass", OPTION_STRING, 0x4D}, {"userclass", OPTION_STRING, 0x4D},
{"", 0x00, 0x00} /* MSIE's "Web Proxy Autodiscovery Protocol" support */
{"wpad", OPTION_STRING, 0xfc},
{"", 0x00, 0x00}
}; };
/* Lengths of the different option types */ /* Lengths of the different option types */
int option_lengths[] = { const unsigned char option_lengths[] = {
[OPTION_IP] = 4, [OPTION_IP] = 4,
[OPTION_IP_PAIR] = 8, [OPTION_IP_PAIR] = 8,
[OPTION_BOOLEAN] = 1, [OPTION_BOOLEAN] = 1,
[OPTION_STRING] = 1, [OPTION_STRING] = 1,
[OPTION_U8] = 1, [OPTION_U8] = 1,
[OPTION_U16] = 2, [OPTION_U16] = 2,
[OPTION_S16] = 2, [OPTION_S16] = 2,
[OPTION_U32] = 4, [OPTION_U32] = 4,
[OPTION_S32] = 4 [OPTION_S32] = 4
}; };
@ -150,9 +152,9 @@ int add_option_string(uint8_t *optionptr, uint8_t *string)
/* add a one to four byte option to a packet */ /* add a one to four byte option to a packet */
int add_simple_option(uint8_t *optionptr, uint8_t code, uint32_t data) 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) { if (dh->code == code) {
uint8_t option[6], len; uint8_t option[6], len;

4
networking/udhcp/options.h
View File

@ -26,8 +26,8 @@ struct dhcp_option {
uint8_t code; uint8_t code;
}; };
extern struct dhcp_option dhcp_options[]; extern const struct dhcp_option dhcp_options[];
extern int option_lengths[]; extern const unsigned char option_lengths[];
uint8_t *get_option(struct dhcpMessage *packet, int code); uint8_t *get_option(struct dhcpMessage *packet, int code);
int end_option(uint8_t *optionptr); int end_option(uint8_t *optionptr);

6
networking/udhcp/script.c
View File

@ -54,7 +54,8 @@ static int mton(struct in_addr *mask)
/* Fill dest with the text of option 'option'. */ /* Fill dest with the text of option 'option'. */
static void fill_options(char *dest, uint8_t *option, struct dhcp_option *type_p) static void fill_options(char *dest, uint8_t *option,
const struct dhcp_option *type_p)
{ {
int type, optlen; int type, optlen;
uint16_t val_u16; uint16_t val_u16;
@ -152,7 +153,8 @@ static char **fill_envp(struct dhcpMessage *packet)
for (i = 0; dhcp_options[i].code; i++) { for (i = 0; dhcp_options[i].code; i++) {
if (!(temp = get_option(packet, dhcp_options[i].code))) temp = get_option(packet, dhcp_options[i].code);
if (temp)
continue; continue;
envp[j] = xmalloc(upper_length(temp[OPT_LEN - 2], envp[j] = xmalloc(upper_length(temp[OPT_LEN - 2],
dhcp_options[i].flags & TYPE_MASK) + strlen(dhcp_options[i].name) + 2); dhcp_options[i].flags & TYPE_MASK) + strlen(dhcp_options[i].name) + 2);