Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-20 02:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak DHCP startup logging.

Browse Source
This commit is contained in:
Simon Kelley
2013-01-11 16:28:50 +00:00
parent baeb3adf21
commit b1a1b6def5
1 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/dhcp-common.c
View File

@@ -679,7 +679,7 @@ void log_context(int family, struct dhcp_context *context)
void *start = &context->start; void *start = &context->start;
void *end = &context->end; void *end = &context->end;
char *n = "", *m = "", *p = daemon->namebuff; char *template = "", *p = daemon->namebuff;
*p = 0; *p = 0;
@@ -695,35 +695,32 @@ void log_context(int family, struct dhcp_context *context)
} }
#endif #endif
if ((context->flags & CONTEXT_DHCP) ||
!(context->flags & (CONTEXT_CONSTRUCTED | CONTEXT_TEMPLATE)))
{
if (family != AF_INET && (context->flags & CONTEXT_DEPRECATE)) if (family != AF_INET && (context->flags & CONTEXT_DEPRECATE))
strcpy(daemon->namebuff, _(", prefix deprecated")); strcpy(daemon->namebuff, _(", prefix deprecated"));
else else
{ {
p += sprintf(p, _(", lease time ")); p += sprintf(p, _(", lease time "));
m = p;
prettyprint_time(p, context->lease_time); prettyprint_time(p, context->lease_time);
p += strlen(p); p += strlen(p);
} }
}
#ifdef HAVE_DHCP6 #ifdef HAVE_DHCP6
if (context->flags & CONTEXT_CONSTRUCTED) if (context->flags & CONTEXT_CONSTRUCTED)
{ {
char ifrn_name[IFNAMSIZ]; char ifrn_name[IFNAMSIZ];
if (indextoname(daemon->doing_dhcp6 ? daemon->dhcp6fd : daemon->icmp6fd, context->if_index, ifrn_name))
{
n = p;
p += sprintf(p, ", constructed for %s", ifrn_name);
}
}
if (context->flags & CONTEXT_TEMPLATE) template = p;
p += sprintf(p, ", ");
if (indextoname(daemon->doing_dhcp6 ? daemon->dhcp6fd : daemon->icmp6fd, context->if_index, ifrn_name))
sprintf(p, "constructed for %s", ifrn_name);
}
else if (context->flags & CONTEXT_TEMPLATE)
{ {
n = p; template = p;
p += sprintf(p, ", template for %s%s", context->template_interface, p += sprintf(p, ", ");
sprintf(p, "template for %s%s", context->template_interface,
(context->flags & CONTEXT_WILDCARD) ? "*" : ""); (context->flags & CONTEXT_WILDCARD) ? "*" : "");
} }
#endif #endif
@@ -734,27 +731,22 @@ void log_context(int family, struct dhcp_context *context)
inet_ntop(family, end, daemon->dhcp_buff3, 256); inet_ntop(family, end, daemon->dhcp_buff3, 256);
my_syslog(MS_DHCP | LOG_INFO, my_syslog(MS_DHCP | LOG_INFO,
(context->flags & CONTEXT_RA_STATELESS) ? (context->flags & CONTEXT_RA_STATELESS) ?
_("%s stateless on %s%.0s%.0s") : _("%s stateless on %s%.0s%.0s%s") :
(context->flags & CONTEXT_STATIC) ? (context->flags & CONTEXT_STATIC) ?
_("%s, static leases only on %.0s%s%s") : _("%s, static leases only on %.0s%s%s%.0s") :
(context->flags & CONTEXT_PROXY) ? (context->flags & CONTEXT_PROXY) ?
_("%s, proxy on subnet %.0s%s%.0s") : _("%s, proxy on subnet %.0s%s%.0s%.0s") :
_("%s, IP range %s -- %s%s"), _("%s, IP range %s -- %s%s%.0s"),
(family != AF_INET) ? "DHCPv6" : "DHCP", (family != AF_INET) ? "DHCPv6" : "DHCP",
daemon->dhcp_buff, daemon->dhcp_buff3, daemon->namebuff); daemon->dhcp_buff, daemon->dhcp_buff3, daemon->namebuff, template);
} }
#ifdef HAVE_DHCP6 #ifdef HAVE_DHCP6
if (context->flags & CONTEXT_RA_NAME) if (context->flags & CONTEXT_RA_NAME)
my_syslog(MS_DHCP | LOG_INFO, _("DHCPv4-derived IPv6 names on %s%s"), my_syslog(MS_DHCP | LOG_INFO, _("DHCPv4-derived IPv6 names on %s%s"), daemon->addrbuff, template);
daemon->addrbuff, n);
if ((context->flags & CONTEXT_RA) || (option_bool(OPT_RA) && (context->flags & CONTEXT_DHCP) && family == AF_INET6))
if (context->flags & CONTEXT_RA) my_syslog(MS_DHCP | LOG_INFO, _("router advertisement on %s%s"), daemon->addrbuff, template);
my_syslog(MS_DHCP | LOG_INFO, _("router advertisement on %s%s%s"),
daemon->addrbuff,
(context->flags & (CONTEXT_CONSTRUCTED | CONTEXT_TEMPLATE)) ? "" : ", prefix valid ",
(context->flags & (CONTEXT_CONSTRUCTED | CONTEXT_TEMPLATE)) ? n : m);
#endif #endif
} }