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

options is a pretty common symbol, bad idea to use as a global in udhcp when compiling into busybox

Browse Source
This commit is contained in:
Russ Dill
2003-12-15 22:09:36 +00:00
parent a1fece2c70
commit 4a9e34c148
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
networking/udhcp/options.c
View File

@@ -13,7 +13,7 @@
/* supported options are easily added here */
struct dhcp_option options[] = {
struct dhcp_option dhcp_options[] = {
/* name[10] flags code */
{"subnet", OPTION_IP | OPTION_REQ, 0x01},
{"timezone", OPTION_S32, 0x02},
@@ -158,9 +158,9 @@ int add_simple_option(unsigned char *optionptr, unsigned char code, u_int32_t da
u16 = (u_int16_t *) &aligned;
u32 = &aligned;
for (i = 0; options[i].code; i++)
if (options[i].code == code) {
length = option_lengths[options[i].flags & TYPE_MASK];
for (i = 0; dhcp_options[i].code; i++)
if (dhcp_options[i].code == code) {
length = option_lengths[dhcp_options[i].flags & TYPE_MASK];
}
if (!length) {