Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy last commit.

Browse Source
This commit is contained in:
Simon Kelley
2012-03-12 17:28:27 +00:00
parent 6c8f21e4a4
commit 5cfea3d402
1 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/rfc3315.c
View File

@@ -1345,59 +1345,55 @@ static void log6_opts(int nest, unsigned int xid, void *start_opts, void *end_op
void *opt; void *opt;
char *desc = nest ? "nest" : "sent"; char *desc = nest ? "nest" : "sent";
if (start_opts != end_opts) if (start_opts == end_opts)
return;
for (opt = start_opts; opt; opt = opt6_next(opt, end_opts)) for (opt = start_opts; opt; opt = opt6_next(opt, end_opts))
{ {
int type = opt6_type(opt); int type = opt6_type(opt);
void *ia_options = NULL;
if (type == OPTION6_IA_NA || type == OPTION6_IA_TA) char *optname;
{
int iaid = opt6_uint(opt, 0, 4);
void *ia_end = opt6_ptr(opt, opt6_len(opt));
void *ia_options = opt6_ptr(opt, type == OPTION6_IA_NA ? 12 : 4);
if (type == OPTION6_IA_NA) if (type == OPTION6_IA_NA)
my_syslog(MS_DHCP | LOG_INFO, "%u %s size:%3d option:%3d ia-na IAID=%u T1=%u T2=%u", {
xid, desc, opt6_len(opt), type, iaid, opt6_uint(opt, 4, 4), opt6_uint(opt, 8, 4)); sprintf(daemon->namebuff, "IAID=%u T1=%u T2=%u",
else opt6_uint(opt, 0, 4), opt6_uint(opt, 4, 4), opt6_uint(opt, 8, 4));
my_syslog(MS_DHCP | LOG_INFO, "%u %s size:%3d option:%3d ia-ta IAID=%u", optname = "ia-na";
xid, desc, opt6_len(opt), type, iaid); ia_options = opt6_ptr(opt, 12);
}
log6_opts(1, xid, ia_options, ia_end); else if (type == OPTION6_IA_TA)
{
sprintf(daemon->namebuff, "IAID=%u", opt6_uint(opt, 0, 4));
optname = "ia-ta";
ia_options = opt6_ptr(opt, 4);
} }
else if (type == OPTION6_IAADDR) else if (type == OPTION6_IAADDR)
{ {
void *ia_end = opt6_ptr(opt, opt6_len(opt));
void *ia_options = opt6_ptr(opt, 24);
inet_ntop(AF_INET6, opt6_ptr(opt, 0), daemon->addrbuff, ADDRSTRLEN); inet_ntop(AF_INET6, opt6_ptr(opt, 0), daemon->addrbuff, ADDRSTRLEN);
sprintf(daemon->namebuff, "%s PL=%u VL=%u",
my_syslog(MS_DHCP | LOG_INFO, "%u %s size:%3d option:%3d iaaddr %s PL=%u VL=%u", daemon->addrbuff, opt6_uint(opt, 16, 4), opt6_uint(opt, 20, 4));
xid, desc, opt6_len(opt), type, daemon->addrbuff, opt6_uint(opt, 16, 4), opt6_uint(opt, 20, 4)); optname = "iaaddr";
ia_options = opt6_ptr(opt, 24);
log6_opts(1, xid, ia_options, ia_end);
} }
else if (type == OPTION6_STATUS_CODE) else if (type == OPTION6_STATUS_CODE)
{ {
memcpy(daemon->namebuff, opt6_ptr(opt, 2), opt6_len(opt)-2); int len = sprintf(daemon->namebuff, "%u ", opt6_uint(opt, 0, 2));
daemon->namebuff[opt6_len(opt)-2] = 0; memcpy(daemon->namebuff + len, opt6_ptr(opt, 2), opt6_len(opt)-2);
my_syslog(MS_DHCP | LOG_INFO, "%u %s size:%3d option:%3d status %u %s", daemon->namebuff[len + opt6_len(opt) - 2] = 0;
xid, desc, opt6_len(opt), type, opt6_uint(opt, 0, 2), daemon->namebuff); optname = "status";
} }
else else
{ {
int offset = 0;
char *optname;
/* account for flag byte on FQDN */ /* account for flag byte on FQDN */
if (type == OPTION6_FQDN) int offset = type == OPTION6_FQDN ? 1 : 0;
offset = 1;
optname = option_string(AF_INET6, type, opt6_ptr(opt, offset), opt6_len(opt) - offset, daemon->namebuff, MAXDNAME); optname = option_string(AF_INET6, type, opt6_ptr(opt, offset), opt6_len(opt) - offset, daemon->namebuff, MAXDNAME);
}
my_syslog(MS_DHCP | LOG_INFO, "%u %s size:%3d option:%3d %s %s", my_syslog(MS_DHCP | LOG_INFO, "%u %s size:%3d option:%3d %s %s",
xid, desc, opt6_len(opt), type, optname, daemon->namebuff); xid, desc, opt6_len(opt), type, optname, daemon->namebuff);
}
if (ia_options)
log6_opts(1, xid, ia_options, opt6_ptr(opt, opt6_len(opt)));
} }
} }