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

Fix FTBFS when NO_IPV6 defined.

Browse Source
This commit is contained in:
Simon Kelley
2013-10-01 09:54:41 +01:00
parent 8f3194f7ac
commit 2f9fd1dcc5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/helper.c
View File

@@ -61,6 +61,9 @@ struct script_data
#else #else
time_t expires; time_t expires;
#endif #endif
#ifdef HAVE_TFTP
off_t file_len;
#endif
#ifdef HAVE_DHCP6 #ifdef HAVE_DHCP6
struct in6_addr addr6; struct in6_addr addr6;
int iaid, vendorclass_count; int iaid, vendorclass_count;
@@ -289,9 +292,11 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
inet_ntop(AF_INET6, &data.addr6, daemon->addrbuff, ADDRSTRLEN); inet_ntop(AF_INET6, &data.addr6, daemon->addrbuff, ADDRSTRLEN);
#endif #endif
#ifdef HAVE_TFTP
/* file length */ /* file length */
if (data.action == ACTION_TFTP) if (data.action == ACTION_TFTP)
sprintf(is6 ? daemon->packet : daemon->dhcp_buff, "%u", data.iaid); sprintf(is6 ? daemon->packet : daemon->dhcp_buff, "%lu", (unsigned long)data.file_len);
#endif
#ifdef HAVE_LUASCRIPT #ifdef HAVE_LUASCRIPT
if (daemon->luascript) if (daemon->luascript)
@@ -739,7 +744,7 @@ void queue_tftp(off_t file_len, char *filename, union mysockaddr *peer)
buf->action = ACTION_TFTP; buf->action = ACTION_TFTP;
buf->hostname_len = filename_len; buf->hostname_len = filename_len;
buf->iaid = file_len; buf->file_len = file_len;
if ((buf->flags = peer->sa.sa_family) == AF_INET) if ((buf->flags = peer->sa.sa_family) == AF_INET)
buf->addr = peer->in.sin_addr; buf->addr = peer->in.sin_addr;