mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-18 19:41:03 +00:00
Compare commits
4
Commits
v2.61test5
...
v2.61test7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a953096485 | ||
|
|
884a6dfe6d | ||
|
|
0068301d24 | ||
|
|
353ae4d270 |
No files matched your search
@@ -24,6 +24,24 @@ version 2.61
|
|||||||
Add --host-record. Thanks to Rob Zwissler for the
|
Add --host-record. Thanks to Rob Zwissler for the
|
||||||
suggestion.
|
suggestion.
|
||||||
|
|
||||||
|
Invoke the DHCP script with action "tftp" when a TFTP file
|
||||||
|
transfer completes. The size of the file, address to which
|
||||||
|
it was sent and complete pathname are supplied. Note that
|
||||||
|
version 2.60 introduced some script incompatibilties
|
||||||
|
associated with DHCPv6, and this is a further change. To
|
||||||
|
be safe, scripts should ignore unknown actions, and if
|
||||||
|
not IPv6-aware, should exit if the environment
|
||||||
|
variable DNSMASQ_IAID is set. The use-case for this is
|
||||||
|
to track netboot/install. Suggestion from Shantanu
|
||||||
|
Gadgil.
|
||||||
|
|
||||||
|
Update contrib/port-forward/dnsmasq-portforward to reflect
|
||||||
|
the above.
|
||||||
|
|
||||||
|
Set the environment variable DNSMASQ_LOG_DHCP when running
|
||||||
|
the script id --log-dhcp is in effect, so that script can
|
||||||
|
taylor their logging verbosity. Suggestion from Malte Forkel.
|
||||||
|
|
||||||
|
|
||||||
version 2.60
|
version 2.60
|
||||||
Fix compilation problem in Mac OS X Lion. Thanks to Olaf
|
Fix compilation problem in Mac OS X Lion. Thanks to Olaf
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ version = -DVERSION='\"`$(top)/bld/get-version $(top)`\"'
|
|||||||
objs = cache.o rfc1035.o util.o option.o forward.o network.o \
|
objs = cache.o rfc1035.o util.o option.o forward.o network.o \
|
||||||
dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
|
dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
|
||||||
helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o \
|
helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o \
|
||||||
dhcp-common.o outpacket.o radv.o
|
dhcp-common.o outpacket.o radv.o slaac.o
|
||||||
|
|
||||||
hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
|
hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
|
||||||
dns-protocol.h radv-protocol.h
|
dns-protocol.h radv-protocol.h
|
||||||
|
|||||||
+1
-1
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := bpf.c cache.c dbus.c dhcp.c dnsmasq.c \
|
|||||||
netlink.c network.c option.c rfc1035.c \
|
netlink.c network.c option.c rfc1035.c \
|
||||||
rfc2131.c tftp.c util.c conntrack.c \
|
rfc2131.c tftp.c util.c conntrack.c \
|
||||||
dhcp6.c rfc3315.c dhcp-common.c outpacket.c \
|
dhcp6.c rfc3315.c dhcp-common.c outpacket.c \
|
||||||
radv.c
|
radv.c slaac.c
|
||||||
|
|
||||||
LOCAL_MODULE := dnsmasq
|
LOCAL_MODULE := dnsmasq
|
||||||
|
|
||||||
|
|||||||
@@ -34,11 +34,21 @@ if [ ${DNSMASQ_OLD_HOSTNAME} ] && [ ${action} = old ] ; then
|
|||||||
hostname=${DNSMASQ_OLD_HOSTNAME}
|
hostname=${DNSMASQ_OLD_HOSTNAME}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# IPv6 leases are not our concern. no NAT there!
|
||||||
|
if [ ${DNSMASQ_IAID} ] ; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
# action init is not relevant, and will only be seen when leasefile-ro is set.
|
# action init is not relevant, and will only be seen when leasefile-ro is set.
|
||||||
if [ ${action} = init ] ; then
|
if [ ${action} = init ] ; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# action tftp is not relevant.
|
||||||
|
if [ ${action} = tftp ] ; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ${hostname} ]; then
|
if [ ${hostname} ]; then
|
||||||
ports=$(sed -n -e "/^${hostname}\ .*/ s/^.* //p" ${PORTSFILE})
|
ports=$(sed -n -e "/^${hostname}\ .*/ s/^.* //p" ${PORTSFILE})
|
||||||
|
|
||||||
|
|||||||
+44
-13
@@ -576,14 +576,14 @@ for details. Instead, the keyword
|
|||||||
.B ra-names
|
.B ra-names
|
||||||
may be used. This does the same at ra-only, but also enables a mode
|
may be used. This does the same at ra-only, but also enables a mode
|
||||||
which gives DNS names to dual-stack hosts which do SLAAC for
|
which gives DNS names to dual-stack hosts which do SLAAC for
|
||||||
IPv6. Dnsmasq uses the hosts IPv4 lease to derive the name, network
|
IPv6. Dnsmasq uses the host's IPv4 lease to derive the name, network
|
||||||
segment and MAC address and assumes that the host will also have an
|
segment and MAC address and assumes that the host will also have an
|
||||||
IPv6 address calculated using the SLAAC alogrithm, on the same network
|
IPv6 address calculated using the SLAAC alogrithm, on the same network
|
||||||
segment. An AAAA record is added to the DNS for this IPv6
|
segment. The address is pinged, and if a reply is received, an AAAA
|
||||||
|
record is added to the DNS for this IPv6
|
||||||
address. Note that this is only happens for directly-connected
|
address. Note that this is only happens for directly-connected
|
||||||
networks, (not one doing DHCP via a relay) and it will generate an
|
networks, (not one doing DHCP via a relay) and it will not work
|
||||||
erroneous AAAA record if a host is using privacy extensions or does
|
if a host is using privacy extensions.
|
||||||
not support IPv6. Use with care.
|
|
||||||
|
|
||||||
The interface:<interface name> section is not normally used. See the
|
The interface:<interface name> section is not normally used. See the
|
||||||
NOTES section for details of this.
|
NOTES section for details of this.
|
||||||
@@ -1069,7 +1069,8 @@ re-intialised. The enterprise-id is assigned by IANA, and the uid is a
|
|||||||
string of hex octets unique to a particular device.
|
string of hex octets unique to a particular device.
|
||||||
.TP
|
.TP
|
||||||
.B \-6 --dhcp-script=<path>
|
.B \-6 --dhcp-script=<path>
|
||||||
Whenever a new DHCP lease is created, or an old one destroyed, the
|
Whenever a new DHCP lease is created, or an old one destroyed, or a
|
||||||
|
TFTP file transfer completes, the
|
||||||
executable specified by this option is run. <path>
|
executable specified by this option is run. <path>
|
||||||
must be an absolute pathname, no PATH search occurs.
|
must be an absolute pathname, no PATH search occurs.
|
||||||
The arguments to the process
|
The arguments to the process
|
||||||
@@ -1119,6 +1120,8 @@ is known.
|
|||||||
DNSMASQ_TAGS contains all the tags set during the
|
DNSMASQ_TAGS contains all the tags set during the
|
||||||
DHCP transaction, separated by spaces.
|
DHCP transaction, separated by spaces.
|
||||||
|
|
||||||
|
DNSMASQ_LOG_DHCP is set if --log-dhcp is in effect.
|
||||||
|
|
||||||
For IPv4 only:
|
For IPv4 only:
|
||||||
|
|
||||||
DNSMASQ_CLIENT_ID if the host provided a client-id.
|
DNSMASQ_CLIENT_ID if the host provided a client-id.
|
||||||
@@ -1145,6 +1148,8 @@ only supplied for
|
|||||||
since these data are not held in dnsmasq's lease
|
since these data are not held in dnsmasq's lease
|
||||||
database.
|
database.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
All file descriptors are
|
All file descriptors are
|
||||||
closed except stdin, stdout and stderr which are open to /dev/null
|
closed except stdin, stdout and stderr which are open to /dev/null
|
||||||
(except in debug mode).
|
(except in debug mode).
|
||||||
@@ -1163,6 +1168,17 @@ all existing leases as they are read from the lease file. Expired
|
|||||||
leases will be called with "del" and others with "old". When dnsmasq
|
leases will be called with "del" and others with "old". When dnsmasq
|
||||||
receives a HUP signal, the script will be invoked for existing leases
|
receives a HUP signal, the script will be invoked for existing leases
|
||||||
with an "old " event.
|
with an "old " event.
|
||||||
|
|
||||||
|
|
||||||
|
There are two further actions which may appear as the first argument
|
||||||
|
to the script, "init" and "tftp". More may be added in the future, so
|
||||||
|
scripts should be written to ignore unknown actions. "init" is
|
||||||
|
decsribed below in
|
||||||
|
.B --leasefile-ro
|
||||||
|
The "tftp" action is invoked when a TFTP file transfer completes: the
|
||||||
|
arguments are the file size in bytes, the address to which the file
|
||||||
|
was sent, and the complete pathname of the file.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-luascript=<path>
|
.B --dhcp-luascript=<path>
|
||||||
Specify a script written in Lua, to be run when leases are created,
|
Specify a script written in Lua, to be run when leases are created,
|
||||||
@@ -1176,11 +1192,13 @@ function, and may provide
|
|||||||
and
|
and
|
||||||
.B shutdown
|
.B shutdown
|
||||||
functions, which are called, without arguments when dnsmasq starts up
|
functions, which are called, without arguments when dnsmasq starts up
|
||||||
and terminates.
|
and terminates. It may also provide a
|
||||||
|
.B tftp
|
||||||
|
function.
|
||||||
|
|
||||||
The
|
The
|
||||||
.B lease
|
.B lease
|
||||||
method receives the information detailed in
|
function receives the information detailed in
|
||||||
.B --dhcp-script.
|
.B --dhcp-script.
|
||||||
It gets two arguments, firstly the action, which is a string
|
It gets two arguments, firstly the action, which is a string
|
||||||
containing, "add", "old" or "del", and secondly a table of tag value
|
containing, "add", "old" or "del", and secondly a table of tag value
|
||||||
@@ -1198,6 +1216,15 @@ for IPv4, and
|
|||||||
and
|
and
|
||||||
.B hostname
|
.B hostname
|
||||||
for IPv6.
|
for IPv6.
|
||||||
|
|
||||||
|
The
|
||||||
|
.B tftp
|
||||||
|
function is called in the same way as the lease function, and the
|
||||||
|
table holds the tags
|
||||||
|
.B destination_address,
|
||||||
|
.B file_name
|
||||||
|
and
|
||||||
|
.B file_size.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-scriptuser
|
.B --dhcp-scriptuser
|
||||||
Specify the user as which to run the lease-change script or Lua script. This defaults to root, but can be changed to another user using this flag.
|
Specify the user as which to run the lease-change script or Lua script. This defaults to root, but can be changed to another user using this flag.
|
||||||
@@ -1292,13 +1319,17 @@ only a subset of this is needed, and dnsmasq can handle it, using
|
|||||||
existing DHCP configuration to provide most data. When RA is enabled,
|
existing DHCP configuration to provide most data. When RA is enabled,
|
||||||
dnsmasq will advertise a prefix for each dhcp-range, with default
|
dnsmasq will advertise a prefix for each dhcp-range, with default
|
||||||
router and recursive DNS server as the relevant link-local address on
|
router and recursive DNS server as the relevant link-local address on
|
||||||
the machine running dnsmasq. The "managed address" bits are set,
|
the machine running dnsmasq. The "managed address" bits are set, and
|
||||||
except for a dhcp-range which is marked as "ra-only", in which case RA
|
the "use SLAAC" bit is reset, except for a dhcp-range which is
|
||||||
is provided but no DHCPv6 service and the managed address bits are
|
marked as "ra-only" or "ra-names", in which case RA is provided but no
|
||||||
cleared.
|
DHCPv6 service and the managed address bits are
|
||||||
|
cleared and the "use SLAAC" bit set. If the same subnet appears in a
|
||||||
|
normal dhcp-range and an "ra-only" dhcp-range, then the "managed
|
||||||
|
address" bits and the "use SLAAC" bits are all set, allowing SLAAC and
|
||||||
|
DHCP address to co-exist on the same subnet.
|
||||||
.B enable-ra
|
.B enable-ra
|
||||||
enables router advertisement for prefixes where dnsmasq is doing
|
enables router advertisement for prefixes where dnsmasq is doing
|
||||||
DHCPv6. It is not needed to "ra-only" prefixes. Creating an "ra-only"
|
DHCPv6. It is not needed for "ra-only" prefixes. Creating an "ra-only"
|
||||||
prefix and not setting
|
prefix and not setting
|
||||||
.B enable-ra
|
.B enable-ra
|
||||||
sends advertisements only to "ra-only" prefixes.
|
sends advertisements only to "ra-only" prefixes.
|
||||||
|
|||||||
+1
-1
@@ -299,7 +299,7 @@ void dhcp_packet(time_t now, int pxe_fd)
|
|||||||
iov.iov_len = dhcp_reply(parm.current, ifr.ifr_name, iface_index, (size_t)sz,
|
iov.iov_len = dhcp_reply(parm.current, ifr.ifr_name, iface_index, (size_t)sz,
|
||||||
now, unicast_dest, &is_inform, pxe_fd, iface_addr);
|
now, unicast_dest, &is_inform, pxe_fd, iface_addr);
|
||||||
lease_update_file(now);
|
lease_update_file(now);
|
||||||
lease_update_dns();
|
lease_update_dns(0);
|
||||||
|
|
||||||
if (iov.iov_len == 0)
|
if (iov.iov_len == 0)
|
||||||
return;
|
return;
|
||||||
|
|||||||
+1
-1
@@ -139,7 +139,7 @@ void dhcp6_packet(time_t now)
|
|||||||
sz, IN6_IS_ADDR_MULTICAST(&from.sin6_addr), now);
|
sz, IN6_IS_ADDR_MULTICAST(&from.sin6_addr), now);
|
||||||
|
|
||||||
lease_update_file(now);
|
lease_update_file(now);
|
||||||
lease_update_dns();
|
lease_update_dns(0);
|
||||||
|
|
||||||
/* The port in the source address of the original request should
|
/* The port in the source address of the original request should
|
||||||
be correct, but at least once client sends from the server port,
|
be correct, but at least once client sends from the server port,
|
||||||
|
|||||||
+21
-9
@@ -721,6 +721,10 @@ int main (int argc, char **argv)
|
|||||||
# ifdef HAVE_SCRIPT
|
# ifdef HAVE_SCRIPT
|
||||||
while (helper_buf_empty() && do_script_run(now));
|
while (helper_buf_empty() && do_script_run(now));
|
||||||
|
|
||||||
|
# ifdef HAVE_TFTP
|
||||||
|
while (helper_buf_empty() && do_tftp_script_run());
|
||||||
|
# endif
|
||||||
|
|
||||||
if (!helper_buf_empty())
|
if (!helper_buf_empty())
|
||||||
{
|
{
|
||||||
FD_SET(daemon->helperfd, &wset);
|
FD_SET(daemon->helperfd, &wset);
|
||||||
@@ -729,6 +733,11 @@ int main (int argc, char **argv)
|
|||||||
# else
|
# else
|
||||||
/* need this for other side-effects */
|
/* need this for other side-effects */
|
||||||
while (do_script_run(now));
|
while (do_script_run(now));
|
||||||
|
|
||||||
|
# ifdef HAVE_TFTP
|
||||||
|
while (do_tftp_script_run());
|
||||||
|
# endif
|
||||||
|
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -864,9 +873,17 @@ static void sig_handler(int sig)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void send_alarm(void)
|
/* now == 0 -> queue immediate callback */
|
||||||
|
void send_alarm(time_t event, time_t now)
|
||||||
{
|
{
|
||||||
|
if (now == 0 || event != 0)
|
||||||
|
{
|
||||||
|
/* alarm(0) or alarm(-ve) doesn't do what we want.... */
|
||||||
|
if ((now == 0 || difftime(event, now) <= 0.0))
|
||||||
send_event(pipewrite, EVENT_ALARM, 0, NULL);
|
send_event(pipewrite, EVENT_ALARM, 0, NULL);
|
||||||
|
else
|
||||||
|
alarm((unsigned)difftime(event, now));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void send_event(int fd, int event, int data, char *msg)
|
void send_event(int fd, int event, int data, char *msg)
|
||||||
@@ -988,13 +1005,8 @@ static void async_event(int pipe, time_t now)
|
|||||||
}
|
}
|
||||||
#ifdef HAVE_DHCP6
|
#ifdef HAVE_DHCP6
|
||||||
else if (daemon->ra_contexts)
|
else if (daemon->ra_contexts)
|
||||||
{
|
/* Not doing DHCP, so no lease system, manage alarms for ra only */
|
||||||
/* Not doing DHCP, so no lease system, manage
|
send_alarm(periodic_ra(now), now);
|
||||||
alarms for ra only */
|
|
||||||
time_t next_event = periodic_ra(now);
|
|
||||||
if (next_event != 0)
|
|
||||||
alarm((unsigned)difftime(next_event, now));
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
@@ -1158,7 +1170,7 @@ void clear_cache_and_reload(time_t now)
|
|||||||
check_dhcp_hosts(0);
|
check_dhcp_hosts(0);
|
||||||
lease_update_from_configs();
|
lease_update_from_configs();
|
||||||
lease_update_file(now);
|
lease_update_file(now);
|
||||||
lease_update_dns();
|
lease_update_dns(1);
|
||||||
}
|
}
|
||||||
#ifdef HAVE_DHCP6
|
#ifdef HAVE_DHCP6
|
||||||
else if (daemon->ra_contexts)
|
else if (daemon->ra_contexts)
|
||||||
|
|||||||
+32
-16
@@ -458,6 +458,7 @@ struct frec {
|
|||||||
#define ACTION_OLD_HOSTNAME 2
|
#define ACTION_OLD_HOSTNAME 2
|
||||||
#define ACTION_OLD 3
|
#define ACTION_OLD 3
|
||||||
#define ACTION_ADD 4
|
#define ACTION_ADD 4
|
||||||
|
#define ACTION_TFTP 5
|
||||||
|
|
||||||
#define LEASE_NEW 1 /* newly created */
|
#define LEASE_NEW 1 /* newly created */
|
||||||
#define LEASE_CHANGED 2 /* modified */
|
#define LEASE_CHANGED 2 /* modified */
|
||||||
@@ -466,6 +467,7 @@ struct frec {
|
|||||||
#define LEASE_USED 16 /* used this DHCPv6 transaction */
|
#define LEASE_USED 16 /* used this DHCPv6 transaction */
|
||||||
#define LEASE_NA 32 /* IPv6 no-temporary lease */
|
#define LEASE_NA 32 /* IPv6 no-temporary lease */
|
||||||
#define LEASE_TA 64 /* IPv6 temporary lease */
|
#define LEASE_TA 64 /* IPv6 temporary lease */
|
||||||
|
#define LEASE_HAVE_HWADDR 128 /* Have set hwaddress */
|
||||||
|
|
||||||
struct dhcp_lease {
|
struct dhcp_lease {
|
||||||
int clid_len; /* length of client identifier */
|
int clid_len; /* length of client identifier */
|
||||||
@@ -483,6 +485,14 @@ struct dhcp_lease {
|
|||||||
unsigned char *extradata;
|
unsigned char *extradata;
|
||||||
unsigned int extradata_len, extradata_size;
|
unsigned int extradata_len, extradata_size;
|
||||||
int last_interface;
|
int last_interface;
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
struct slaac_address {
|
||||||
|
struct in6_addr addr, local;
|
||||||
|
time_t ping_time;
|
||||||
|
int backoff; /* zero -> confirmed */
|
||||||
|
struct slaac_address *next;
|
||||||
|
} *slaac_address;
|
||||||
|
#endif
|
||||||
struct dhcp_lease *next;
|
struct dhcp_lease *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -627,7 +637,7 @@ struct dhcp_context {
|
|||||||
#ifdef HAVE_DHCP6
|
#ifdef HAVE_DHCP6
|
||||||
struct in6_addr start6, end6; /* range of available addresses */
|
struct in6_addr start6, end6; /* range of available addresses */
|
||||||
struct in6_addr local6;
|
struct in6_addr local6;
|
||||||
int prefix;
|
int prefix, if_index;
|
||||||
time_t ra_time;
|
time_t ra_time;
|
||||||
#endif
|
#endif
|
||||||
int flags;
|
int flags;
|
||||||
@@ -651,13 +661,6 @@ struct ping_result {
|
|||||||
struct ping_result *next;
|
struct ping_result *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct subnet_map {
|
|
||||||
int iface;
|
|
||||||
struct in6_addr subnet;
|
|
||||||
struct subnet_map *next;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
struct tftp_file {
|
struct tftp_file {
|
||||||
int refcount, fd;
|
int refcount, fd;
|
||||||
off_t size;
|
off_t size;
|
||||||
@@ -801,7 +804,7 @@ extern struct daemon {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* TFTP stuff */
|
/* TFTP stuff */
|
||||||
struct tftp_transfer *tftp_trans;
|
struct tftp_transfer *tftp_trans, *tftp_done_trans;
|
||||||
|
|
||||||
/* utility string buffer, hold max sized IP address as string */
|
/* utility string buffer, hold max sized IP address as string */
|
||||||
char *addrbuff;
|
char *addrbuff;
|
||||||
@@ -957,7 +960,7 @@ char *host_from_dns(struct in_addr addr);
|
|||||||
/* lease.c */
|
/* lease.c */
|
||||||
#ifdef HAVE_DHCP
|
#ifdef HAVE_DHCP
|
||||||
void lease_update_file(time_t now);
|
void lease_update_file(time_t now);
|
||||||
void lease_update_dns();
|
void lease_update_dns(int force);
|
||||||
void lease_init(time_t now);
|
void lease_init(time_t now);
|
||||||
struct dhcp_lease *lease4_allocate(struct in_addr addr);
|
struct dhcp_lease *lease4_allocate(struct in_addr addr);
|
||||||
#ifdef HAVE_DHCP6
|
#ifdef HAVE_DHCP6
|
||||||
@@ -966,12 +969,13 @@ struct dhcp_lease *lease6_find(unsigned char *clid, int clid_len,
|
|||||||
int lease_type, int iaid, struct in6_addr *addr);
|
int lease_type, int iaid, struct in6_addr *addr);
|
||||||
struct dhcp_lease *lease6_find_by_addr(struct in6_addr *net, int prefix, u64 addr);
|
struct dhcp_lease *lease6_find_by_addr(struct in6_addr *net, int prefix, u64 addr);
|
||||||
u64 lease_find_max_addr6(struct dhcp_context *context);
|
u64 lease_find_max_addr6(struct dhcp_context *context);
|
||||||
|
void lease_ping_reply(struct in6_addr *sender, unsigned char *packet, char *interface);
|
||||||
#endif
|
#endif
|
||||||
void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,
|
void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,
|
||||||
unsigned char *clid, int hw_len, int hw_type, int clid_len);
|
unsigned char *clid, int hw_len, int hw_type, int clid_len, time_t now);
|
||||||
void lease_set_hostname(struct dhcp_lease *lease, char *name, int auth, char *domain, char *config_domain);
|
void lease_set_hostname(struct dhcp_lease *lease, char *name, int auth, char *domain, char *config_domain);
|
||||||
void lease_set_expires(struct dhcp_lease *lease, unsigned int len, time_t now);
|
void lease_set_expires(struct dhcp_lease *lease, unsigned int len, time_t now);
|
||||||
void lease_set_interface(struct dhcp_lease *lease, int interface);
|
void lease_set_interface(struct dhcp_lease *lease, int interface, time_t now);
|
||||||
struct dhcp_lease *lease_find_by_client(unsigned char *hwaddr, int hw_len, int hw_type,
|
struct dhcp_lease *lease_find_by_client(unsigned char *hwaddr, int hw_len, int hw_type,
|
||||||
unsigned char *clid, int clid_len);
|
unsigned char *clid, int clid_len);
|
||||||
struct dhcp_lease *lease_find_by_addr(struct in_addr addr);
|
struct dhcp_lease *lease_find_by_addr(struct in_addr addr);
|
||||||
@@ -1000,7 +1004,7 @@ unsigned char *extended_hwaddr(int hwtype, int hwlen, unsigned char *hwaddr,
|
|||||||
int make_icmp_sock(void);
|
int make_icmp_sock(void);
|
||||||
int icmp_ping(struct in_addr addr);
|
int icmp_ping(struct in_addr addr);
|
||||||
#endif
|
#endif
|
||||||
void send_alarm(void);
|
void send_alarm(time_t event, time_t now);
|
||||||
void send_event(int fd, int event, int data, char *msg);
|
void send_event(int fd, int event, int data, char *msg);
|
||||||
void clear_cache_and_reload(time_t now);
|
void clear_cache_and_reload(time_t now);
|
||||||
void poll_resolv(int force, int do_reload, time_t now);
|
void poll_resolv(int force, int do_reload, time_t now);
|
||||||
@@ -1032,11 +1036,14 @@ void emit_dbus_signal(int action, struct dhcp_lease *lease, char *hostname);
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* helper.c */
|
/* helper.c */
|
||||||
#if defined(HAVE_DHCP) && !defined(NO_FORK)
|
#if defined(HAVE_SCRIPT)
|
||||||
int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd);
|
int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd);
|
||||||
void helper_write(void);
|
void helper_write(void);
|
||||||
void queue_script(int action, struct dhcp_lease *lease,
|
void queue_script(int action, struct dhcp_lease *lease,
|
||||||
char *hostname, time_t now);
|
char *hostname, time_t now);
|
||||||
|
#ifdef HAVE_TFTP
|
||||||
|
void queue_tftp(off_t file_len, char *filename, union mysockaddr *peer);
|
||||||
|
#endif
|
||||||
int helper_buf_empty(void);
|
int helper_buf_empty(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1044,6 +1051,7 @@ int helper_buf_empty(void);
|
|||||||
#ifdef HAVE_TFTP
|
#ifdef HAVE_TFTP
|
||||||
void tftp_request(struct listener *listen, time_t now);
|
void tftp_request(struct listener *listen, time_t now);
|
||||||
void check_tftp_listeners(fd_set *rset, time_t now);
|
void check_tftp_listeners(fd_set *rset, time_t now);
|
||||||
|
int do_tftp_script_run(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* conntrack.c */
|
/* conntrack.c */
|
||||||
@@ -1121,6 +1129,14 @@ void put_opt6_string(char *s);
|
|||||||
void ra_init(time_t now);
|
void ra_init(time_t now);
|
||||||
void icmp6_packet(void);
|
void icmp6_packet(void);
|
||||||
time_t periodic_ra(time_t now);
|
time_t periodic_ra(time_t now);
|
||||||
void ra_start_unsolicted(time_t now);
|
void ra_start_unsolicted(time_t now, struct dhcp_context *context);
|
||||||
struct subnet_map *build_subnet_map(void);
|
#endif
|
||||||
|
|
||||||
|
/* slaac.c */
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
void build_subnet_map(void);
|
||||||
|
void slaac_add_addrs(struct dhcp_lease *lease, time_t now);
|
||||||
|
time_t periodic_slaac(time_t now, struct dhcp_lease *leases);
|
||||||
|
void slaac_ping_reply(struct in6_addr *sender, unsigned char *packet, char *interface, struct dhcp_lease *leases);
|
||||||
|
void schedule_subnet_map(void);
|
||||||
#endif
|
#endif
|
||||||
+92
-19
@@ -193,16 +193,22 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
_exit(0);
|
_exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is6 = !!(data.flags & (LEASE_TA | LEASE_NA));
|
||||||
|
|
||||||
if (data.action == ACTION_DEL)
|
if (data.action == ACTION_DEL)
|
||||||
action_str = "del";
|
action_str = "del";
|
||||||
else if (data.action == ACTION_ADD)
|
else if (data.action == ACTION_ADD)
|
||||||
action_str = "add";
|
action_str = "add";
|
||||||
else if (data.action == ACTION_OLD || data.action == ACTION_OLD_HOSTNAME)
|
else if (data.action == ACTION_OLD || data.action == ACTION_OLD_HOSTNAME)
|
||||||
action_str = "old";
|
action_str = "old";
|
||||||
|
else if (data.action == ACTION_TFTP)
|
||||||
|
{
|
||||||
|
action_str = "tftp";
|
||||||
|
is6 = (data.flags != AF_INET);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
is6 = !!(data.flags & (LEASE_TA | LEASE_NA));
|
|
||||||
|
|
||||||
if (!is6)
|
if (!is6)
|
||||||
{
|
{
|
||||||
@@ -271,6 +277,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
char *dot;
|
char *dot;
|
||||||
hostname = (char *)buf;
|
hostname = (char *)buf;
|
||||||
hostname[data.hostname_len - 1] = 0;
|
hostname[data.hostname_len - 1] = 0;
|
||||||
|
if (data.action != ACTION_TFTP)
|
||||||
|
{
|
||||||
if (!legal_hostname(hostname))
|
if (!legal_hostname(hostname))
|
||||||
hostname = NULL;
|
hostname = NULL;
|
||||||
else if ((dot = strchr(hostname, '.')))
|
else if ((dot = strchr(hostname, '.')))
|
||||||
@@ -279,6 +287,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
*dot = 0;
|
*dot = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
extradata = buf + data.hostname_len;
|
extradata = buf + data.hostname_len;
|
||||||
|
|
||||||
@@ -289,8 +298,32 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
inet_ntop(AF_INET6, &data.hwaddr, daemon->addrbuff, ADDRSTRLEN);
|
inet_ntop(AF_INET6, &data.hwaddr, daemon->addrbuff, ADDRSTRLEN);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* file length */
|
||||||
|
if (data.action == ACTION_TFTP)
|
||||||
|
sprintf(daemon->dhcp_buff, "%u", data.hwaddr_len);
|
||||||
|
|
||||||
#ifdef HAVE_LUASCRIPT
|
#ifdef HAVE_LUASCRIPT
|
||||||
if (daemon->luascript)
|
if (daemon->luascript)
|
||||||
|
{
|
||||||
|
if (data.action == ACTION_TFTP)
|
||||||
|
{
|
||||||
|
lua_getglobal(lua, "tftp");
|
||||||
|
if (lua_type(lua, -1) != LUA_TFUNCTION)
|
||||||
|
lua_pop(lua, 1); /* tftp function optional */
|
||||||
|
else
|
||||||
|
{
|
||||||
|
lua_pushstring(lua, action_str); /* arg1 - action */
|
||||||
|
lua_newtable(lua); /* arg2 - data table */
|
||||||
|
lua_pushstring(lua, daemon->addrbuff);
|
||||||
|
lua_setfield(lua, -2, "destination_address");
|
||||||
|
lua_pushstring(lua, hostname);
|
||||||
|
lua_setfield(lua, -2, "file_name");
|
||||||
|
lua_pushstring(lua, daemon->dhcp_buff);
|
||||||
|
lua_setfield(lua, -2, "file_size");
|
||||||
|
lua_call(lua, 2, 0); /* pass 2 values, expect 0 */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
lua_getglobal(lua, "lease"); /* function to call */
|
lua_getglobal(lua, "lease"); /* function to call */
|
||||||
lua_pushstring(lua, action_str); /* arg1 - action */
|
lua_pushstring(lua, action_str); /* arg1 - action */
|
||||||
@@ -400,6 +433,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
|
|
||||||
lua_call(lua, 2, 0); /* pass 2 values, expect 0 */
|
lua_call(lua, 2, 0); /* pass 2 values, expect 0 */
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* no script, just lua */
|
/* no script, just lua */
|
||||||
@@ -439,6 +473,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (data.action != ACTION_TFTP)
|
||||||
|
{
|
||||||
if (is6)
|
if (is6)
|
||||||
{
|
{
|
||||||
my_setenv("DNSMASQ_IAID", daemon->dhcp_buff3, &err);
|
my_setenv("DNSMASQ_IAID", daemon->dhcp_buff3, &err);
|
||||||
@@ -513,6 +549,10 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
my_setenv("DNSMASQ_OLD_HOSTNAME", hostname, &err);
|
my_setenv("DNSMASQ_OLD_HOSTNAME", hostname, &err);
|
||||||
hostname = NULL;
|
hostname = NULL;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (option_bool(OPT_LOG_OPTS))
|
||||||
|
my_setenv("DNSMASQ_LOG_DHCP", "1", &err);
|
||||||
|
|
||||||
/* we need to have the event_fd around if exec fails */
|
/* we need to have the event_fd around if exec fails */
|
||||||
if ((i = fcntl(event_fd, F_GETFD)) != -1)
|
if ((i = fcntl(event_fd, F_GETFD)) != -1)
|
||||||
@@ -584,11 +624,29 @@ static unsigned char *grab_extradata_lua(unsigned char *buf, unsigned char *end,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static void buff_alloc(size_t size)
|
||||||
|
{
|
||||||
|
if (size > buf_size)
|
||||||
|
{
|
||||||
|
struct script_data *new;
|
||||||
|
|
||||||
|
/* start with reasonable size, will almost never need extending. */
|
||||||
|
if (size < sizeof(struct script_data) + 200)
|
||||||
|
size = sizeof(struct script_data) + 200;
|
||||||
|
|
||||||
|
if (!(new = whine_malloc(size)))
|
||||||
|
return;
|
||||||
|
if (buf)
|
||||||
|
free(buf);
|
||||||
|
buf = new;
|
||||||
|
buf_size = size;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* pack up lease data into a buffer */
|
/* pack up lease data into a buffer */
|
||||||
void queue_script(int action, struct dhcp_lease *lease, char *hostname, time_t now)
|
void queue_script(int action, struct dhcp_lease *lease, char *hostname, time_t now)
|
||||||
{
|
{
|
||||||
unsigned char *p;
|
unsigned char *p;
|
||||||
size_t size;
|
|
||||||
unsigned int hostname_len = 0, clid_len = 0, ed_len = 0;
|
unsigned int hostname_len = 0, clid_len = 0, ed_len = 0;
|
||||||
int fd = daemon->dhcpfd;
|
int fd = daemon->dhcpfd;
|
||||||
|
|
||||||
@@ -608,23 +666,7 @@ void queue_script(int action, struct dhcp_lease *lease, char *hostname, time_t n
|
|||||||
if (hostname)
|
if (hostname)
|
||||||
hostname_len = strlen(hostname) + 1;
|
hostname_len = strlen(hostname) + 1;
|
||||||
|
|
||||||
size = sizeof(struct script_data) + clid_len + ed_len + hostname_len;
|
buff_alloc(sizeof(struct script_data) + clid_len + ed_len + hostname_len);
|
||||||
|
|
||||||
if (size > buf_size)
|
|
||||||
{
|
|
||||||
struct script_data *new;
|
|
||||||
|
|
||||||
/* start with reasonable size, will almost never need extending. */
|
|
||||||
if (size < sizeof(struct script_data) + 200)
|
|
||||||
size = sizeof(struct script_data) + 200;
|
|
||||||
|
|
||||||
if (!(new = whine_malloc(size)))
|
|
||||||
return;
|
|
||||||
if (buf)
|
|
||||||
free(buf);
|
|
||||||
buf = new;
|
|
||||||
buf_size = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
buf->action = action;
|
buf->action = action;
|
||||||
buf->flags = lease->flags;
|
buf->flags = lease->flags;
|
||||||
@@ -669,6 +711,37 @@ void queue_script(int action, struct dhcp_lease *lease, char *hostname, time_t n
|
|||||||
bytes_in_buf = p - (unsigned char *)buf;
|
bytes_in_buf = p - (unsigned char *)buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_TFTP
|
||||||
|
/* This nastily re-uses DHCP-fields for TFTP stuff */
|
||||||
|
void queue_tftp(off_t file_len, char *filename, union mysockaddr *peer)
|
||||||
|
{
|
||||||
|
unsigned int filename_len;
|
||||||
|
|
||||||
|
/* no script */
|
||||||
|
if (daemon->helperfd == -1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
filename_len = strlen(filename) + 1;
|
||||||
|
buff_alloc(sizeof(struct script_data) + filename_len);
|
||||||
|
memset(buf, 0, sizeof(struct script_data));
|
||||||
|
|
||||||
|
buf->action = ACTION_TFTP;
|
||||||
|
buf->hostname_len = filename_len;
|
||||||
|
buf->hwaddr_len = file_len;
|
||||||
|
|
||||||
|
if ((buf->flags = peer->sa.sa_family) == AF_INET)
|
||||||
|
buf->addr = peer->in.sin_addr;
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
else
|
||||||
|
memcpy(buf->hwaddr, &peer->in6.sin6_addr, IN6ADDRSZ);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
memcpy((unsigned char *)(buf+1), filename, filename_len);
|
||||||
|
|
||||||
|
bytes_in_buf = sizeof(struct script_data) + filename_len;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
int helper_buf_empty(void)
|
int helper_buf_empty(void)
|
||||||
{
|
{
|
||||||
return bytes_in_buf == 0;
|
return bytes_in_buf == 0;
|
||||||
|
|||||||
+67
-51
@@ -97,7 +97,8 @@ void lease_init(time_t now)
|
|||||||
if (hw_type == 0 && hw_len != 0)
|
if (hw_type == 0 && hw_len != 0)
|
||||||
hw_type = ARPHRD_ETHER;
|
hw_type = ARPHRD_ETHER;
|
||||||
|
|
||||||
lease_set_hwaddr(lease, (unsigned char *)daemon->dhcp_buff2, (unsigned char *)daemon->packet, hw_len, hw_type, clid_len);
|
lease_set_hwaddr(lease, (unsigned char *)daemon->dhcp_buff2, (unsigned char *)daemon->packet,
|
||||||
|
hw_len, hw_type, clid_len, now);
|
||||||
|
|
||||||
if (strcmp(daemon->dhcp_buff, "*") != 0)
|
if (strcmp(daemon->dhcp_buff, "*") != 0)
|
||||||
lease_set_hostname(lease, daemon->dhcp_buff, 0, get_domain(lease->addr), NULL);
|
lease_set_hostname(lease, daemon->dhcp_buff, 0, get_domain(lease->addr), NULL);
|
||||||
@@ -118,7 +119,7 @@ void lease_init(time_t now)
|
|||||||
|
|
||||||
if ((lease = lease6_allocate(&addr.addr.addr6, lease_type)))
|
if ((lease = lease6_allocate(&addr.addr.addr6, lease_type)))
|
||||||
{
|
{
|
||||||
lease_set_hwaddr(lease, NULL, (unsigned char *)daemon->packet, 0, hw_type, clid_len);
|
lease_set_hwaddr(lease, NULL, (unsigned char *)daemon->packet, 0, hw_type, clid_len, now);
|
||||||
|
|
||||||
if (strcmp(daemon->dhcp_buff, "*") != 0)
|
if (strcmp(daemon->dhcp_buff, "*") != 0)
|
||||||
lease_set_hostname(lease, daemon->dhcp_buff, 0, get_domain6((struct in6_addr *)lease->hwaddr), NULL);
|
lease_set_hostname(lease, daemon->dhcp_buff, 0, get_domain6((struct in6_addr *)lease->hwaddr), NULL);
|
||||||
@@ -306,9 +307,16 @@ void lease_update_file(time_t now)
|
|||||||
next_event = 0;
|
next_event = 0;
|
||||||
|
|
||||||
#ifdef HAVE_DHCP6
|
#ifdef HAVE_DHCP6
|
||||||
/* do timed RAs and determine when the next is */
|
/* do timed RAs and determine when the next is, also pings to potential SLAAC addresses */
|
||||||
if (daemon->ra_contexts)
|
if (daemon->ra_contexts)
|
||||||
|
{
|
||||||
|
time_t ra_event = periodic_slaac(now, leases);
|
||||||
|
|
||||||
next_event = periodic_ra(now);
|
next_event = periodic_ra(now);
|
||||||
|
|
||||||
|
if (next_event == 0 || difftime(next_event, ra_event) > 0.0)
|
||||||
|
next_event = ra_event;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (lease = leases; lease; lease = lease->next)
|
for (lease = leases; lease; lease = lease->next)
|
||||||
@@ -326,8 +334,7 @@ void lease_update_file(time_t now)
|
|||||||
(unsigned int)difftime(next_event, now));
|
(unsigned int)difftime(next_event, now));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (next_event != 0)
|
send_alarm(next_event, now);
|
||||||
alarm((unsigned)difftime(next_event, now));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -342,7 +349,7 @@ static int find_interface_v4(struct in_addr local, int if_index,
|
|||||||
for (lease = leases; lease; lease = lease->next)
|
for (lease = leases; lease; lease = lease->next)
|
||||||
if (!(lease->flags & (LEASE_TA | LEASE_NA)))
|
if (!(lease->flags & (LEASE_TA | LEASE_NA)))
|
||||||
if (is_same_net(local, lease->addr, netmask))
|
if (is_same_net(local, lease->addr, netmask))
|
||||||
lease->last_interface = if_index;
|
lease_set_interface(lease, if_index, *((time_t *)vparam));
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -353,17 +360,22 @@ static int find_interface_v6(struct in6_addr *local, int prefix,
|
|||||||
{
|
{
|
||||||
struct dhcp_lease *lease;
|
struct dhcp_lease *lease;
|
||||||
|
|
||||||
(void) scope;
|
(void)scope;
|
||||||
(void) vparam;
|
|
||||||
(void)dad;
|
(void)dad;
|
||||||
|
|
||||||
for (lease = leases; lease; lease = lease->next)
|
for (lease = leases; lease; lease = lease->next)
|
||||||
if ((lease->flags & (LEASE_TA | LEASE_NA)))
|
if ((lease->flags & (LEASE_TA | LEASE_NA)))
|
||||||
if (is_same_net6(local, (struct in6_addr *)&lease->hwaddr, prefix))
|
if (is_same_net6(local, (struct in6_addr *)&lease->hwaddr, prefix))
|
||||||
lease->last_interface = if_index;
|
lease_set_interface(lease, if_index, *((time_t *)vparam));
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void lease_ping_reply(struct in6_addr *sender, unsigned char *packet, char *interface)
|
||||||
|
{
|
||||||
|
slaac_ping_reply(sender, packet, interface, leases);
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@@ -373,9 +385,13 @@ static int find_interface_v6(struct in6_addr *local, int prefix,
|
|||||||
start-time. */
|
start-time. */
|
||||||
void lease_find_interfaces(time_t now)
|
void lease_find_interfaces(time_t now)
|
||||||
{
|
{
|
||||||
iface_enumerate(AF_INET, NULL, find_interface_v4);
|
|
||||||
#ifdef HAVE_DHCP6
|
#ifdef HAVE_DHCP6
|
||||||
iface_enumerate(AF_INET6, NULL, find_interface_v6);
|
build_subnet_map();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
iface_enumerate(AF_INET, &now, find_interface_v4);
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
iface_enumerate(AF_INET6, &now, find_interface_v6);
|
||||||
|
|
||||||
/* If we're not doing DHCPv6, and there are not v6 leases, don't add the DUID to the database */
|
/* If we're not doing DHCPv6, and there are not v6 leases, don't add the DUID to the database */
|
||||||
if (!daemon->duid && daemon->dhcp6)
|
if (!daemon->duid && daemon->dhcp6)
|
||||||
@@ -388,16 +404,12 @@ void lease_find_interfaces(time_t now)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
void lease_update_dns(void)
|
void lease_update_dns(int force)
|
||||||
{
|
{
|
||||||
struct dhcp_lease *lease;
|
struct dhcp_lease *lease;
|
||||||
|
|
||||||
if (daemon->port != 0 && dns_dirty)
|
if (daemon->port != 0 && (dns_dirty || force))
|
||||||
{
|
{
|
||||||
#ifdef HAVE_DHCP6
|
|
||||||
struct subnet_map *subnets = build_subnet_map();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
cache_unhash_dhcp();
|
cache_unhash_dhcp();
|
||||||
|
|
||||||
for (lease = leases; lease; lease = lease->next)
|
for (lease = leases; lease; lease = lease->next)
|
||||||
@@ -409,41 +421,15 @@ void lease_update_dns(void)
|
|||||||
prot = AF_INET6;
|
prot = AF_INET6;
|
||||||
else if (lease->hostname || lease->fqdn)
|
else if (lease->hostname || lease->fqdn)
|
||||||
{
|
{
|
||||||
struct subnet_map *map;
|
struct slaac_address *slaac;
|
||||||
for (map = subnets; map; map = map->next)
|
|
||||||
if (lease->last_interface == map->iface)
|
|
||||||
{
|
|
||||||
struct in6_addr addr = map->subnet;
|
|
||||||
if (lease->hwaddr_len == 6 &&
|
|
||||||
(lease->hwaddr_type == ARPHRD_ETHER || lease->hwaddr_type == ARPHRD_IEEE802))
|
|
||||||
{
|
|
||||||
/* convert MAC address to EUI-64 */
|
|
||||||
memcpy(&addr.s6_addr[8], lease->hwaddr, 3);
|
|
||||||
memcpy(&addr.s6_addr[13], &lease->hwaddr[3], 3);
|
|
||||||
addr.s6_addr[11] = 0xff;
|
|
||||||
addr.s6_addr[12] = 0xfe;
|
|
||||||
}
|
|
||||||
#if defined(ARPHRD_EUI64)
|
|
||||||
else if (lease->hwaddr_len == 8 &&
|
|
||||||
lease->hwaddr_type == ARPHRD_EUI64)
|
|
||||||
memcpy(&addr.s6_addr[8], lease->hwaddr, 8);
|
|
||||||
#endif
|
|
||||||
#if defined(ARPHRD_IEEE1394) && defined(ARPHRD_EUI64)
|
|
||||||
else if (lease->clid_len == 9 &&
|
|
||||||
lease->clid[0] == ARPHRD_EUI64 &&
|
|
||||||
lease->hwaddr_type == ARPHRD_IEEE1394)
|
|
||||||
/* firewire has EUI-64 identifier as clid */
|
|
||||||
memcpy(&addr.s6_addr[8], &lease->clid[1], 8);
|
|
||||||
#endif
|
|
||||||
else
|
|
||||||
continue;
|
|
||||||
|
|
||||||
addr.s6_addr[8] ^= 0x02;
|
|
||||||
|
|
||||||
|
for (slaac = lease->slaac_address; slaac; slaac = slaac->next)
|
||||||
|
if (slaac->backoff == 0)
|
||||||
|
{
|
||||||
if (lease->fqdn)
|
if (lease->fqdn)
|
||||||
cache_add_dhcp_entry(lease->fqdn, AF_INET6, (struct all_addr *)&addr, lease->expires);
|
cache_add_dhcp_entry(lease->fqdn, AF_INET6, (struct all_addr *)&slaac->addr, lease->expires);
|
||||||
if (!option_bool(OPT_DHCP_FQDN) && lease->hostname)
|
if (!option_bool(OPT_DHCP_FQDN) && lease->hostname)
|
||||||
cache_add_dhcp_entry(lease->hostname, AF_INET6, (struct all_addr *)&addr, lease->expires);
|
cache_add_dhcp_entry(lease->hostname, AF_INET6, (struct all_addr *)&slaac->addr, lease->expires);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -713,8 +699,13 @@ void lease_set_expires(struct dhcp_lease *lease, unsigned int len, time_t now)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,
|
void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,
|
||||||
unsigned char *clid, int hw_len, int hw_type, int clid_len)
|
unsigned char *clid, int hw_len, int hw_type, int clid_len, time_t now)
|
||||||
{
|
{
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
int change = 0;
|
||||||
|
lease->flags |= LEASE_HAVE_HWADDR;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (hw_len != lease->hwaddr_len ||
|
if (hw_len != lease->hwaddr_len ||
|
||||||
hw_type != lease->hwaddr_type ||
|
hw_type != lease->hwaddr_type ||
|
||||||
(hw_len != 0 && memcmp(lease->hwaddr, hwaddr, hw_len) != 0))
|
(hw_len != 0 && memcmp(lease->hwaddr, hwaddr, hw_len) != 0))
|
||||||
@@ -725,6 +716,9 @@ void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,
|
|||||||
lease->hwaddr_type = hw_type;
|
lease->hwaddr_type = hw_type;
|
||||||
lease->flags |= LEASE_CHANGED;
|
lease->flags |= LEASE_CHANGED;
|
||||||
file_dirty = 1; /* run script on change */
|
file_dirty = 1; /* run script on change */
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
change = 1;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* only update clid when one is available, stops packets
|
/* only update clid when one is available, stops packets
|
||||||
@@ -742,17 +736,27 @@ void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,
|
|||||||
free(lease->clid);
|
free(lease->clid);
|
||||||
if (!(lease->clid = whine_malloc(clid_len)))
|
if (!(lease->clid = whine_malloc(clid_len)))
|
||||||
return;
|
return;
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
change = 1;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else if (memcmp(lease->clid, clid, clid_len) != 0)
|
else if (memcmp(lease->clid, clid, clid_len) != 0)
|
||||||
{
|
{
|
||||||
lease->flags |= LEASE_AUX_CHANGED;
|
lease->flags |= LEASE_AUX_CHANGED;
|
||||||
file_dirty = 1;
|
file_dirty = 1;
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
change = 1;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
lease->clid_len = clid_len;
|
lease->clid_len = clid_len;
|
||||||
memcpy(lease->clid, clid, clid_len);
|
memcpy(lease->clid, clid, clid_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
if (change)
|
||||||
|
slaac_add_addrs(lease, now);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void kill_name(struct dhcp_lease *lease)
|
static void kill_name(struct dhcp_lease *lease)
|
||||||
@@ -870,13 +874,17 @@ void lease_set_hostname(struct dhcp_lease *lease, char *name, int auth, char *do
|
|||||||
lease->flags |= LEASE_CHANGED; /* run script on change */
|
lease->flags |= LEASE_CHANGED; /* run script on change */
|
||||||
}
|
}
|
||||||
|
|
||||||
void lease_set_interface(struct dhcp_lease *lease, int interface)
|
void lease_set_interface(struct dhcp_lease *lease, int interface, time_t now)
|
||||||
{
|
{
|
||||||
if (lease->last_interface == interface)
|
if (lease->last_interface == interface)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
lease->last_interface = interface;
|
lease->last_interface = interface;
|
||||||
lease->flags |= LEASE_CHANGED;
|
lease->flags |= LEASE_CHANGED;
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
slaac_add_addrs(lease, now);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void rerun_scripts(void)
|
void rerun_scripts(void)
|
||||||
@@ -919,6 +927,14 @@ int do_script_run(time_t now)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
struct slaac_address *slaac, *tmp;
|
||||||
|
for (slaac = lease->slaac_address; slaac; slaac = tmp)
|
||||||
|
{
|
||||||
|
tmp = slaac->next;
|
||||||
|
free(slaac);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
kill_name(lease);
|
kill_name(lease);
|
||||||
#ifdef HAVE_SCRIPT
|
#ifdef HAVE_SCRIPT
|
||||||
queue_script(ACTION_DEL, lease, lease->old_hostname, now);
|
queue_script(ACTION_DEL, lease, lease->old_hostname, now);
|
||||||
|
|||||||
+3
-2
@@ -345,10 +345,11 @@ static void nl_routechange(struct nlmsghdr *h)
|
|||||||
/* force RAs to sync new network and pick up new interfaces. */
|
/* force RAs to sync new network and pick up new interfaces. */
|
||||||
if (daemon->ra_contexts)
|
if (daemon->ra_contexts)
|
||||||
{
|
{
|
||||||
ra_start_unsolicted(dnsmasq_time());
|
schedule_subnet_map();
|
||||||
|
ra_start_unsolicted(dnsmasq_time(), NULL);
|
||||||
/* cause lease_update_file to run after we return, in case we were called from
|
/* cause lease_update_file to run after we return, in case we were called from
|
||||||
iface_enumerate and can't re-enter it now */
|
iface_enumerate and can't re-enter it now */
|
||||||
send_alarm();
|
send_alarm(0, 0);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
+7
-3
@@ -17,6 +17,13 @@
|
|||||||
#define ALL_HOSTS "FF02::1"
|
#define ALL_HOSTS "FF02::1"
|
||||||
#define ALL_ROUTERS "FF02::2"
|
#define ALL_ROUTERS "FF02::2"
|
||||||
|
|
||||||
|
struct ping_packet {
|
||||||
|
u8 type, code;
|
||||||
|
u16 checksum;
|
||||||
|
u16 identifier;
|
||||||
|
u16 sequence_no;
|
||||||
|
};
|
||||||
|
|
||||||
struct ra_packet {
|
struct ra_packet {
|
||||||
u8 type, code;
|
u8 type, code;
|
||||||
u16 checksum;
|
u16 checksum;
|
||||||
@@ -32,9 +39,6 @@ struct prefix_opt {
|
|||||||
struct in6_addr prefix;
|
struct in6_addr prefix;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define ICMP6_ROUTER_SOLICIT 133
|
|
||||||
#define ICMP6_ROUTER_ADVERT 134
|
|
||||||
|
|
||||||
#define ICMP6_OPT_SOURCE_MAC 1
|
#define ICMP6_OPT_SOURCE_MAC 1
|
||||||
#define ICMP6_OPT_PREFIX 3
|
#define ICMP6_OPT_PREFIX 3
|
||||||
#define ICMP6_OPT_MTU 5
|
#define ICMP6_OPT_MTU 5
|
||||||
|
|||||||
+43
-84
@@ -55,13 +55,20 @@ void ra_init(time_t now)
|
|||||||
#endif
|
#endif
|
||||||
int val = 255; /* radvd uses this value */
|
int val = 255; /* radvd uses this value */
|
||||||
socklen_t len = sizeof(int);
|
socklen_t len = sizeof(int);
|
||||||
|
struct dhcp_context *context;
|
||||||
|
|
||||||
/* ensure this is around even if we're not doing DHCPv6 */
|
/* ensure this is around even if we're not doing DHCPv6 */
|
||||||
expand_buf(&daemon->outpacket, sizeof(struct dhcp_packet));
|
expand_buf(&daemon->outpacket, sizeof(struct dhcp_packet));
|
||||||
|
|
||||||
|
/* See if we're guessing SLAAC addresses, if so we need to recieve ping replies */
|
||||||
|
for (context = daemon->ra_contexts; context; context = context->next)
|
||||||
|
if ((context->flags & CONTEXT_RA_NAME))
|
||||||
|
break;
|
||||||
|
|
||||||
ICMP6_FILTER_SETBLOCKALL(&filter);
|
ICMP6_FILTER_SETBLOCKALL(&filter);
|
||||||
ICMP6_FILTER_SETPASS(ND_ROUTER_SOLICIT, &filter);
|
ICMP6_FILTER_SETPASS(ND_ROUTER_SOLICIT, &filter);
|
||||||
ICMP6_FILTER_SETPASS(ND_ROUTER_ADVERT, &filter);
|
if (context)
|
||||||
|
ICMP6_FILTER_SETPASS(ICMP6_ECHO_REPLY, &filter);
|
||||||
|
|
||||||
if ((fd = socket(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) == -1 ||
|
if ((fd = socket(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) == -1 ||
|
||||||
getsockopt(fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &hop_limit, &len) ||
|
getsockopt(fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &hop_limit, &len) ||
|
||||||
@@ -77,21 +84,21 @@ void ra_init(time_t now)
|
|||||||
|
|
||||||
daemon->icmp6fd = fd;
|
daemon->icmp6fd = fd;
|
||||||
|
|
||||||
ra_start_unsolicted(now);
|
ra_start_unsolicted(now, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ra_start_unsolicted(time_t now)
|
void ra_start_unsolicted(time_t now, struct dhcp_context *context)
|
||||||
{
|
{
|
||||||
struct dhcp_context *context;
|
/* init timers so that we do ra's for some/all soon. some ra_times will end up zeroed
|
||||||
|
|
||||||
/* init timers so that we do ra's for all soon. some ra_times will end up zeroed
|
|
||||||
if it's not appropriate to advertise those contexts.
|
if it's not appropriate to advertise those contexts.
|
||||||
This gets re-called on a netlink route-change to re-do the advertisement
|
This gets re-called on a netlink route-change to re-do the advertisement
|
||||||
and pick up new interfaces */
|
and pick up new interfaces */
|
||||||
|
|
||||||
/* range 0 - 5 */
|
if (context)
|
||||||
|
context->ra_time = now;
|
||||||
|
else
|
||||||
for (context = daemon->ra_contexts; context; context = context->next)
|
for (context = daemon->ra_contexts; context; context = context->next)
|
||||||
context->ra_time = now + (rand16()/13000);
|
context->ra_time = now + (rand16()/13000); /* range 0 - 5 */
|
||||||
|
|
||||||
/* re-do frequently for a minute or so, in case the first gets lost. */
|
/* re-do frequently for a minute or so, in case the first gets lost. */
|
||||||
ra_short_period_start = now;
|
ra_short_period_start = now;
|
||||||
@@ -158,7 +165,19 @@ void icmp6_packet(void)
|
|||||||
|
|
||||||
p = (unsigned char *)daemon->outpacket.iov_base;
|
p = (unsigned char *)daemon->outpacket.iov_base;
|
||||||
|
|
||||||
if (p[0] != ICMP6_ROUTER_SOLICIT || p[1] != 0)
|
if (p[1] != 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (p[0] == ICMP6_ECHO_REPLY)
|
||||||
|
{
|
||||||
|
/* We may be doing RA but not DHCPv4, in which case the lease
|
||||||
|
database may not exist and we have nothing to do anyway */
|
||||||
|
if (daemon->dhcp)
|
||||||
|
lease_ping_reply(&from.sin6_addr, p, interface);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (p[0] != ND_ROUTER_SOLICIT)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* look for link-layer address option for logging */
|
/* look for link-layer address option for logging */
|
||||||
@@ -184,10 +203,10 @@ static void send_ra(int iface, char *iface_name, struct in6_addr *dest)
|
|||||||
save_counter(0);
|
save_counter(0);
|
||||||
ra = expand(sizeof(struct ra_packet));
|
ra = expand(sizeof(struct ra_packet));
|
||||||
|
|
||||||
ra->type = ICMP6_ROUTER_ADVERT;
|
ra->type = ND_ROUTER_ADVERT;
|
||||||
ra->code = 0;
|
ra->code = 0;
|
||||||
ra->hop_limit = hop_limit;
|
ra->hop_limit = hop_limit;
|
||||||
ra->flags = 0;
|
ra->flags = 0x00;
|
||||||
ra->lifetime = htons(1800); /* AdvDefaultLifetime*/
|
ra->lifetime = htons(1800); /* AdvDefaultLifetime*/
|
||||||
ra->reachable_time = 0;
|
ra->reachable_time = 0;
|
||||||
ra->retrans_time = 0;
|
ra->retrans_time = 0;
|
||||||
@@ -227,7 +246,7 @@ static void send_ra(int iface, char *iface_name, struct in6_addr *dest)
|
|||||||
|
|
||||||
/* set managed bits unless we're providing only RA on this link */
|
/* set managed bits unless we're providing only RA on this link */
|
||||||
if (parm.managed)
|
if (parm.managed)
|
||||||
ra->flags = 0xc0;
|
ra->flags = 0xc0; /* M flag, managed, O flag, other */
|
||||||
|
|
||||||
/* decide where we're sending */
|
/* decide where we're sending */
|
||||||
memset(&addr, 0, sizeof(addr));
|
memset(&addr, 0, sizeof(addr));
|
||||||
@@ -238,7 +257,7 @@ static void send_ra(int iface, char *iface_name, struct in6_addr *dest)
|
|||||||
addr.sin6_port = htons(IPPROTO_ICMPV6);
|
addr.sin6_port = htons(IPPROTO_ICMPV6);
|
||||||
if (dest)
|
if (dest)
|
||||||
{
|
{
|
||||||
memcpy(&addr.sin6_addr, dest, sizeof(struct in6_addr));
|
addr.sin6_addr = *dest;
|
||||||
if (IN6_IS_ADDR_LINKLOCAL(dest) ||
|
if (IN6_IS_ADDR_LINKLOCAL(dest) ||
|
||||||
IN6_IS_ADDR_MC_LINKLOCAL(dest))
|
IN6_IS_ADDR_MC_LINKLOCAL(dest))
|
||||||
addr.sin6_scope_id = iface;
|
addr.sin6_scope_id = iface;
|
||||||
@@ -274,7 +293,11 @@ static int add_prefixes(struct in6_addr *local, int prefix,
|
|||||||
is_same_net6(local, &context->start6, prefix) &&
|
is_same_net6(local, &context->start6, prefix) &&
|
||||||
is_same_net6(local, &context->end6, prefix))
|
is_same_net6(local, &context->end6, prefix))
|
||||||
{
|
{
|
||||||
if (!(context->flags & CONTEXT_RA_ONLY))
|
int do_slaac = 0;
|
||||||
|
|
||||||
|
if (context->flags & CONTEXT_RA_ONLY)
|
||||||
|
do_slaac = 1;
|
||||||
|
else
|
||||||
{
|
{
|
||||||
/* don't do RA for non-ra-only unless --enable-ra is set */
|
/* don't do RA for non-ra-only unless --enable-ra is set */
|
||||||
if (!option_bool(OPT_RA))
|
if (!option_bool(OPT_RA))
|
||||||
@@ -298,6 +321,10 @@ static int add_prefixes(struct in6_addr *local, int prefix,
|
|||||||
is_same_net6(local, &tmp->start6, prefix) &&
|
is_same_net6(local, &tmp->start6, prefix) &&
|
||||||
is_same_net6(local, &tmp->end6, prefix))
|
is_same_net6(local, &tmp->end6, prefix))
|
||||||
{
|
{
|
||||||
|
/* if any dhcp-range with ra-only on this subnet
|
||||||
|
set the "do_slaac" bit */
|
||||||
|
if (tmp->flags & CONTEXT_RA_ONLY)
|
||||||
|
do_slaac = 1;
|
||||||
tmp->flags |= CONTEXT_RA_DONE;
|
tmp->flags |= CONTEXT_RA_DONE;
|
||||||
context->ra_time = 0;
|
context->ra_time = 0;
|
||||||
}
|
}
|
||||||
@@ -316,7 +343,7 @@ static int add_prefixes(struct in6_addr *local, int prefix,
|
|||||||
opt->len = 4;
|
opt->len = 4;
|
||||||
opt->prefix_len = prefix;
|
opt->prefix_len = prefix;
|
||||||
/* autonomous only is we're not doing dhcp */
|
/* autonomous only is we're not doing dhcp */
|
||||||
opt->flags = (context->flags & CONTEXT_RA_ONLY) ? 0xc0 : 0x00;
|
opt->flags = do_slaac ? 0x40 : 0x00;
|
||||||
opt->valid_lifetime = opt->preferred_lifetime = htonl(time);
|
opt->valid_lifetime = opt->preferred_lifetime = htonl(time);
|
||||||
opt->reserved = 0;
|
opt->reserved = 0;
|
||||||
|
|
||||||
@@ -406,7 +433,7 @@ static int iface_search(struct in6_addr *local, int prefix,
|
|||||||
if (prefix == context->prefix &&
|
if (prefix == context->prefix &&
|
||||||
is_same_net6(local, &context->start6, prefix) &&
|
is_same_net6(local, &context->start6, prefix) &&
|
||||||
is_same_net6(local, &context->end6, prefix))
|
is_same_net6(local, &context->end6, prefix))
|
||||||
if (context->ra_time != 0 && difftime(context->ra_time, param->now) < 0.0)
|
if (context->ra_time != 0 && difftime(context->ra_time, param->now) <= 0.0)
|
||||||
{
|
{
|
||||||
/* found an interface that's overdue for RA determine new
|
/* found an interface that's overdue for RA determine new
|
||||||
timeout value and zap other contexts on the same interface
|
timeout value and zap other contexts on the same interface
|
||||||
@@ -426,73 +453,5 @@ static int iface_search(struct in6_addr *local, int prefix,
|
|||||||
return 1; /* keep searching */
|
return 1; /* keep searching */
|
||||||
}
|
}
|
||||||
|
|
||||||
static int add_subnet(struct in6_addr *local, int prefix,
|
|
||||||
int scope, int if_index, int dad, void *vparam)
|
|
||||||
{
|
|
||||||
struct dhcp_context *context;
|
|
||||||
struct subnet_map **subnets = vparam;
|
|
||||||
struct subnet_map *map;
|
|
||||||
|
|
||||||
(void)scope;
|
|
||||||
(void)dad;
|
|
||||||
|
|
||||||
for (context = daemon->ra_contexts; context; context = context->next)
|
|
||||||
if ((context->flags & CONTEXT_RA_NAME) &&
|
|
||||||
prefix == context->prefix &&
|
|
||||||
is_same_net6(local, &context->start6, prefix) &&
|
|
||||||
is_same_net6(local, &context->end6, prefix))
|
|
||||||
{
|
|
||||||
for (map = *subnets; map; map = map->next)
|
|
||||||
if (map->iface == 0 ||
|
|
||||||
(map->iface == if_index && is_same_net6(local, &map->subnet, prefix)))
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* It's there already */
|
|
||||||
if (map && map->iface != 0)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (!map && (map = whine_malloc(sizeof(struct subnet_map))))
|
|
||||||
{
|
|
||||||
map->next = *subnets;
|
|
||||||
*subnets = map;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (map)
|
|
||||||
{
|
|
||||||
map->iface = if_index;
|
|
||||||
map->subnet = *local;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Build a map from ra-names subnets to corresponding interfaces. This
|
|
||||||
is used to go from DHCPv4 leases to SLAAC addresses,
|
|
||||||
interface->IPv6-subnet, IPv6-subnet + MAC address -> SLAAC.
|
|
||||||
*/
|
|
||||||
struct subnet_map *build_subnet_map(void)
|
|
||||||
{
|
|
||||||
struct subnet_map *map;
|
|
||||||
struct dhcp_context *context;
|
|
||||||
static struct subnet_map *subnets = NULL;
|
|
||||||
|
|
||||||
for (context = daemon->ra_contexts; context; context = context->next)
|
|
||||||
if ((context->flags & CONTEXT_RA_NAME))
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* no ra-names, no need to go further. */
|
|
||||||
if (!context)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
/* mark unused */
|
|
||||||
for (map = subnets; map; map = map->next)
|
|
||||||
map->iface = 0;
|
|
||||||
|
|
||||||
if (iface_enumerate(AF_INET6, &subnets, add_subnet))
|
|
||||||
return subnets;
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+5
-5
@@ -483,14 +483,14 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
|||||||
{
|
{
|
||||||
logaddr = &mess->yiaddr;
|
logaddr = &mess->yiaddr;
|
||||||
|
|
||||||
lease_set_hwaddr(lease, mess->chaddr, NULL, mess->hlen, mess->htype, 0);
|
lease_set_hwaddr(lease, mess->chaddr, NULL, mess->hlen, mess->htype, 0, now);
|
||||||
if (hostname)
|
if (hostname)
|
||||||
lease_set_hostname(lease, hostname, 1, get_domain(lease->addr), domain);
|
lease_set_hostname(lease, hostname, 1, get_domain(lease->addr), domain);
|
||||||
/* infinite lease unless nailed in dhcp-host line. */
|
/* infinite lease unless nailed in dhcp-host line. */
|
||||||
lease_set_expires(lease,
|
lease_set_expires(lease,
|
||||||
have_config(config, CONFIG_TIME) ? config->lease_time : 0xffffffff,
|
have_config(config, CONFIG_TIME) ? config->lease_time : 0xffffffff,
|
||||||
now);
|
now);
|
||||||
lease_set_interface(lease, int_index);
|
lease_set_interface(lease, int_index, now);
|
||||||
|
|
||||||
clear_packet(mess, end);
|
clear_packet(mess, end);
|
||||||
do_options(context, mess, end, NULL, hostname, get_domain(mess->yiaddr),
|
do_options(context, mess, end, NULL, hostname, get_domain(mess->yiaddr),
|
||||||
@@ -1276,7 +1276,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
|||||||
}
|
}
|
||||||
|
|
||||||
time = calc_time(context, config, option_find(mess, sz, OPTION_LEASE_TIME, 4));
|
time = calc_time(context, config, option_find(mess, sz, OPTION_LEASE_TIME, 4));
|
||||||
lease_set_hwaddr(lease, mess->chaddr, clid, mess->hlen, mess->htype, clid_len);
|
lease_set_hwaddr(lease, mess->chaddr, clid, mess->hlen, mess->htype, clid_len, now);
|
||||||
|
|
||||||
/* if all the netids in the ignore_name list are present, ignore client-supplied name */
|
/* if all the netids in the ignore_name list are present, ignore client-supplied name */
|
||||||
if (!hostname_auth)
|
if (!hostname_auth)
|
||||||
@@ -1310,7 +1310,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
|||||||
lease_set_hostname(lease, hostname, hostname_auth, get_domain(lease->addr), domain);
|
lease_set_hostname(lease, hostname, hostname_auth, get_domain(lease->addr), domain);
|
||||||
|
|
||||||
lease_set_expires(lease, time, now);
|
lease_set_expires(lease, time, now);
|
||||||
lease_set_interface(lease, int_index);
|
lease_set_interface(lease, int_index, now);
|
||||||
|
|
||||||
if (override.s_addr != 0)
|
if (override.s_addr != 0)
|
||||||
lease->override = override;
|
lease->override = override;
|
||||||
@@ -1387,7 +1387,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
|||||||
else
|
else
|
||||||
time = (unsigned int)difftime(lease->expires, now);
|
time = (unsigned int)difftime(lease->expires, now);
|
||||||
option_put(mess, end, OPTION_LEASE_TIME, 4, time);
|
option_put(mess, end, OPTION_LEASE_TIME, 4, time);
|
||||||
lease_set_interface(lease, int_index);
|
lease_set_interface(lease, int_index, now);
|
||||||
}
|
}
|
||||||
|
|
||||||
do_options(context, mess, end, req_options, hostname, get_domain(mess->ciaddr),
|
do_options(context, mess, end, req_options, hostname, get_domain(mess->ciaddr),
|
||||||
|
|||||||
+2
-2
@@ -637,8 +637,8 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
|
|||||||
if (lease)
|
if (lease)
|
||||||
{
|
{
|
||||||
lease_set_expires(lease, lease_time, now);
|
lease_set_expires(lease, lease_time, now);
|
||||||
lease_set_hwaddr(lease, NULL, clid, 0, iaid, clid_len);
|
lease_set_hwaddr(lease, NULL, clid, 0, iaid, clid_len, now);
|
||||||
lease_set_interface(lease, interface);
|
lease_set_interface(lease, interface, now);
|
||||||
if (hostname && ia_type == OPTION6_IA_NA)
|
if (hostname && ia_type == OPTION6_IA_NA)
|
||||||
{
|
{
|
||||||
char *addr_domain = get_domain6(addrp);
|
char *addr_domain = get_domain6(addrp);
|
||||||
|
|||||||
+243
@@ -0,0 +1,243 @@
|
|||||||
|
/* dnsmasq is Copyright (c) 2000-2012 Simon Kelley
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
|
||||||
|
#include <netinet/icmp6.h>
|
||||||
|
|
||||||
|
static int map_rebuild = 0;
|
||||||
|
static int ping_id = 0;
|
||||||
|
|
||||||
|
void slaac_add_addrs(struct dhcp_lease *lease, time_t now)
|
||||||
|
{
|
||||||
|
struct slaac_address *slaac, *old, **up;
|
||||||
|
struct dhcp_context *context;
|
||||||
|
|
||||||
|
if (!(lease->flags & LEASE_HAVE_HWADDR) ||
|
||||||
|
lease->last_interface == 0 ||
|
||||||
|
!lease->hostname)
|
||||||
|
return ;
|
||||||
|
|
||||||
|
old = lease->slaac_address;
|
||||||
|
lease->slaac_address = NULL;
|
||||||
|
|
||||||
|
for (context = daemon->ra_contexts; context; context = context->next)
|
||||||
|
if ((context->flags & CONTEXT_RA_NAME) && lease->last_interface == context->if_index)
|
||||||
|
{
|
||||||
|
struct in6_addr addr = context->start6;
|
||||||
|
if (lease->hwaddr_len == 6 &&
|
||||||
|
(lease->hwaddr_type == ARPHRD_ETHER || lease->hwaddr_type == ARPHRD_IEEE802))
|
||||||
|
{
|
||||||
|
/* convert MAC address to EUI-64 */
|
||||||
|
memcpy(&addr.s6_addr[8], lease->hwaddr, 3);
|
||||||
|
memcpy(&addr.s6_addr[13], &lease->hwaddr[3], 3);
|
||||||
|
addr.s6_addr[11] = 0xff;
|
||||||
|
addr.s6_addr[12] = 0xfe;
|
||||||
|
}
|
||||||
|
#if defined(ARPHRD_EUI64)
|
||||||
|
else if (lease->hwaddr_len == 8 &&
|
||||||
|
lease->hwaddr_type == ARPHRD_EUI64)
|
||||||
|
memcpy(&addr.s6_addr[8], lease->hwaddr, 8);
|
||||||
|
#endif
|
||||||
|
#if defined(ARPHRD_IEEE1394) && defined(ARPHRD_EUI64)
|
||||||
|
else if (lease->clid_len == 9 &&
|
||||||
|
lease->clid[0] == ARPHRD_EUI64 &&
|
||||||
|
lease->hwaddr_type == ARPHRD_IEEE1394)
|
||||||
|
/* firewire has EUI-64 identifier as clid */
|
||||||
|
memcpy(&addr.s6_addr[8], &lease->clid[1], 8);
|
||||||
|
#endif
|
||||||
|
else
|
||||||
|
continue;
|
||||||
|
|
||||||
|
addr.s6_addr[8] ^= 0x02;
|
||||||
|
|
||||||
|
/* check if we already have this one */
|
||||||
|
for (up = &old, slaac = old; slaac; slaac = slaac->next)
|
||||||
|
{
|
||||||
|
if (IN6_ARE_ADDR_EQUAL(&addr, &slaac->addr))
|
||||||
|
{
|
||||||
|
*up = slaac->next;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
up = &slaac->next;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* No, make new one */
|
||||||
|
if (!slaac && (slaac = whine_malloc(sizeof(struct slaac_address))))
|
||||||
|
{
|
||||||
|
slaac->ping_time = now;
|
||||||
|
slaac->backoff = 1;
|
||||||
|
slaac->addr = addr;
|
||||||
|
slaac->local = context->local6;
|
||||||
|
/* Do RA's to prod it */
|
||||||
|
ra_start_unsolicted(now, context);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (slaac)
|
||||||
|
{
|
||||||
|
slaac->next = lease->slaac_address;
|
||||||
|
lease->slaac_address = slaac;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Free any no reused */
|
||||||
|
for (; old; old = slaac)
|
||||||
|
{
|
||||||
|
slaac = old->next;
|
||||||
|
free(old);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
time_t periodic_slaac(time_t now, struct dhcp_lease *leases)
|
||||||
|
{
|
||||||
|
struct dhcp_context *context;
|
||||||
|
struct dhcp_lease *lease;
|
||||||
|
struct slaac_address *slaac;
|
||||||
|
time_t next_event = 0;
|
||||||
|
|
||||||
|
for (context = daemon->ra_contexts; context; context = context->next)
|
||||||
|
if ((context->flags & CONTEXT_RA_NAME))
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* nothing configured */
|
||||||
|
if (!context)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
while (ping_id == 0)
|
||||||
|
ping_id = rand16();
|
||||||
|
|
||||||
|
if (map_rebuild)
|
||||||
|
{
|
||||||
|
map_rebuild = 0;
|
||||||
|
build_subnet_map();
|
||||||
|
}
|
||||||
|
|
||||||
|
for (lease = leases; lease; lease = lease->next)
|
||||||
|
for (slaac = lease->slaac_address; slaac; slaac = slaac->next)
|
||||||
|
{
|
||||||
|
/* confirmed? */
|
||||||
|
if (slaac->backoff == 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (difftime(slaac->ping_time, now) <= 0.0)
|
||||||
|
{
|
||||||
|
struct ping_packet *ping;
|
||||||
|
struct sockaddr_in6 addr;
|
||||||
|
|
||||||
|
save_counter(0);
|
||||||
|
ping = expand(sizeof(struct ping_packet));
|
||||||
|
ping->type = ICMP6_ECHO_REQUEST;
|
||||||
|
ping->code = 0;
|
||||||
|
ping->identifier = ping_id;
|
||||||
|
ping->sequence_no = slaac->backoff;
|
||||||
|
|
||||||
|
memset(&addr, 0, sizeof(addr));
|
||||||
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
||||||
|
addr.sin6_len = sizeof(struct sockaddr_in6);
|
||||||
|
#endif
|
||||||
|
addr.sin6_family = AF_INET6;
|
||||||
|
addr.sin6_port = htons(IPPROTO_ICMPV6);
|
||||||
|
addr.sin6_addr = slaac->addr;
|
||||||
|
|
||||||
|
send_from(daemon->icmp6fd, 0, daemon->outpacket.iov_base, save_counter(0),
|
||||||
|
(union mysockaddr *)&addr, (struct all_addr *)&slaac->local, lease->last_interface);
|
||||||
|
|
||||||
|
slaac->ping_time += (1 << (slaac->backoff - 1)) + (rand16()/21785); /* 0 - 3 */
|
||||||
|
if (slaac->backoff > 4)
|
||||||
|
slaac->ping_time += rand16()/4000; /* 0 - 15 */
|
||||||
|
slaac->backoff++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (next_event == 0 || difftime(next_event, slaac->ping_time) >= 0.0)
|
||||||
|
next_event = slaac->ping_time;
|
||||||
|
}
|
||||||
|
|
||||||
|
return next_event;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void slaac_ping_reply(struct in6_addr *sender, unsigned char *packet, char *interface, struct dhcp_lease *leases)
|
||||||
|
{
|
||||||
|
struct dhcp_lease *lease;
|
||||||
|
struct slaac_address *slaac;
|
||||||
|
struct ping_packet *ping = (struct ping_packet *)packet;
|
||||||
|
int gotone = 0;
|
||||||
|
|
||||||
|
if (ping->identifier == ping_id)
|
||||||
|
for (lease = leases; lease; lease = lease->next)
|
||||||
|
for (slaac = lease->slaac_address; slaac; slaac = slaac->next)
|
||||||
|
if (slaac->backoff != 0 && IN6_ARE_ADDR_EQUAL(sender, &slaac->addr))
|
||||||
|
{
|
||||||
|
slaac->backoff = 0;
|
||||||
|
gotone = 1;
|
||||||
|
inet_ntop(AF_INET6, sender, daemon->addrbuff, ADDRSTRLEN);
|
||||||
|
my_syslog(MS_DHCP | LOG_INFO, "SLAAC-CONFIRM(%s) %s %s", interface, daemon->addrbuff, lease->hostname);
|
||||||
|
}
|
||||||
|
|
||||||
|
lease_update_dns(gotone);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Build a map from ra-names subnets to corresponding interfaces. This
|
||||||
|
is used to go from DHCPv4 leases to SLAAC addresses,
|
||||||
|
interface->IPv6-subnet, IPv6-subnet + MAC address -> SLAAC.
|
||||||
|
*/
|
||||||
|
static int add_subnet(struct in6_addr *local, int prefix,
|
||||||
|
int scope, int if_index, int dad, void *vparam)
|
||||||
|
{
|
||||||
|
struct dhcp_context *context;
|
||||||
|
|
||||||
|
(void)scope;
|
||||||
|
(void)dad;
|
||||||
|
(void)vparam;
|
||||||
|
|
||||||
|
for (context = daemon->ra_contexts; context; context = context->next)
|
||||||
|
if ((context->flags & CONTEXT_RA_NAME) &&
|
||||||
|
prefix == context->prefix &&
|
||||||
|
is_same_net6(local, &context->start6, prefix) &&
|
||||||
|
is_same_net6(local, &context->end6, prefix))
|
||||||
|
{
|
||||||
|
context->if_index = if_index;
|
||||||
|
context->local6 = *local;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void build_subnet_map(void)
|
||||||
|
{
|
||||||
|
struct dhcp_context *context;
|
||||||
|
int ok = 0;
|
||||||
|
|
||||||
|
for (context = daemon->ra_contexts; context; context = context->next)
|
||||||
|
{
|
||||||
|
context->if_index = 0;
|
||||||
|
if ((context->flags & CONTEXT_RA_NAME))
|
||||||
|
ok = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ra-names configured */
|
||||||
|
if (ok)
|
||||||
|
iface_enumerate(AF_INET6, NULL, add_subnet);
|
||||||
|
}
|
||||||
|
|
||||||
|
void schedule_subnet_map(void)
|
||||||
|
{
|
||||||
|
map_rebuild = 1;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
+20
-1
@@ -571,7 +571,9 @@ void check_tftp_listeners(fd_set *rset, time_t now)
|
|||||||
my_syslog(MS_TFTP | LOG_INFO, _("sent %s to %s"), transfer->file->filename, daemon->addrbuff);
|
my_syslog(MS_TFTP | LOG_INFO, _("sent %s to %s"), transfer->file->filename, daemon->addrbuff);
|
||||||
/* unlink */
|
/* unlink */
|
||||||
*up = tmp;
|
*up = tmp;
|
||||||
free_transfer(transfer);
|
/* put on queue to be sent to script and deleted */
|
||||||
|
transfer->next = daemon->tftp_done_trans;
|
||||||
|
daemon->tftp_done_trans = transfer;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -709,4 +711,21 @@ static ssize_t get_block(char *packet, struct tftp_transfer *transfer)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int do_tftp_script_run(void)
|
||||||
|
{
|
||||||
|
struct tftp_transfer *transfer;
|
||||||
|
|
||||||
|
if ((transfer = daemon->tftp_done_trans))
|
||||||
|
{
|
||||||
|
daemon->tftp_done_trans = transfer->next;
|
||||||
|
#ifdef HAVE_SCRIPT
|
||||||
|
queue_tftp(transfer->file->size, transfer->file->filename, &transfer->peer);
|
||||||
|
#endif
|
||||||
|
free_transfer(transfer);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
Reference in new issue
Block a user