From 1c8855ed10d3923a9a4fd8a89f1c95439d4c8827 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Sun, 26 Dec 2021 16:35:54 +0000 Subject: Fix wrong client address for dhcp-script when DHCPv4 relay in use. --- src/helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/helper.c b/src/helper.c index 02340a0..455a68c 100644 --- a/src/helper.c +++ b/src/helper.c @@ -432,8 +432,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) buf = grab_extradata_lua(buf, end, "relay_address"); else if (data.giaddr.s_addr != 0) { - inet_ntop(AF_INET, &data.giaddr, daemon->addrbuff, ADDRSTRLEN); - lua_pushstring(lua, daemon->addrbuff); + inet_ntop(AF_INET, &data.giaddr, daemon->dhcp_buff2, ADDRSTRLEN); + lua_pushstring(lua, daemon->dhcp_buff2); lua_setfield(lua, -2, "relay_address"); } @@ -615,7 +615,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) { const char *giaddr = NULL; if (data.giaddr.s_addr != 0) - giaddr = inet_ntop(AF_INET, &data.giaddr, daemon->addrbuff, ADDRSTRLEN); + giaddr = inet_ntop(AF_INET, &data.giaddr, daemon->dhcp_buff2, ADDRSTRLEN); my_setenv("DNSMASQ_RELAY_ADDRESS", giaddr, &err); } -- cgit v1.2.1