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

Unify options.[ch] with the one used in ndhs.

Browse Source
This commit is contained in:
Nicholas J. Kain 2011-09-02 02:12:51 -04:00
parent c4b4938a59
commit 071e91941f
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ndhc/options.c
View File

@ -29,10 +29,13 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <arpa/inet.h>
#include "options.h"
#include "log.h"
#ifndef NDHS_BUILD
#include "ifch_proto.h"
#endif
static int do_overload_value(uint8_t *buf, ssize_t blen, int overload)
{
@ -138,8 +141,8 @@ static inline size_t sizeof_option_str(uint8_t code, size_t datalen)
// Add a raw data string to the options. It will take a binary string suitable
// for use with eg memcpy() and will append it to the options[] field of
// a dhcp packet with the requested option code and proper length specifier.
static size_t add_option_string(struct dhcpmsg *packet, uint8_t code,
char *str, size_t slen)
size_t add_option_string(struct dhcpmsg *packet, uint8_t code, const char *str,
size_t slen)
{
size_t len = sizeof_option_str(code, slen);
if (slen > 255 || len != slen + 2) {
@ -208,8 +211,7 @@ static size_t add_u16_option(struct dhcpmsg *packet, uint8_t code,
}
// Data should be in network byte order.
static size_t add_u32_option(struct dhcpmsg *packet, uint8_t code,
uint32_t data)
size_t add_u32_option(struct dhcpmsg *packet, uint8_t code, uint32_t data)
{
ssize_t end = add_option_check(packet, code, 4);
if (end < 0)
@ -236,6 +238,22 @@ size_t add_option_request_list(struct dhcpmsg *packet)
(char *)reqdata, sizeof reqdata);
}
size_t add_option_domain_name(struct dhcpmsg *packet, char *dom,
size_t domlen)
{
return add_option_string(packet, DCODE_DOMAIN, dom, domlen);
}
void add_option_subnet_mask(struct dhcpmsg *packet, uint32_t subnet)
{
add_u32_option(packet, DCODE_SUBNET, subnet);
}
void add_option_broadcast(struct dhcpmsg *packet, uint32_t bc)
{
add_u32_option(packet, DCODE_BROADCAST, bc);
}
void add_option_msgtype(struct dhcpmsg *packet, uint8_t type)
{
add_u8_option(packet, DCODE_MSGTYPE, type);
@ -246,17 +264,18 @@ void add_option_reqip(struct dhcpmsg *packet, uint32_t ip)
add_u32_option(packet, DCODE_REQIP, ip);
}
void add_option_serverid(struct dhcpmsg *packet, uint32_t sid)
{
add_u32_option(packet, DCODE_SERVER_ID, sid);
}
#ifndef NDHS_BUILD
void add_option_maxsize(struct dhcpmsg *packet)
{
add_u16_option(packet, DCODE_MAX_SIZE,
htons(sizeof(struct ip_udp_dhcp_packet)));
}
void add_option_serverid(struct dhcpmsg *packet, uint32_t sid)
{
add_u32_option(packet, DCODE_SERVER_ID, sid);
}
void add_option_vendor(struct dhcpmsg *packet)
{
size_t len = strlen(client_config.vendor);
@ -291,6 +310,7 @@ void add_option_hostname(struct dhcpmsg *packet)
if (len)
add_option_string(packet, DCODE_HOSTNAME, client_config.hostname, len);
}
#endif
uint32_t get_option_router(struct dhcpmsg *packet)
{

12
ndhc/options.h
View File

@ -60,15 +60,23 @@ ssize_t get_dhcp_opt(struct dhcpmsg *packet, uint8_t code, uint8_t *dbuf,
ssize_t dlen);
ssize_t get_end_option_idx(struct dhcpmsg *packet);
size_t add_option_string(struct dhcpmsg *packet, uint8_t code, const char *str,
size_t slen);
size_t add_u32_option(struct dhcpmsg *packet, uint8_t code, uint32_t data);
size_t add_option_request_list(struct dhcpmsg *packet);
size_t add_option_domain_name(struct dhcpmsg *packet, char *dom, size_t domlen);
void add_option_subnet_mask(struct dhcpmsg *packet, uint32_t subnet);
void add_option_broadcast(struct dhcpmsg *packet, uint32_t bc);
void add_option_msgtype(struct dhcpmsg *packet, uint8_t type);
void add_option_reqip(struct dhcpmsg *packet, uint32_t ip);
void add_option_maxsize(struct dhcpmsg *packet);
void add_option_serverid(struct dhcpmsg *packet, uint32_t sid);
#ifndef NDHS_BUILD
void add_option_maxsize(struct dhcpmsg *packet);
void add_option_vendor(struct dhcpmsg *packet);
void add_option_clientid(struct dhcpmsg *packet);
void add_option_hostname(struct dhcpmsg *packet);
#endif
uint32_t get_option_router(struct dhcpmsg *packet);
uint8_t get_option_msgtype(struct dhcpmsg *packet);
uint32_t get_option_serverid(struct dhcpmsg *packet, int *found);