summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Kelley <simon@thekelleys.org.uk>2021-08-10 23:54:13 +0100
committerSimon Kelley <simon@thekelleys.org.uk>2021-08-10 23:54:13 +0100
commitfc64b97cd51c7bd3f9bca955952d6d9b3ec7ef95 (patch)
tree5547c35f4c0cc60e39a51cd105e01fd165e10903
parentdaddc8cb809fbe8560f071608bf99232c70d5ec0 (diff)
downloaddnsmasq-fc64b97cd51c7bd3f9bca955952d6d9b3ec7ef95.tar.gz
dhcp_buff2 not availble in log_packet, use daemon->addrbuff
-rw-r--r--src/rfc2131.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rfc2131.c b/src/rfc2131.c
index 11c9e4f..c902eb7 100644
--- a/src/rfc2131.c
+++ b/src/rfc2131.c
@@ -1698,9 +1698,9 @@ static void log_packet(char *type, void *addr, unsigned char *ext_mac,
if (!err && !option_bool(OPT_LOG_OPTS) && option_bool(OPT_QUIET_DHCP))
return;
- daemon->dhcp_buff2[0] = 0;
+ daemon->addrbuff[0] = 0;
if (addr)
- inet_ntop(AF_INET, addr, daemon->dhcp_buff2, DHCP_BUFF_SZ - 1);
+ inet_ntop(AF_INET, addr, daemon->addrbuff, ADDRSTRLEN);
print_mac(daemon->namebuff, ext_mac, mac_len);
@@ -1709,7 +1709,7 @@ static void log_packet(char *type, void *addr, unsigned char *ext_mac,
ntohl(xid),
type,
interface,
- daemon->dhcp_buff2,
+ daemon->addrbuff,
addr ? " " : "",
daemon->namebuff,
string ? string : "",
@@ -1718,7 +1718,7 @@ static void log_packet(char *type, void *addr, unsigned char *ext_mac,
my_syslog(MS_DHCP | LOG_INFO, "%s(%s) %s%s%s %s%s",
type,
interface,
- daemon->dhcp_buff2,
+ daemon->addrbuff,
addr ? " " : "",
daemon->namebuff,
string ? string : "",
@@ -1726,9 +1726,9 @@ static void log_packet(char *type, void *addr, unsigned char *ext_mac,
#ifdef HAVE_UBUS
if (!strcmp(type, "DHCPACK"))
- ubus_event_bcast("dhcp.ack", daemon->namebuff, addr ? daemon->dhcp_buff2 : NULL, string, interface);
+ ubus_event_bcast("dhcp.ack", daemon->namebuff, addr ? daemon->addrbuff : NULL, string, interface);
else if (!strcmp(type, "DHCPRELEASE"))
- ubus_event_bcast("dhcp.release", daemon->namebuff, addr ? daemon->dhcp_buff2 : NULL, string, interface);
+ ubus_event_bcast("dhcp.release", daemon->namebuff, addr ? daemon->addrbuff : NULL, string, interface);
#endif
}