mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-06 15:51:41 +00:00
Compare commits
2
Commits
v2.67test17
...
v2.67rc2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d5c35a59b0 | ||
|
|
2f9fd1dcc5 |
No files matched your search
+516
-467
File diff suppressed because it is too large.
Load diff
+8
-3
@@ -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)
|
|||||||
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;
|
||||||
|
|||||||
Reference in new issue
Block a user