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

Just keep a statically constructed options request payload. It's simpler

Browse Source 
and more compact.
This commit is contained in:
Nicholas J. Kain 2011-07-26 01:58:05 -04:00
parent d00922df51
commit b935180a2f
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ndhc/options.c
View File

@ -40,9 +40,6 @@ struct dhcp_option {
char name[6]; char name[6];
}; };
// Marks an option that will be sent on the parameter request list to the
// remote DHCP server.
#define OPTION_REQ 16
// Marks an option that can be sent as a list of multiple items. // Marks an option that can be sent as a list of multiple items.
#define OPTION_LIST 32 #define OPTION_LIST 32
@ -51,16 +48,16 @@ struct dhcp_option {
// useful part and helps for safety checks and determining what options to // useful part and helps for safety checks and determining what options to
// send in the initial DHCP option request packet. // send in the initial DHCP option request packet.
static const struct dhcp_option options[] = { static const struct dhcp_option options[] = {
{DCODE_SUBNET , OPTION_IP | OPTION_LIST | OPTION_REQ, CMD_SUBNET }, {DCODE_SUBNET , OPTION_IP | OPTION_LIST, CMD_SUBNET },
{DCODE_TIMEZONE , OPTION_S32, CMD_TIMEZONE }, {DCODE_TIMEZONE , OPTION_S32, CMD_TIMEZONE },
{DCODE_ROUTER , OPTION_IP | OPTION_REQ, CMD_ROUTER }, {DCODE_ROUTER , OPTION_IP, CMD_ROUTER },
{DCODE_DNS , OPTION_IP | OPTION_LIST | OPTION_REQ, CMD_DNS }, {DCODE_DNS , OPTION_IP | OPTION_LIST, CMD_DNS },
{DCODE_LPRSVR , OPTION_IP | OPTION_LIST, CMD_LPRSVR }, {DCODE_LPRSVR , OPTION_IP | OPTION_LIST, CMD_LPRSVR },
{DCODE_HOSTNAME , OPTION_STRING | OPTION_REQ, CMD_HOSTNAME }, {DCODE_HOSTNAME , OPTION_STRING, CMD_HOSTNAME },
{DCODE_DOMAIN , OPTION_STRING | OPTION_REQ, CMD_DOMAIN }, {DCODE_DOMAIN , OPTION_STRING, CMD_DOMAIN },
{DCODE_IPTTL , OPTION_U8, CMD_IPTTL }, {DCODE_IPTTL , OPTION_U8, CMD_IPTTL },
{DCODE_MTU , OPTION_U16, CMD_MTU }, {DCODE_MTU , OPTION_U16, CMD_MTU },
{DCODE_BROADCAST, OPTION_IP | OPTION_REQ, CMD_BROADCAST}, {DCODE_BROADCAST, OPTION_IP, CMD_BROADCAST},
{DCODE_NTPSVR , OPTION_IP | OPTION_LIST, CMD_NTPSVR }, {DCODE_NTPSVR , OPTION_IP | OPTION_LIST, CMD_NTPSVR },
{DCODE_WINS , OPTION_IP | OPTION_LIST, CMD_WINS }, {DCODE_WINS , OPTION_IP | OPTION_LIST, CMD_WINS },
{0x00 , OPTION_NONE, CMD_NULL } {0x00 , OPTION_NONE, CMD_NULL }
@ -307,13 +304,12 @@ static size_t add_u32_option(struct dhcpmsg *packet, uint8_t code,
// Add a paramater request list for stubborn DHCP servers // Add a paramater request list for stubborn DHCP servers
size_t add_option_request_list(struct dhcpmsg *packet) size_t add_option_request_list(struct dhcpmsg *packet)
{ {
uint8_t reqdata[256]; static const uint8_t reqdata[] = {
size_t j = 0; DCODE_SUBNET, DCODE_ROUTER, DCODE_DNS, DCODE_HOSTNAME, DCODE_DOMAIN,
for (int i = 0; options[i].code; i++) { DCODE_BROADCAST,
if (options[i].type & OPTION_REQ) };
reqdata[j++] = options[i].code; return add_option_string(packet, DCODE_PARAM_REQ,
} (char *)reqdata, sizeof reqdata);
return add_option_string(packet, DCODE_PARAM_REQ, (char *)reqdata, j);
} }
void add_option_msgtype(struct dhcpmsg *packet, uint8_t type) void add_option_msgtype(struct dhcpmsg *packet, uint8_t type)