Skip to content

D
Dnsmasq
Commit 2f9fd1dc authored by Simon Kelley's avatar Simon Kelley
Browse files
Options

Fix FTBFS when NO_IPV6 defined.

parent 8f3194f7
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
src/helper.c
View file @ 2f9fd1dc
...@@ -61,6 +61,9 @@ struct script_data ...@@ -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,10 +292,12 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) ...@@ -289,10 +292,12 @@ 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) ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment