diff --git a/ndhc/options.c b/ndhc/options.c index 835f3f4..5c32b87 100644 --- a/ndhc/options.c +++ b/ndhc/options.c @@ -24,13 +24,13 @@ struct dhcp_option options[] = { /* name[10] flags code */ {"subnet" , OPTION_IP, 0x01}, {"timezone" , OPTION_S32, 0x02}, - {"router" , OPTION_IP | OPTION_LIST, 0x03}, - {"timesvr" , OPTION_IP | OPTION_LIST, 0x04}, - {"namesvr" , OPTION_IP | OPTION_LIST, 0x05}, - {"dns" , OPTION_IP | OPTION_LIST, 0x06}, - {"logsvr" , OPTION_IP | OPTION_LIST, 0x07}, - {"cookiesvr", OPTION_IP | OPTION_LIST, 0x08}, - {"lprsvr" , OPTION_IP | OPTION_LIST, 0x09}, + {"router" , OPTION_IP, 0x03}, + {"timesvr" , OPTION_IP, 0x04}, + {"namesvr" , OPTION_IP, 0x05}, + {"dns" , OPTION_IP, 0x06}, + {"logsvr" , OPTION_IP, 0x07}, + {"cookiesvr", OPTION_IP, 0x08}, + {"lprsvr" , OPTION_IP, 0x09}, {"hostname" , OPTION_STRING, 0x0c}, {"bootsize" , OPTION_U16, 0x0d}, {"domain" , OPTION_STRING, 0x0f}, @@ -39,8 +39,8 @@ struct dhcp_option options[] = { {"ipttl" , OPTION_U8, 0x17}, {"mtu" , OPTION_U16, 0x1a}, {"broadcast", OPTION_IP, 0x1c}, - {"ntpsrv" , OPTION_IP | OPTION_LIST, 0x2a}, - {"wins" , OPTION_IP | OPTION_LIST, 0x2c}, + {"ntpsrv" , OPTION_IP, 0x2a}, + {"wins" , OPTION_IP, 0x2c}, {"requestip", OPTION_IP, 0x32}, {"lease" , OPTION_U32, 0x33}, {"dhcptype" , OPTION_U8, 0x35}, diff --git a/ndhc/options.h b/ndhc/options.h index 85cf9b0..b7bd8a4 100644 --- a/ndhc/options.h +++ b/ndhc/options.h @@ -65,8 +65,6 @@ enum { OPTION_S32 }; -#define OPTION_LIST 0x20 /* There can be a list of 1 or more of these */ - struct dhcp_option { char name[10]; char flags;