Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

--add option 61 to server side #23

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

--add option 61 to server side #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 46 additions & 4 deletions src/rfc2131.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

#include "dnsmasq.h"
#include <stdbool.h>

#ifdef HAVE_DHCP

Expand Down Expand Up @@ -67,12 +68,13 @@ struct dhcp_boot *find_boot(struct dhcp_netid *netid);
static int pxe_uefi_workaround(int pxe_arch, struct dhcp_netid *netid, struct dhcp_packet *mess, struct in_addr local, time_t now, int pxe);
static void apply_delay(u32 xid, time_t recvtime, struct dhcp_netid *netid);
static int is_pxe_client(struct dhcp_packet *mess, size_t sz, const char **pxe_vendor);
static void option_put_char(struct dhcp_packet *mess, unsigned char *end, int opt, int len, unsigned char *val);

size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
size_t sz, time_t now, int unicast_dest, int loopback,
int *is_inform, int pxe, struct in_addr fallback, time_t recvtime)
{
unsigned char *opt, *clid = NULL;
unsigned char *opt, *clid = NULL, *option_clid = NULL;
struct dhcp_lease *ltmp, *lease = NULL;
struct dhcp_vendor *vendor;
struct dhcp_mac *mac;
Expand Down Expand Up @@ -100,6 +102,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
struct dhcp_opt *o;
unsigned char pxe_uuid[17];
unsigned char *oui = NULL, *serial = NULL;
bool Flag_CID = false;
#ifdef HAVE_SCRIPT
unsigned char *class = NULL;
#endif
Expand Down Expand Up @@ -239,8 +242,12 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
/* If there is no client identifier option, use the hardware address */
if (!option_bool(OPT_IGNORE_CLID) && (opt = option_find(mess, sz, OPTION_CLIENT_ID, 1)))
{
clid_len = option_len(opt);
clid_len= option_len(opt);
option_clid = whine_malloc(clid_len);
clid = option_ptr(opt, 0);
memcpy(option_clid, clid, clid_len);
Flag_CID = true ;

}

/* do we have a lease in store? */
Expand Down Expand Up @@ -919,7 +926,11 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
"%s.%d", service->basename, layer);

option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr));
if(true == Flag_CID)
{
option_put_char(mess, end, OPTION_CLIENT_ID, clid_len, option_clid);
}

pxe_misc(mess, end, uuid, pxevendor);

prune_vendor_opts(tagif_netid);
Expand Down Expand Up @@ -1169,6 +1180,11 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
clear_packet(mess, end);
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPOFFER);
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(server_id(context, override, fallback).s_addr));
if(true == Flag_CID)
{
option_put_char(mess, end, OPTION_CLIENT_ID, clid_len, option_clid);
}

option_put(mess, end, OPTION_LEASE_TIME, 4, time);
/* T1 and T2 are required in DHCPOFFER by HP's wacky Jetdirect client. */
do_options(context, mess, end, req_options, offer_hostname, get_domain(mess->yiaddr),
Expand All @@ -1177,7 +1193,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
return dhcp_packet_size(mess, agent_id, real_end);


case DHCPREQUEST:
case DHCPREQUEST:-
if (ignore || have_config(config, CONFIG_DISABLE))
return 0;
if ((opt = option_find(mess, sz, OPTION_REQUESTED_IP, INADDRSZ)))
Expand Down Expand Up @@ -1361,6 +1377,11 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
clear_packet(mess, end);
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPNAK);
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(server_id(context, override, fallback).s_addr));
if(true == Flag_CID)
{
option_put_char(mess, end, OPTION_CLIENT_ID, clid_len, option_clid);
}

option_put_string(mess, end, OPTION_MESSAGE, message, borken_opt);
/* This fixes a problem with the DHCP spec, broadcasting a NAK to a host on
a distant subnet which unicast a REQ to us won't work. */
Expand Down Expand Up @@ -1518,6 +1539,11 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
clear_packet(mess, end);
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(server_id(context, override, fallback).s_addr));
if(true == Flag_CID)
{
option_put_char(mess, end, OPTION_CLIENT_ID, clid_len, option_clid);
}

option_put(mess, end, OPTION_LEASE_TIME, 4, time);
if (rapid_commit)
option_put(mess, end, OPTION_RAPID_COMMIT, 0, 0);
Expand Down Expand Up @@ -1573,6 +1599,11 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
clear_packet(mess, end);
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(server_id(context, override, fallback).s_addr));
if(true == Flag_CID)
{
option_put_char(mess, end, OPTION_CLIENT_ID, clid_len, option_clid);
}


/* RFC 2131 says that DHCPINFORM shouldn't include lease-time parameters, but
we supply a utility which makes DHCPINFORM requests to get this information.
Expand Down Expand Up @@ -1971,6 +2002,17 @@ static void option_put(struct dhcp_packet *mess, unsigned char *end, int opt, in
*(p++) = val >> (8 * (len - (i + 1)));
}

static void option_put_char(struct dhcp_packet *mess, unsigned char *end, int opt, int len, unsigned char * val)
{
int i;
unsigned char *p = free_space(mess, end, opt, len);

if (p)
for (i = 0; i < len; i++)
*(p++) = val[i];
free(val);
}

static void option_put_string(struct dhcp_packet *mess, unsigned char *end, int opt,
const char *string, int null_term)
{
Expand Down