mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-20 19:52:10 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
03a97b6170 | ||
|
|
7622fc06ab | ||
|
|
73a08a248d |
No files matched your search
+2509
File diff suppressed because it is too large.
Load diff
@@ -1,4 +1,4 @@
|
|||||||
# dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
# dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# 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
|
# it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
BINDIR = ${PREFIX}/sbin
|
BINDIR = ${PREFIX}/sbin
|
||||||
@@ -23,24 +23,19 @@ PO = po
|
|||||||
MAN = man
|
MAN = man
|
||||||
|
|
||||||
PKG_CONFIG = pkg-config
|
PKG_CONFIG = pkg-config
|
||||||
AWK = nawk
|
|
||||||
INSTALL = install
|
INSTALL = install
|
||||||
|
|
||||||
DBUS_MINOR=" `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --modversion dbus-1 | $(AWK) -F . -- '{ if ($$(NF-1)) print \"-DDBUS_MINOR=\"$$(NF-1) }'`"
|
|
||||||
DBUS_CFLAGS="`echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --cflags dbus-1`"
|
DBUS_CFLAGS="`echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --cflags dbus-1`"
|
||||||
DBUS_LIBS=" `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --libs dbus-1`"
|
DBUS_LIBS=" `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --libs dbus-1`"
|
||||||
SUNOS_VER=" `if uname | grep SunOS 2>&1 >/dev/null; then uname -r | $(AWK) -F . -- '{ print \"-DSUNOS_VER=\"$$2 }'; fi`"
|
|
||||||
SUNOS_LIBS=" `if uname | grep SunOS 2>&1 >/dev/null; then echo -lsocket -lnsl -lposix4; fi `"
|
SUNOS_LIBS=" `if uname | grep SunOS 2>&1 >/dev/null; then echo -lsocket -lnsl -lposix4; fi `"
|
||||||
|
|
||||||
all : dnsmasq
|
all : dnsmasq
|
||||||
|
|
||||||
dnsmasq :
|
dnsmasq :
|
||||||
cd $(SRC) && $(MAKE) \
|
cd $(SRC) && $(MAKE) \
|
||||||
DBUS_MINOR=$(DBUS_MINOR) \
|
|
||||||
DBUS_CFLAGS=$(DBUS_CFLAGS) \
|
DBUS_CFLAGS=$(DBUS_CFLAGS) \
|
||||||
DBUS_LIBS=$(DBUS_LIBS) \
|
DBUS_LIBS=$(DBUS_LIBS) \
|
||||||
SUNOS_LIBS=$(SUNOS_LIBS) \
|
SUNOS_LIBS=$(SUNOS_LIBS) \
|
||||||
SUNOS_VER=$(SUNOS_VER) \
|
|
||||||
-f ../bld/Makefile dnsmasq
|
-f ../bld/Makefile dnsmasq
|
||||||
|
|
||||||
clean :
|
clean :
|
||||||
@@ -57,11 +52,9 @@ install-common :
|
|||||||
all-i18n :
|
all-i18n :
|
||||||
cd $(SRC) && $(MAKE) \
|
cd $(SRC) && $(MAKE) \
|
||||||
I18N=-DLOCALEDIR='\"$(LOCALEDIR)\"' \
|
I18N=-DLOCALEDIR='\"$(LOCALEDIR)\"' \
|
||||||
DBUS_MINOR=$(DBUS_MINOR) \
|
|
||||||
DBUS_CFLAGS=$(DBUS_CFLAGS) \
|
DBUS_CFLAGS=$(DBUS_CFLAGS) \
|
||||||
DBUS_LIBS=$(DBUS_LIBS) \
|
DBUS_LIBS=$(DBUS_LIBS) \
|
||||||
SUNOS_LIBS=$(SUNOS_LIBS) \
|
SUNOS_LIBS=$(SUNOS_LIBS) \
|
||||||
SUNOS_VER=$(SUNOS_VER) \
|
|
||||||
-f ../bld/Makefile dnsmasq
|
-f ../bld/Makefile dnsmasq
|
||||||
cd $(PO); for f in *.po; do \
|
cd $(PO); for f in *.po; do \
|
||||||
cd ../$(SRC) && $(MAKE) -f ../bld/Makefile $${f%.po}.mo; \
|
cd ../$(SRC) && $(MAKE) -f ../bld/Makefile $${f%.po}.mo; \
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
Hello,
|
||||||
|
|
||||||
|
For some specific application I needed to deny access to a MAC address
|
||||||
|
to a lease. For this reason I modified the dhcp-script behavior and is
|
||||||
|
called with an extra parameter "access" once a dhcp request or discover
|
||||||
|
is received. In that case if the exit code of the script is zero,
|
||||||
|
dnsmasq continues normally, and if non-zero the packet is ignored.
|
||||||
|
|
||||||
|
This was not added as a security feature but as a mean to handle
|
||||||
|
differently some addresses. It is also quite intrusive since it requires
|
||||||
|
changes in several other subsystems.
|
||||||
|
|
||||||
|
It attach the patch in case someone is interested.
|
||||||
|
|
||||||
|
regards,
|
||||||
|
Nikos
|
||||||
|
|
||||||
|
nmav@gennetsa.com
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,578 @@
|
|||||||
|
Index: src/dnsmasq.c
|
||||||
|
===================================================================
|
||||||
|
--- src/dnsmasq.c (revision 696)
|
||||||
|
+++ src/dnsmasq.c (revision 821)
|
||||||
|
@@ -59,7 +59,6 @@
|
||||||
|
static int set_dns_listeners(time_t now, fd_set *set, int *maxfdp);
|
||||||
|
static void check_dns_listeners(fd_set *set, time_t now);
|
||||||
|
static void sig_handler(int sig);
|
||||||
|
-static void async_event(int pipe, time_t now);
|
||||||
|
static void fatal_event(struct event_desc *ev);
|
||||||
|
static void poll_resolv(void);
|
||||||
|
|
||||||
|
@@ -275,7 +274,7 @@
|
||||||
|
piperead = pipefd[0];
|
||||||
|
pipewrite = pipefd[1];
|
||||||
|
/* prime the pipe to load stuff first time. */
|
||||||
|
- send_event(pipewrite, EVENT_RELOAD, 0);
|
||||||
|
+ send_event(pipewrite, EVENT_RELOAD, 0, 0);
|
||||||
|
|
||||||
|
err_pipe[1] = -1;
|
||||||
|
|
||||||
|
@@ -340,7 +339,7 @@
|
||||||
|
}
|
||||||
|
else if (getuid() == 0)
|
||||||
|
{
|
||||||
|
- send_event(err_pipe[1], EVENT_PIDFILE, errno);
|
||||||
|
+ send_event(err_pipe[1], EVENT_PIDFILE, errno, 0);
|
||||||
|
_exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -372,7 +371,7 @@
|
||||||
|
(setgroups(0, &dummy) == -1 ||
|
||||||
|
setgid(gp->gr_gid) == -1))
|
||||||
|
{
|
||||||
|
- send_event(err_pipe[1], EVENT_GROUP_ERR, errno);
|
||||||
|
+ send_event(err_pipe[1], EVENT_GROUP_ERR, errno, 0);
|
||||||
|
_exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -415,14 +414,14 @@
|
||||||
|
|
||||||
|
if (bad_capabilities != 0)
|
||||||
|
{
|
||||||
|
- send_event(err_pipe[1], EVENT_CAP_ERR, bad_capabilities);
|
||||||
|
+ send_event(err_pipe[1], EVENT_CAP_ERR, bad_capabilities, 0);
|
||||||
|
_exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* finally drop root */
|
||||||
|
if (setuid(ent_pw->pw_uid) == -1)
|
||||||
|
{
|
||||||
|
- send_event(err_pipe[1], EVENT_USER_ERR, errno);
|
||||||
|
+ send_event(err_pipe[1], EVENT_USER_ERR, errno, 0);
|
||||||
|
_exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -434,7 +433,7 @@
|
||||||
|
/* lose the setuid and setgid capbilities */
|
||||||
|
if (capset(hdr, data) == -1)
|
||||||
|
{
|
||||||
|
- send_event(err_pipe[1], EVENT_CAP_ERR, errno);
|
||||||
|
+ send_event(err_pipe[1], EVENT_CAP_ERR, errno, 0);
|
||||||
|
_exit(0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@@ -647,7 +646,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
if (FD_ISSET(piperead, &rset))
|
||||||
|
- async_event(piperead, now);
|
||||||
|
+ async_event(piperead, now, NULL, 0);
|
||||||
|
|
||||||
|
#ifdef HAVE_LINUX_NETWORK
|
||||||
|
if (FD_ISSET(daemon->netlinkfd, &rset))
|
||||||
|
@@ -674,7 +673,7 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (daemon->dhcp && FD_ISSET(daemon->dhcpfd, &rset))
|
||||||
|
- dhcp_packet(now);
|
||||||
|
+ dhcp_packet(piperead, now);
|
||||||
|
|
||||||
|
#ifndef NO_FORK
|
||||||
|
if (daemon->helperfd != -1 && FD_ISSET(daemon->helperfd, &wset))
|
||||||
|
@@ -719,17 +718,18 @@
|
||||||
|
else
|
||||||
|
return;
|
||||||
|
|
||||||
|
- send_event(pipewrite, event, 0);
|
||||||
|
+ send_event(pipewrite, event, 0, 0);
|
||||||
|
errno = errsave;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-void send_event(int fd, int event, int data)
|
||||||
|
+void send_event(int fd, int event, int data, int priv)
|
||||||
|
{
|
||||||
|
struct event_desc ev;
|
||||||
|
|
||||||
|
ev.event = event;
|
||||||
|
ev.data = data;
|
||||||
|
+ ev.priv = priv;
|
||||||
|
|
||||||
|
/* error pipe, debug mode. */
|
||||||
|
if (fd == -1)
|
||||||
|
@@ -771,14 +771,17 @@
|
||||||
|
die(_("cannot open %s: %s"), daemon->log_file ? daemon->log_file : "log", EC_FILE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-
|
||||||
|
-static void async_event(int pipe, time_t now)
|
||||||
|
+
|
||||||
|
+/* returns the private data of the event
|
||||||
|
+ */
|
||||||
|
+int async_event(int pipe, time_t now, struct event_desc* event, unsigned int secs)
|
||||||
|
{
|
||||||
|
pid_t p;
|
||||||
|
struct event_desc ev;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
- if (read_write(pipe, (unsigned char *)&ev, sizeof(ev), 1))
|
||||||
|
+ if (read_timeout(pipe, (unsigned char *)&ev, sizeof(ev), now, secs) > 0)
|
||||||
|
+ {
|
||||||
|
switch (ev.event)
|
||||||
|
{
|
||||||
|
case EVENT_RELOAD:
|
||||||
|
@@ -872,6 +875,14 @@
|
||||||
|
flush_log();
|
||||||
|
exit(EC_GOOD);
|
||||||
|
}
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ return -1; /* timeout */
|
||||||
|
+
|
||||||
|
+ if (event)
|
||||||
|
+ memcpy( event, &ev, sizeof(ev));
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void poll_resolv()
|
||||||
|
Index: src/config.h
|
||||||
|
===================================================================
|
||||||
|
--- src/config.h (revision 696)
|
||||||
|
+++ src/config.h (revision 821)
|
||||||
|
@@ -51,6 +51,8 @@
|
||||||
|
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
|
||||||
|
#define LOG_MAX 5 /* log-queue length */
|
||||||
|
#define RANDFILE "/dev/urandom"
|
||||||
|
+#define SCRIPT_TIMEOUT 6
|
||||||
|
+#define LEASE_CHECK_TIMEOUT 10
|
||||||
|
|
||||||
|
/* DBUS interface specifics */
|
||||||
|
#define DNSMASQ_SERVICE "uk.org.thekelleys.dnsmasq"
|
||||||
|
Index: src/dnsmasq.h
|
||||||
|
===================================================================
|
||||||
|
--- src/dnsmasq.h (revision 696)
|
||||||
|
+++ src/dnsmasq.h (revision 821)
|
||||||
|
@@ -116,6 +116,7 @@
|
||||||
|
/* Async event queue */
|
||||||
|
struct event_desc {
|
||||||
|
int event, data;
|
||||||
|
+ unsigned int priv;
|
||||||
|
};
|
||||||
|
|
||||||
|
#define EVENT_RELOAD 1
|
||||||
|
@@ -390,6 +391,7 @@
|
||||||
|
#define ACTION_OLD_HOSTNAME 2
|
||||||
|
#define ACTION_OLD 3
|
||||||
|
#define ACTION_ADD 4
|
||||||
|
+#define ACTION_ACCESS 5
|
||||||
|
|
||||||
|
#define DHCP_CHADDR_MAX 16
|
||||||
|
|
||||||
|
@@ -709,6 +711,7 @@
|
||||||
|
char *print_mac(char *buff, unsigned char *mac, int len);
|
||||||
|
void bump_maxfd(int fd, int *max);
|
||||||
|
int read_write(int fd, unsigned char *packet, int size, int rw);
|
||||||
|
+int read_timeout(int fd, unsigned char *packet, int size, time_t now, int secs);
|
||||||
|
|
||||||
|
/* log.c */
|
||||||
|
void die(char *message, char *arg1, int exit_code);
|
||||||
|
@@ -748,7 +751,7 @@
|
||||||
|
|
||||||
|
/* dhcp.c */
|
||||||
|
void dhcp_init(void);
|
||||||
|
-void dhcp_packet(time_t now);
|
||||||
|
+void dhcp_packet(int piperead, time_t now);
|
||||||
|
|
||||||
|
struct dhcp_context *address_available(struct dhcp_context *context,
|
||||||
|
struct in_addr addr,
|
||||||
|
@@ -792,14 +795,16 @@
|
||||||
|
void rerun_scripts(void);
|
||||||
|
|
||||||
|
/* rfc2131.c */
|
||||||
|
-size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
||||||
|
+size_t dhcp_reply(int pipefd, struct dhcp_context *context, char *iface_name, int int_index,
|
||||||
|
size_t sz, time_t now, int unicast_dest, int *is_inform);
|
||||||
|
|
||||||
|
/* dnsmasq.c */
|
||||||
|
int make_icmp_sock(void);
|
||||||
|
int icmp_ping(struct in_addr addr);
|
||||||
|
-void send_event(int fd, int event, int data);
|
||||||
|
+void send_event(int fd, int event, int data, int priv);
|
||||||
|
void clear_cache_and_reload(time_t now);
|
||||||
|
+int wait_for_child(int pipe);
|
||||||
|
+int async_event(int pipe, time_t now, struct event_desc*, unsigned int timeout);
|
||||||
|
|
||||||
|
/* isc.c */
|
||||||
|
#ifdef HAVE_ISC_READER
|
||||||
|
@@ -832,9 +837,9 @@
|
||||||
|
/* helper.c */
|
||||||
|
#ifndef NO_FORK
|
||||||
|
int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd);
|
||||||
|
-void helper_write(void);
|
||||||
|
+int helper_write(void);
|
||||||
|
void queue_script(int action, struct dhcp_lease *lease,
|
||||||
|
- char *hostname, time_t now);
|
||||||
|
+ char *hostname, time_t now, unsigned int uid);
|
||||||
|
int helper_buf_empty(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Index: src/util.c
|
||||||
|
===================================================================
|
||||||
|
--- src/util.c (revision 696)
|
||||||
|
+++ src/util.c (revision 821)
|
||||||
|
@@ -444,3 +444,38 @@
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+int read_timeout(int fd, unsigned char *packet, int size, time_t now, int secs)
|
||||||
|
+{
|
||||||
|
+ ssize_t n, done;
|
||||||
|
+ time_t expire;
|
||||||
|
+
|
||||||
|
+ expire = now + secs;
|
||||||
|
+
|
||||||
|
+ for (done = 0; done < size; done += n)
|
||||||
|
+ {
|
||||||
|
+ retry:
|
||||||
|
+ if (secs > 0) alarm(secs);
|
||||||
|
+ n = read(fd, &packet[done], (size_t)(size - done));
|
||||||
|
+
|
||||||
|
+ if (n == 0)
|
||||||
|
+ return 0;
|
||||||
|
+ else if (n == -1)
|
||||||
|
+ {
|
||||||
|
+ if (errno == EINTR) {
|
||||||
|
+ my_syslog(LOG_INFO, _("read timed out (errno %d)"), errno);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (retry_send() || errno == ENOMEM || errno == ENOBUFS || errno == EAGAIN)
|
||||||
|
+ {
|
||||||
|
+ if (secs == 0 || (secs > 0 && dnsmasq_time() < expire))
|
||||||
|
+ goto retry;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ my_syslog(LOG_INFO, _("error in read (timeout %d, errno %d)"), secs, errno);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
Index: src/dhcp.c
|
||||||
|
===================================================================
|
||||||
|
--- src/dhcp.c (revision 696)
|
||||||
|
+++ src/dhcp.c (revision 821)
|
||||||
|
@@ -103,7 +103,7 @@
|
||||||
|
daemon->dhcp_packet.iov_base = safe_malloc(daemon->dhcp_packet.iov_len);
|
||||||
|
}
|
||||||
|
|
||||||
|
-void dhcp_packet(time_t now)
|
||||||
|
+void dhcp_packet(int piperead, time_t now)
|
||||||
|
{
|
||||||
|
struct dhcp_packet *mess;
|
||||||
|
struct dhcp_context *context;
|
||||||
|
@@ -239,7 +239,8 @@
|
||||||
|
if (!iface_enumerate(&parm, complete_context, NULL))
|
||||||
|
return;
|
||||||
|
lease_prune(NULL, now); /* lose any expired leases */
|
||||||
|
- iov.iov_len = dhcp_reply(parm.current, ifr.ifr_name, iface_index, (size_t)sz,
|
||||||
|
+
|
||||||
|
+ iov.iov_len = dhcp_reply(piperead, parm.current, ifr.ifr_name, iface_index, (size_t)sz,
|
||||||
|
now, unicast_dest, &is_inform);
|
||||||
|
lease_update_file(now);
|
||||||
|
lease_update_dns();
|
||||||
|
Index: src/helper.c
|
||||||
|
===================================================================
|
||||||
|
--- src/helper.c (revision 696)
|
||||||
|
+++ src/helper.c (revision 821)
|
||||||
|
@@ -45,6 +45,7 @@
|
||||||
|
#endif
|
||||||
|
unsigned char hwaddr[DHCP_CHADDR_MAX];
|
||||||
|
char interface[IF_NAMESIZE];
|
||||||
|
+ unsigned int uid;
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct script_data *buf = NULL;
|
||||||
|
@@ -60,7 +61,7 @@
|
||||||
|
then fork our process. */
|
||||||
|
if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1)
|
||||||
|
{
|
||||||
|
- send_event(err_fd, EVENT_PIPE_ERR, errno);
|
||||||
|
+ send_event(err_fd, EVENT_PIPE_ERR, errno, 0);
|
||||||
|
_exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -87,13 +88,13 @@
|
||||||
|
{
|
||||||
|
if (daemon->options & OPT_NO_FORK)
|
||||||
|
/* send error to daemon process if no-fork */
|
||||||
|
- send_event(event_fd, EVENT_HUSER_ERR, errno);
|
||||||
|
+ send_event(event_fd, EVENT_HUSER_ERR, errno, 0);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* kill daemon */
|
||||||
|
- send_event(event_fd, EVENT_DIE, 0);
|
||||||
|
+ send_event(event_fd, EVENT_DIE, 0, 0);
|
||||||
|
/* return error */
|
||||||
|
- send_event(err_fd, EVENT_HUSER_ERR, errno);;
|
||||||
|
+ send_event(err_fd, EVENT_HUSER_ERR, errno, 0);
|
||||||
|
}
|
||||||
|
_exit(0);
|
||||||
|
}
|
||||||
|
@@ -122,6 +123,8 @@
|
||||||
|
action_str = "del";
|
||||||
|
else if (data.action == ACTION_ADD)
|
||||||
|
action_str = "add";
|
||||||
|
+ else if (data.action == ACTION_ACCESS)
|
||||||
|
+ action_str = "access";
|
||||||
|
else if (data.action == ACTION_OLD || data.action == ACTION_OLD_HOSTNAME)
|
||||||
|
action_str = "old";
|
||||||
|
else
|
||||||
|
@@ -178,9 +181,11 @@
|
||||||
|
{
|
||||||
|
/* On error send event back to main process for logging */
|
||||||
|
if (WIFSIGNALED(status))
|
||||||
|
- send_event(event_fd, EVENT_KILLED, WTERMSIG(status));
|
||||||
|
- else if (WIFEXITED(status) && WEXITSTATUS(status) != 0)
|
||||||
|
- send_event(event_fd, EVENT_EXITED, WEXITSTATUS(status));
|
||||||
|
+ send_event(event_fd, EVENT_KILLED, WTERMSIG(status), data.uid);
|
||||||
|
+ else if (WIFEXITED(status))
|
||||||
|
+ send_event(event_fd, EVENT_EXITED, WEXITSTATUS(status), data.uid);
|
||||||
|
+ else
|
||||||
|
+ send_event(event_fd, EVENT_EXITED, -1, data.uid);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -263,7 +268,7 @@
|
||||||
|
err = errno;
|
||||||
|
}
|
||||||
|
/* failed, send event so the main process logs the problem */
|
||||||
|
- send_event(event_fd, EVENT_EXEC_ERR, err);
|
||||||
|
+ send_event(event_fd, EVENT_EXEC_ERR, err, data.uid);
|
||||||
|
_exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -295,7 +300,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 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 int uid)
|
||||||
|
{
|
||||||
|
unsigned char *p;
|
||||||
|
size_t size;
|
||||||
|
@@ -332,6 +337,7 @@
|
||||||
|
buf_size = size;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ buf->uid = uid;
|
||||||
|
buf->action = action;
|
||||||
|
buf->hwaddr_len = lease->hwaddr_len;
|
||||||
|
buf->hwaddr_type = lease->hwaddr_type;
|
||||||
|
@@ -393,12 +399,15 @@
|
||||||
|
return bytes_in_buf == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-void helper_write(void)
|
||||||
|
+/* returns -1 if write failed for a reason, 1 if no data exist
|
||||||
|
+ * and 0 if everything was ok.
|
||||||
|
+ */
|
||||||
|
+int helper_write(void)
|
||||||
|
{
|
||||||
|
ssize_t rc;
|
||||||
|
|
||||||
|
if (bytes_in_buf == 0)
|
||||||
|
- return;
|
||||||
|
+ return 1;
|
||||||
|
|
||||||
|
if ((rc = write(daemon->helperfd, buf, bytes_in_buf)) != -1)
|
||||||
|
{
|
||||||
|
@@ -409,9 +418,11 @@
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (errno == EAGAIN || errno == EINTR)
|
||||||
|
- return;
|
||||||
|
+ return -1;
|
||||||
|
bytes_in_buf = 0;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
Index: src/rfc2131.c
|
||||||
|
===================================================================
|
||||||
|
--- src/rfc2131.c (revision 696)
|
||||||
|
+++ src/rfc2131.c (revision 821)
|
||||||
|
@@ -100,8 +100,49 @@
|
||||||
|
int clid_len, unsigned char *clid, int *len_out);
|
||||||
|
static void match_vendor_opts(unsigned char *opt, struct dhcp_opt *dopt);
|
||||||
|
|
||||||
|
+static int check_access_script( int piperead, struct dhcp_lease *lease, struct dhcp_packet *mess, time_t now)
|
||||||
|
+{
|
||||||
|
+#ifndef NO_FORK
|
||||||
|
+unsigned int uid;
|
||||||
|
+struct event_desc ev;
|
||||||
|
+int ret;
|
||||||
|
+struct dhcp_lease _lease;
|
||||||
|
+
|
||||||
|
+ if (daemon->lease_change_command == NULL) return 0; /* ok */
|
||||||
|
+
|
||||||
|
+ if (!lease) { /* if host has not been seen before lease is NULL */
|
||||||
|
+ memset(&_lease, 0, sizeof(_lease));
|
||||||
|
+ lease = &_lease;
|
||||||
|
+ lease_set_hwaddr(lease, mess->chaddr, NULL, mess->hlen, mess->htype, 0);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ uid = rand16();
|
||||||
|
+ queue_script(ACTION_ACCESS, lease, NULL, now, uid);
|
||||||
|
+
|
||||||
|
+ /* send all data to helper process */
|
||||||
|
+ do
|
||||||
|
+ {
|
||||||
|
+ helper_write();
|
||||||
|
+ } while (helper_buf_empty() == 0);
|
||||||
|
+
|
||||||
|
+ /* wait for our event */
|
||||||
|
+ ret = 0;
|
||||||
|
+ do
|
||||||
|
+ {
|
||||||
|
+ ret = async_event( piperead, now, &ev, SCRIPT_TIMEOUT);
|
||||||
|
+ }
|
||||||
|
+ while(ev.priv != uid && ret >= 0);
|
||||||
|
+
|
||||||
|
+ if (ret < 0 || ev.data != 0) /* timeout or error */
|
||||||
|
+ {
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
+ return 0; /* ok */
|
||||||
|
+}
|
||||||
|
|
||||||
|
-size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
||||||
|
+size_t dhcp_reply(int piperead, struct dhcp_context *context, char *iface_name, int int_index,
|
||||||
|
size_t sz, time_t now, int unicast_dest, int *is_inform)
|
||||||
|
{
|
||||||
|
unsigned char *opt, *clid = NULL;
|
||||||
|
@@ -252,7 +293,7 @@
|
||||||
|
mac->netid.next = netid;
|
||||||
|
netid = &mac->netid;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
/* Determine network for this packet. Our caller will have already linked all the
|
||||||
|
contexts which match the addresses of the receiving interface but if the
|
||||||
|
machine has an address already, or came via a relay, or we have a subnet selector,
|
||||||
|
@@ -329,7 +370,7 @@
|
||||||
|
my_syslog(LOG_INFO, _("Available DHCP range: %s -- %s"), daemon->namebuff, inet_ntoa(context_tmp->end));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
mess->op = BOOTREPLY;
|
||||||
|
|
||||||
|
config = find_config(daemon->dhcp_conf, context, clid, clid_len,
|
||||||
|
@@ -418,7 +459,7 @@
|
||||||
|
else
|
||||||
|
mess->yiaddr = lease->addr;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
if (!message &&
|
||||||
|
!lease &&
|
||||||
|
(!(lease = lease_allocate(mess->yiaddr))))
|
||||||
|
@@ -641,7 +682,14 @@
|
||||||
|
memcpy(req_options, option_ptr(opt, 0), option_len(opt));
|
||||||
|
req_options[option_len(opt)] = OPTION_END;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+ if (mess_type == DHCPREQUEST || mess_type == DHCPDISCOVER)
|
||||||
|
+ if (check_access_script(piperead, lease, mess, now) < 0)
|
||||||
|
+ {
|
||||||
|
+ my_syslog(LOG_INFO, _("Ignoring client due to access script"));
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
switch (mess_type)
|
||||||
|
{
|
||||||
|
case DHCPDECLINE:
|
||||||
|
Index: src/log.c
|
||||||
|
===================================================================
|
||||||
|
--- src/log.c (revision 696)
|
||||||
|
+++ src/log.c (revision 821)
|
||||||
|
@@ -73,7 +73,7 @@
|
||||||
|
|
||||||
|
if (!log_reopen(daemon->log_file))
|
||||||
|
{
|
||||||
|
- send_event(errfd, EVENT_LOG_ERR, errno);
|
||||||
|
+ send_event(errfd, EVENT_LOG_ERR, errno, 0);
|
||||||
|
_exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
Index: src/lease.c
|
||||||
|
===================================================================
|
||||||
|
--- src/lease.c (revision 696)
|
||||||
|
+++ src/lease.c (revision 821)
|
||||||
|
@@ -511,7 +511,7 @@
|
||||||
|
if (lease->old_hostname)
|
||||||
|
{
|
||||||
|
#ifndef NO_FORK
|
||||||
|
- queue_script(ACTION_OLD_HOSTNAME, lease, lease->old_hostname, now);
|
||||||
|
+ queue_script(ACTION_OLD_HOSTNAME, lease, lease->old_hostname, now, 0);
|
||||||
|
#endif
|
||||||
|
free(lease->old_hostname);
|
||||||
|
lease->old_hostname = NULL;
|
||||||
|
@@ -520,7 +520,7 @@
|
||||||
|
else
|
||||||
|
{
|
||||||
|
#ifndef NO_FORK
|
||||||
|
- queue_script(ACTION_DEL, lease, lease->hostname, now);
|
||||||
|
+ queue_script(ACTION_DEL, lease, lease->hostname, now, 0);
|
||||||
|
#endif
|
||||||
|
old_leases = lease->next;
|
||||||
|
|
||||||
|
@@ -540,7 +540,7 @@
|
||||||
|
if (lease->old_hostname)
|
||||||
|
{
|
||||||
|
#ifndef NO_FORK
|
||||||
|
- queue_script(ACTION_OLD_HOSTNAME, lease, lease->old_hostname, now);
|
||||||
|
+ queue_script(ACTION_OLD_HOSTNAME, lease, lease->old_hostname, now, 0);
|
||||||
|
#endif
|
||||||
|
free(lease->old_hostname);
|
||||||
|
lease->old_hostname = NULL;
|
||||||
|
@@ -552,7 +552,7 @@
|
||||||
|
(lease->aux_changed && (daemon->options & OPT_LEASE_RO)))
|
||||||
|
{
|
||||||
|
#ifndef NO_FORK
|
||||||
|
- queue_script(lease->new ? ACTION_ADD : ACTION_OLD, lease, lease->hostname, now);
|
||||||
|
+ queue_script(lease->new ? ACTION_ADD : ACTION_OLD, lease, lease->hostname, now, 0);
|
||||||
|
#endif
|
||||||
|
lease->new = lease->changed = lease->aux_changed = 0;
|
||||||
|
|
||||||
|
Index: man/dnsmasq.8
|
||||||
|
===================================================================
|
||||||
|
--- man/dnsmasq.8 (revision 696)
|
||||||
|
+++ man/dnsmasq.8 (revision 821)
|
||||||
|
@@ -724,12 +724,15 @@
|
||||||
|
.B \-6 --dhcp-script=<path>
|
||||||
|
Whenever a new DHCP lease is created, or an old one destroyed, the
|
||||||
|
binary specified by this option is run. The arguments to the process
|
||||||
|
-are "add", "old" or "del", the MAC
|
||||||
|
+are "add", "old", "access" or "del", the MAC
|
||||||
|
address of the host (or "<null>"), the IP address, and the hostname,
|
||||||
|
if known. "add" means a lease has been created, "del" means it has
|
||||||
|
been destroyed, "old" is a notification of an existing lease when
|
||||||
|
dnsmasq starts or a change to MAC address or hostname of an existing
|
||||||
|
lease (also, lease length or expiry and client-id, if leasefile-ro is set).
|
||||||
|
+The "access" keyword means that a request was just received and depending
|
||||||
|
+on the script exit status request for address will be granted, if exit status
|
||||||
|
+is zero or not if it is non-zero.
|
||||||
|
The process is run as root (assuming that dnsmasq was originally run as
|
||||||
|
root) even if dnsmasq is configured to change UID to an unprivileged user.
|
||||||
|
The environment is inherited from the invoker of dnsmasq, and if the
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
A remake of patch Bob Carroll had posted to dnsmasq,
|
||||||
|
now compatible with version 2.47. Hopefully he doesn't
|
||||||
|
mind (sending a copy of this mail to him too).
|
||||||
|
|
||||||
|
Maybe the patch in question is not acceptible
|
||||||
|
as it doesn't add new switch, rather it binds itself to "strict-order".
|
||||||
|
|
||||||
|
What it does is: if you have strict-order in the
|
||||||
|
dnsmasq config file and query a domain that would result
|
||||||
|
in NXDOMAIN, it iterates the whole given nameserver list
|
||||||
|
until the last one says NXDOMAIN.
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
diff -ur dnsmasq-2.47/src/forward.c dnsmasq-2.47-patched/src/forward.c
|
||||||
|
--- dnsmasq-2.47/src/forward.c 2009-02-01 17:59:48.000000000 +0200
|
||||||
|
+++ dnsmasq-2.47-patched/src/forward.c 2009-03-18 19:10:22.000000000 +0200
|
||||||
|
@@ -488,9 +488,12 @@
|
||||||
|
return;
|
||||||
|
|
||||||
|
server = forward->sentto;
|
||||||
|
+
|
||||||
|
+ if ( (header->rcode == NXDOMAIN) && ((daemon->options & OPT_ORDER) != 0) && (server->next != NULL) )
|
||||||
|
+ header->rcode = SERVFAIL;
|
||||||
|
|
||||||
|
if ((header->rcode == SERVFAIL || header->rcode == REFUSED) &&
|
||||||
|
- !(daemon->options & OPT_ORDER) &&
|
||||||
|
+ ((daemon->options & OPT_ORDER) != 0) &&
|
||||||
|
forward->forwardall == 0)
|
||||||
|
/* for broken servers, attempt to send to another one. */
|
||||||
|
{
|
||||||
@@ -5,12 +5,10 @@
|
|||||||
<policy user="root">
|
<policy user="root">
|
||||||
<allow own="uk.org.thekelleys.dnsmasq"/>
|
<allow own="uk.org.thekelleys.dnsmasq"/>
|
||||||
<allow send_destination="uk.org.thekelleys.dnsmasq"/>
|
<allow send_destination="uk.org.thekelleys.dnsmasq"/>
|
||||||
<allow send_interface="uk.org.thekelleys.dnsmasq"/>
|
|
||||||
</policy>
|
</policy>
|
||||||
<policy context="default">
|
<policy context="default">
|
||||||
<deny own="uk.org.thekelleys.dnsmasq"/>
|
<deny own="uk.org.thekelleys.dnsmasq"/>
|
||||||
<deny send_destination="uk.org.thekelleys.dnsmasq"/>
|
<deny send_destination="uk.org.thekelleys.dnsmasq"/>
|
||||||
<deny send_interface="uk.org.thekelleys.dnsmasq"/>
|
|
||||||
</policy>
|
</policy>
|
||||||
</busconfig>
|
</busconfig>
|
||||||
|
|
||||||
+49
-3
@@ -329,7 +329,7 @@
|
|||||||
# Reboot time. (Note 'i' to send 32-bit value)
|
# Reboot time. (Note 'i' to send 32-bit value)
|
||||||
#dhcp-option-force=211,30i
|
#dhcp-option-force=211,30i
|
||||||
|
|
||||||
# Set the boot filename for BOOTP. You will only need
|
# Set the boot filename for netboot/PXE. You will only need
|
||||||
# this is you want to boot machines over the network and you will need
|
# this is you want to boot machines over the network and you will need
|
||||||
# a TFTP server; either dnsmasq's built in TFTP server or an
|
# a TFTP server; either dnsmasq's built in TFTP server or an
|
||||||
# external one. (See below for how to enable the TFTP server.)
|
# external one. (See below for how to enable the TFTP server.)
|
||||||
@@ -342,6 +342,50 @@
|
|||||||
#dhcp-boot=net:#gpxe,undionly.kpxe
|
#dhcp-boot=net:#gpxe,undionly.kpxe
|
||||||
#dhcp-boot=mybootimage
|
#dhcp-boot=mybootimage
|
||||||
|
|
||||||
|
# Encapsulated options for Etherboot gPXE. All the options are
|
||||||
|
# encapsulated within option 175
|
||||||
|
#dhcp-option=encap:175, 1, 5b # priority code
|
||||||
|
#dhcp-option=encap:175, 176, 1b # no-proxydhcp
|
||||||
|
#dhcp-option=encap:175, 177, string # bus-id
|
||||||
|
#dhcp-option=encap:175, 189, 1b # BIOS drive code
|
||||||
|
#dhcp-option=encap:175, 190, user # iSCSI username
|
||||||
|
#dhcp-option=encap:175, 191, pass # iSCSI password
|
||||||
|
|
||||||
|
# Test for the architecture of a netboot client. PXE clients are
|
||||||
|
# supposed to send their architecture as option 93. (See RFC 4578)
|
||||||
|
#dhcp-match=peecees, option:client-arch, 0 #x86-32
|
||||||
|
#dhcp-match=itanics, option:client-arch, 2 #IA64
|
||||||
|
#dhcp-match=hammers, option:client-arch, 6 #x86-64
|
||||||
|
#dhcp-match=mactels, option:client-arch, 7 #EFI x86-64
|
||||||
|
|
||||||
|
# Do real PXE, rather than just booting a single file, this is an
|
||||||
|
# alternative to dhcp-boot.
|
||||||
|
#pxe-prompt="What system shall I netboot?"
|
||||||
|
# or with timeout before first available action is taken:
|
||||||
|
#pxe-prompt="Press F8 for menu.", 60
|
||||||
|
|
||||||
|
# Available boot services. for PXE.
|
||||||
|
#pxe-service=x86PC, "Boot from local disk", 0
|
||||||
|
|
||||||
|
# Loads <tftp-root>/pxelinux.0 from dnsmasq TFTP server.
|
||||||
|
#pxe-service=x86PC, "Install Linux", pxelinux
|
||||||
|
|
||||||
|
# Loads <tftp-root>/pxelinux.0 from TFTP server at 1.2.3.4.
|
||||||
|
# Beware this fails on old PXE ROMS.
|
||||||
|
#pxe-service=x86PC, "Install Linux", pxelinux, 1.2.3.4
|
||||||
|
|
||||||
|
# Use bootserver on network, found my multicast or broadcast.
|
||||||
|
#pxe-service=x86PC, "Install windows from RIS server", 1
|
||||||
|
|
||||||
|
# Use bootserver at a known IP address.
|
||||||
|
#pxe-service=x86PC, "Install windows from RIS server", 1, 1.2.3.4
|
||||||
|
|
||||||
|
# If you have multicast-FTP available,
|
||||||
|
# information for that can be passed in a similar way using options 1
|
||||||
|
# to 5. See page 19 of
|
||||||
|
# http://download.intel.com/design/archives/wfm/downloads/pxespec.pdf
|
||||||
|
|
||||||
|
|
||||||
# Enable dnsmasq's built-in TFTP server
|
# Enable dnsmasq's built-in TFTP server
|
||||||
#enable-tftp
|
#enable-tftp
|
||||||
|
|
||||||
@@ -355,8 +399,9 @@
|
|||||||
# Set the boot file name only when the "red" tag is set.
|
# Set the boot file name only when the "red" tag is set.
|
||||||
#dhcp-boot=net:red,pxelinux.red-net
|
#dhcp-boot=net:red,pxelinux.red-net
|
||||||
|
|
||||||
# An example of dhcp-boot with an external server: the name and IP
|
# An example of dhcp-boot with an external TFTP server: the name and IP
|
||||||
# address of the server are given after the filename.
|
# address of the server are given after the filename.
|
||||||
|
# Can fail with old PXE ROMS. Overridden by --pxe-service.
|
||||||
#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3
|
#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3
|
||||||
|
|
||||||
# Set the limit on DHCP leases, the default is 150
|
# Set the limit on DHCP leases, the default is 150
|
||||||
@@ -409,7 +454,8 @@
|
|||||||
#alias=1.2.3.4,5.6.7.8
|
#alias=1.2.3.4,5.6.7.8
|
||||||
# and this maps 1.2.3.x to 5.6.7.x
|
# and this maps 1.2.3.x to 5.6.7.x
|
||||||
#alias=1.2.3.0,5.6.7.0,255.255.255.0
|
#alias=1.2.3.0,5.6.7.0,255.255.255.0
|
||||||
|
# and this maps 192.168.0.10->192.168.0.40 to 10.0.0.10->10.0.0.40
|
||||||
|
#alias=192.168.0.10-192.168.0.40,10.0.0.0,255.255.255.0
|
||||||
|
|
||||||
# Change these lines if you want dnsmasq to serve MX records.
|
# Change these lines if you want dnsmasq to serve MX records.
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP
|
|||||||
server and allows machines with DHCP-allocated addresses
|
server and allows machines with DHCP-allocated addresses
|
||||||
to appear in the DNS with names configured either in each host or
|
to appear in the DNS with names configured either in each host or
|
||||||
in a central configuration file. Dnsmasq supports static and dynamic
|
in a central configuration file. Dnsmasq supports static and dynamic
|
||||||
DHCP leases and BOOTP/TFTP for network booting of diskless machines.
|
DHCP leases and BOOTP/TFTP/PXE for network booting of diskless machines.
|
||||||
<P>
|
<P>
|
||||||
Dnsmasq is targeted at home networks using NAT and
|
Dnsmasq is targeted at home networks using NAT and
|
||||||
connected to the internet via a modem, cable-modem or ADSL
|
connected to the internet via a modem, cable-modem or ADSL
|
||||||
@@ -89,12 +89,15 @@ Dnsmasq is part of the Debian distribution, it can be downloaded from
|
|||||||
<A HREF="http://ftp.debian.org/debian/pool/main/d/dnsmasq/"> here</A> or installed using <TT>apt</TT>.
|
<A HREF="http://ftp.debian.org/debian/pool/main/d/dnsmasq/"> here</A> or installed using <TT>apt</TT>.
|
||||||
|
|
||||||
<H2>Links.</H2>
|
<H2>Links.</H2>
|
||||||
There is an article in German on dnsmasq at <A
|
Damien Raude-Morvan has an article in French at <A HREF="http://www.drazzib.com/docs-dnsmasq.html">http://www.drazzib.com/docs-dnsmasq.html</A>
|
||||||
HREF="http://www.linuxnetmag.com/de/issue7/m7dnsmasq1.html">http://www.linuxnetmag.com/de/issue7/m7dnsmasq1.html</A>
|
|
||||||
and Damien Raude-Morvan has one in French at <A HREF="http://www.drazzib.com/docs-dnsmasq.html">http://www.drazzib.com/docs-dnsmasq.html</A>
|
|
||||||
There is a good article about dnsmasq at <A
|
There is a good article about dnsmasq at <A
|
||||||
HREF="http://www.enterprisenetworkingplanet.com/netos/article.php/3377351">http://www.enterprisenetworkingplanet.com/netos/article.php/3377351</A>
|
HREF="http://www.enterprisenetworkingplanet.com/netos/article.php/3377351">http://www.enterprisenetworkingplanet.com/netos/article.php/3377351</A>
|
||||||
and Ilya Evseev has an article in Russian about dnsmasq to be found at <A HREF="http://ilya-evseev.narod.ru/articles/dnsmasq"> http://ilya-evseev.narod.ru/articles/dnsmasq</A>
|
and another at <A
|
||||||
|
HREF="http://www.linux.com/articles/149040">http://www.linux.com/articles/149040</A>
|
||||||
|
and Ilya Evseev has an article in Russian about dnsmasq to be found at
|
||||||
|
<A HREF="http://ilya-evseev.narod.ru/articles/dnsmasq">
|
||||||
|
http://ilya-evseev.narod.ru/articles/dnsmasq</A>. Ismael Ull has an
|
||||||
|
article about dnsmasq in Spanish at <A HREF="http://www.mey-online.com.ar/blog/index.php/archives/guia-rapida-de-dnsmasq">http://www.mey-online.com.ar/blog/index.php/archives/guia-rapida-de-dnsmasq</A>
|
||||||
<H2>License.</H2>
|
<H2>License.</H2>
|
||||||
Dnsmasq is distributed under the GPL. See the file COPYING in the distribution
|
Dnsmasq is distributed under the GPL. See the file COPYING in the distribution
|
||||||
for details.
|
for details.
|
||||||
|
|||||||
+113
-35
@@ -15,8 +15,8 @@ contents of /etc/hosts so that local hostnames
|
|||||||
which do not appear in the global DNS can be resolved and also answers
|
which do not appear in the global DNS can be resolved and also answers
|
||||||
DNS queries for DHCP configured hosts.
|
DNS queries for DHCP configured hosts.
|
||||||
.PP
|
.PP
|
||||||
The dnsmasq DHCP server supports static address assignments, multiple
|
The dnsmasq DHCP server supports static address assignments and multiple
|
||||||
networks, DHCP-relay and RFC3011 subnet specifiers. It automatically
|
networks. It automatically
|
||||||
sends a sensible default set of DHCP options, and can be configured to
|
sends a sensible default set of DHCP options, and can be configured to
|
||||||
send any desired set of DHCP options, including vendor-encapsulated
|
send any desired set of DHCP options, including vendor-encapsulated
|
||||||
options. It includes a secure, read-only,
|
options. It includes a secure, read-only,
|
||||||
@@ -31,13 +31,17 @@ BSD, unless the GNU getopt library is linked, the long form of the
|
|||||||
options does not work on the command line; it is still recognised in
|
options does not work on the command line; it is still recognised in
|
||||||
the configuration file.
|
the configuration file.
|
||||||
.TP
|
.TP
|
||||||
|
.B --test
|
||||||
|
Read and syntax check configuration file(s). Exit with code 0 if all
|
||||||
|
is OK, or a non-zero code otherwise. Do not start up dnsmasq.
|
||||||
|
.TP
|
||||||
.B \-h, --no-hosts
|
.B \-h, --no-hosts
|
||||||
Don't read the hostnames in /etc/hosts.
|
Don't read the hostnames in /etc/hosts.
|
||||||
.TP
|
.TP
|
||||||
.B \-H, --addn-hosts=<file>
|
.B \-H, --addn-hosts=<file>
|
||||||
Additional hosts file. Read the specified file as well as /etc/hosts. If -h is given, read
|
Additional hosts file. Read the specified file as well as /etc/hosts. If -h is given, read
|
||||||
only the specified file. This option may be repeated for more than one
|
only the specified file. This option may be repeated for more than one
|
||||||
additional hosts file.
|
additional hosts file. If a directory is given, then read all the files contained in that directory.
|
||||||
.TP
|
.TP
|
||||||
.B \-E, --expand-hosts
|
.B \-E, --expand-hosts
|
||||||
Add the domain to simple names (without a period) in /etc/hosts
|
Add the domain to simple names (without a period) in /etc/hosts
|
||||||
@@ -208,13 +212,17 @@ Bogus private reverse lookups. All reverse lookups for private IP ranges (ie 192
|
|||||||
which are not found in /etc/hosts or the DHCP leases file are answered
|
which are not found in /etc/hosts or the DHCP leases file are answered
|
||||||
with "no such domain" rather than being forwarded upstream.
|
with "no such domain" rather than being forwarded upstream.
|
||||||
.TP
|
.TP
|
||||||
.B \-V, --alias=<old-ip>,<new-ip>[,<mask>]
|
.B \-V, --alias=[<old-ip>]|[<start-ip>-<end-ip>],<new-ip>[,<mask>]
|
||||||
Modify IPv4 addresses returned from upstream nameservers; old-ip is
|
Modify IPv4 addresses returned from upstream nameservers; old-ip is
|
||||||
replaced by new-ip. If the optional mask is given then any address
|
replaced by new-ip. If the optional mask is given then any address
|
||||||
which matches the masked old-ip will be re-written. So, for instance
|
which matches the masked old-ip will be re-written. So, for instance
|
||||||
.B --alias=1.2.3.0,6.7.8.0,255.255.255.0
|
.B --alias=1.2.3.0,6.7.8.0,255.255.255.0
|
||||||
will map 1.2.3.56 to 6.7.8.56 and 1.2.3.67 to 6.7.8.67. This is what
|
will map 1.2.3.56 to 6.7.8.56 and 1.2.3.67 to 6.7.8.67. This is what
|
||||||
Cisco PIX routers call "DNS doctoring".
|
Cisco PIX routers call "DNS doctoring". If the old IP is given as
|
||||||
|
range, then only addresses in the range, rather than a whole subnet,
|
||||||
|
are re-written. So
|
||||||
|
.B --alias=192.168.0.10-192.168.0.40,10.0.0.0,255.255.255.0
|
||||||
|
maps 192.168.0.10->192.168.0.40 to 10.0.0.10->10.0.0.40
|
||||||
.TP
|
.TP
|
||||||
.B \-B, --bogus-nxdomain=<ipaddr>
|
.B \-B, --bogus-nxdomain=<ipaddr>
|
||||||
Transform replies which contain the IP address given into "No such
|
Transform replies which contain the IP address given into "No such
|
||||||
@@ -418,25 +426,22 @@ Set the maximum number of concurrent DNS queries. The default value is
|
|||||||
where this needs to be increased is when using web-server log file
|
where this needs to be increased is when using web-server log file
|
||||||
resolvers, which can generate large numbers of concurrent queries.
|
resolvers, which can generate large numbers of concurrent queries.
|
||||||
.TP
|
.TP
|
||||||
.B \-F, --dhcp-range=[[net:]network-id,]<start-addr>,<end-addr>[[,<netmask>],<broadcast>][,<default lease time>]
|
.B \-F, --dhcp-range=[[net:]network-id,]<start-addr>,<end-addr>[[,<netmask>],<broadcast>][,<lease time>]
|
||||||
Enable the DHCP server. Addresses will be given out from the range
|
Enable the DHCP server. Addresses will be given out from the range
|
||||||
<start-addr> to <end-addr> and from statically defined addresses given
|
<start-addr> to <end-addr> and from statically defined addresses given
|
||||||
in
|
in
|
||||||
.B dhcp-host
|
.B dhcp-host
|
||||||
options. If the lease time is given, then leases
|
options. If the lease time is given, then leases
|
||||||
will be given for that length of time. The lease time is in seconds,
|
will be given for that length of time. The lease time is in seconds,
|
||||||
or minutes (eg 45m) or hours (eg 1h) or the literal "infinite". The
|
or minutes (eg 45m) or hours (eg 1h) or "infinite". If not given,
|
||||||
|
the default lease time is one hour. The
|
||||||
minimum lease time is two minutes. This
|
minimum lease time is two minutes. This
|
||||||
option may be repeated, with different addresses, to enable DHCP
|
option may be repeated, with different addresses, to enable DHCP
|
||||||
service to more than one network. For directly connected networks (ie,
|
service to more than one network. For directly connected networks (ie,
|
||||||
networks on which the machine running dnsmasq has an interface) the
|
networks on which the machine running dnsmasq has an interface) the
|
||||||
netmask is optional. It is, however, required for networks which
|
netmask is optional. It is, however, required for networks which
|
||||||
receive DHCP service via a relay agent. The broadcast address is
|
receive DHCP service via a relay agent. The broadcast address is
|
||||||
always optional. On some broken systems, dnsmasq can listen on only
|
always optional. It is always
|
||||||
one interface when using DHCP, and the name of that interface must be
|
|
||||||
given using the
|
|
||||||
.B interface
|
|
||||||
option. This limitation currently affects OpenBSD before version 4.0. It is always
|
|
||||||
allowed to have more than one dhcp-range in a single subnet. The optional
|
allowed to have more than one dhcp-range in a single subnet. The optional
|
||||||
network-id is a alphanumeric label which marks this network so that
|
network-id is a alphanumeric label which marks this network so that
|
||||||
dhcp options may be specified on a per-network basis.
|
dhcp options may be specified on a per-network basis.
|
||||||
@@ -445,10 +450,18 @@ a tag to matching it. Only one tag may be set, but more than one tag may be matc
|
|||||||
The end address may be replaced by the keyword
|
The end address may be replaced by the keyword
|
||||||
.B static
|
.B static
|
||||||
which tells dnsmasq to enable DHCP for the network specified, but not
|
which tells dnsmasq to enable DHCP for the network specified, but not
|
||||||
to dynamically allocate IP addresses. Only hosts which have static
|
to dynamically allocate IP addresses: only hosts which have static
|
||||||
addresses given via
|
addresses given via
|
||||||
.B dhcp-host
|
.B dhcp-host
|
||||||
or from /etc/ethers will be served.
|
or from /etc/ethers will be served. The end address may be replaced by
|
||||||
|
the keyword
|
||||||
|
.B proxy
|
||||||
|
in which case dnsmasq will provide proxy-DHCP on the specified
|
||||||
|
subnet. (See
|
||||||
|
.B pxe-prompt
|
||||||
|
and
|
||||||
|
.B pxe-service
|
||||||
|
for details.)
|
||||||
.TP
|
.TP
|
||||||
.B \-G, --dhcp-host=[<hwaddr>][,id:<client_id>|*][,net:<netid>][,<ipaddr>][,<hostname>][,<lease_time>][,ignore]
|
.B \-G, --dhcp-host=[<hwaddr>][,id:<client_id>|*][,net:<netid>][,<ipaddr>][,<hostname>][,<lease_time>][,ignore]
|
||||||
Specify per host parameters for the DHCP server. This allows a machine
|
Specify per host parameters for the DHCP server. This allows a machine
|
||||||
@@ -513,13 +526,15 @@ Token-Ring hardware address, since the ARP-address type for token ring
|
|||||||
is 6.
|
is 6.
|
||||||
|
|
||||||
As a special case, it is possible to include more than one
|
As a special case, it is possible to include more than one
|
||||||
hardware address. This allows an IP address to be associated with
|
hardware address. eg:
|
||||||
|
.B --dhcp-host=11:22:33:44:55:66,12:34:56:78:90:12,192.168.0.2
|
||||||
|
This allows an IP address to be associated with
|
||||||
multiple hardware addresses, and gives dnsmasq permission to abandon a
|
multiple hardware addresses, and gives dnsmasq permission to abandon a
|
||||||
DHCP lease to one of the hardware addresses when another one asks for
|
DHCP lease to one of the hardware addresses when another one asks for
|
||||||
a lease. Beware that this is a dangerous thing to do, it will only
|
a lease. Beware that this is a dangerous thing to do, it will only
|
||||||
work reliably if only one of the hardware addresses is active at any
|
work reliably if only one of the hardware addresses is active at any
|
||||||
time and there is no way for dnsmasq to enforce this. It is, however
|
time and there is no way for dnsmasq to enforce this. It is, for instance,
|
||||||
useful, for instance to allocate a stable IP address to a laptop which
|
useful to allocate a stable IP address to a laptop which
|
||||||
has both wired and wireless interfaces.
|
has both wired and wireless interfaces.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-hostsfile=<file>
|
.B --dhcp-hostsfile=<file>
|
||||||
@@ -543,7 +558,7 @@ have exactly the same effect as
|
|||||||
options containing the same information. /etc/ethers is re-read when
|
options containing the same information. /etc/ethers is re-read when
|
||||||
dnsmasq receives SIGHUP.
|
dnsmasq receives SIGHUP.
|
||||||
.TP
|
.TP
|
||||||
.B \-O, --dhcp-option=[<network-id>,[<network-id>,]][vendor:[<vendor-class>],][<opt>|option:<opt-name>],[<value>[,<value>]]
|
.B \-O, --dhcp-option=[<network-id>,[<network-id>,]][encap:<opt>,][vendor:[<vendor-class>],][<opt>|option:<opt-name>],[<value>[,<value>]]
|
||||||
Specify different or extra options to DHCP clients. By default,
|
Specify different or extra options to DHCP clients. By default,
|
||||||
dnsmasq sends some standard options to DHCP clients, the netmask and
|
dnsmasq sends some standard options to DHCP clients, the netmask and
|
||||||
broadcast address are set to the same as the host running dnsmasq, and
|
broadcast address are set to the same as the host running dnsmasq, and
|
||||||
@@ -603,10 +618,18 @@ client. It is
|
|||||||
possible to omit the vendorclass completely;
|
possible to omit the vendorclass completely;
|
||||||
.B --dhcp-option=vendor:,1,0.0.0.0
|
.B --dhcp-option=vendor:,1,0.0.0.0
|
||||||
in which case the encapsulated option is always sent.
|
in which case the encapsulated option is always sent.
|
||||||
|
|
||||||
|
Options may be encapsulated within other options: for instance
|
||||||
|
.B --dhcp-option=encap:175, 190, "iscsi-client0"
|
||||||
|
will send option 175, within which is the option 190. If multiple
|
||||||
|
options are given which are encapsulated with the same option number
|
||||||
|
then they will be correctly combined into one encapsulated option.
|
||||||
|
encap: and vendor: are may not both be set in the same dhcp-option.
|
||||||
|
|
||||||
The address 0.0.0.0 is not treated specially in
|
The address 0.0.0.0 is not treated specially in
|
||||||
encapsulated vendor class options.
|
encapsulated options.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-option-force=[<network-id>,[<network-id>,]][vendor:[<vendor-class>],]<opt>,[<value>[,<value>]]
|
.B --dhcp-option-force=[<network-id>,[<network-id>,]][encap:<opt>,][vendor:[<vendor-class>],]<opt>,[<value>[,<value>]]
|
||||||
This works in exactly the same way as
|
This works in exactly the same way as
|
||||||
.B --dhcp-option
|
.B --dhcp-option
|
||||||
except that the option will always be sent, even if the client does
|
except that the option will always be sent, even if the client does
|
||||||
@@ -658,10 +681,22 @@ agent ID and one provided by a relay agent, the network-id tag is set.
|
|||||||
.B --dhcp-subscrid=<network-id>,<subscriber-id>
|
.B --dhcp-subscrid=<network-id>,<subscriber-id>
|
||||||
Map from RFC3993 subscriber-id relay agent options to network-id tags.
|
Map from RFC3993 subscriber-id relay agent options to network-id tags.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-match=<network-id>,<option number>
|
.B --dhcp-match=<network-id>,<option number>|option:<option name>[,<value>]
|
||||||
Set the network-id tag if the client sends a DHCP option of the given
|
Without a value, set the network-id tag if the client sends a DHCP
|
||||||
number. This can be used to identify particular clients which send
|
option of the given number or name. When a value is given, set the tag only if
|
||||||
information using private option numbers.
|
the option is sent and matches the value. The value may be of the form
|
||||||
|
"01:ff:*:02" in which case the value must match (apart from widcards)
|
||||||
|
but the option sent may have unmatched data past the end of the
|
||||||
|
value. The value may also be of the same form as in
|
||||||
|
.B dhcp-option
|
||||||
|
in which case the option sent is treated as an array, and one element
|
||||||
|
must match, so
|
||||||
|
|
||||||
|
--dhcp-match=efi-ia32,option:client-arch,6
|
||||||
|
|
||||||
|
will set the tag "efi-ia32" if the the number 6 appears in the list of
|
||||||
|
architectures sent by the client in option 93. (See RFC 4578 for
|
||||||
|
details.) If the value is a string, substring matching is used.
|
||||||
.TP
|
.TP
|
||||||
.B \-J, --dhcp-ignore=<network-id>[,<network-id>]
|
.B \-J, --dhcp-ignore=<network-id>[,<network-id>]
|
||||||
When all the given network-ids match the set of network-ids derived
|
When all the given network-ids match the set of network-ids derived
|
||||||
@@ -695,6 +730,57 @@ If the optional network-id(s) are given,
|
|||||||
they must match for this configuration to be sent. Note that
|
they must match for this configuration to be sent. Note that
|
||||||
network-ids are prefixed by "net:" to distinguish them.
|
network-ids are prefixed by "net:" to distinguish them.
|
||||||
.TP
|
.TP
|
||||||
|
.B --pxe-service=[net:<network-id>,]<CSA>,<menu text>,<basename>|<bootservicetype>[,<server address>]
|
||||||
|
Most uses of PXE boot-ROMS simply allow the PXE
|
||||||
|
system to obtain an IP address and then download the file specified by
|
||||||
|
.B dhcp-boot
|
||||||
|
and execute it. However the PXE system is capable of more complex
|
||||||
|
functions when supported by a suitable DHCP server.
|
||||||
|
|
||||||
|
This specifies a boot option which may appear in a PXE boot menu. <CSA> is
|
||||||
|
client system type, only services of the correct type will appear in a
|
||||||
|
menu. The known types are x86PC, PC98, IA64_EFI, Alpha, Arc_x86,
|
||||||
|
Intel_Lean_Client, IA32_EFI, BC_EFI, Xscale_EFI and X86-64_EFI; an
|
||||||
|
integer may be used for other types. The
|
||||||
|
parameter after the menu text may be a file name, in which case dnsmasq acts as a
|
||||||
|
boot server and directs the PXE client to download the file by TFTP,
|
||||||
|
either from itself (
|
||||||
|
.B enable-tftp
|
||||||
|
must be set for this to work) or another TFTP server if the final IP
|
||||||
|
address is given.
|
||||||
|
Note that the "layer"
|
||||||
|
suffix (normally ".0") is supplied by PXE, and should not be added to
|
||||||
|
the basename. If an integer boot service type, rather than a basename
|
||||||
|
is given, then the PXE client will search for a
|
||||||
|
suitable boot service for that type on the network. This search may be done
|
||||||
|
by multicast or broadcast, or direct to a server if its IP address is provided. A boot service
|
||||||
|
type of 0 is special, and will abort the net boot procedure and
|
||||||
|
continue booting from local media.
|
||||||
|
.TP
|
||||||
|
.B --pxe-prompt=[net:<network-id>,]<prompt>[,<timeout>]
|
||||||
|
Setting this provides a prompt to be displayed after PXE boot. If the
|
||||||
|
timeout is given then after the
|
||||||
|
timeout has elapsed with no keyboard input, the first available menu
|
||||||
|
option will be automatically executed. If the timeout is zero then the first available menu
|
||||||
|
item will be executed immediately. If
|
||||||
|
.B pxe-prompt
|
||||||
|
is ommitted the system will wait for user input if there are multiple
|
||||||
|
items in the menu, but boot immediately if
|
||||||
|
there is only one. See
|
||||||
|
.B pxe-service
|
||||||
|
for details of menu items.
|
||||||
|
|
||||||
|
Dnsmasq supports PXE "proxy-DHCP", in this case another DHCP server on
|
||||||
|
the network is responsible for allocating IP addresses, and dnsmasq
|
||||||
|
simply provides the information given in
|
||||||
|
.B pxe-prompt
|
||||||
|
and
|
||||||
|
.B pxe-service
|
||||||
|
to allow netbooting. This mode is enabled using the
|
||||||
|
.B proxy
|
||||||
|
keyword in
|
||||||
|
.B dhcp-range.
|
||||||
|
.TP
|
||||||
.B \-X, --dhcp-lease-max=<number>
|
.B \-X, --dhcp-lease-max=<number>
|
||||||
Limits dnsmasq to the specified maximum number of DHCP leases. The
|
Limits dnsmasq to the specified maximum number of DHCP leases. The
|
||||||
default is 150. This limit is to prevent DoS attacks from hosts which
|
default is 150. This limit is to prevent DoS attacks from hosts which
|
||||||
@@ -737,15 +823,7 @@ Extra logging for DHCP: log all the options sent to DHCP clients and
|
|||||||
the netid tags used to determine them.
|
the netid tags used to determine them.
|
||||||
.TP
|
.TP
|
||||||
.B \-l, --dhcp-leasefile=<path>
|
.B \-l, --dhcp-leasefile=<path>
|
||||||
Use the specified file to store DHCP lease information. If this option
|
Use the specified file to store DHCP lease information.
|
||||||
is given but no dhcp-range option is given then dnsmasq version 1
|
|
||||||
behaviour is activated. The file given is assumed to be an ISC dhcpd
|
|
||||||
lease file and parsed for leases which are then added to the DNS
|
|
||||||
system if they have a hostname. This functionality may have been
|
|
||||||
excluded from dnsmasq at compile time, in which case an error will
|
|
||||||
occur. In any case note that ISC leasefile integration is a deprecated
|
|
||||||
feature. It should not be used in new installations, and will be
|
|
||||||
removed in a future release.
|
|
||||||
.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, the
|
||||||
@@ -811,8 +889,8 @@ to the client-id and lease length and expiry time.
|
|||||||
.TP
|
.TP
|
||||||
.B --bridge-interface=<interface>,<alias>[,<alias>]
|
.B --bridge-interface=<interface>,<alias>[,<alias>]
|
||||||
Treat DHCP request packets arriving at any of the <alias> interfaces
|
Treat DHCP request packets arriving at any of the <alias> interfaces
|
||||||
as if they had arrived at <interface>. This option is only available
|
as if they had arrived at <interface>. This option is necessary when
|
||||||
on BSD platforms, and is necessary when using "old style" bridging, since
|
using "old style" bridging on BSD platforms, since
|
||||||
packets arrive at tap interfaces which don't have an IP address.
|
packets arrive at tap interfaces which don't have an IP address.
|
||||||
.TP
|
.TP
|
||||||
.B \-s, --domain=<domain>[,<address range>]
|
.B \-s, --domain=<domain>[,<address range>]
|
||||||
|
|||||||
+119
-45
@@ -17,9 +17,8 @@ resueltos. Tambi
|
|||||||
vía DHCP.
|
vía DHCP.
|
||||||
.PP
|
.PP
|
||||||
El servidor DHCP dnsmasq incluye soporte para asignación de direcciones
|
El servidor DHCP dnsmasq incluye soporte para asignación de direcciones
|
||||||
estáticas, redes múltiples, DHCP-relay y especificadores de subredes
|
estáticas y redes múltiples. Automáticamente envía un predeterminado sensible de
|
||||||
RFC3011. Automáticamente envía un predeterminado sensible de opciones
|
opciones DHCP, y puede ser configurado para enviar cualquier opciones DHCP deseadas,
|
||||||
DHCP, y puede ser configurado para enviar cualquier opciones DHCP deseadas,
|
|
||||||
incluyendo opciones encapsuladas por vendedores. Incluye un servidor seguro
|
incluyendo opciones encapsuladas por vendedores. Incluye un servidor seguro
|
||||||
TFTP solo-lectura para permitir el inicio vía red/PXE de hosts DHCP. Tambíen
|
TFTP solo-lectura para permitir el inicio vía red/PXE de hosts DHCP. Tambíen
|
||||||
incluye soporte para BOOTP.
|
incluye soporte para BOOTP.
|
||||||
@@ -33,13 +32,20 @@ archivo PID. En BSD, a menos que la librer
|
|||||||
la forma larga de las opciones no funciona en la línea de comandos,
|
la forma larga de las opciones no funciona en la línea de comandos,
|
||||||
pero todavía es reconocida en el archivo de configuración.
|
pero todavía es reconocida en el archivo de configuración.
|
||||||
.TP
|
.TP
|
||||||
|
.B --test
|
||||||
|
Leer archivo(s) de configuración y revisar su sintaxis. Salir con código
|
||||||
|
0 si todo está bien, o un código no-cero en cualquier otro caso. No
|
||||||
|
iniciar dnsmasq.
|
||||||
|
.TP
|
||||||
.B \-h, --no-hosts
|
.B \-h, --no-hosts
|
||||||
No leer los nombres de hosts en /etc/hosts.
|
No leer los nombres de hosts en /etc/hosts.
|
||||||
.TP
|
.TP
|
||||||
.B \-H, --addn-hosts=<archivo>
|
.B \-H, --addn-hosts=<archivo>
|
||||||
Archivo de hosts adicional. Leer el archivo especificado adicionalmente
|
Archivo de hosts adicional. Leer el archivo especificado adicionalmente
|
||||||
a /etc/hosts. Si se brinda -h, leer solo el archivo especificado. Esta
|
a /etc/hosts. Si se brinda -h, leer solo el archivo especificado. Esta
|
||||||
opción puede ser repetida para más de un archivo de hosts adicional.
|
opción puede ser repetida para más de un archivo de hosts adicional. Si
|
||||||
|
un directorio es brindado, entonces leer todos los archivos contenidos en
|
||||||
|
ese directorio.
|
||||||
.TP
|
.TP
|
||||||
.B \-E, --expand-hosts
|
.B \-E, --expand-hosts
|
||||||
Agregar el dominio a nombres sencillos (sin punto) en /etc/hosts de la
|
Agregar el dominio a nombres sencillos (sin punto) en /etc/hosts de la
|
||||||
@@ -225,14 +231,18 @@ privados (192.168.x.x, etc.) los cuales no se encuentren en
|
|||||||
/etc/hosts o en el archivo de arriendos DHCP es respondida con
|
/etc/hosts o en el archivo de arriendos DHCP es respondida con
|
||||||
"dominio no existente" en vez de ser reenviada upstream.
|
"dominio no existente" en vez de ser reenviada upstream.
|
||||||
.TP
|
.TP
|
||||||
.B \-V, --alias=<IP viejo>,<IP nuevo>[,<máscara>]
|
.B \-V, --alias=[<IP viejo>]|[<IP inicio>-<IP final>],<IP nuevo>[,<máscara>]
|
||||||
Modificar direcciones IPv4 retornadas desde servidores DNS upstream;
|
Modificar direcciones IPv4 retornadas desde servidores DNS upstream;
|
||||||
<IP viejo> es remplazado con <IP nuevo>. Si la máscara opcional
|
<IP viejo> es remplazado con <IP nuevo>. Si la máscara opcional
|
||||||
es brindada, entonces cualquier dirección que coincida con el
|
es brindada, entonces cualquier dirección que coincida con el
|
||||||
<IP viejo> enmascarado será re-escrita. Así que, por ejemplo,
|
<IP viejo> enmascarado será re-escrita. Así que, por ejemplo,
|
||||||
.B --alias=1.2.3.0,6.7.8.0,255.255.255.0 trazará 1.2.3.56 a 6.7.8.56
|
.B --alias=1.2.3.0,6.7.8.0,255.255.255.0 trazará 1.2.3.56 a 6.7.8.56
|
||||||
y 1.2.3.67 a 6.7.8.67. Esto es lo que
|
y 1.2.3.67 a 6.7.8.67. Esto es lo que
|
||||||
ruteadores Cisco PIX llaman "DNS doctoring".
|
ruteadores Cisco PIX llaman "DNS doctoring". Si la dirección vieja es
|
||||||
|
brindada como un rango, entonces solo direcciones en ese rango, y no
|
||||||
|
la subred entera, son re-escritas. De tal manera que
|
||||||
|
.B --alias=192.168.0.10-192.168.0.40,10.0.0.0,255.255.255.0
|
||||||
|
relaciona 192.168.0.10->192.168.0.40 a 10.0.0.10->10.0.0.40
|
||||||
.TP
|
.TP
|
||||||
.B \-B, --bogus-nxdomain=<dirección IP>
|
.B \-B, --bogus-nxdomain=<dirección IP>
|
||||||
Transformar respuestas que contienen la dirección IP brindada a
|
Transformar respuestas que contienen la dirección IP brindada a
|
||||||
@@ -449,39 +459,43 @@ de casos. La
|
|||||||
es al usar resolvedores de bitácoras de servidores web, los cuales pueden
|
es al usar resolvedores de bitácoras de servidores web, los cuales pueden
|
||||||
generar un número inmenso de búsquedas simultáneas.
|
generar un número inmenso de búsquedas simultáneas.
|
||||||
.TP
|
.TP
|
||||||
.B \-F, --dhcp-range=[[net:]network-id,]<dirección-inicio>,<dirección-final>[[,<máscara>],<broadcast>][,<tiempo de arriendo predeterminado>]
|
.B \-F, --dhcp-range=[[net:]network-id,]<dirección-inicio>,<dirección-final>[[,<máscara>],<broadcast>][,<tiempo de arriendo>]
|
||||||
Habilitar el servidor DHCP. Direcciones serán distribuidas desde el
|
Habilitar el servidor DHCP. Direcciones serán distribuidas desde el
|
||||||
rango <dirección-inicio> hasta <dirección-final> y desde direcciones definidas
|
rango <dirección-inicio> hasta <dirección-final> y desde direcciones definidas
|
||||||
estáticamente en opciones
|
estáticamente en opciones
|
||||||
.B dhcp-host
|
.B dhcp-host
|
||||||
Si el tiempo de arriendo es especificado, entonces arriendos serán
|
Si el tiempo de arriendo es especificado, entonces arriendos serán
|
||||||
otorgados por esa cantidad de tiempo. El tiempo de arriendo es en
|
otorgados por esa cantidad de tiempo. El tiempo de arriendo es en
|
||||||
segundos, o minutos (por ejemplo, 45m), o horas (por ejemplo, 1h), o el
|
segundos, o minutos (por ejemplo, 45m), u horas (por ejemplo, 1h), o
|
||||||
literal "infinite". Esta opción puede ser repetida, con diferentes
|
"infinite". Si no es brindada, el tiempo de arriendo predeterminado
|
||||||
|
es de una hora. El tiempo de arriendo mínimo es de dos minutos.
|
||||||
|
Esta opción puede ser repetida, con diferentes
|
||||||
direcciones, para habilitar servicio DHCP en más de una red. Para
|
direcciones, para habilitar servicio DHCP en más de una red. Para
|
||||||
redes conectadas diréctamente (en otras palabras, redes en las
|
redes conectadas diréctamente (en otras palabras, redes en las
|
||||||
cuales la máquina corriendo dnsmasq tiene una interface) la
|
cuales la máquina corriendo dnsmasq tiene una interface) la
|
||||||
máscara de subred es opcional. Pero, es requerida para redes que
|
máscara de subred es opcional. Pero, es requerida para redes que
|
||||||
reciben servicio DHCP vía un agente de relay. La dirección de
|
reciben servicio DHCP vía un agente de relay. La dirección de
|
||||||
broadcast siempre es opcional. En algunos sistemas rotos, dnsmasq
|
broadcast siempre es opcional. Siempre se permite tener más de
|
||||||
solo puede escuchar en una interface cuando se usa DHCP, y el
|
un rango dhcp (dhcp-range) en una subred. El parámetro opcional
|
||||||
nombre de esa interface debe ser brindado usando la opción
|
network-id es una etiqueta alfanumérica la cual marca esta red de
|
||||||
.B interface
|
tal forma que opciones dhcp puedan ser especificadas en base a cada red.
|
||||||
Esta limitación actualmente afecta a OpenBSD antes de versión 4.0.
|
|
||||||
Siempre se permite tener más de un rango dhcp (dhcp-range) en una
|
|
||||||
subred. El parámetro opcional network-id es una etiqueta alfanumérica
|
|
||||||
la cual marca esta red de tal forma que opciones dhcp puedan ser
|
|
||||||
especificadas en base a cada red.
|
|
||||||
Cuando es prefijada con 'net:' entonces el significado cambia
|
Cuando es prefijada con 'net:' entonces el significado cambia
|
||||||
de "fijar etiqueta" a "coincidir con etiqueta". Solo una etiqueta puede
|
de "fijar etiqueta" a "coincidir con etiqueta". Solo una etiqueta puede
|
||||||
ser fijada, pero más de una puede ser revisada por coincidencias. La
|
ser fijada, pero más de una puede ser revisada por coincidencias. La
|
||||||
dirección final puede ser remplazada por la palabra clave
|
dirección final puede ser remplazada por la palabra clave
|
||||||
.B static
|
.B static
|
||||||
la cual le dice a dnsmasq que debe habilitar DHCP para la red
|
la cual le dice a dnsmasq que debe habilitar DHCP para la red
|
||||||
especificada, pero no alocar dinámicamente direcciones IP.
|
especificada, pero no alocar dinámicamente direcciones IP:
|
||||||
Solo hosts que tienen direcciones estáticas brindadas vía
|
Solo hosts que tienen direcciones estáticas brindadas vía
|
||||||
.B dhcp-host
|
.B dhcp-host
|
||||||
o desde /etc/ethers serán servidas.
|
o desde /etc/ethers serán servidas. La dirección final puede ser
|
||||||
|
remplazada por la palabra clave
|
||||||
|
.B proxy
|
||||||
|
caso en el cual dnsmasq proveerá proxy-DHCP en la subred especificada. (Ver
|
||||||
|
.B pxe-prompt
|
||||||
|
y
|
||||||
|
.B pxe-service
|
||||||
|
para detalles.)
|
||||||
.TP
|
.TP
|
||||||
.B \-G, --dhcp-host=[<dirección de hardware>][,id:<client_id>|*][,net:<netid>][,<dirección IP>][,<nombre de host>][,<tiempo de arriendo>][,ignore]
|
.B \-G, --dhcp-host=[<dirección de hardware>][,id:<client_id>|*][,net:<netid>][,<dirección IP>][,<nombre de host>][,<tiempo de arriendo>][,ignore]
|
||||||
Especificar parámetros por host para el servidor DHCP. Esto permite
|
Especificar parámetros por host para el servidor DHCP. Esto permite
|
||||||
@@ -546,14 +560,16 @@ solo coincidir
|
|||||||
el tipo ARP para Token-Ring es 6.
|
el tipo ARP para Token-Ring es 6.
|
||||||
|
|
||||||
Como caso especial, es posible incluir más de una dirección de
|
Como caso especial, es posible incluir más de una dirección de
|
||||||
hardware. Esto permite que una dirección IP sea asociada con
|
hardware. Ejemplo:
|
||||||
|
.B --dhcp-host=11:22:33:44:55:66,12:34:56:78:90:12,192.168.0.2
|
||||||
|
Esto permite que una dirección IP sea asociada con
|
||||||
direcciones de hardware múltiples, y le brinda a dnsmasq permiso
|
direcciones de hardware múltiples, y le brinda a dnsmasq permiso
|
||||||
para abandonar un arriendo DHCP a una de las direcciones de hardware
|
para abandonar un arriendo DHCP a una de las direcciones de hardware
|
||||||
cuando otra pide un arriendo. Nótese que esto es algo peligroso,
|
cuando otra pide un arriendo. Nótese que esto es algo peligroso,
|
||||||
sólo funcionará dependiblemente si una de las direcciones de hardware
|
sólo funcionará dependiblemente si una de las direcciones de hardware
|
||||||
está activa en cualquier momento y dnsmasq no tiene forma de enforzar
|
está activa en cualquier momento y dnsmasq no tiene forma de enforzar
|
||||||
esto. Pero es útil, por ejemplo, para alocar una dirección IP estable
|
esto. Pero es útil, por ejemplo, para alocar una dirección IP estable
|
||||||
a una laptop que tiene interfaces alámbricas e inalámbricas.
|
a una laptop que tiene interface alámbrica e inalámbrica.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-hostsfile=<archivo>
|
.B --dhcp-hostsfile=<archivo>
|
||||||
Leer información host DHCP desde el archivo especificado. El archivo contiene información de un host por línea. El formato de una línea es igual que texto hacia la derecha de '=' en --dhcp-host. La ventaja de almacenar información host DHCP en este archivo es que puede ser cambiada sin tener que reiniciar dnsmasq. El archivo será re-leído cuando dnsmasq recibe un SIGHUP.
|
Leer información host DHCP desde el archivo especificado. El archivo contiene información de un host por línea. El formato de una línea es igual que texto hacia la derecha de '=' en --dhcp-host. La ventaja de almacenar información host DHCP en este archivo es que puede ser cambiada sin tener que reiniciar dnsmasq. El archivo será re-leído cuando dnsmasq recibe un SIGHUP.
|
||||||
@@ -571,7 +587,7 @@ dnsmasq, estas l
|
|||||||
.B --dhcp-host
|
.B --dhcp-host
|
||||||
que contienen la misma información. /etc/ethers es re-leída cuando dnsmasq recibe un SIGHUP.
|
que contienen la misma información. /etc/ethers es re-leída cuando dnsmasq recibe un SIGHUP.
|
||||||
.TP
|
.TP
|
||||||
.B \-O, --dhcp-option=[<network-id>,[<network-id>,]][vendor:[<vendor-class>],][<opt>|option:<opt-name>],[<value>[,<value>]]
|
.B \-O, --dhcp-option=[<network-id>,[<network-id>,]][encap:<opt>,][vendor:[<vendor-class>],][<opt>|option:<opt-name>],[<value>[,<value>]]
|
||||||
Especificar opciones diferentes o extra a clientes DHCP. Por
|
Especificar opciones diferentes o extra a clientes DHCP. Por
|
||||||
predeterminado, dnsmasq envía algunas opciones estándar a clientes
|
predeterminado, dnsmasq envía algunas opciones estándar a clientes
|
||||||
DHCP. La máscara de subred y dirección broadcast son fijadas igual
|
DHCP. La máscara de subred y dirección broadcast son fijadas igual
|
||||||
@@ -634,11 +650,16 @@ vendor-class (n
|
|||||||
seleccionar opciones encapsuladas en preferencia sobre cualquiera enviada
|
seleccionar opciones encapsuladas en preferencia sobre cualquiera enviada
|
||||||
por el cliente. Es posible omitir el vendorclass completamente;
|
por el cliente. Es posible omitir el vendorclass completamente;
|
||||||
.B --dhcp-option=vendor:,1,0.0.0.0
|
.B --dhcp-option=vendor:,1,0.0.0.0
|
||||||
caso en el cuál la opción encapsulada siempre es enviada. La dirección
|
caso en el cuál la opción encapsulada siempre es enviada.
|
||||||
0.0.0.0 no es tratada de forma especial en opciones de clase de vendedor
|
Opciones pueden ser encapsuladas dentro de otras opciones, por ejemplo:
|
||||||
encapsuladas.
|
.B --dhcp-option=encap:175, 190, "iscsi-client0"
|
||||||
|
enviará opción 175, dentro de la cual está opción 190. Si múltiples
|
||||||
|
opciones son brindadas que están encapsuladas con el mismo número de
|
||||||
|
opción entonces serán correctamente combinadas en una opción encapsulada.
|
||||||
|
encap: y vendor: no pueden ser fijadas ambas dentro de la misma opción dhcp-option.
|
||||||
|
La dirección 0.0.0.0 no es tratada de forma especial en opciones encapsuladas.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-option-force=[<network-id>,[<network-id>,]][vendor:[<vendor-class>],]<opt>,[<value>[,<value>]]
|
.B --dhcp-option-force=[<network-id>,[<network-id>,]][encap:<opt>,][vendor:[<vendor-class>],]<opt>,[<value>[,<value>]]
|
||||||
Esto funciona exáctamente de la misma forma que
|
Esto funciona exáctamente de la misma forma que
|
||||||
.B --dhcp-option
|
.B --dhcp-option
|
||||||
excepto que la opción siempre será enviada, aún si el cliente no la pide en
|
excepto que la opción siempre será enviada, aún si el cliente no la pide en
|
||||||
@@ -692,11 +713,22 @@ network-id es fijado.
|
|||||||
.B --dhcp-subscrid=<network-id>,<subscriber-id>
|
.B --dhcp-subscrid=<network-id>,<subscriber-id>
|
||||||
Trazar de opciones relay subscriber-id RFC3993 a opciones network-id.
|
Trazar de opciones relay subscriber-id RFC3993 a opciones network-id.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-match=<network-id>,<número de opción>
|
.B --dhcp-match=<network-id>,<option number>|option:<option name>[,<value>]
|
||||||
Fijar la opción network-id si el cliente envía un opción DHCP del nombre
|
Sin un valor, fijar la etiqueta network-id si el cliente envía una opción
|
||||||
brindado. Esto puede ser utilizado para identificar clientes particulares
|
DHCP del número o valor brindado. Cuando un valor es brindado, fijar la
|
||||||
que envían información usando números privados de opciones.
|
etiqueta solo si la opción es enviada y coincide con el valor. El valor puede
|
||||||
.TP
|
ser de la forma "01:ff:*:02", caso en el cual el valor debe coincidir (aparte
|
||||||
|
de los comodines) pero la opción enviada puede tener data que no coincide despues
|
||||||
|
del final del valor. El valor también puede ser de la misma forma que
|
||||||
|
.B dhcp-option
|
||||||
|
caso en el cual la opción enviada es tratada como un array, y un elemento debe
|
||||||
|
coincidir, así que
|
||||||
|
|
||||||
|
--dhcp-match=efi-ia32,option:client-arch,6
|
||||||
|
|
||||||
|
fijará la etiqueta a "efi-ia32" si el número 6 aparece en la lista de
|
||||||
|
architecturas enviada por los clientes en opción 93. (Ver RFC 4578 para
|
||||||
|
detalles.) Si el valor es un string, coincidencia substring es usada.
|
||||||
.B \-J, --dhcp-ignore=<network-id>[,<network-id>]
|
.B \-J, --dhcp-ignore=<network-id>[,<network-id>]
|
||||||
Cuando todos los network ids brindados coincidan con el juego de
|
Cuando todos los network ids brindados coincidan con el juego de
|
||||||
network ids derivados de las clases net, host, y vendor, ignorar
|
network ids derivados de las clases net, host, y vendor, ignorar
|
||||||
@@ -730,6 +762,57 @@ el inicio atrav
|
|||||||
ellas deberán coincidir para que esta configuración sea enviada. Nótese
|
ellas deberán coincidir para que esta configuración sea enviada. Nótese
|
||||||
que network-ids están prefijadas con "net:" para distinguirlas.
|
que network-ids están prefijadas con "net:" para distinguirlas.
|
||||||
.TP
|
.TP
|
||||||
|
.B --pxe-service=[net:<network-id>,]<CSA>,<texto de menú>,<nombre base>|<tipo de servicio boot>[,<dirección de servidor>]
|
||||||
|
La mayoría de usos para boot-ROMS PXE simplemente permiten al sistema PXE
|
||||||
|
obtener una dirección IP y entonces bajar el archivo especificado por
|
||||||
|
.B dhcp-boot
|
||||||
|
y ejecutarlo. Sin embargo, el sistema PXE es capaz de llevar
|
||||||
|
a cabo funciones más complejas cuando están soportadas por un
|
||||||
|
servidor DHCP adecuado.
|
||||||
|
|
||||||
|
Esto especifica una opción boot que puede aparecer en un menú de boot
|
||||||
|
PXE. <CSA> es tipo de sistema de cliente, solo servicios del tipo correcto
|
||||||
|
aparecerán en un menú. Los tipos conocidos son x86PC, PC98, IA64_EFI,
|
||||||
|
Alpha, Arc_x86, Intel_Lean_Client, IA32_EFI, BC_EFI, Xscale_EFI y X86-64_EFI;
|
||||||
|
un número entero puede ser utilizado para otros tipos. El parámetro después
|
||||||
|
del texto de menú puede ser un nombre de archivo, caso en el cuál dnsmasq
|
||||||
|
actúa como un servidor boot y le ordena al cliente PXE bajar el archivo
|
||||||
|
vía TFTP, ya sea de sí mismo (
|
||||||
|
.B enable-tftp
|
||||||
|
debe estar fijado para que esto funcione) o desde otro servidor TFTP si la
|
||||||
|
dirección IP final es brindada.
|
||||||
|
Nótese que el sufijo "layer" (normalmente ".0") es brindado por PXE, y
|
||||||
|
no debe ser agregado al nombre base. Si un número entero es brindado en vez
|
||||||
|
de un nombre base, entonces el cliente PXE buscará un servicio boot adecuado
|
||||||
|
para ese tipo de red. Esta búsqueda puede ser hecha mediante multicast o
|
||||||
|
broadcast, o directamente a un servidor si la dirección IP es brindada. Un
|
||||||
|
tipo de servicio boot de 0 es especial, y abortará el proceso boot de red
|
||||||
|
y continuará desde medio local.
|
||||||
|
.TP
|
||||||
|
.B --pxe-prompt=[net:<network-id>,]<prompt>[,<timeout>]
|
||||||
|
Fijar esto hace que un aviso sea expuesto despues del boot PXE. Si el timeout
|
||||||
|
es brindado, entonces despues que el timeout se haya vencido sin input del
|
||||||
|
teclado, la primera opción del menú sera automaticamente ejecutada. Si el
|
||||||
|
timeout es cero entonces la primera opción del menú sera automaticamente
|
||||||
|
ejecutada. Si
|
||||||
|
.B pxe-prompt
|
||||||
|
es omitido, el sistema esperará para el input del usuario si hay múltiples
|
||||||
|
artículos en el menú, pero hará boot imediatamente si hay solo uno. Ver
|
||||||
|
.B pxe-service
|
||||||
|
para detalles sobre artículos de menu.
|
||||||
|
|
||||||
|
Dnsmasq tiene soporte para "proxy-DHCP" PXE, en este caso otro servidor
|
||||||
|
DHCP en la red es responsable por asignar direcciones IP, y dnsmasq
|
||||||
|
simplemente provee la dirección brindada en
|
||||||
|
.B pxe-prompt
|
||||||
|
y
|
||||||
|
.B pxe-service
|
||||||
|
para permitir boot a travez de la red. Este modo es habilitado usando
|
||||||
|
la palabra clave
|
||||||
|
.B proxy
|
||||||
|
en
|
||||||
|
.B dhcp-range.
|
||||||
|
.TP
|
||||||
.B \-X, --dhcp-lease-max=<número>
|
.B \-X, --dhcp-lease-max=<número>
|
||||||
Limita a dnsmasq a el número especificado de arriendos DHCP. El
|
Limita a dnsmasq a el número especificado de arriendos DHCP. El
|
||||||
predeterminado es 150. El limite es para prevenir ataques DoS desde
|
predeterminado es 150. El limite es para prevenir ataques DoS desde
|
||||||
@@ -776,15 +859,7 @@ clientes DHCP y las etiquetas netid usadas para determinarlos.
|
|||||||
.TP
|
.TP
|
||||||
.B \-l, --dhcp-leasefile=<path>
|
.B \-l, --dhcp-leasefile=<path>
|
||||||
Usar el archivo especificado para almacenar información de arriendos
|
Usar el archivo especificado para almacenar información de arriendos
|
||||||
DHCP. Si esta opción es brindada, pero ninguna opcion dhcp-range es
|
DHCP.
|
||||||
brindada, entonces se activa comportamiento tipo dnsmasq versión 1.
|
|
||||||
El archivo brindado se asume es un archivo de arriendos dhcpd ISC y
|
|
||||||
es analizado en busca de arriendos los cuales son agregados al sistema
|
|
||||||
DNS si tienen un nombre de host. Esta funcionalidad pudo haber sido
|
|
||||||
excluida de dnsmasq a la hora de compilación, y en tal caso ocurrirá
|
|
||||||
un error. Nótese que la integración de archivos de
|
|
||||||
arriendo ISC es una caracterísctica depreciada. No debería ser usada
|
|
||||||
en instalaciones nuevas, y será eliminada en una versión futura.
|
|
||||||
.TP
|
.TP
|
||||||
.B \-6 --dhcp-script=<path>
|
.B \-6 --dhcp-script=<path>
|
||||||
Cuando un arriendo DHCP nuevo es creado, o uno viejo es
|
Cuando un arriendo DHCP nuevo es creado, o uno viejo es
|
||||||
@@ -853,10 +928,9 @@ cuando hay cambios hechos a el client-id y tiempos de arriendo y vencimiento.
|
|||||||
.TP
|
.TP
|
||||||
.B --bridge-interface=<nombre de interface>,<alias>[,<alias>]
|
.B --bridge-interface=<nombre de interface>,<alias>[,<alias>]
|
||||||
Tratar paquetes de pedidos DHCP que llegan a cualquiera de las interfaces <alias>
|
Tratar paquetes de pedidos DHCP que llegan a cualquiera de las interfaces <alias>
|
||||||
como si hubieran llegado a la interface <nombre de interface>. Esta opción solo
|
como si hubieran llegado a la interface <nombre de interface>. Esta opción
|
||||||
está disponible en plataformas BSD, y es necesaria cuando se usan
|
es necesaria al usar bridging estilo viejo en plataformas BSD, dado a que
|
||||||
puentes "estilo viejo", ya que los paquetes llegan a interfaces tap que no
|
los paquetes llegan a interfaces tap que no tienen una dirección IP.
|
||||||
tienen una dirección IP.
|
|
||||||
.TP
|
.TP
|
||||||
.B \-s, --domain=<dominio>[,<rango de IPs>]
|
.B \-s, --domain=<dominio>[,<rango de IPs>]
|
||||||
Especifica los dominios DNS para el servidor DHCP. Dominios pueden ser
|
Especifica los dominios DNS para el servidor DHCP. Dominios pueden ser
|
||||||
|
|||||||
+194
-52
@@ -16,9 +16,8 @@ fichier /etc/hosts afin que les noms locaux n'apparaissant pas dans les DNS
|
|||||||
globaux soient tout de même résolus, et assure également la résolution de nom
|
globaux soient tout de même résolus, et assure également la résolution de nom
|
||||||
pour les hôtes présents dans le service DHCP.
|
pour les hôtes présents dans le service DHCP.
|
||||||
.PP
|
.PP
|
||||||
Le serveur DHCP Dnsmasq DHCP supporte les définitions d'adresses statiques, les
|
Le serveur DHCP Dnsmasq DHCP supporte les définitions d'adresses statiques et les
|
||||||
réseaux multiples, le relai DHCP et les spécifications de sous-réseaux conformes
|
réseaux multiples. Il envoie par défaut un jeu raisonnable de paramètres DHCP, et
|
||||||
à la RFC3011. Il envoie par défaut un jeu raisonnable de paramètres DHCP, et
|
|
||||||
peut être configuré pour envoyer n'importe quel option DHCP.
|
peut être configuré pour envoyer n'importe quel option DHCP.
|
||||||
Il inclut un serveur TFTP sécurisé en lecture seule permettant le démarrage via
|
Il inclut un serveur TFTP sécurisé en lecture seule permettant le démarrage via
|
||||||
le réseau/PXE de clients DHCP et supporte également le protocole BOOTP.
|
le réseau/PXE de clients DHCP et supporte également le protocole BOOTP.
|
||||||
@@ -33,6 +32,11 @@ Sur BSD, à moins que le logiciel ne soit compilé avec la bibliothèque GNU
|
|||||||
getopt, la forme longue des options ne fonctionne pas en ligne de commande; Elle
|
getopt, la forme longue des options ne fonctionne pas en ligne de commande; Elle
|
||||||
est toujours supportée dans le fichier de configuration.
|
est toujours supportée dans le fichier de configuration.
|
||||||
.TP
|
.TP
|
||||||
|
.B --test
|
||||||
|
Vérifie la syntaxe du ou des fichiers de configurations. Se termine avec le
|
||||||
|
code de retour 0 si tout est OK, ou un code différent de 0 dans le cas
|
||||||
|
contraire. Ne démarre pas Dnsmasq.
|
||||||
|
.TP
|
||||||
.B \-h, --no-hosts
|
.B \-h, --no-hosts
|
||||||
Ne pas charger les noms du fichier /etc/hosts.
|
Ne pas charger les noms du fichier /etc/hosts.
|
||||||
.TP
|
.TP
|
||||||
@@ -41,7 +45,8 @@ Fichiers d'hôtes additionnels. Lire le fichier spécifié en plus de /etc/hosts
|
|||||||
Si
|
Si
|
||||||
.B -h
|
.B -h
|
||||||
est spécifié, lire uniquement le fichier spécifié. Cette option peut être
|
est spécifié, lire uniquement le fichier spécifié. Cette option peut être
|
||||||
répétée afin d'ajouter d'autres fichiers.
|
répétée afin d'ajouter d'autres fichiers. Si un répertoire est donné, lis les
|
||||||
|
fichiers contenus dans ce répertoire.
|
||||||
.TP
|
.TP
|
||||||
.B \-E, --expand-hosts
|
.B \-E, --expand-hosts
|
||||||
Ajoute le nom de domaine aux noms simples (ne contenant pas de point dans le
|
Ajoute le nom de domaine aux noms simples (ne contenant pas de point dans le
|
||||||
@@ -236,7 +241,7 @@ trouvées dans /etc/hosts ou dans le fichier de baux DHCP se voient retournées
|
|||||||
une réponse "pas de tel domaine" ("no such domain") au lieu d'être transmises
|
une réponse "pas de tel domaine" ("no such domain") au lieu d'être transmises
|
||||||
aux serveurs de nom amont ("upstream server").
|
aux serveurs de nom amont ("upstream server").
|
||||||
.TP
|
.TP
|
||||||
.B \-V, --alias=<ancienne IP>,<nouvelle IP>[,<masque>]
|
.B \-V, --alias=[<ancienne IP>]|[<IP de début>-<IP de fin>],<nouvelle IP>[,<masque>]
|
||||||
Modifie les adresses IPv4 retournées par les serveurs de nom amont;
|
Modifie les adresses IPv4 retournées par les serveurs de nom amont;
|
||||||
<ancienne IP> est remplacée par <nouvelle IP>. Si le <masque> optionnel est
|
<ancienne IP> est remplacée par <nouvelle IP>. Si le <masque> optionnel est
|
||||||
fourni, alors toute adresse correspondant à l'adresse <ancienne IP>/<masque>
|
fourni, alors toute adresse correspondant à l'adresse <ancienne IP>/<masque>
|
||||||
@@ -244,7 +249,11 @@ sera réécrite. Ainsi par exemple
|
|||||||
.B --alias=1.2.3.0,6.7.8.0,255.255.255.0
|
.B --alias=1.2.3.0,6.7.8.0,255.255.255.0
|
||||||
modifiera 1.2.3.56 en 6.7.8.56 et 1.2.3.67 en 6.7.8.67.
|
modifiera 1.2.3.56 en 6.7.8.56 et 1.2.3.67 en 6.7.8.67.
|
||||||
Cette fonctionnalité correspond à ce que les routeurs Cisco PIX appellent
|
Cette fonctionnalité correspond à ce que les routeurs Cisco PIX appellent
|
||||||
"bidouillage DNS" ("DNS doctoring").
|
"bidouillage DNS" ("DNS doctoring"). Si l'ancienne IP est donnée sous la forme
|
||||||
|
d'une gamme d'adresses, alors seules les adresses dans cette gamme seront
|
||||||
|
réecrites, et non le sous-réseau dans son ensemble. Ainsi,
|
||||||
|
.B --alias=192.168.0.10-192.168.0.40,10.0.0.0,255.255.255.0
|
||||||
|
fait correspondre 192.168.0.10->192.168.0.40 à 10.0.0.10->10.0.0.40
|
||||||
.TP
|
.TP
|
||||||
.B \-B, --bogus-nxdomain=<adresse IP>
|
.B \-B, --bogus-nxdomain=<adresse IP>
|
||||||
Transforme les réponses contenant l'adresse IP fournie en réponses "pas de tel
|
Transforme les réponses contenant l'adresse IP fournie en réponses "pas de tel
|
||||||
@@ -455,6 +464,14 @@ Définit un enregistrement DNS de type PTR.
|
|||||||
.B --naptr-record=<nom>,<ordre>,<préférence>,<drapeaux>,<service>,<expr. régulière>[,<remplacement>]
|
.B --naptr-record=<nom>,<ordre>,<préférence>,<drapeaux>,<service>,<expr. régulière>[,<remplacement>]
|
||||||
Retourne un enregistrement de type NAPTR, tel que spécifié dans le RFC3403.
|
Retourne un enregistrement de type NAPTR, tel que spécifié dans le RFC3403.
|
||||||
.TP
|
.TP
|
||||||
|
.B --cname=<cname>,<cible>
|
||||||
|
Retourne un enregistrement de type CNAME qui indique que <cname> est en
|
||||||
|
réalité <cible>. Il existe des contraintes significatives sur la valeur
|
||||||
|
de cible; il doit s'agir d'un nom DNS qui est connu de dnsmasq via /etc/hosts
|
||||||
|
(ou un fichier hôtes additionnel) ou via DHCP. Si une cible ne satisfait
|
||||||
|
pas ces critères, le CNAME est ignoré. Le CNAME doit être unique, mais
|
||||||
|
il est autorisé d'avoir plus d'un CNAME pointant vers la même cible.
|
||||||
|
.TP
|
||||||
.B --interface-name=<nom>,<interface>
|
.B --interface-name=<nom>,<interface>
|
||||||
Définit un entregistrement DNS associant le nom avec l'adresse primaire sur
|
Définit un entregistrement DNS associant le nom avec l'adresse primaire sur
|
||||||
l'interface donnée en argument. Cette option spécifie un enregistrement de type
|
l'interface donnée en argument. Cette option spécifie un enregistrement de type
|
||||||
@@ -485,7 +502,7 @@ lorsqu'un serveur web a la résolution de nom activée pour l'enregistrement de
|
|||||||
son journal des requêtes, ce qui peut générer un nombre important de requêtes
|
son journal des requêtes, ce qui peut générer un nombre important de requêtes
|
||||||
simultanées.
|
simultanées.
|
||||||
.TP
|
.TP
|
||||||
.B \-F, --dhcp-range=[[net:]identifiant de réseau,]<adresse de début>,<adresse de fin>[[,<masque de réseau>],<broadcast>][,<durée de bail par défaut>]
|
.B \-F, --dhcp-range=[[net:]identifiant de réseau,]<adresse de début>,<adresse de fin>[[,<masque de réseau>],<broadcast>][,<durée de bail>]
|
||||||
Active le serveur DHCP. Les adresses seront données dans la plage comprise entre
|
Active le serveur DHCP. Les adresses seront données dans la plage comprise entre
|
||||||
<adresse de début> et <adresse de fin> et à partir des adresses définies
|
<adresse de début> et <adresse de fin> et à partir des adresses définies
|
||||||
statiquement dans l'option
|
statiquement dans l'option
|
||||||
@@ -493,7 +510,9 @@ statiquement dans l'option
|
|||||||
Si une durée de bail est donnée, alors les baux seront donnés pour cette
|
Si une durée de bail est donnée, alors les baux seront donnés pour cette
|
||||||
durée. La durée de bail est donnée en secondes, en minutes (exemple : 45m),
|
durée. La durée de bail est donnée en secondes, en minutes (exemple : 45m),
|
||||||
en heures (exemple : 1h) ou être la chaine de caractère "infinite" pour une
|
en heures (exemple : 1h) ou être la chaine de caractère "infinite" pour une
|
||||||
durée indéterminée. La valeur minimum pour un bail DHCP est de 2 minutes.
|
durée indéterminée. Si aucune valeur n'est donnée, une durée de bail par défaut
|
||||||
|
de une heure est appliquée. La valeur minimum pour un bail DHCP est de 2
|
||||||
|
minutes.
|
||||||
Cette option peut être répétée, avec différentes adresses,
|
Cette option peut être répétée, avec différentes adresses,
|
||||||
pour activer le service DHCP sur plus d'un réseau. Pour des réseaux directement
|
pour activer le service DHCP sur plus d'un réseau. Pour des réseaux directement
|
||||||
connectés (c'est-à-dire des réseaux dans lesquels la machine sur laquelle tourne
|
connectés (c'est-à-dire des réseaux dans lesquels la machine sur laquelle tourne
|
||||||
@@ -501,11 +520,8 @@ Dnsmasq possède une interface), le masque de réseau est optionnel. Il est par
|
|||||||
contre requis pour les réseaux pour lesquels le service DHCP se fait via un
|
contre requis pour les réseaux pour lesquels le service DHCP se fait via un
|
||||||
relais DHCP ("relay agent"). L'adresse de broadcast est toujours optionnelle.
|
relais DHCP ("relay agent"). L'adresse de broadcast est toujours optionnelle.
|
||||||
|
|
||||||
Sur certains systèmes, Dnsmasq ne peut écouter que sur une interface lorsqu'il
|
Il est toujours possible d'avoir plus d'une plage DHCP pour un même
|
||||||
utilise DHCP, et le nom de l'interface doit être spécifié par l'option
|
sous-réseau.
|
||||||
.B interface.
|
|
||||||
Cette limitation affecte tous les systèmes OpenBSD avant la version 4.0. Il
|
|
||||||
est toujours possible d'avoir plus d'une plage DHCP pour un même sous-réseau.
|
|
||||||
|
|
||||||
L'identifiant de réseau optionnel est un label alphanumérique qui permet de
|
L'identifiant de réseau optionnel est un label alphanumérique qui permet de
|
||||||
marquer ce réseau afin de fournir des options DHCP spécifiques à chaque réseau.
|
marquer ce réseau afin de fournir des options DHCP spécifiques à chaque réseau.
|
||||||
@@ -516,10 +532,19 @@ label, il définit le label pour laquelle la règle s'applique. Un seul label pe
|
|||||||
L'adresse de fin peut être remplacée par le mot-clef
|
L'adresse de fin peut être remplacée par le mot-clef
|
||||||
.B static
|
.B static
|
||||||
("statique") qui indique à Dnsmasq d'activer le service DHCP pour le réseau
|
("statique") qui indique à Dnsmasq d'activer le service DHCP pour le réseau
|
||||||
spécifié, mais de ne pas activer l'allocation dynamique d'adresses IP. Seuls les
|
spécifié, mais de ne pas activer l'allocation dynamique d'adresses IP : Seuls
|
||||||
hôtes possédant des adresses IP statiques fournies via
|
les hôtes possédant des adresses IP statiques fournies via
|
||||||
.B dhcp-host
|
.B dhcp-host
|
||||||
ou présentes dans le fichier /etc/ethers seront alors servis par le DHCP.
|
ou présentes dans le fichier /etc/ethers seront alors servis par le DHCP.
|
||||||
|
|
||||||
|
L'adresse de fin peut-être remplacée par le mot-clef
|
||||||
|
.B proxy
|
||||||
|
, auquel cas Dnsmasq fournira un service de DHCP proxy pour le sous-réseau
|
||||||
|
spécifié. (voir
|
||||||
|
.B pxe-prompt
|
||||||
|
et
|
||||||
|
.B pxe-service
|
||||||
|
pour plus de détails).
|
||||||
.TP
|
.TP
|
||||||
.B \-G, --dhcp-host=[<adresse matérielle>][,id:<identifiant client>|*][,net:<identifiant de réseau>][,<adresse IP>][,<nom d'hôte>][,<durée de bail>][,ignore]
|
.B \-G, --dhcp-host=[<adresse matérielle>][,id:<identifiant client>|*][,net:<identifiant de réseau>][,<adresse IP>][,<nom d'hôte>][,<durée de bail>][,ignore]
|
||||||
Spécifie les paramètres DHCP relatifs à un hôte. Cela permet à une machine
|
Spécifie les paramètres DHCP relatifs à un hôte. Cela permet à une machine
|
||||||
@@ -545,6 +570,7 @@ réfère à l'hôte d'identifiant 01:02:03:04. Il est également possible de
|
|||||||
spécifier l'identifiant client sous la forme d'une chaîne de caractères, comme
|
spécifier l'identifiant client sous la forme d'une chaîne de caractères, comme
|
||||||
ceci :
|
ceci :
|
||||||
.B --dhcp-host=id:identifiantclientsousformedechaine,.....
|
.B --dhcp-host=id:identifiantclientsousformedechaine,.....
|
||||||
|
|
||||||
L'option spéciale id:* signifie : "ignorer tout identifiant client et n'utiliser
|
L'option spéciale id:* signifie : "ignorer tout identifiant client et n'utiliser
|
||||||
que l'adresse matérielle". Cela est utile lorsqu'un client présente un
|
que l'adresse matérielle". Cela est utile lorsqu'un client présente un
|
||||||
identifiant client mais pas les autres.
|
identifiant client mais pas les autres.
|
||||||
@@ -558,7 +584,9 @@ spécifiée par son adresse matérielle, son identifiant client ou son nom d'hô
|
|||||||
Par exemple
|
Par exemple
|
||||||
.B --dhcp-host=00:20:e0:3b:13:af,ignore
|
.B --dhcp-host=00:20:e0:3b:13:af,ignore
|
||||||
Cela est utile lorsqu'un autre serveur DHCP sur le réseau doit être utilisé par
|
Cela est utile lorsqu'un autre serveur DHCP sur le réseau doit être utilisé par
|
||||||
certaines machines. Le paramètre net:<identifiant réseau> permet de définir un
|
certaines machines.
|
||||||
|
|
||||||
|
Le paramètre net:<identifiant réseau> permet de définir un
|
||||||
identifiant de réseau lorsque l'option dhcp-host est utilisée. Cela peut servir
|
identifiant de réseau lorsque l'option dhcp-host est utilisée. Cela peut servir
|
||||||
à sélectionner des options DHCP juste pour cet hôte. Lorsqu'une machine coïncide
|
à sélectionner des options DHCP juste pour cet hôte. Lorsqu'une machine coïncide
|
||||||
avec une directive dhcp-host (ou une impliquée par /etc/ethers), alors
|
avec une directive dhcp-host (ou une impliquée par /etc/ethers), alors
|
||||||
@@ -573,12 +601,26 @@ avec des octets joker, ainsi par exemple
|
|||||||
demande à Dnsmasq d'ignorer une gamme d'adresses matérielles. Il est à noter
|
demande à Dnsmasq d'ignorer une gamme d'adresses matérielles. Il est à noter
|
||||||
que "*" doit-être précédé d'un caractère d'échappement ou mis entre guillemets
|
que "*" doit-être précédé d'un caractère d'échappement ou mis entre guillemets
|
||||||
lorsque spécifié en option de ligne de commande, mais pas dans le fichier de
|
lorsque spécifié en option de ligne de commande, mais pas dans le fichier de
|
||||||
configuration. Les adresses matérielles coïncident en principe avec n'importe
|
configuration.
|
||||||
|
|
||||||
|
Les adresses matérielles coïncident en principe avec n'importe
|
||||||
quel type de réseau (ARP), mais il est possible de les limiter à un seul type
|
quel type de réseau (ARP), mais il est possible de les limiter à un seul type
|
||||||
ARP en les précédant du type ARP (en Hexadécimal) et de "-". Ainsi
|
ARP en les précédant du type ARP (en Hexadécimal) et de "-". Ainsi
|
||||||
.B --dhcp-host=06-00:20:e0:3b:13:af,1.2.3.4
|
.B --dhcp-host=06-00:20:e0:3b:13:af,1.2.3.4
|
||||||
coïncidera uniquement avec des adresses matérielles Token-Ring, puisque le type
|
coïncidera uniquement avec des adresses matérielles Token-Ring, puisque le type
|
||||||
ARP pour une adresse Token-Ring est 6.
|
ARP pour une adresse Token-Ring est 6.
|
||||||
|
|
||||||
|
Un cas spécial correspond à l'inclusion d'une ou plusieurs adresses
|
||||||
|
matérielles, c-à-d :
|
||||||
|
.B --dhcp-host=11:22:33:44:55:66,12:34:56:78:90:12,192.168.0.2.
|
||||||
|
Cela permet à une adresse IP d'être associé à plusieurs adresses
|
||||||
|
matérielles, et donne à dnsmasq la permission d'abandonner un bail DHCP
|
||||||
|
attribué à l'une de ces adresses lorsqu'une autre adresse dans la liste
|
||||||
|
demande un bail. Ceci est une opération dangereuse qui ne fonctionnera
|
||||||
|
de manière fiable que si une adresse matérielle est active à un moment
|
||||||
|
donné et dnsmasq n'a aucun moyen de s'assurer de cela. Cela est utile,
|
||||||
|
par exemple, pour allouer une adresse IP stable à un laptop qui
|
||||||
|
aurait à la fois une connexion filaire et sans-fil.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-hostsfile=<fichier>
|
.B --dhcp-hostsfile=<fichier>
|
||||||
Lis les informations d'hôtes DHCP dans le fichier spécifié. Le fichier contient
|
Lis les informations d'hôtes DHCP dans le fichier spécifié. Le fichier contient
|
||||||
@@ -603,7 +645,7 @@ par Dnsmasq, ces lignes ont exactement le même effet que l'option
|
|||||||
contenant les mêmes informations. /etc/ethers est relu à la réception d'un
|
contenant les mêmes informations. /etc/ethers est relu à la réception d'un
|
||||||
signal SIGHUP par Dnsmasq.
|
signal SIGHUP par Dnsmasq.
|
||||||
.TP
|
.TP
|
||||||
.B \-O, --dhcp-option=[<identifiant_de_réseau>,[<identifiant_de_réseau>,]][vendor:[<classe_vendeur>],][<opt>|option:<nom d'option>],[<valeur>[,<valeur>]]
|
.B \-O, --dhcp-option=[<identifiant_de_réseau>,[<identifiant_de_réseau>,]][encap:<option>,][vendor:[<classe_vendeur>],][<option>|option:<nom d'option>],[<valeur>[,<valeur>]]
|
||||||
Spécifie des options différentes ou supplémentaires pour des clients DHCP. Par
|
Spécifie des options différentes ou supplémentaires pour des clients DHCP. Par
|
||||||
défaut, Dnsmasq envoie un ensemble standard d'options aux clients DHCP : le
|
défaut, Dnsmasq envoie un ensemble standard d'options aux clients DHCP : le
|
||||||
masque de réseau et l'adresse de broadcast sont les mêmes que pour l'hôte
|
masque de réseau et l'adresse de broadcast sont les mêmes que pour l'hôte
|
||||||
@@ -673,10 +715,19 @@ pour sélectionner les options encapsulées, de préférence à toute option env
|
|||||||
par le client. Il est possible d'omettre complètement une classe de vendeur :
|
par le client. Il est possible d'omettre complètement une classe de vendeur :
|
||||||
.B --dhcp-option=vendor:,1,0.0.0.0
|
.B --dhcp-option=vendor:,1,0.0.0.0
|
||||||
Dans ce cas l'option encapsulée est toujours envoyée.
|
Dans ce cas l'option encapsulée est toujours envoyée.
|
||||||
|
|
||||||
|
Les options peuvent-être encapsulées au sein d'autres options :
|
||||||
|
par exemple
|
||||||
|
.B --dhcp-option=encap:175, 190, "iscsi-client0"
|
||||||
|
enverra l'option 175, au sein de laquelle se trouve l'option 190.
|
||||||
|
Plusieurs options encapsulées avec le même numéro d'option seront correctement
|
||||||
|
combinées au sein d'une seule option encapsulée. Il n'est pas possible de
|
||||||
|
spécifier encap: et vendor: au sein d'une même option dhcp.
|
||||||
|
|
||||||
L'adresse 0.0.0.0 n'est pas traitée de manière particulière lorsque fournie dans
|
L'adresse 0.0.0.0 n'est pas traitée de manière particulière lorsque fournie dans
|
||||||
une option encapsulée de classe de vendeur.
|
une option encapsulée.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-option-force=[<identifiant de réseau>,[<identifiant de réseau>,]][vendor:[<classe de vendeur>],]<opt>,[<valeur>[,<valeur>]]
|
.B --dhcp-option-force=[<identifiant de réseau>,[<identifiant de réseau>,]][encap:<option>,][vendor:[<classe de vendeur>],]<option>,[<valeur>[,<valeur>]]
|
||||||
Cela fonctionne exactement de la même façon que
|
Cela fonctionne exactement de la même façon que
|
||||||
.B --dhcp-option
|
.B --dhcp-option
|
||||||
sauf que cette option sera toujours envoyée, même si le client ne la demande pas
|
sauf que cette option sera toujours envoyée, même si le client ne la demande pas
|
||||||
@@ -738,11 +789,23 @@ relais DHCP, alors l'identifiant de réseau est positionné.
|
|||||||
Associe des options de relais DHCP issues de la RFC3993 à des identifiants de
|
Associe des options de relais DHCP issues de la RFC3993 à des identifiants de
|
||||||
réseau.
|
réseau.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-match=<identifiant de réseau>,<numéro d'option>
|
.B --dhcp-match=<identifiant de réseau>,<numéro d'option>|option:<nom d'option>[,<valeur>]
|
||||||
Associe l'identifiant de réseau si le client envoie une option DHCP
|
Si aucune valeur n'est spécifiée, associe l'identifiant de réseau si le client
|
||||||
avec le numéro spécifié. Cela peut-être utilisé pour identifier des
|
envoie une option DHCP avec le numéro ou le nom spécifié. Lorsqu'une valeur est
|
||||||
clients spécifiques qui envoient des informations par le biais de
|
fournie, positionne le label seulement dans le cas où l'option est fournie et
|
||||||
numéros privés d'option.
|
correspond à la valeur. La valeur peut-être de la forme "01:ff:*:02", auquel
|
||||||
|
cas le début de l'option doit correspondre (en respectant les jokers). La
|
||||||
|
valeur peut aussi être de la même forme que dans
|
||||||
|
.B dhcp-option
|
||||||
|
, auquel cas l'option est traitée comme un tableau de valeur, et un des
|
||||||
|
éléments doit correspondre, ainsi
|
||||||
|
|
||||||
|
--dhcp-match=efi-ia32,option:client-arch,6
|
||||||
|
|
||||||
|
spécifie le label "efi-ia32" si le numéro 6 apparaît dnas la liste
|
||||||
|
d'architectures envoyé par le client au sein de l'option 93. (se réferer
|
||||||
|
au RFC 4578 pour plus de détails). Si la valeur est un chaine de caractères,
|
||||||
|
celle-ci est recherchée (correspondance en temps que sous-chaîne).
|
||||||
.TP
|
.TP
|
||||||
.B \-J, --dhcp-ignore=<identifiant de réseau>[,<identifiant de réseau>]
|
.B \-J, --dhcp-ignore=<identifiant de réseau>[,<identifiant de réseau>]
|
||||||
Lorsque tous les identifiants de réseau fournis coïncident avec la liste
|
Lorsque tous les identifiants de réseau fournis coïncident avec la liste
|
||||||
@@ -779,6 +842,58 @@ Si d'éventuels identifiants de réseau sont fournis, ils doivent coïncider ave
|
|||||||
ceux du client pour que cet élement de configuration lui soit envoyé. Il est à
|
ceux du client pour que cet élement de configuration lui soit envoyé. Il est à
|
||||||
noter que les identifiants de réseau doivent-être préfixés par "net:".
|
noter que les identifiants de réseau doivent-être préfixés par "net:".
|
||||||
.TP
|
.TP
|
||||||
|
.B --pxe-service=[net:<identifiant de réseau>,]<CSA>,<entrée de menu>,<nom de fichier>|<type de service de démarrage>[,<adresse de serveur>]
|
||||||
|
La plupart des ROMS de démarrage PXE ne permettent au système PXE que la simple
|
||||||
|
obtention d'une adresse IP, le téléchargement du fichier spécifié dans
|
||||||
|
.B dhcp-boot
|
||||||
|
et son exécution. Cependant, le système PXE est capable de fonctions bien plus
|
||||||
|
complexes pour peu que le serveur DHCP soit adapté.
|
||||||
|
|
||||||
|
Ceci spécifie l'option de démarrage qui apparaitra dans un menu de démarrage
|
||||||
|
PXE. <CSA> est le type du système client. Seuls des types de services valides
|
||||||
|
apparaitront dans un menu. Les types connus sont x86PC, PC98, IA64_EFI, Alpha,
|
||||||
|
Arc_x86, Intel_Lean_Client, IA32_EFI, BC_EFI, Xscale_EFI et X86-64_EFI;
|
||||||
|
D'autres types peuvent-être spécifiés sous la forme d'une valeur entière. Le
|
||||||
|
paramètre après le texte correspondant à l'entrée dans le menu peut être un nom
|
||||||
|
de fichier, auquel cas Dnsmasq agit comme un serveur de démarrage et indique au
|
||||||
|
client PXE qu'il faut télécharger ce fichier via TFTP, soit depuis ce serveur
|
||||||
|
(l'option
|
||||||
|
.B enable-tftp
|
||||||
|
doit être spécifiée pour que cela marche), soit depuis un autre serveur TFTP
|
||||||
|
si une adresse de serveur est fournie.
|
||||||
|
Veuillez noter que le suffixe de "couche" (en principe ".0") est fourni par PXE
|
||||||
|
et ne doit pas être rajouté au nom de fichier. Si une valeur numérique entière
|
||||||
|
est fournir pour le type de démarrage, en remplacement du nom de fichier, le
|
||||||
|
client PXE devra chercher un service de démarrage de ce type sur le réseau.
|
||||||
|
Cette recherche peut être faite via multicast ou broadcast, ou directement
|
||||||
|
auprès d'un serveur si son adresse IP est fournie dans l'option. Un service de
|
||||||
|
démarrage de type 0 est spécial et provoquera une interruption du démarrage par
|
||||||
|
le réseau ainsi que la poursuite du démarrage sur un média local.
|
||||||
|
.TP
|
||||||
|
.B --pxe-prompt=[net:<identifiant de réseau>,]<invite>[,<délai>]
|
||||||
|
Cette option permet d'afficher une invite à la suite du démarrage PXE. Si un
|
||||||
|
délai est fourni, alors la première entrée du menu de démarrage sera
|
||||||
|
automatiquement exécutée après ce délai. Si le délai vaut 0, alors la première
|
||||||
|
entrée disponible sera exécutée immédiatement. Si
|
||||||
|
.B pxe-prompt
|
||||||
|
est omis, le système attendra un choix de l'utilisateur s'il existe plusieurs
|
||||||
|
entrées dans le menu, ou démarrera immédiatement dans le cas où il n'y a qu'une
|
||||||
|
seule entrée. Voir
|
||||||
|
.B pxe-service
|
||||||
|
pour plus de détails sur les entrées de menu.
|
||||||
|
|
||||||
|
Dnsmasq peut servir de "proxy-DHCP" PXE, dans le cas où un autre serveur DHCP
|
||||||
|
sur le réseau est responsable de l'allocation des adresses IP, auquel cas
|
||||||
|
Dnsmasq se contente de fournir les informations données dans les options
|
||||||
|
.B pxe-prompt
|
||||||
|
et
|
||||||
|
.B pxe-service
|
||||||
|
pour permettre le démarrage par le réseau. Ce mode est activé en utilisant le
|
||||||
|
mot-clef
|
||||||
|
.B proxy
|
||||||
|
dans
|
||||||
|
.B dhcp-range.
|
||||||
|
.TP
|
||||||
.B \-X, --dhcp-lease-max=<nombre>
|
.B \-X, --dhcp-lease-max=<nombre>
|
||||||
Limite Dnsmasq à un maximum de <nombre> baux DHCP. Le défaut est de 150. Cette
|
Limite Dnsmasq à un maximum de <nombre> baux DHCP. Le défaut est de 150. Cette
|
||||||
limite permet d'éviter des attaques de déni de service ("DoS") par des hôtes
|
limite permet d'éviter des attaques de déni de service ("DoS") par des hôtes
|
||||||
@@ -802,10 +917,14 @@ numéro est utilisé pour le port serveur et ce numéro plus 1 est utilisé pour
|
|||||||
port client. Enfin, en fournissant deux numéros de ports, il est possible de
|
port client. Enfin, en fournissant deux numéros de ports, il est possible de
|
||||||
spécifier arbitrairement 2 ports à la fois pour le serveur et pour le client DHCP.
|
spécifier arbitrairement 2 ports à la fois pour le serveur et pour le client DHCP.
|
||||||
.TP
|
.TP
|
||||||
.B \-3, --bootp-dynamic
|
.B \-3, --bootp-dynamic[=<identifiant de réseau>[,<identifiant de réseau>]]
|
||||||
Permet l'allocation dynamique d'adresses IP à des clients BOOTP. Utiliser cette
|
Permet l'allocation dynamique d'adresses IP à des clients BOOTP. Utiliser cette
|
||||||
option avec précaution, une adresse allouée à un client BOOTP étant perpétuelle,
|
option avec précaution, une adresse allouée à un client BOOTP étant perpétuelle,
|
||||||
et de fait n'est plus disponibles pour d'autres hôtes.
|
et de fait n'est plus disponibles pour d'autres hôtes. Si aucun argument n'est
|
||||||
|
donné, alors cette option permet une allocation dynamique dans tous les cas. Si
|
||||||
|
des arguments sont spécifiés, alors l'allocation ne se fait que lorsque tous
|
||||||
|
les identifiants coïncident. Il est possible de répeter cette option avec
|
||||||
|
plusieurs jeux d'arguments.
|
||||||
.TP
|
.TP
|
||||||
.B \-5, --no-ping
|
.B \-5, --no-ping
|
||||||
Par défaut, le serveur DHCP tente de s'assurer qu'une adresse n'est pas utilisée
|
Par défaut, le serveur DHCP tente de s'assurer qu'une adresse n'est pas utilisée
|
||||||
@@ -822,32 +941,28 @@ détermination de celles-ci.
|
|||||||
.TP
|
.TP
|
||||||
.B \-l, --dhcp-leasefile=<chemin de fichier>
|
.B \-l, --dhcp-leasefile=<chemin de fichier>
|
||||||
Utilise le fichier dont le chemin est fourni pour stocker les informations de
|
Utilise le fichier dont le chemin est fourni pour stocker les informations de
|
||||||
baux DHCP. Si cette option est fournie mais qu'aucune option de type dhcp-range
|
baux DHCP.
|
||||||
n'est donnée, alors un comportement de type Dnsmasq version 1 est activé. Le
|
|
||||||
fichier fourni est supposé être un fichier de baux DHCP de type ISC DHCPD et est
|
|
||||||
parcouru à la recherche de baux contenant des noms d'hôtes. Les noms trouvés
|
|
||||||
sont rajoutés au DNS. Cette fonctionalité peut être exclue de Dnsmasq à la
|
|
||||||
compilation, auquel cas une erreur sera produite. Il est à noter que
|
|
||||||
l'intégration avec un fichier de baux au format ISC est une fonctionalité
|
|
||||||
obsolète. Elle ne devrait pas être utilisée dans les nouvelles installations et
|
|
||||||
sera retirée dans une future version.
|
|
||||||
.TP
|
.TP
|
||||||
.B \-6 --dhcp-script=<chemin de fichier>
|
.B \-6 --dhcp-script=<chemin de fichier>
|
||||||
Lorsqu'un bail DHCP est créé, ou qu'un ancien est supprimé, le fichier dont le
|
Lorsqu'un bail DHCP est créé, ou qu'un ancien est supprimé, le fichier dont le
|
||||||
chemin est spécifié est exécuté. Les arguments fournis à celui-ci sont soit
|
chemin est spécifié est exécuté. Les arguments fournis à celui-ci sont soit
|
||||||
"add" ("ajouter"), "old" ("ancien") ou "del" ("supprimer"), suivi de l'adresse
|
"add" ("ajouter"), "old" ("ancien") ou "del" ("supprimer"), suivi de l'adresse
|
||||||
MAC de l'hôte (ou "<null>") puis l'adresse IP et le nom d'hôte si celui-ci est
|
MAC de l'hôte puis l'adresse IP et le nom d'hôte si celui-ci est
|
||||||
connu."add" signifie qu'un bail a été créé, "del" signifie qu'il a été supprimé,
|
connu."add" signifie qu'un bail a été créé, "del" signifie qu'il a été supprimé,
|
||||||
"old" notifie que le bail existait au lancement de Dnsmasq, ou un changement
|
"old" notifie que le bail existait au lancement de Dnsmasq, ou un changement
|
||||||
d'adresse MAC ou de nom d'hôte pour un bail existant (ou, dans le cas où
|
d'adresse MAC ou de nom d'hôte pour un bail existant (ou, dans le cas où
|
||||||
leasefile-ro est spécifié, un changement de durée de bail ou d'identifiant
|
leasefile-ro est spécifié, un changement de durée de bail ou d'identifiant
|
||||||
d'hôte). Le processus est exécuté en temps que super-utilisateur (si Dnsmasq a
|
d'hôte). Si l'adresse Mac est d'un type de réseau autre qu'ethernet, il est
|
||||||
été lancé en temps que "root"), même si Dnsmasq est configuré pour changer son
|
nécessaire de la préceder du type de réseau, par exemple "06-01:23:45:67:89:ab"
|
||||||
UID pour celle d'un utilisateur non-privilégié. L'environnement est hérité de
|
pour du token ring. Le processus est exécuté en temps que super-utilisateur
|
||||||
celui de l'invocation du processus Dnsmasq, et si l'hôte fournit un identifiant
|
(si Dnsmasq a été lancé en temps que "root"), même si Dnsmasq est configuré
|
||||||
de client, celui-ci est stocké dans la variable d'environnement
|
pour changer son UID pour celle d'un utilisateur non-privilégié.
|
||||||
DNSMASQ_CLIENT_ID. Si le client fournit une information de classe de vendeur ou
|
L'environnement est hérité de celui de l'invocation du processus Dnsmasq, et
|
||||||
de classe d'utilisateur, celles-ci sont positionnées dans les variables
|
si l'hôte fournit un identifiant de client, celui-ci est stocké dans la
|
||||||
|
variable d'environnement DNSMASQ_CLIENT_ID. Si un nom de domaine pleinement
|
||||||
|
qualifié (FQDN) est connu pour l'hôte, la part relative au domaine est stockée
|
||||||
|
dans DNSMASQ_DOMAIN. Si le client fournit une information de classe de vendeur
|
||||||
|
ou de classe d'utilisateur, celles-ci sont positionnées dans les variables
|
||||||
DNSMASQ_VENDOR_CLASS et DNSMASQ_USER_CLASS0 à DNSMASQ_USER_CLASSn
|
DNSMASQ_VENDOR_CLASS et DNSMASQ_USER_CLASS0 à DNSMASQ_USER_CLASSn
|
||||||
respectivement, mais seulement pour les actions "add" et "old" lorsqu'un hôte
|
respectivement, mais seulement pour les actions "add" et "old" lorsqu'un hôte
|
||||||
reprend un bail existant, ces variables n'étant pas stockées dans la base de
|
reprend un bail existant, ces variables n'étant pas stockées dans la base de
|
||||||
@@ -901,12 +1016,14 @@ longueur de bail ou de date d'expiration.
|
|||||||
.B --bridge-interface=<interface>,<alias>[,<alias>]
|
.B --bridge-interface=<interface>,<alias>[,<alias>]
|
||||||
Traiter les requêtes DHCP arrivant sur n'importe laquelle des interfaces <alias>
|
Traiter les requêtes DHCP arrivant sur n'importe laquelle des interfaces <alias>
|
||||||
comme si elles arrivaient de l'interface <interface>. Cette option est
|
comme si elles arrivaient de l'interface <interface>. Cette option est
|
||||||
uniquement disponible sur les plateformes BSD, et est uniquement nécessaire
|
nécessaire lors de l'utilisation de pont ethernet "ancien mode" sur plate-forme
|
||||||
lors de l'utilisation de pont ethernet "ancien mode", puisque dans ce cas les
|
BSD, puisque dans ce cas les paquets arrivent sur des interfaces "tap" n'ont
|
||||||
paquets arrivent sur des interfaces "tap" n'ayant pas d'adresse IP.
|
pas d'adresse IP.
|
||||||
.TP
|
.TP
|
||||||
.B \-s, --domain=<domaine>
|
.B \-s, --domain=<domaine>[,<gamme d'adresses>]
|
||||||
Spécifie le domaine du serveur DHCP. Cela a deux effets; tout d'abord, le
|
Spécifie le domaine du serveur DHCP. Le domaine peut être donné de manière
|
||||||
|
inconditionnelle (sans spécifier de gamme d'adresses IP) ou pour des gammes
|
||||||
|
d'adresses IP limitées. Cela a deux effets; tout d'abord, le
|
||||||
serveur DHCP retourne le domaine à tous les hôtes le demandant, deuxièmement,
|
serveur DHCP retourne le domaine à tous les hôtes le demandant, deuxièmement,
|
||||||
cela spécifie le domaine valide pour les hôtes DHCP configurés. Le but de cela
|
cela spécifie le domaine valide pour les hôtes DHCP configurés. Le but de cela
|
||||||
est de contraindre les noms d'hôte afin qu'aucun hôte sur le LAN ne puisse
|
est de contraindre les noms d'hôte afin qu'aucun hôte sur le LAN ne puisse
|
||||||
@@ -925,7 +1042,29 @@ et avoir une machine dont le nom DHCP serait "laptop". L'adresse IP de cette
|
|||||||
machine sera disponible à la fois pour "laptop" et "laptop.thekelleys.org.uk".
|
machine sera disponible à la fois pour "laptop" et "laptop.thekelleys.org.uk".
|
||||||
Si la valeur fournie pour <domaine> est "#", alors le nom de domaine est
|
Si la valeur fournie pour <domaine> est "#", alors le nom de domaine est
|
||||||
positionné à la première valeur de la directive "search" du fichier
|
positionné à la première valeur de la directive "search" du fichier
|
||||||
/etc/resolv.conf (ou équivalent).
|
/etc/resolv.conf (ou équivalent). La gamme d'adresses peut être de la forme
|
||||||
|
<adresse ip>,<adresse ip> ou <adresse ip>/<masque de réseau> voire une simple
|
||||||
|
<adresse ip>. Voir
|
||||||
|
.B --dhcp-fqdn
|
||||||
|
qui peut changer le comportement de dnsmasq relatif aux domaines.
|
||||||
|
.TP
|
||||||
|
.B --dhcp-fqdn
|
||||||
|
Dans le mode par défaut, dnsmasq insère les noms non-qualifiés des clients
|
||||||
|
DHCP dans le DNS. Pour cette raison, les noms doivent être uniques, même si
|
||||||
|
deux clients ayant le même nom sont dans deux domaines différents. Si un
|
||||||
|
deuxième client DHCP apparaît ayant le même nom qu'un client déjà existant,
|
||||||
|
ce nom est transféré au nouveau client. Si
|
||||||
|
.B --dhcp-fqdn
|
||||||
|
est spécifié, ce comportement change : les noms non qualifiés ne sont plus
|
||||||
|
rajoutés dans le DNS, seuls les noms qualifiés le sont. Deux clients DHCP
|
||||||
|
avec le même nom peuvent tous les deux garder le nom, pour peu que la partie
|
||||||
|
relative au domaine soit différente (c-à-d que les noms pleinements qualifiés
|
||||||
|
diffèrent). Pour d'assurer que tous les noms ont une partie domaine, il doit-y
|
||||||
|
avoir au moins un
|
||||||
|
.B --domain
|
||||||
|
sans gamme d'adresses de spécifié lorsque l'option
|
||||||
|
.B --dhcp-fqdn
|
||||||
|
est configurée.
|
||||||
.TP
|
.TP
|
||||||
.B --enable-tftp
|
.B --enable-tftp
|
||||||
Active la fonction serveur TFTP. Celui-ci est de manière délibérée limité aux
|
Active la fonction serveur TFTP. Celui-ci est de manière délibérée limité aux
|
||||||
@@ -1164,9 +1303,12 @@ les identifiants de réseau fonctionnent comme suit : Dnsmasq associe à chaque
|
|||||||
requête DHCP un ensemble d'identifiants de réseau; un pour la plage d'adresse
|
requête DHCP un ensemble d'identifiants de réseau; un pour la plage d'adresse
|
||||||
DHCP (
|
DHCP (
|
||||||
.B dhcp-range
|
.B dhcp-range
|
||||||
) utilisée pour allouer l'adresse, une pour chaque entrée
|
) utilisée pour allouer l'adresse, un identifiant pour chaque entrée
|
||||||
.B dhcp-host
|
.B dhcp-host
|
||||||
associée et éventuellement une pour chaque classe de vendeur ou d'utilisateur
|
associée (il ajoute "known" lorsqu'une entrée dhcp-host coïncide), l'étiquette
|
||||||
|
"bootp" pour les requêtes BOOTP, un identifiant dont le nom est le nom de
|
||||||
|
l'interface sur laquelle la requête est arrivée, et éventuellement un
|
||||||
|
identifiant pour chaque classe de vendeur ou d'utilisateur
|
||||||
fournie par le client DHCP dans sa requête. Les options DHCP (
|
fournie par le client DHCP dans sa requête. Les options DHCP (
|
||||||
.B dhcp-option
|
.B dhcp-option
|
||||||
) ayant un identifiant de réseau seront utilisés de préférence à celles
|
) ayant un identifiant de réseau seront utilisés de préférence à celles
|
||||||
|
|||||||
+378
-346
File diff suppressed because it is too large.
Load diff
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -63,16 +63,20 @@ int iface_enumerate(void *parm, int (*ipv4_callback)(), int (*ipv6_callback)())
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (ptr = ifc.ifc_buf; ptr < ifc.ifc_buf + ifc.ifc_len; ptr += len )
|
for (ptr = ifc.ifc_buf; ptr < (char *)(ifc.ifc_buf + ifc.ifc_len); ptr += len)
|
||||||
{
|
{
|
||||||
/* subsequent entries may not be aligned, so copy into
|
/* subsequent entries may not be aligned, so copy into
|
||||||
an aligned buffer to avoid nasty complaints about
|
an aligned buffer to avoid nasty complaints about
|
||||||
unaligned accesses. */
|
unaligned accesses. */
|
||||||
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
||||||
len = ((struct ifreq *)ptr)->ifr_addr.sa_len + offsetof(struct ifreq, ifr_ifru);
|
|
||||||
#else
|
|
||||||
len = sizeof(struct ifreq);
|
len = sizeof(struct ifreq);
|
||||||
|
|
||||||
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
||||||
|
ifr = (struct ifreq *)ptr;
|
||||||
|
if (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_ifru))
|
||||||
|
len = ifr->ifr_addr.sa_len + offsetof(struct ifreq, ifr_ifru);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!expand_buf(&ifreq, len))
|
if (!expand_buf(&ifreq, len))
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
@@ -126,7 +130,7 @@ int iface_enumerate(void *parm, int (*ipv4_callback)(), int (*ipv6_callback)())
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if defined(HAVE_BSD_NETWORK)
|
#if defined(HAVE_BSD_NETWORK) && defined(HAVE_DHCP)
|
||||||
#include <net/bpf.h>
|
#include <net/bpf.h>
|
||||||
|
|
||||||
void init_bpf(void)
|
void init_bpf(void)
|
||||||
@@ -171,7 +175,7 @@ void send_via_bpf(struct dhcp_packet *mess, size_t len,
|
|||||||
/* Only know how to do ethernet on *BSD */
|
/* Only know how to do ethernet on *BSD */
|
||||||
if (mess->htype != ARPHRD_ETHER || mess->hlen != ETHER_ADDR_LEN)
|
if (mess->htype != ARPHRD_ETHER || mess->hlen != ETHER_ADDR_LEN)
|
||||||
{
|
{
|
||||||
my_syslog(LOG_WARNING, _("DHCP request for unsupported hardware type (%d) received on %s"),
|
my_syslog(MS_DHCP | LOG_WARNING, _("DHCP request for unsupported hardware type (%d) received on %s"),
|
||||||
mess->htype, ifr->ifr_name);
|
mess->htype, ifr->ifr_name);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
+128
-22
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,14 +10,17 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
static struct crec *cache_head = NULL, *cache_tail = NULL, **hash_table = NULL;
|
static struct crec *cache_head = NULL, *cache_tail = NULL, **hash_table = NULL;
|
||||||
static struct crec *dhcp_spare = NULL, *new_chain = NULL;
|
#ifdef HAVE_DHCP
|
||||||
|
static struct crec *dhcp_spare = NULL;
|
||||||
|
#endif
|
||||||
|
static struct crec *new_chain = NULL;
|
||||||
static int cache_inserted = 0, cache_live_freed = 0, insert_error;
|
static int cache_inserted = 0, cache_live_freed = 0, insert_error;
|
||||||
static union bigname *big_free = NULL;
|
static union bigname *big_free = NULL;
|
||||||
static int bignames_left, hash_size;
|
static int bignames_left, hash_size;
|
||||||
@@ -859,10 +862,11 @@ static int read_hostsfile(char *filename, int index, int cache_size)
|
|||||||
return name_count;
|
return name_count;
|
||||||
}
|
}
|
||||||
|
|
||||||
void cache_reload(struct hostsfile *addn_hosts)
|
void cache_reload(void)
|
||||||
{
|
{
|
||||||
struct crec *cache, **up, *tmp;
|
struct crec *cache, **up, *tmp;
|
||||||
int i, total_size = daemon->cachesize;
|
int i, total_size = daemon->cachesize;
|
||||||
|
struct hostsfile *ah;
|
||||||
|
|
||||||
cache_inserted = cache_live_freed = 0;
|
cache_inserted = cache_live_freed = 0;
|
||||||
|
|
||||||
@@ -889,7 +893,7 @@ void cache_reload(struct hostsfile *addn_hosts)
|
|||||||
up = &cache->hash_next;
|
up = &cache->hash_next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((daemon->options & OPT_NO_HOSTS) && !addn_hosts)
|
if ((daemon->options & OPT_NO_HOSTS) && !daemon->addn_hosts)
|
||||||
{
|
{
|
||||||
if (daemon->cachesize > 0)
|
if (daemon->cachesize > 0)
|
||||||
my_syslog(LOG_INFO, _("cleared cache"));
|
my_syslog(LOG_INFO, _("cleared cache"));
|
||||||
@@ -898,13 +902,116 @@ void cache_reload(struct hostsfile *addn_hosts)
|
|||||||
|
|
||||||
if (!(daemon->options & OPT_NO_HOSTS))
|
if (!(daemon->options & OPT_NO_HOSTS))
|
||||||
total_size = read_hostsfile(HOSTSFILE, 0, total_size);
|
total_size = read_hostsfile(HOSTSFILE, 0, total_size);
|
||||||
while (addn_hosts)
|
|
||||||
|
for (i = 0, ah = daemon->addn_hosts; ah; ah = ah->next)
|
||||||
{
|
{
|
||||||
total_size = read_hostsfile(addn_hosts->fname, addn_hosts->index, total_size);
|
if (i <= ah->index)
|
||||||
addn_hosts = addn_hosts->next;
|
i = ah->index + 1;
|
||||||
|
|
||||||
|
if (ah->flags & AH_DIR)
|
||||||
|
ah->flags |= AH_INACTIVE;
|
||||||
|
else
|
||||||
|
ah->flags &= ~AH_INACTIVE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (ah = daemon->addn_hosts; ah; ah = ah->next)
|
||||||
|
if (!(ah->flags & AH_INACTIVE))
|
||||||
|
{
|
||||||
|
struct stat buf;
|
||||||
|
if (stat(ah->fname, &buf) != -1 && S_ISDIR(buf.st_mode))
|
||||||
|
{
|
||||||
|
DIR *dir_stream;
|
||||||
|
struct dirent *ent;
|
||||||
|
|
||||||
|
/* don't read this as a file */
|
||||||
|
ah->flags |= AH_INACTIVE;
|
||||||
|
|
||||||
|
if (!(dir_stream = opendir(ah->fname)))
|
||||||
|
my_syslog(LOG_ERR, _("cannot access directory %s: %s"),
|
||||||
|
ah->fname, strerror(errno));
|
||||||
|
else
|
||||||
|
{
|
||||||
|
while ((ent = readdir(dir_stream)))
|
||||||
|
{
|
||||||
|
size_t lendir = strlen(ah->fname);
|
||||||
|
size_t lenfile = strlen(ent->d_name);
|
||||||
|
struct hostsfile *ah1;
|
||||||
|
char *path;
|
||||||
|
|
||||||
|
/* ignore emacs backups and dotfiles */
|
||||||
|
if (lenfile == 0 ||
|
||||||
|
ent->d_name[lenfile - 1] == '~' ||
|
||||||
|
(ent->d_name[0] == '#' && ent->d_name[lenfile - 1] == '#') ||
|
||||||
|
ent->d_name[0] == '.')
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* see if we have an existing record.
|
||||||
|
dir is ah->fname
|
||||||
|
file is ent->d_name
|
||||||
|
path to match is ah1->fname */
|
||||||
|
|
||||||
|
for (ah1 = daemon->addn_hosts; ah1; ah1 = ah1->next)
|
||||||
|
{
|
||||||
|
if (lendir < strlen(ah1->fname) &&
|
||||||
|
strstr(ah1->fname, ah->fname) == ah1->fname &&
|
||||||
|
ah1->fname[lendir] == '/' &&
|
||||||
|
strcmp(ah1->fname + lendir + 1, ent->d_name) == 0)
|
||||||
|
{
|
||||||
|
ah1->flags &= ~AH_INACTIVE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* make new record */
|
||||||
|
if (!ah1)
|
||||||
|
{
|
||||||
|
if (!(ah1 = whine_malloc(sizeof(struct hostsfile))))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (!(path = whine_malloc(lendir + lenfile + 2)))
|
||||||
|
{
|
||||||
|
free(ah1);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
strcpy(path, ah->fname);
|
||||||
|
strcat(path, "/");
|
||||||
|
strcat(path, ent->d_name);
|
||||||
|
ah1->fname = path;
|
||||||
|
ah1->index = i++;
|
||||||
|
ah1->flags = AH_DIR;
|
||||||
|
ah1->next = daemon->addn_hosts;
|
||||||
|
daemon->addn_hosts = ah1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* inactivate record if not regular file */
|
||||||
|
if ((ah1->flags & AH_DIR) && stat(ah1->fname, &buf) != -1 && !S_ISREG(buf.st_mode))
|
||||||
|
ah1->flags |= AH_INACTIVE;
|
||||||
|
|
||||||
|
}
|
||||||
|
closedir(dir_stream);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (ah = daemon->addn_hosts; ah; ah = ah->next)
|
||||||
|
if (!(ah->flags & AH_INACTIVE))
|
||||||
|
total_size = read_hostsfile(ah->fname, ah->index, total_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char *get_domain(struct in_addr addr)
|
||||||
|
{
|
||||||
|
struct cond_domain *c;
|
||||||
|
|
||||||
|
for (c = daemon->cond_domain; c; c = c->next)
|
||||||
|
if (ntohl(addr.s_addr) >= ntohl(c->start.s_addr) &&
|
||||||
|
ntohl(addr.s_addr) <= ntohl(c->end.s_addr))
|
||||||
|
return c->domain;
|
||||||
|
|
||||||
|
return daemon->domain_suffix;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
void cache_unhash_dhcp(void)
|
void cache_unhash_dhcp(void)
|
||||||
{
|
{
|
||||||
struct crec *cache, **up;
|
struct crec *cache, **up;
|
||||||
@@ -942,7 +1049,7 @@ void cache_add_dhcp_entry(char *host_name,
|
|||||||
_("not giving name %s to the DHCP lease of %s because "
|
_("not giving name %s to the DHCP lease of %s because "
|
||||||
"the name exists in %s with address %s"),
|
"the name exists in %s with address %s"),
|
||||||
host_name, inet_ntoa(*host_address),
|
host_name, inet_ntoa(*host_address),
|
||||||
record_source(daemon->addn_hosts, crec->uid), daemon->namebuff);
|
record_source(crec->uid), daemon->namebuff);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1009,6 +1116,7 @@ void cache_add_dhcp_entry(char *host_name,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
void dump_cache(time_t now)
|
void dump_cache(time_t now)
|
||||||
@@ -1099,20 +1207,18 @@ void dump_cache(time_t now)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
char *record_source(struct hostsfile *addn_hosts, int index)
|
char *record_source(int index)
|
||||||
{
|
{
|
||||||
char *source = HOSTSFILE;
|
struct hostsfile *ah;
|
||||||
while (addn_hosts)
|
|
||||||
{
|
|
||||||
if (addn_hosts->index == index)
|
|
||||||
{
|
|
||||||
source = addn_hosts->fname;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
addn_hosts = addn_hosts->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
return source;
|
if (index == 0)
|
||||||
|
return HOSTSFILE;
|
||||||
|
|
||||||
|
for (ah = daemon->addn_hosts; ah; ah = ah->next)
|
||||||
|
if (ah->index == index)
|
||||||
|
return ah->fname;
|
||||||
|
|
||||||
|
return "<unknown>";
|
||||||
}
|
}
|
||||||
|
|
||||||
void querystr(char *str, unsigned short type)
|
void querystr(char *str, unsigned short type)
|
||||||
|
|||||||
+33
-50
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,11 +10,11 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define VERSION "2.46"
|
#define VERSION "2.49"
|
||||||
|
|
||||||
#define FTABSIZ 150 /* max number of outstanding requests (default) */
|
#define FTABSIZ 150 /* max number of outstanding requests (default) */
|
||||||
#define MAX_PROCS 20 /* max no children for TCP requests */
|
#define MAX_PROCS 20 /* max no children for TCP requests */
|
||||||
@@ -38,18 +38,25 @@
|
|||||||
# define RESOLVFILE "/etc/resolv.conf"
|
# define RESOLVFILE "/etc/resolv.conf"
|
||||||
#endif
|
#endif
|
||||||
#define RUNFILE "/var/run/dnsmasq.pid"
|
#define RUNFILE "/var/run/dnsmasq.pid"
|
||||||
#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
|
|
||||||
# define LEASEFILE "/var/db/dnsmasq.leases"
|
#ifndef LEASEFILE
|
||||||
#elif defined(__sun__) || defined (__sun)
|
# if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
|
||||||
# define LEASEFILE "/var/cache/dnsmasq.leases"
|
# define LEASEFILE "/var/db/dnsmasq.leases"
|
||||||
#else
|
# elif defined(__sun__) || defined (__sun)
|
||||||
# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
|
# define LEASEFILE "/var/cache/dnsmasq.leases"
|
||||||
|
# else
|
||||||
|
# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
#if defined(__FreeBSD__)
|
|
||||||
# define CONFFILE "/usr/local/etc/dnsmasq.conf"
|
#ifndef CONFFILE
|
||||||
#else
|
# if defined(__FreeBSD__)
|
||||||
# define CONFFILE "/etc/dnsmasq.conf"
|
# define CONFFILE "/usr/local/etc/dnsmasq.conf"
|
||||||
|
# else
|
||||||
|
# define CONFFILE "/etc/dnsmasq.conf"
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFLEASE 3600 /* default lease time, 1 hour */
|
#define DEFLEASE 3600 /* default lease time, 1 hour */
|
||||||
#define CHUSER "nobody"
|
#define CHUSER "nobody"
|
||||||
#define CHGRP "dip"
|
#define CHGRP "dip"
|
||||||
@@ -61,6 +68,7 @@
|
|||||||
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
|
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
|
||||||
#define LOG_MAX 5 /* log-queue length */
|
#define LOG_MAX 5 /* log-queue length */
|
||||||
#define RANDFILE "/dev/urandom"
|
#define RANDFILE "/dev/urandom"
|
||||||
|
#define DAD_WAIT 20 /* retry binding IPv6 sockets for this long */
|
||||||
|
|
||||||
/* DBUS interface specifics */
|
/* DBUS interface specifics */
|
||||||
#define DNSMASQ_SERVICE "uk.org.thekelleys.dnsmasq"
|
#define DNSMASQ_SERVICE "uk.org.thekelleys.dnsmasq"
|
||||||
@@ -98,9 +106,6 @@ HAVE_BSD_NETWORK
|
|||||||
HAVE_SOLARIS_NETWORK
|
HAVE_SOLARIS_NETWORK
|
||||||
define exactly one of these to alter interaction with kernel networking.
|
define exactly one of these to alter interaction with kernel networking.
|
||||||
|
|
||||||
HAVE_SOLARIS_PRIVS
|
|
||||||
define for Solaris > 10 which can split privileges.
|
|
||||||
|
|
||||||
HAVE_BROKEN_RTC
|
HAVE_BROKEN_RTC
|
||||||
define this on embedded systems which don't have an RTC
|
define this on embedded systems which don't have an RTC
|
||||||
which keeps time over reboots. Causes dnsmasq to use uptime
|
which keeps time over reboots. Causes dnsmasq to use uptime
|
||||||
@@ -118,6 +123,9 @@ HAVE_BROKEN_RTC
|
|||||||
HAVE_TFTP
|
HAVE_TFTP
|
||||||
define this to get dnsmasq's built-in TFTP server.
|
define this to get dnsmasq's built-in TFTP server.
|
||||||
|
|
||||||
|
HAVE_DHCP
|
||||||
|
define this to get dnsmasq's DHCP server.
|
||||||
|
|
||||||
HAVE_GETOPT_LONG
|
HAVE_GETOPT_LONG
|
||||||
define this if you have GNU libc or GNU getopt.
|
define this if you have GNU libc or GNU getopt.
|
||||||
|
|
||||||
@@ -133,11 +141,6 @@ HAVE_DBUS
|
|||||||
define some methods to allow (re)configuration of the upstream DNS
|
define some methods to allow (re)configuration of the upstream DNS
|
||||||
servers via DBus.
|
servers via DBus.
|
||||||
|
|
||||||
HAVE_BSD_BRIDGE
|
|
||||||
Define this to enable the --bridge-interface option, useful on some
|
|
||||||
BSD systems.
|
|
||||||
|
|
||||||
|
|
||||||
NOTES:
|
NOTES:
|
||||||
For Linux you should define
|
For Linux you should define
|
||||||
HAVE_LINUX_NETWORK
|
HAVE_LINUX_NETWORK
|
||||||
@@ -157,6 +160,7 @@ NOTES:
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* platform independent options- uncomment to enable */
|
/* platform independent options- uncomment to enable */
|
||||||
|
#define HAVE_DHCP
|
||||||
#define HAVE_TFTP
|
#define HAVE_TFTP
|
||||||
/* #define HAVE_BROKEN_RTC */
|
/* #define HAVE_BROKEN_RTC */
|
||||||
/* #define HAVE_DBUS */
|
/* #define HAVE_DBUS */
|
||||||
@@ -166,6 +170,11 @@ NOTES:
|
|||||||
#undef HAVE_TFTP
|
#undef HAVE_TFTP
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Allow DHCP to be disabled with COPTS=-DNO_DHCP */
|
||||||
|
#ifdef NO_DHCP
|
||||||
|
#undef HAVE_DHCP
|
||||||
|
#endif
|
||||||
|
|
||||||
/* platform dependent options. */
|
/* platform dependent options. */
|
||||||
|
|
||||||
/* Must preceed __linux__ since uClinux defines __linux__ too. */
|
/* Must preceed __linux__ since uClinux defines __linux__ too. */
|
||||||
@@ -203,13 +212,6 @@ NOTES:
|
|||||||
#define HAVE_GETOPT_LONG
|
#define HAVE_GETOPT_LONG
|
||||||
#undef HAVE_ARC4RANDOM
|
#undef HAVE_ARC4RANDOM
|
||||||
#undef HAVE_SOCKADDR_SA_LEN
|
#undef HAVE_SOCKADDR_SA_LEN
|
||||||
/* glibc < 2.2 has broken Sockaddr_in6 so we have to use our own. */
|
|
||||||
/* glibc < 2.2 doesn't define in_addr_t */
|
|
||||||
#if defined(__GLIBC__) && (__GLIBC__ == 2) && \
|
|
||||||
defined(__GLIBC_MINOR__) && (__GLIBC_MINOR__ < 2)
|
|
||||||
typedef unsigned long in_addr_t;
|
|
||||||
# define HAVE_BROKEN_SOCKADDR_IN6
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#elif defined(__FreeBSD__) || \
|
#elif defined(__FreeBSD__) || \
|
||||||
defined(__OpenBSD__) || \
|
defined(__OpenBSD__) || \
|
||||||
@@ -224,7 +226,6 @@ typedef unsigned long in_addr_t;
|
|||||||
# define HAVE_ARC4RANDOM
|
# define HAVE_ARC4RANDOM
|
||||||
#endif
|
#endif
|
||||||
#define HAVE_SOCKADDR_SA_LEN
|
#define HAVE_SOCKADDR_SA_LEN
|
||||||
#define HAVE_BSD_BRIDGE
|
|
||||||
|
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
#define HAVE_BSD_NETWORK
|
#define HAVE_BSD_NETWORK
|
||||||
@@ -239,34 +240,16 @@ typedef unsigned long in_addr_t;
|
|||||||
#define HAVE_GETOPT_LONG
|
#define HAVE_GETOPT_LONG
|
||||||
#undef HAVE_ARC4RANDOM
|
#undef HAVE_ARC4RANDOM
|
||||||
#define HAVE_SOCKADDR_SA_LEN
|
#define HAVE_SOCKADDR_SA_LEN
|
||||||
#define HAVE_BSD_BRIDGE
|
|
||||||
|
|
||||||
#elif defined(__sun) || defined(__sun__)
|
#elif defined(__sun) || defined(__sun__)
|
||||||
#define HAVE_SOLARIS_NETWORK
|
#define HAVE_SOLARIS_NETWORK
|
||||||
/* only Solaris 10 does split privs. */
|
#define HAVE_GETOPT_LONG
|
||||||
#if (SUNOS_VER >= 10)
|
|
||||||
# define HAVE_SOLARIS_PRIVS
|
|
||||||
# define HAVE_GETOPT_LONG
|
|
||||||
#endif
|
|
||||||
/* some CMSG stuff missing on early solaris */
|
|
||||||
#ifndef OSSH_ALIGNBYTES
|
|
||||||
# define OSSH_ALIGNBYTES (sizeof(int) - 1)
|
|
||||||
#endif
|
|
||||||
#ifndef __CMSG_ALIGN
|
|
||||||
# define __CMSG_ALIGN(p) (((u_int)(p) + OSSH_ALIGNBYTES) &~ OSSH_ALIGNBYTES)
|
|
||||||
#endif
|
|
||||||
#ifndef CMSG_LEN
|
|
||||||
# define CMSG_LEN(len) (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
|
|
||||||
#endif
|
|
||||||
#ifndef CMSG_SPACE
|
|
||||||
# define CMSG_SPACE(len) (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(len))
|
|
||||||
#endif
|
|
||||||
#undef HAVE_ARC4RANDOM
|
#undef HAVE_ARC4RANDOM
|
||||||
#undef HAVE_SOCKADDR_SA_LEN
|
#undef HAVE_SOCKADDR_SA_LEN
|
||||||
|
|
||||||
#define _XPG4_2
|
#define _XPG4_2
|
||||||
#define __EXTENSIONS__
|
#define __EXTENSIONS__
|
||||||
#define ETHER_ADDR_LEN 6
|
#define ETHER_ADDR_LEN 6
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Decide if we're going to support IPv6 */
|
/* Decide if we're going to support IPv6 */
|
||||||
|
|||||||
+48
-13
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,17 +10,52 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
#ifdef HAVE_DBUS
|
#ifdef HAVE_DBUS
|
||||||
|
|
||||||
#define DBUS_API_SUBJECT_TO_CHANGE
|
|
||||||
#include <dbus/dbus.h>
|
#include <dbus/dbus.h>
|
||||||
|
|
||||||
|
const char* introspection_xml =
|
||||||
|
"<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n"
|
||||||
|
"\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
|
||||||
|
"<node name=\"" DNSMASQ_PATH "\">\n"
|
||||||
|
" <interface name=\"org.freedesktop.DBus.Introspectable\">\n"
|
||||||
|
" <method name=\"Introspect\">\n"
|
||||||
|
" <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
|
||||||
|
" </method>\n"
|
||||||
|
" </interface>\n"
|
||||||
|
" <interface name=\"" DNSMASQ_SERVICE "\">\n"
|
||||||
|
" <method name=\"ClearCache\">\n"
|
||||||
|
" </method>\n"
|
||||||
|
" <method name=\"GetVersion\">\n"
|
||||||
|
" <arg name=\"version\" direction=\"out\" type=\"s\"/>\n"
|
||||||
|
" </method>\n"
|
||||||
|
" <method name=\"SetServers\">\n"
|
||||||
|
" <arg name=\"servers\" direction=\"in\" type=\"av\"/>\n"
|
||||||
|
" </method>\n"
|
||||||
|
" <signal name=\"DhcpLeaseAdded\">\n"
|
||||||
|
" <arg name=\"ipaddr\" type=\"s\"/>\n"
|
||||||
|
" <arg name=\"hwaddr\" type=\"s\"/>\n"
|
||||||
|
" <arg name=\"hostname\" type=\"s\"/>\n"
|
||||||
|
" </signal>\n"
|
||||||
|
" <signal name=\"DhcpLeaseDeleted\">\n"
|
||||||
|
" <arg name=\"ipaddr\" type=\"s\"/>\n"
|
||||||
|
" <arg name=\"hwaddr\" type=\"s\"/>\n"
|
||||||
|
" <arg name=\"hostname\" type=\"s\"/>\n"
|
||||||
|
" </signal>\n"
|
||||||
|
" <signal name=\"DhcpLeaseUpdated\">\n"
|
||||||
|
" <arg name=\"ipaddr\" type=\"s\"/>\n"
|
||||||
|
" <arg name=\"hwaddr\" type=\"s\"/>\n"
|
||||||
|
" <arg name=\"hostname\" type=\"s\"/>\n"
|
||||||
|
" </signal>\n"
|
||||||
|
" </interface>\n"
|
||||||
|
"</node>\n";
|
||||||
|
|
||||||
struct watch {
|
struct watch {
|
||||||
DBusWatch *watch;
|
DBusWatch *watch;
|
||||||
struct watch *next;
|
struct watch *next;
|
||||||
@@ -229,7 +264,15 @@ DBusHandlerResult message_handler(DBusConnection *connection,
|
|||||||
{
|
{
|
||||||
char *method = (char *)dbus_message_get_member(message);
|
char *method = (char *)dbus_message_get_member(message);
|
||||||
|
|
||||||
if (strcmp(method, "GetVersion") == 0)
|
if (dbus_message_is_method_call(message, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
|
||||||
|
{
|
||||||
|
DBusMessage *reply = dbus_message_new_method_return(message);
|
||||||
|
|
||||||
|
dbus_message_append_args(reply, DBUS_TYPE_STRING, &introspection_xml, DBUS_TYPE_INVALID);
|
||||||
|
dbus_connection_send (connection, reply, NULL);
|
||||||
|
dbus_message_unref (reply);
|
||||||
|
}
|
||||||
|
else if (strcmp(method, "GetVersion") == 0)
|
||||||
{
|
{
|
||||||
char *v = VERSION;
|
char *v = VERSION;
|
||||||
DBusMessage *reply = dbus_message_new_method_return(message);
|
DBusMessage *reply = dbus_message_new_method_return(message);
|
||||||
@@ -301,11 +344,7 @@ void set_dbus_listeners(int *maxfdp,
|
|||||||
if (dbus_watch_get_enabled(w->watch))
|
if (dbus_watch_get_enabled(w->watch))
|
||||||
{
|
{
|
||||||
unsigned int flags = dbus_watch_get_flags(w->watch);
|
unsigned int flags = dbus_watch_get_flags(w->watch);
|
||||||
#if (DBUS_MINOR > 0)
|
|
||||||
int fd = dbus_watch_get_unix_fd(w->watch);
|
int fd = dbus_watch_get_unix_fd(w->watch);
|
||||||
#else
|
|
||||||
int fd = dbus_watch_get_fd(w->watch);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bump_maxfd(fd, maxfdp);
|
bump_maxfd(fd, maxfdp);
|
||||||
|
|
||||||
@@ -328,11 +367,7 @@ void check_dbus_listeners(fd_set *rset, fd_set *wset, fd_set *eset)
|
|||||||
if (dbus_watch_get_enabled(w->watch))
|
if (dbus_watch_get_enabled(w->watch))
|
||||||
{
|
{
|
||||||
unsigned int flags = 0;
|
unsigned int flags = 0;
|
||||||
#if (DBUS_MINOR > 0)
|
|
||||||
int fd = dbus_watch_get_unix_fd(w->watch);
|
int fd = dbus_watch_get_unix_fd(w->watch);
|
||||||
#else
|
|
||||||
int fd = dbus_watch_get_fd(w->watch);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (FD_ISSET(fd, rset))
|
if (FD_ISSET(fd, rset))
|
||||||
flags |= DBUS_WATCH_READABLE;
|
flags |= DBUS_WATCH_READABLE;
|
||||||
|
|||||||
+83
-77
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,12 +10,14 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
|
|
||||||
struct iface_param {
|
struct iface_param {
|
||||||
struct in_addr relay, primary;
|
struct in_addr relay, primary;
|
||||||
struct dhcp_context *current;
|
struct dhcp_context *current;
|
||||||
@@ -35,7 +37,7 @@ void dhcp_init(void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (fd == -1)
|
if (fd == -1)
|
||||||
die (_("cannot create DHCP socket : %s"), NULL, EC_BADNET);
|
die (_("cannot create DHCP socket: %s"), NULL, EC_BADNET);
|
||||||
|
|
||||||
if (!fix_fd(fd) ||
|
if (!fix_fd(fd) ||
|
||||||
#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
|
#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
|
||||||
@@ -43,7 +45,7 @@ void dhcp_init(void)
|
|||||||
#endif
|
#endif
|
||||||
#if defined(HAVE_LINUX_NETWORK)
|
#if defined(HAVE_LINUX_NETWORK)
|
||||||
setsockopt(fd, SOL_IP, IP_PKTINFO, &oneopt, sizeof(oneopt)) == -1 ||
|
setsockopt(fd, SOL_IP, IP_PKTINFO, &oneopt, sizeof(oneopt)) == -1 ||
|
||||||
#elif defined(IP_RECVIF)
|
#else
|
||||||
setsockopt(fd, IPPROTO_IP, IP_RECVIF, &oneopt, sizeof(oneopt)) == -1 ||
|
setsockopt(fd, IPPROTO_IP, IP_RECVIF, &oneopt, sizeof(oneopt)) == -1 ||
|
||||||
#endif
|
#endif
|
||||||
setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &oneopt, sizeof(oneopt)) == -1)
|
setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &oneopt, sizeof(oneopt)) == -1)
|
||||||
@@ -51,12 +53,7 @@ void dhcp_init(void)
|
|||||||
|
|
||||||
/* When bind-interfaces is set, there might be more than one dnmsasq
|
/* When bind-interfaces is set, there might be more than one dnmsasq
|
||||||
instance binding port 67. That's OK if they serve different networks.
|
instance binding port 67. That's OK if they serve different networks.
|
||||||
Need to set REUSEADDR to make this posible, or REUSEPORT on *BSD.
|
Need to set REUSEADDR to make this posible, or REUSEPORT on *BSD. */
|
||||||
OpenBSD <= 4.0 screws up IP_RECVIF when SO_REUSEPORT is set, but
|
|
||||||
OpenBSD <= 3.9 doesn't have IP_RECVIF anyway, so we just have to elide
|
|
||||||
this for OpenBSD 4.0, if you want more than one instance on oBSD4.0, tough. */
|
|
||||||
|
|
||||||
#ifndef OpenBSD4_0
|
|
||||||
if (daemon->options & OPT_NOWILD)
|
if (daemon->options & OPT_NOWILD)
|
||||||
{
|
{
|
||||||
#ifdef SO_REUSEPORT
|
#ifdef SO_REUSEPORT
|
||||||
@@ -67,7 +64,6 @@ void dhcp_init(void)
|
|||||||
if (rc == -1)
|
if (rc == -1)
|
||||||
die(_("failed to set SO_REUSE{ADDR|PORT} on DHCP socket: %s"), NULL, EC_BADNET);
|
die(_("failed to set SO_REUSE{ADDR|PORT} on DHCP socket: %s"), NULL, EC_BADNET);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
memset(&saddr, 0, sizeof(saddr));
|
memset(&saddr, 0, sizeof(saddr));
|
||||||
saddr.sin_family = AF_INET;
|
saddr.sin_family = AF_INET;
|
||||||
@@ -124,7 +120,7 @@ void dhcp_packet(time_t now)
|
|||||||
char control[CMSG_SPACE(sizeof(struct in_pktinfo))];
|
char control[CMSG_SPACE(sizeof(struct in_pktinfo))];
|
||||||
#elif defined(HAVE_SOLARIS_NETWORK)
|
#elif defined(HAVE_SOLARIS_NETWORK)
|
||||||
char control[CMSG_SPACE(sizeof(unsigned int))];
|
char control[CMSG_SPACE(sizeof(unsigned int))];
|
||||||
#elif defined(IP_RECVIF)
|
#elif defined(HAVE_BSD_NETWORK)
|
||||||
char control[CMSG_SPACE(sizeof(struct sockaddr_dl))];
|
char control[CMSG_SPACE(sizeof(struct sockaddr_dl))];
|
||||||
#endif
|
#endif
|
||||||
} control_u;
|
} control_u;
|
||||||
@@ -136,13 +132,30 @@ void dhcp_packet(time_t now)
|
|||||||
msg.msg_iov = &daemon->dhcp_packet;
|
msg.msg_iov = &daemon->dhcp_packet;
|
||||||
msg.msg_iovlen = 1;
|
msg.msg_iovlen = 1;
|
||||||
|
|
||||||
do
|
while (1)
|
||||||
{
|
{
|
||||||
msg.msg_flags = 0;
|
msg.msg_flags = 0;
|
||||||
while ((sz = recvmsg(daemon->dhcpfd, &msg, MSG_PEEK)) == -1 && errno == EINTR);
|
while ((sz = recvmsg(daemon->dhcpfd, &msg, MSG_PEEK | MSG_TRUNC)) == -1 && errno == EINTR);
|
||||||
|
|
||||||
|
if (sz == -1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!(msg.msg_flags & MSG_TRUNC))
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* Very new Linux kernels return the actual size needed,
|
||||||
|
older ones always return truncated size */
|
||||||
|
if ((size_t)sz == daemon->dhcp_packet.iov_len)
|
||||||
|
{
|
||||||
|
if (!expand_buf(&daemon->dhcp_packet, sz + 100))
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
expand_buf(&daemon->dhcp_packet, sz);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
while (sz != -1 && (msg.msg_flags & MSG_TRUNC) &&
|
|
||||||
expand_buf(&daemon->dhcp_packet, daemon->dhcp_packet.iov_len + 100));
|
|
||||||
|
|
||||||
/* expand_buf may have moved buffer */
|
/* expand_buf may have moved buffer */
|
||||||
mess = (struct dhcp_packet *)daemon->dhcp_packet.iov_base;
|
mess = (struct dhcp_packet *)daemon->dhcp_packet.iov_base;
|
||||||
@@ -154,7 +167,7 @@ void dhcp_packet(time_t now)
|
|||||||
|
|
||||||
while ((sz = recvmsg(daemon->dhcpfd, &msg, 0)) == -1 && errno == EINTR);
|
while ((sz = recvmsg(daemon->dhcpfd, &msg, 0)) == -1 && errno == EINTR);
|
||||||
|
|
||||||
if (sz < (ssize_t)(sizeof(*mess) - sizeof(mess->options)))
|
if ((msg.msg_flags & MSG_TRUNC) || sz < (ssize_t)(sizeof(*mess) - sizeof(mess->options)))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
#if defined (HAVE_LINUX_NETWORK)
|
#if defined (HAVE_LINUX_NETWORK)
|
||||||
@@ -167,21 +180,22 @@ void dhcp_packet(time_t now)
|
|||||||
unicast_dest = 1;
|
unicast_dest = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(ifr.ifr_ifindex = iface_index) ||
|
#elif defined(HAVE_BSD_NETWORK)
|
||||||
ioctl(daemon->dhcpfd, SIOCGIFNAME, &ifr) == -1)
|
|
||||||
return;
|
|
||||||
|
|
||||||
#elif defined(IP_RECVIF)
|
|
||||||
if (msg.msg_controllen >= sizeof(struct cmsghdr))
|
if (msg.msg_controllen >= sizeof(struct cmsghdr))
|
||||||
for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
|
for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
|
||||||
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVIF)
|
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVIF)
|
||||||
#ifdef HAVE_SOLARIS_NETWORK
|
|
||||||
iface_index = *((unsigned int *)CMSG_DATA(cmptr));
|
|
||||||
#else
|
|
||||||
iface_index = ((struct sockaddr_dl *)CMSG_DATA(cmptr))->sdl_index;
|
iface_index = ((struct sockaddr_dl *)CMSG_DATA(cmptr))->sdl_index;
|
||||||
|
|
||||||
|
|
||||||
|
#elif defined(HAVE_SOLARIS_NETWORK)
|
||||||
|
if (msg.msg_controllen >= sizeof(struct cmsghdr))
|
||||||
|
for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
|
||||||
|
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVIF)
|
||||||
|
iface_index = *((unsigned int *)CMSG_DATA(cmptr));
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!iface_index || !if_indextoname(iface_index, ifr.ifr_name))
|
if (!indextoname(daemon->dhcpfd, iface_index, ifr.ifr_name))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
#ifdef MSG_BCAST
|
#ifdef MSG_BCAST
|
||||||
@@ -190,17 +204,6 @@ void dhcp_packet(time_t now)
|
|||||||
unicast_dest = 1;
|
unicast_dest = 1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else
|
|
||||||
/* fallback for systems without IP_RECVIF - allow only one interface
|
|
||||||
and assume packets arrive from it - yuk. */
|
|
||||||
{
|
|
||||||
struct iname *name;
|
|
||||||
for (name = daemon->if_names; name->isloop; name = name->next);
|
|
||||||
strcpy(ifr.ifr_name, name->name);
|
|
||||||
iface_index = if_nametoindex(name->name);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ifr.ifr_addr.sa_family = AF_INET;
|
ifr.ifr_addr.sa_family = AF_INET;
|
||||||
if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 )
|
if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 )
|
||||||
{
|
{
|
||||||
@@ -208,7 +211,7 @@ void dhcp_packet(time_t now)
|
|||||||
iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
|
iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!iface_check(AF_INET, (struct all_addr *)addrp, &ifr, &iface_index))
|
if (!iface_check(AF_INET, (struct all_addr *)addrp, ifr.ifr_name, &iface_index))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
||||||
@@ -218,9 +221,9 @@ void dhcp_packet(time_t now)
|
|||||||
/* interface may have been changed by alias in iface_check */
|
/* interface may have been changed by alias in iface_check */
|
||||||
if (!addrp)
|
if (!addrp)
|
||||||
{
|
{
|
||||||
if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1)
|
if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) == -1)
|
||||||
{
|
{
|
||||||
my_syslog(LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);
|
my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -319,7 +322,7 @@ void dhcp_packet(time_t now)
|
|||||||
dest.sin_addr.s_addr = INADDR_BROADCAST;
|
dest.sin_addr.s_addr = INADDR_BROADCAST;
|
||||||
dest.sin_port = htons(daemon->dhcp_client_port);
|
dest.sin_port = htons(daemon->dhcp_client_port);
|
||||||
/* note that we don't specify the interface here: that's done by the
|
/* note that we don't specify the interface here: that's done by the
|
||||||
IP_XMIT_IF sockopt lower down. */
|
IP_BOUND_IF sockopt lower down. */
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -345,7 +348,7 @@ void dhcp_packet(time_t now)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_SOLARIS_NETWORK
|
#ifdef HAVE_SOLARIS_NETWORK
|
||||||
setsockopt(daemon->dhcpfd, IPPROTO_IP, IP_XMIT_IF, &iface_index, sizeof(iface_index));
|
setsockopt(daemon->dhcpfd, IPPROTO_IP, IP_BOUND_IF, &iface_index, sizeof(iface_index));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
while(sendmsg(daemon->dhcpfd, &msg, 0) == -1 && retry_send());
|
while(sendmsg(daemon->dhcpfd, &msg, 0) == -1 && retry_send());
|
||||||
@@ -379,7 +382,7 @@ static int complete_context(struct in_addr local, int if_index,
|
|||||||
{
|
{
|
||||||
strcpy(daemon->dhcp_buff, inet_ntoa(context->start));
|
strcpy(daemon->dhcp_buff, inet_ntoa(context->start));
|
||||||
strcpy(daemon->dhcp_buff2, inet_ntoa(context->end));
|
strcpy(daemon->dhcp_buff2, inet_ntoa(context->end));
|
||||||
my_syslog(LOG_WARNING, _("DHCP range %s -- %s is not consistent with netmask %s"),
|
my_syslog(MS_DHCP | LOG_WARNING, _("DHCP range %s -- %s is not consistent with netmask %s"),
|
||||||
daemon->dhcp_buff, daemon->dhcp_buff2, inet_ntoa(netmask));
|
daemon->dhcp_buff, daemon->dhcp_buff2, inet_ntoa(netmask));
|
||||||
}
|
}
|
||||||
context->netmask = netmask;
|
context->netmask = netmask;
|
||||||
@@ -469,9 +472,9 @@ struct dhcp_context *narrow_context(struct dhcp_context *context,
|
|||||||
if (!(tmp = address_available(context, taddr, netids)))
|
if (!(tmp = address_available(context, taddr, netids)))
|
||||||
{
|
{
|
||||||
for (tmp = context; tmp; tmp = tmp->current)
|
for (tmp = context; tmp; tmp = tmp->current)
|
||||||
if (is_same_net(taddr, tmp->start, tmp->netmask) &&
|
if (is_same_net(taddr, tmp->start, tmp->netmask) &&
|
||||||
(tmp->flags & CONTEXT_STATIC))
|
(tmp->flags & CONTEXT_STATIC))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (!tmp)
|
if (!tmp)
|
||||||
for (tmp = context; tmp; tmp = tmp->current)
|
for (tmp = context; tmp; tmp = tmp->current)
|
||||||
@@ -560,9 +563,16 @@ int address_allocate(struct dhcp_context *context,
|
|||||||
if (addr.s_addr == d->router.s_addr)
|
if (addr.s_addr == d->router.s_addr)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
/* Addresses which end in .255 and .0 are broken in Windows even when using
|
||||||
|
supernetting. ie dhcp-range=192.168.0.1,192.168.1.254,255,255,254.0
|
||||||
|
then 192.168.0.255 is a valid IP address, but not for Windows as it's
|
||||||
|
in the class C range. See KB281579. We therefore don't allocate these
|
||||||
|
addresses to avoid hard-to-diagnose problems. Thanks Bill. */
|
||||||
if (!d &&
|
if (!d &&
|
||||||
!lease_find_by_addr(addr) &&
|
!lease_find_by_addr(addr) &&
|
||||||
!config_find_by_address(daemon->dhcp_conf, addr))
|
!config_find_by_address(daemon->dhcp_conf, addr) &&
|
||||||
|
(!IN_CLASSC(ntohl(addr.s_addr)) ||
|
||||||
|
((ntohl(addr.s_addr) & 0xff) != 0xff && ((ntohl(addr.s_addr) & 0xff) != 0x0))))
|
||||||
{
|
{
|
||||||
struct ping_result *r, *victim = NULL;
|
struct ping_result *r, *victim = NULL;
|
||||||
int count, max = (int)(0.6 * (((float)PING_CACHE_TIME)/
|
int count, max = (int)(0.6 * (((float)PING_CACHE_TIME)/
|
||||||
@@ -655,7 +665,8 @@ struct dhcp_config *find_config(struct dhcp_config *configs,
|
|||||||
unsigned char *hwaddr, int hw_len,
|
unsigned char *hwaddr, int hw_len,
|
||||||
int hw_type, char *hostname)
|
int hw_type, char *hostname)
|
||||||
{
|
{
|
||||||
struct dhcp_config *config;
|
int count, new;
|
||||||
|
struct dhcp_config *config, *candidate;
|
||||||
struct hwaddr_config *conf_addr;
|
struct hwaddr_config *conf_addr;
|
||||||
|
|
||||||
if (clid)
|
if (clid)
|
||||||
@@ -688,16 +699,20 @@ struct dhcp_config *find_config(struct dhcp_config *configs,
|
|||||||
is_addr_in_context(context, config))
|
is_addr_in_context(context, config))
|
||||||
return config;
|
return config;
|
||||||
|
|
||||||
for (config = configs; config; config = config->next)
|
/* use match with fewest wildcast octets */
|
||||||
for (conf_addr = config->hwaddr; conf_addr; conf_addr = conf_addr->next)
|
for (candidate = NULL, count = 0, config = configs; config; config = config->next)
|
||||||
if (conf_addr->wildcard_mask != 0 &&
|
if (is_addr_in_context(context, config))
|
||||||
conf_addr->hwaddr_len == hw_len &&
|
for (conf_addr = config->hwaddr; conf_addr; conf_addr = conf_addr->next)
|
||||||
(conf_addr->hwaddr_type == hw_type || conf_addr->hwaddr_type == 0) &&
|
if (conf_addr->wildcard_mask != 0 &&
|
||||||
is_addr_in_context(context, config) &&
|
conf_addr->hwaddr_len == hw_len &&
|
||||||
memcmp_masked(conf_addr->hwaddr, hwaddr, hw_len, conf_addr->wildcard_mask))
|
(conf_addr->hwaddr_type == hw_type || conf_addr->hwaddr_type == 0) &&
|
||||||
return config;
|
(new = memcmp_masked(conf_addr->hwaddr, hwaddr, hw_len, conf_addr->wildcard_mask)) > count)
|
||||||
|
{
|
||||||
|
count = new;
|
||||||
|
candidate = config;
|
||||||
|
}
|
||||||
|
|
||||||
return NULL;
|
return candidate;
|
||||||
}
|
}
|
||||||
|
|
||||||
void dhcp_read_ethers(void)
|
void dhcp_read_ethers(void)
|
||||||
@@ -716,7 +731,7 @@ void dhcp_read_ethers(void)
|
|||||||
|
|
||||||
if (!f)
|
if (!f)
|
||||||
{
|
{
|
||||||
my_syslog(LOG_ERR, _("failed to read %s:%s"), ETHERSFILE, strerror(errno));
|
my_syslog(MS_DHCP | LOG_ERR, _("failed to read %s: %s"), ETHERSFILE, strerror(errno));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -744,7 +759,7 @@ void dhcp_read_ethers(void)
|
|||||||
while (strlen(buff) > 0 && isspace((int)buff[strlen(buff)-1]))
|
while (strlen(buff) > 0 && isspace((int)buff[strlen(buff)-1]))
|
||||||
buff[strlen(buff)-1] = 0;
|
buff[strlen(buff)-1] = 0;
|
||||||
|
|
||||||
if ((*buff == '#') || (*buff == '+'))
|
if ((*buff == '#') || (*buff == '+') || (*buff == 0))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
for (ip = buff; *ip && !isspace((int)*ip); ip++);
|
for (ip = buff; *ip && !isspace((int)*ip); ip++);
|
||||||
@@ -752,7 +767,7 @@ void dhcp_read_ethers(void)
|
|||||||
*ip = 0;
|
*ip = 0;
|
||||||
if (!*ip || parse_hex(buff, hwaddr, ETHER_ADDR_LEN, NULL, NULL) != ETHER_ADDR_LEN)
|
if (!*ip || parse_hex(buff, hwaddr, ETHER_ADDR_LEN, NULL, NULL) != ETHER_ADDR_LEN)
|
||||||
{
|
{
|
||||||
my_syslog(LOG_ERR, _("bad line at %s line %d"), ETHERSFILE, lineno);
|
my_syslog(MS_DHCP | LOG_ERR, _("bad line at %s line %d"), ETHERSFILE, lineno);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -765,7 +780,7 @@ void dhcp_read_ethers(void)
|
|||||||
{
|
{
|
||||||
if ((addr.s_addr = inet_addr(ip)) == (in_addr_t)-1)
|
if ((addr.s_addr = inet_addr(ip)) == (in_addr_t)-1)
|
||||||
{
|
{
|
||||||
my_syslog(LOG_ERR, _("bad address at %s line %d"), ETHERSFILE, lineno);
|
my_syslog(MS_DHCP | LOG_ERR, _("bad address at %s line %d"), ETHERSFILE, lineno);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -779,7 +794,7 @@ void dhcp_read_ethers(void)
|
|||||||
{
|
{
|
||||||
if (!canonicalise(ip))
|
if (!canonicalise(ip))
|
||||||
{
|
{
|
||||||
my_syslog(LOG_ERR, _("bad name at %s line %d"), ETHERSFILE, lineno);
|
my_syslog(MS_DHCP | LOG_ERR, _("bad name at %s line %d"), ETHERSFILE, lineno);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -845,7 +860,7 @@ void dhcp_read_ethers(void)
|
|||||||
|
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
|
||||||
my_syslog(LOG_INFO, _("read %s - %d addresses"), ETHERSFILE, count);
|
my_syslog(MS_DHCP | LOG_INFO, _("read %s - %d addresses"), ETHERSFILE, count);
|
||||||
}
|
}
|
||||||
|
|
||||||
void check_dhcp_hosts(int fatal)
|
void check_dhcp_hosts(int fatal)
|
||||||
@@ -870,7 +885,7 @@ void check_dhcp_hosts(int fatal)
|
|||||||
die(_("duplicate IP address %s in dhcp-config directive."),
|
die(_("duplicate IP address %s in dhcp-config directive."),
|
||||||
inet_ntoa(cp->addr), EC_BADCONF);
|
inet_ntoa(cp->addr), EC_BADCONF);
|
||||||
else
|
else
|
||||||
my_syslog(LOG_ERR, _("duplicate IP address %s in %s."),
|
my_syslog(MS_DHCP | LOG_ERR, _("duplicate IP address %s in %s."),
|
||||||
inet_ntoa(cp->addr), daemon->dhcp_hosts_file);
|
inet_ntoa(cp->addr), daemon->dhcp_hosts_file);
|
||||||
configs->flags &= ~CONFIG_ADDR;
|
configs->flags &= ~CONFIG_ADDR;
|
||||||
}
|
}
|
||||||
@@ -913,12 +928,12 @@ void dhcp_update_configs(struct dhcp_config *configs)
|
|||||||
crec = cache_find_by_name(crec, config->hostname, 0, F_IPV4);
|
crec = cache_find_by_name(crec, config->hostname, 0, F_IPV4);
|
||||||
if (!crec)
|
if (!crec)
|
||||||
continue; /* should be never */
|
continue; /* should be never */
|
||||||
my_syslog(LOG_WARNING, _("%s has more than one address in hostsfile, using %s for DHCP"),
|
my_syslog(MS_DHCP | LOG_WARNING, _("%s has more than one address in hostsfile, using %s for DHCP"),
|
||||||
config->hostname, inet_ntoa(crec->addr.addr.addr.addr4));
|
config->hostname, inet_ntoa(crec->addr.addr.addr.addr4));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config_find_by_address(configs, crec->addr.addr.addr.addr4))
|
if (config_find_by_address(configs, crec->addr.addr.addr.addr4))
|
||||||
my_syslog(LOG_WARNING, _("duplicate IP address %s (%s) in dhcp-config directive"),
|
my_syslog(MS_DHCP | LOG_WARNING, _("duplicate IP address %s (%s) in dhcp-config directive"),
|
||||||
inet_ntoa(crec->addr.addr.addr.addr4), config->hostname);
|
inet_ntoa(crec->addr.addr.addr.addr4), config->hostname);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -970,14 +985,5 @@ char *strip_hostname(char *hostname)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *get_domain(struct in_addr addr)
|
#endif
|
||||||
{
|
|
||||||
struct cond_domain *c;
|
|
||||||
|
|
||||||
for (c = daemon->cond_domain; c; c = c->next)
|
|
||||||
if (ntohl(addr.s_addr) >= ntohl(c->start.s_addr) &&
|
|
||||||
ntohl(addr.s_addr) <= ntohl(c->end.s_addr))
|
|
||||||
return c->domain;
|
|
||||||
|
|
||||||
return daemon->domain_suffix;
|
|
||||||
}
|
|
||||||
+58
-35
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -33,9 +33,6 @@ static char *compile_opts =
|
|||||||
#ifdef NO_FORK
|
#ifdef NO_FORK
|
||||||
"no-MMU "
|
"no-MMU "
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_BSD_BRIDGE
|
|
||||||
"BSD-bridge "
|
|
||||||
#endif
|
|
||||||
#ifndef HAVE_DBUS
|
#ifndef HAVE_DBUS
|
||||||
"no-"
|
"no-"
|
||||||
#endif
|
#endif
|
||||||
@@ -44,6 +41,10 @@ static char *compile_opts =
|
|||||||
"no-"
|
"no-"
|
||||||
#endif
|
#endif
|
||||||
"I18N "
|
"I18N "
|
||||||
|
#ifndef HAVE_DHCP
|
||||||
|
"no-"
|
||||||
|
#endif
|
||||||
|
"DHCP "
|
||||||
#ifndef HAVE_TFTP
|
#ifndef HAVE_TFTP
|
||||||
"no-"
|
"no-"
|
||||||
#endif
|
#endif
|
||||||
@@ -67,9 +68,11 @@ int main (int argc, char **argv)
|
|||||||
struct iname *if_tmp;
|
struct iname *if_tmp;
|
||||||
int piperead, pipefd[2], err_pipe[2];
|
int piperead, pipefd[2], err_pipe[2];
|
||||||
struct passwd *ent_pw = NULL;
|
struct passwd *ent_pw = NULL;
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
uid_t script_uid = 0;
|
uid_t script_uid = 0;
|
||||||
gid_t script_gid = 0;
|
gid_t script_gid = 0;
|
||||||
struct group *gp= NULL;
|
#endif
|
||||||
|
struct group *gp = NULL;
|
||||||
long i, max_fd = sysconf(_SC_OPEN_MAX);
|
long i, max_fd = sysconf(_SC_OPEN_MAX);
|
||||||
char *baduser = NULL;
|
char *baduser = NULL;
|
||||||
int log_err;
|
int log_err;
|
||||||
@@ -108,11 +111,13 @@ int main (int argc, char **argv)
|
|||||||
daemon->edns_pktsz : DNSMASQ_PACKETSZ;
|
daemon->edns_pktsz : DNSMASQ_PACKETSZ;
|
||||||
daemon->packet = safe_malloc(daemon->packet_buff_sz);
|
daemon->packet = safe_malloc(daemon->packet_buff_sz);
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
if (!daemon->lease_file)
|
if (!daemon->lease_file)
|
||||||
{
|
{
|
||||||
if (daemon->dhcp)
|
if (daemon->dhcp)
|
||||||
daemon->lease_file = LEASEFILE;
|
daemon->lease_file = LEASEFILE;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Close any file descriptors we inherited apart from std{in|out|err} */
|
/* Close any file descriptors we inherited apart from std{in|out|err} */
|
||||||
for (i = 0; i < max_fd; i++)
|
for (i = 0; i < max_fd; i++)
|
||||||
@@ -145,23 +150,16 @@ int main (int argc, char **argv)
|
|||||||
|
|
||||||
now = dnsmasq_time();
|
now = dnsmasq_time();
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
if (daemon->dhcp)
|
if (daemon->dhcp)
|
||||||
{
|
{
|
||||||
#if !defined(HAVE_LINUX_NETWORK) && !defined(IP_RECVIF)
|
|
||||||
int c;
|
|
||||||
struct iname *tmp;
|
|
||||||
for (c = 0, tmp = daemon->if_names; tmp; tmp = tmp->next)
|
|
||||||
if (!tmp->isloop)
|
|
||||||
c++;
|
|
||||||
if (c != 1)
|
|
||||||
die(_("must set exactly one interface on broken systems without IP_RECVIF"), NULL, EC_BADCONF);
|
|
||||||
#endif
|
|
||||||
/* Note that order matters here, we must call lease_init before
|
/* Note that order matters here, we must call lease_init before
|
||||||
creating any file descriptors which shouldn't be leaked
|
creating any file descriptors which shouldn't be leaked
|
||||||
to the lease-script init process. */
|
to the lease-script init process. */
|
||||||
lease_init(now);
|
lease_init(now);
|
||||||
dhcp_init();
|
dhcp_init();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!enumerate_interfaces())
|
if (!enumerate_interfaces())
|
||||||
die(_("failed to find list of interfaces: %s"), NULL, EC_MISC);
|
die(_("failed to find list of interfaces: %s"), NULL, EC_MISC);
|
||||||
@@ -204,6 +202,7 @@ int main (int argc, char **argv)
|
|||||||
if (daemon->port != 0)
|
if (daemon->port != 0)
|
||||||
pre_allocate_sfds();
|
pre_allocate_sfds();
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
/* Note getpwnam returns static storage */
|
/* Note getpwnam returns static storage */
|
||||||
if (daemon->dhcp && daemon->lease_change_command && daemon->scriptuser)
|
if (daemon->dhcp && daemon->lease_change_command && daemon->scriptuser)
|
||||||
{
|
{
|
||||||
@@ -215,6 +214,7 @@ int main (int argc, char **argv)
|
|||||||
else
|
else
|
||||||
baduser = daemon->scriptuser;
|
baduser = daemon->scriptuser;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (daemon->username && !(ent_pw = getpwnam(daemon->username)))
|
if (daemon->username && !(ent_pw = getpwnam(daemon->username)))
|
||||||
baduser = daemon->username;
|
baduser = daemon->username;
|
||||||
@@ -290,8 +290,9 @@ int main (int argc, char **argv)
|
|||||||
When startup is complete we close this and the process terminates. */
|
When startup is complete we close this and the process terminates. */
|
||||||
safe_pipe(err_pipe, 0);
|
safe_pipe(err_pipe, 0);
|
||||||
|
|
||||||
if ((pid = fork()) == -1 )
|
if ((pid = fork()) == -1)
|
||||||
die(_("cannot fork into background: %s"), NULL, EC_MISC);
|
/* fd == -1 since we've not forked, never returns. */
|
||||||
|
send_event(-1, EVENT_FORK_ERR, errno);
|
||||||
|
|
||||||
if (pid != 0)
|
if (pid != 0)
|
||||||
{
|
{
|
||||||
@@ -312,9 +313,11 @@ int main (int argc, char **argv)
|
|||||||
/* NO calls to die() from here on. */
|
/* NO calls to die() from here on. */
|
||||||
|
|
||||||
setsid();
|
setsid();
|
||||||
pid = fork();
|
|
||||||
|
|
||||||
if (pid != 0 && pid != -1)
|
if ((pid = fork()) == -1)
|
||||||
|
send_event(err_pipe[1], EVENT_FORK_ERR, errno);
|
||||||
|
|
||||||
|
if (pid != 0)
|
||||||
_exit(0);
|
_exit(0);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -349,7 +352,7 @@ int main (int argc, char **argv)
|
|||||||
|
|
||||||
/* if we are to run scripts, we need to fork a helper before dropping root. */
|
/* if we are to run scripts, we need to fork a helper before dropping root. */
|
||||||
daemon->helperfd = -1;
|
daemon->helperfd = -1;
|
||||||
#ifndef NO_FORK
|
#if defined(HAVE_DHCP) && !defined(NO_FORK)
|
||||||
if (daemon->dhcp && daemon->lease_change_command)
|
if (daemon->dhcp && daemon->lease_change_command)
|
||||||
daemon->helperfd = create_helper(pipewrite, err_pipe[1], script_uid, script_gid, max_fd);
|
daemon->helperfd = create_helper(pipewrite, err_pipe[1], script_uid, script_gid, max_fd);
|
||||||
#endif
|
#endif
|
||||||
@@ -380,7 +383,7 @@ int main (int argc, char **argv)
|
|||||||
if (capset(hdr, data) == -1 || prctl(PR_SET_KEEPCAPS, 1) == -1)
|
if (capset(hdr, data) == -1 || prctl(PR_SET_KEEPCAPS, 1) == -1)
|
||||||
bad_capabilities = errno;
|
bad_capabilities = errno;
|
||||||
|
|
||||||
#elif defined(HAVE_SOLARIS_PRIVS)
|
#elif defined(HAVE_SOLARIS_NETWORK)
|
||||||
/* http://developers.sun.com/solaris/articles/program_privileges.html */
|
/* http://developers.sun.com/solaris/articles/program_privileges.html */
|
||||||
priv_set_t *priv_set;
|
priv_set_t *priv_set;
|
||||||
|
|
||||||
@@ -400,9 +403,6 @@ int main (int argc, char **argv)
|
|||||||
if (priv_set)
|
if (priv_set)
|
||||||
priv_freeset(priv_set);
|
priv_freeset(priv_set);
|
||||||
|
|
||||||
#elif defined(HAVE_SOLARIS_NETWORK)
|
|
||||||
|
|
||||||
bad_capabilities = ENOTSUP;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (bad_capabilities != 0)
|
if (bad_capabilities != 0)
|
||||||
@@ -482,6 +482,7 @@ int main (int argc, char **argv)
|
|||||||
if (daemon->max_logs != 0)
|
if (daemon->max_logs != 0)
|
||||||
my_syslog(LOG_INFO, _("asynchronous logging enabled, queue limit is %d messages"), daemon->max_logs);
|
my_syslog(LOG_INFO, _("asynchronous logging enabled, queue limit is %d messages"), daemon->max_logs);
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
if (daemon->dhcp)
|
if (daemon->dhcp)
|
||||||
{
|
{
|
||||||
struct dhcp_context *dhcp_tmp;
|
struct dhcp_context *dhcp_tmp;
|
||||||
@@ -490,13 +491,16 @@ int main (int argc, char **argv)
|
|||||||
{
|
{
|
||||||
prettyprint_time(daemon->dhcp_buff2, dhcp_tmp->lease_time);
|
prettyprint_time(daemon->dhcp_buff2, dhcp_tmp->lease_time);
|
||||||
strcpy(daemon->dhcp_buff, inet_ntoa(dhcp_tmp->start));
|
strcpy(daemon->dhcp_buff, inet_ntoa(dhcp_tmp->start));
|
||||||
my_syslog(LOG_INFO,
|
my_syslog(MS_DHCP | LOG_INFO,
|
||||||
(dhcp_tmp->flags & CONTEXT_STATIC) ?
|
(dhcp_tmp->flags & CONTEXT_STATIC) ?
|
||||||
_("DHCP, static leases only on %.0s%s, lease time %s") :
|
_("DHCP, static leases only on %.0s%s, lease time %s") :
|
||||||
|
(dhcp_tmp->flags & CONTEXT_PROXY) ?
|
||||||
|
_("DHCP, proxy on subnet %.0s%s%.0s") :
|
||||||
_("DHCP, IP range %s -- %s, lease time %s"),
|
_("DHCP, IP range %s -- %s, lease time %s"),
|
||||||
daemon->dhcp_buff, inet_ntoa(dhcp_tmp->end), daemon->dhcp_buff2);
|
daemon->dhcp_buff, inet_ntoa(dhcp_tmp->end), daemon->dhcp_buff2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_TFTP
|
#ifdef HAVE_TFTP
|
||||||
if (daemon->options & OPT_TFTP)
|
if (daemon->options & OPT_TFTP)
|
||||||
@@ -506,7 +510,7 @@ int main (int argc, char **argv)
|
|||||||
max_fd = FD_SETSIZE;
|
max_fd = FD_SETSIZE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
my_syslog(LOG_INFO, "TFTP %s%s %s",
|
my_syslog(MS_TFTP | LOG_INFO, "TFTP %s%s %s",
|
||||||
daemon->tftp_prefix ? _("root is ") : _("enabled"),
|
daemon->tftp_prefix ? _("root is ") : _("enabled"),
|
||||||
daemon->tftp_prefix ? daemon->tftp_prefix: "",
|
daemon->tftp_prefix ? daemon->tftp_prefix: "",
|
||||||
daemon->options & OPT_TFTP_SECURE ? _("secure mode") : "");
|
daemon->options & OPT_TFTP_SECURE ? _("secure mode") : "");
|
||||||
@@ -534,7 +538,7 @@ int main (int argc, char **argv)
|
|||||||
if (daemon->tftp_max > max_fd)
|
if (daemon->tftp_max > max_fd)
|
||||||
{
|
{
|
||||||
daemon->tftp_max = max_fd;
|
daemon->tftp_max = max_fd;
|
||||||
my_syslog(LOG_WARNING,
|
my_syslog(MS_TFTP | LOG_WARNING,
|
||||||
_("restricting maximum simultaneous TFTP transfers to %d"),
|
_("restricting maximum simultaneous TFTP transfers to %d"),
|
||||||
daemon->tftp_max);
|
daemon->tftp_max);
|
||||||
}
|
}
|
||||||
@@ -582,11 +586,13 @@ int main (int argc, char **argv)
|
|||||||
set_dbus_listeners(&maxfd, &rset, &wset, &eset);
|
set_dbus_listeners(&maxfd, &rset, &wset, &eset);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
if (daemon->dhcp)
|
if (daemon->dhcp)
|
||||||
{
|
{
|
||||||
FD_SET(daemon->dhcpfd, &rset);
|
FD_SET(daemon->dhcpfd, &rset);
|
||||||
bump_maxfd(daemon->dhcpfd, &maxfd);
|
bump_maxfd(daemon->dhcpfd, &maxfd);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
#ifdef HAVE_LINUX_NETWORK
|
||||||
FD_SET(daemon->netlinkfd, &rset);
|
FD_SET(daemon->netlinkfd, &rset);
|
||||||
@@ -596,7 +602,8 @@ int main (int argc, char **argv)
|
|||||||
FD_SET(piperead, &rset);
|
FD_SET(piperead, &rset);
|
||||||
bump_maxfd(piperead, &maxfd);
|
bump_maxfd(piperead, &maxfd);
|
||||||
|
|
||||||
#ifndef NO_FORK
|
#ifdef HAVE_DHCP
|
||||||
|
# ifndef NO_FORK
|
||||||
while (helper_buf_empty() && do_script_run(now));
|
while (helper_buf_empty() && do_script_run(now));
|
||||||
|
|
||||||
if (!helper_buf_empty())
|
if (!helper_buf_empty())
|
||||||
@@ -604,9 +611,10 @@ int main (int argc, char **argv)
|
|||||||
FD_SET(daemon->helperfd, &wset);
|
FD_SET(daemon->helperfd, &wset);
|
||||||
bump_maxfd(daemon->helperfd, &maxfd);
|
bump_maxfd(daemon->helperfd, &maxfd);
|
||||||
}
|
}
|
||||||
#else
|
# else
|
||||||
/* need this for other side-effects */
|
/* need this for other side-effects */
|
||||||
while (do_script_run(now));
|
while (do_script_run(now));
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* must do this just before select(), when we know no
|
/* must do this just before select(), when we know no
|
||||||
@@ -662,12 +670,14 @@ int main (int argc, char **argv)
|
|||||||
check_tftp_listeners(&rset, now);
|
check_tftp_listeners(&rset, now);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
if (daemon->dhcp && FD_ISSET(daemon->dhcpfd, &rset))
|
if (daemon->dhcp && FD_ISSET(daemon->dhcpfd, &rset))
|
||||||
dhcp_packet(now);
|
dhcp_packet(now);
|
||||||
|
|
||||||
#ifndef NO_FORK
|
# ifndef NO_FORK
|
||||||
if (daemon->helperfd != -1 && FD_ISSET(daemon->helperfd, &wset))
|
if (daemon->helperfd != -1 && FD_ISSET(daemon->helperfd, &wset))
|
||||||
helper_write();
|
helper_write();
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -738,6 +748,9 @@ static void fatal_event(struct event_desc *ev)
|
|||||||
case EVENT_DIE:
|
case EVENT_DIE:
|
||||||
exit(0);
|
exit(0);
|
||||||
|
|
||||||
|
case EVENT_FORK_ERR:
|
||||||
|
die(_("cannot fork into background: %s"), NULL, EC_MISC);
|
||||||
|
|
||||||
case EVENT_PIPE_ERR:
|
case EVENT_PIPE_ERR:
|
||||||
die(_("failed to create helper: %s"), NULL, EC_MISC);
|
die(_("failed to create helper: %s"), NULL, EC_MISC);
|
||||||
|
|
||||||
@@ -777,7 +790,9 @@ static void async_event(int pipe, time_t now)
|
|||||||
reload_servers(daemon->resolv_files->name);
|
reload_servers(daemon->resolv_files->name);
|
||||||
check_servers();
|
check_servers();
|
||||||
}
|
}
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
rerun_scripts();
|
rerun_scripts();
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EVENT_DUMP:
|
case EVENT_DUMP:
|
||||||
@@ -786,11 +801,13 @@ static void async_event(int pipe, time_t now)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case EVENT_ALARM:
|
case EVENT_ALARM:
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
if (daemon->dhcp)
|
if (daemon->dhcp)
|
||||||
{
|
{
|
||||||
lease_prune(NULL, now);
|
lease_prune(NULL, now);
|
||||||
lease_update_file(now);
|
lease_update_file(now);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EVENT_CHILD:
|
case EVENT_CHILD:
|
||||||
@@ -840,7 +857,7 @@ static void async_event(int pipe, time_t now)
|
|||||||
if (daemon->tcp_pids[i] != 0)
|
if (daemon->tcp_pids[i] != 0)
|
||||||
kill(daemon->tcp_pids[i], SIGALRM);
|
kill(daemon->tcp_pids[i], SIGALRM);
|
||||||
|
|
||||||
#ifndef NO_FORK
|
#if defined(HAVE_DHCP) && !defined(NO_FORK)
|
||||||
/* handle pending lease transitions */
|
/* handle pending lease transitions */
|
||||||
if (daemon->helperfd != -1)
|
if (daemon->helperfd != -1)
|
||||||
{
|
{
|
||||||
@@ -857,6 +874,9 @@ static void async_event(int pipe, time_t now)
|
|||||||
if (daemon->lease_stream)
|
if (daemon->lease_stream)
|
||||||
fclose(daemon->lease_stream);
|
fclose(daemon->lease_stream);
|
||||||
|
|
||||||
|
if (daemon->runfile)
|
||||||
|
unlink(daemon->runfile);
|
||||||
|
|
||||||
my_syslog(LOG_INFO, _("exiting on receipt of SIGTERM"));
|
my_syslog(LOG_INFO, _("exiting on receipt of SIGTERM"));
|
||||||
flush_log();
|
flush_log();
|
||||||
exit(EC_GOOD);
|
exit(EC_GOOD);
|
||||||
@@ -901,7 +921,7 @@ static void poll_resolv()
|
|||||||
warned = 0;
|
warned = 0;
|
||||||
check_servers();
|
check_servers();
|
||||||
if (daemon->options & OPT_RELOAD)
|
if (daemon->options & OPT_RELOAD)
|
||||||
cache_reload(daemon->addn_hosts);
|
cache_reload();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -918,8 +938,9 @@ static void poll_resolv()
|
|||||||
void clear_cache_and_reload(time_t now)
|
void clear_cache_and_reload(time_t now)
|
||||||
{
|
{
|
||||||
if (daemon->port != 0)
|
if (daemon->port != 0)
|
||||||
cache_reload(daemon->addn_hosts);
|
cache_reload();
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
if (daemon->dhcp)
|
if (daemon->dhcp)
|
||||||
{
|
{
|
||||||
if (daemon->options & OPT_ETHERS)
|
if (daemon->options & OPT_ETHERS)
|
||||||
@@ -931,6 +952,7 @@ void clear_cache_and_reload(time_t now)
|
|||||||
lease_update_file(now);
|
lease_update_file(now);
|
||||||
lease_update_dns();
|
lease_update_dns();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static int set_dns_listeners(time_t now, fd_set *set, int *maxfdp)
|
static int set_dns_listeners(time_t now, fd_set *set, int *maxfdp)
|
||||||
@@ -1132,7 +1154,7 @@ static void check_dns_listeners(fd_set *set, time_t now)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
int make_icmp_sock(void)
|
int make_icmp_sock(void)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
@@ -1255,5 +1277,6 @@ int icmp_ping(struct in_addr addr)
|
|||||||
|
|
||||||
return gotreply;
|
return gotreply;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
+57
-37
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,11 +10,11 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COPYRIGHT "Copyright (C) 2000-2008 Simon Kelley"
|
#define COPYRIGHT "Copyright (C) 2000-2009 Simon Kelley"
|
||||||
|
|
||||||
#ifndef NO_LARGEFILE
|
#ifndef NO_LARGEFILE
|
||||||
/* Ensure we can use files >2GB (log files may grow this big) */
|
/* Ensure we can use files >2GB (log files may grow this big) */
|
||||||
@@ -106,7 +106,7 @@ extern int capget(cap_user_header_t header, cap_user_data_t data);
|
|||||||
#define LINUX_CAPABILITY_VERSION_3 0x20080522
|
#define LINUX_CAPABILITY_VERSION_3 0x20080522
|
||||||
|
|
||||||
#include <sys/prctl.h>
|
#include <sys/prctl.h>
|
||||||
#elif defined(HAVE_SOLARIS_PRIVS)
|
#elif defined(HAVE_SOLARIS_NETWORK)
|
||||||
#include <priv.h>
|
#include <priv.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -135,6 +135,7 @@ struct event_desc {
|
|||||||
#define EVENT_GROUP_ERR 15
|
#define EVENT_GROUP_ERR 15
|
||||||
#define EVENT_DIE 16
|
#define EVENT_DIE 16
|
||||||
#define EVENT_LOG_ERR 17
|
#define EVENT_LOG_ERR 17
|
||||||
|
#define EVENT_FORK_ERR 18
|
||||||
|
|
||||||
/* Exit codes. */
|
/* Exit codes. */
|
||||||
#define EC_GOOD 0
|
#define EC_GOOD 0
|
||||||
@@ -185,6 +186,11 @@ struct event_desc {
|
|||||||
#define OPT_NO_OVERRIDE (1u<<30)
|
#define OPT_NO_OVERRIDE (1u<<30)
|
||||||
#define OPT_NO_REBIND (1u<<31)
|
#define OPT_NO_REBIND (1u<<31)
|
||||||
|
|
||||||
|
/* extra flags for my_syslog, we use a couple of facilities since they are known
|
||||||
|
not to occupy the same bits as priorities, no matter how syslog.h is set up. */
|
||||||
|
#define MS_TFTP LOG_USER
|
||||||
|
#define MS_DHCP LOG_DAEMON
|
||||||
|
|
||||||
struct all_addr {
|
struct all_addr {
|
||||||
union {
|
union {
|
||||||
struct in_addr addr4;
|
struct in_addr addr4;
|
||||||
@@ -201,7 +207,7 @@ struct bogus_addr {
|
|||||||
|
|
||||||
/* dns doctor param */
|
/* dns doctor param */
|
||||||
struct doctor {
|
struct doctor {
|
||||||
struct in_addr in, out, mask;
|
struct in_addr in, end, out, mask;
|
||||||
struct doctor *next;
|
struct doctor *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -287,19 +293,7 @@ struct crec {
|
|||||||
union mysockaddr {
|
union mysockaddr {
|
||||||
struct sockaddr sa;
|
struct sockaddr sa;
|
||||||
struct sockaddr_in in;
|
struct sockaddr_in in;
|
||||||
#ifdef HAVE_BROKEN_SOCKADDR_IN6
|
#if defined(HAVE_IPV6)
|
||||||
/* early versions of glibc don't include sin6_scope_id in sockaddr_in6
|
|
||||||
but latest kernels _require_ it to be set. The choice is to have
|
|
||||||
dnsmasq fail to compile on back-level libc or fail to run
|
|
||||||
on latest kernels with IPv6. Or to do this: sorry that it's so gross. */
|
|
||||||
struct my_sockaddr_in6 {
|
|
||||||
sa_family_t sin6_family; /* AF_INET6 */
|
|
||||||
uint16_t sin6_port; /* transport layer port # */
|
|
||||||
uint32_t sin6_flowinfo; /* IPv6 traffic class & flow info */
|
|
||||||
struct in6_addr sin6_addr; /* IPv6 address */
|
|
||||||
uint32_t sin6_scope_id; /* set of interfaces for a scope */
|
|
||||||
} in6;
|
|
||||||
#elif defined(HAVE_IPV6)
|
|
||||||
struct sockaddr_in6 in6;
|
struct sockaddr_in6 in6;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
@@ -368,8 +362,11 @@ struct resolvc {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* adn-hosts parms from command-line */
|
/* adn-hosts parms from command-line */
|
||||||
|
#define AH_DIR 1
|
||||||
|
#define AH_INACTIVE 2
|
||||||
struct hostsfile {
|
struct hostsfile {
|
||||||
struct hostsfile *next;
|
struct hostsfile *next;
|
||||||
|
int flags;
|
||||||
char *fname;
|
char *fname;
|
||||||
int index; /* matches to cache entries for logging */
|
int index; /* matches to cache entries for logging */
|
||||||
};
|
};
|
||||||
@@ -464,7 +461,12 @@ struct dhcp_config {
|
|||||||
|
|
||||||
struct dhcp_opt {
|
struct dhcp_opt {
|
||||||
int opt, len, flags;
|
int opt, len, flags;
|
||||||
unsigned char *val, *vendor_class;
|
union {
|
||||||
|
int encap;
|
||||||
|
unsigned int wildcard_mask;
|
||||||
|
unsigned char *vendor_class;
|
||||||
|
} u;
|
||||||
|
unsigned char *val;
|
||||||
struct dhcp_netid *netid;
|
struct dhcp_netid *netid;
|
||||||
struct dhcp_opt *next;
|
struct dhcp_opt *next;
|
||||||
};
|
};
|
||||||
@@ -472,9 +474,14 @@ struct dhcp_opt {
|
|||||||
#define DHOPT_ADDR 1
|
#define DHOPT_ADDR 1
|
||||||
#define DHOPT_STRING 2
|
#define DHOPT_STRING 2
|
||||||
#define DHOPT_ENCAPSULATE 4
|
#define DHOPT_ENCAPSULATE 4
|
||||||
#define DHOPT_VENDOR_MATCH 8
|
#define DHOPT_ENCAP_MATCH 8
|
||||||
#define DHOPT_FORCE 16
|
#define DHOPT_FORCE 16
|
||||||
#define DHOPT_BANK 32
|
#define DHOPT_BANK 32
|
||||||
|
#define DHOPT_ENCAP_DONE 64
|
||||||
|
#define DHOPT_MATCH 128
|
||||||
|
#define DHOPT_VENDOR 256
|
||||||
|
#define DHOPT_HEX 512
|
||||||
|
#define DHOPT_VENDOR_MATCH 1024
|
||||||
|
|
||||||
struct dhcp_boot {
|
struct dhcp_boot {
|
||||||
char *file, *sname;
|
char *file, *sname;
|
||||||
@@ -483,12 +490,19 @@ struct dhcp_boot {
|
|||||||
struct dhcp_boot *next;
|
struct dhcp_boot *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct pxe_service {
|
||||||
|
unsigned short CSA, type;
|
||||||
|
char *menu, *basename;
|
||||||
|
struct in_addr server;
|
||||||
|
struct dhcp_netid *netid;
|
||||||
|
struct pxe_service *next;
|
||||||
|
};
|
||||||
|
|
||||||
#define MATCH_VENDOR 1
|
#define MATCH_VENDOR 1
|
||||||
#define MATCH_USER 2
|
#define MATCH_USER 2
|
||||||
#define MATCH_CIRCUIT 3
|
#define MATCH_CIRCUIT 3
|
||||||
#define MATCH_REMOTE 4
|
#define MATCH_REMOTE 4
|
||||||
#define MATCH_SUBSCRIBER 5
|
#define MATCH_SUBSCRIBER 5
|
||||||
#define MATCH_OPTION 6
|
|
||||||
|
|
||||||
/* vendorclass, userclass, remote-id or cicuit-id */
|
/* vendorclass, userclass, remote-id or cicuit-id */
|
||||||
struct dhcp_vendor {
|
struct dhcp_vendor {
|
||||||
@@ -506,12 +520,10 @@ struct dhcp_mac {
|
|||||||
struct dhcp_mac *next;
|
struct dhcp_mac *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef HAVE_BSD_BRIDGE
|
|
||||||
struct dhcp_bridge {
|
struct dhcp_bridge {
|
||||||
char iface[IF_NAMESIZE];
|
char iface[IF_NAMESIZE];
|
||||||
struct dhcp_bridge *alias, *next;
|
struct dhcp_bridge *alias, *next;
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
struct cond_domain {
|
struct cond_domain {
|
||||||
char *domain;
|
char *domain;
|
||||||
@@ -532,6 +544,7 @@ struct dhcp_context {
|
|||||||
#define CONTEXT_STATIC 1
|
#define CONTEXT_STATIC 1
|
||||||
#define CONTEXT_NETMASK 2
|
#define CONTEXT_NETMASK 2
|
||||||
#define CONTEXT_BRDCAST 4
|
#define CONTEXT_BRDCAST 4
|
||||||
|
#define CONTEXT_PROXY 8
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned char u8;
|
typedef unsigned char u8;
|
||||||
@@ -608,10 +621,11 @@ extern struct daemon {
|
|||||||
struct hostsfile *addn_hosts;
|
struct hostsfile *addn_hosts;
|
||||||
struct dhcp_context *dhcp;
|
struct dhcp_context *dhcp;
|
||||||
struct dhcp_config *dhcp_conf;
|
struct dhcp_config *dhcp_conf;
|
||||||
struct dhcp_opt *dhcp_opts;
|
struct dhcp_opt *dhcp_opts, *dhcp_match;
|
||||||
struct dhcp_vendor *dhcp_vendors;
|
struct dhcp_vendor *dhcp_vendors;
|
||||||
struct dhcp_mac *dhcp_macs;
|
struct dhcp_mac *dhcp_macs;
|
||||||
struct dhcp_boot *boot_config;
|
struct dhcp_boot *boot_config;
|
||||||
|
struct pxe_service *pxe_services;
|
||||||
struct dhcp_netid_list *dhcp_ignore, *dhcp_ignore_names, *force_broadcast, *bootp_dynamic;
|
struct dhcp_netid_list *dhcp_ignore, *dhcp_ignore_names, *force_broadcast, *bootp_dynamic;
|
||||||
char *dhcp_hosts_file, *dhcp_opts_file;
|
char *dhcp_hosts_file, *dhcp_opts_file;
|
||||||
int dhcp_max, tftp_max;
|
int dhcp_max, tftp_max;
|
||||||
@@ -635,23 +649,21 @@ extern struct daemon {
|
|||||||
struct server *srv_save; /* Used for resend on DoD */
|
struct server *srv_save; /* Used for resend on DoD */
|
||||||
size_t packet_len; /* " " */
|
size_t packet_len; /* " " */
|
||||||
struct randfd *rfd_save; /* " " */
|
struct randfd *rfd_save; /* " " */
|
||||||
pid_t tcp_pids[MAX_PROCS];
|
pid_t tcp_pids[MAX_PROCS];
|
||||||
struct randfd randomsocks[RANDOM_SOCKS];
|
struct randfd randomsocks[RANDOM_SOCKS];
|
||||||
|
|
||||||
/* DHCP state */
|
/* DHCP state */
|
||||||
int dhcpfd, helperfd;
|
int dhcpfd, helperfd;
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
#if defined(HAVE_LINUX_NETWORK)
|
||||||
int netlinkfd;
|
int netlinkfd;
|
||||||
#else
|
#elif defined(HAVE_BSD_NETWORK)
|
||||||
int dhcp_raw_fd, dhcp_icmp_fd;
|
int dhcp_raw_fd, dhcp_icmp_fd;
|
||||||
#endif
|
#endif
|
||||||
struct iovec dhcp_packet;
|
struct iovec dhcp_packet;
|
||||||
char *dhcp_buff, *dhcp_buff2;
|
char *dhcp_buff, *dhcp_buff2;
|
||||||
struct ping_result *ping_results;
|
struct ping_result *ping_results;
|
||||||
FILE *lease_stream;
|
FILE *lease_stream;
|
||||||
#ifdef HAVE_BSD_BRIDGE
|
|
||||||
struct dhcp_bridge *bridges;
|
struct dhcp_bridge *bridges;
|
||||||
#endif
|
|
||||||
|
|
||||||
/* DBus stuff */
|
/* DBus stuff */
|
||||||
/* void * here to avoid depending on dbus headers outside dbus.c */
|
/* void * here to avoid depending on dbus headers outside dbus.c */
|
||||||
@@ -668,7 +680,7 @@ pid_t tcp_pids[MAX_PROCS];
|
|||||||
/* cache.c */
|
/* cache.c */
|
||||||
void cache_init(void);
|
void cache_init(void);
|
||||||
void log_query(unsigned short flags, char *name, struct all_addr *addr, char *arg);
|
void log_query(unsigned short flags, char *name, struct all_addr *addr, char *arg);
|
||||||
char *record_source(struct hostsfile *addn_hosts, int index);
|
char *record_source(int index);
|
||||||
void querystr(char *str, unsigned short type);
|
void querystr(char *str, unsigned short type);
|
||||||
struct crec *cache_find_by_addr(struct crec *crecp,
|
struct crec *cache_find_by_addr(struct crec *crecp,
|
||||||
struct all_addr *addr, time_t now,
|
struct all_addr *addr, time_t now,
|
||||||
@@ -679,11 +691,12 @@ void cache_end_insert(void);
|
|||||||
void cache_start_insert(void);
|
void cache_start_insert(void);
|
||||||
struct crec *cache_insert(char *name, struct all_addr *addr,
|
struct crec *cache_insert(char *name, struct all_addr *addr,
|
||||||
time_t now, unsigned long ttl, unsigned short flags);
|
time_t now, unsigned long ttl, unsigned short flags);
|
||||||
void cache_reload(struct hostsfile *addn_hosts);
|
void cache_reload(void);
|
||||||
void cache_add_dhcp_entry(char *host_name, struct in_addr *host_address, time_t ttd);
|
void cache_add_dhcp_entry(char *host_name, struct in_addr *host_address, time_t ttd);
|
||||||
void cache_unhash_dhcp(void);
|
void cache_unhash_dhcp(void);
|
||||||
void dump_cache(time_t now);
|
void dump_cache(time_t now);
|
||||||
char *cache_get_name(struct crec *crecp);
|
char *cache_get_name(struct crec *crecp);
|
||||||
|
char *get_domain(struct in_addr addr);
|
||||||
|
|
||||||
/* rfc1035.c */
|
/* rfc1035.c */
|
||||||
unsigned short extract_request(HEADER *header, size_t qlen,
|
unsigned short extract_request(HEADER *header, size_t qlen,
|
||||||
@@ -740,7 +753,7 @@ void flush_log(void);
|
|||||||
|
|
||||||
/* option.c */
|
/* option.c */
|
||||||
void read_opts (int argc, char **argv, char *compile_opts);
|
void read_opts (int argc, char **argv, char *compile_opts);
|
||||||
char *option_string(unsigned char opt);
|
char *option_string(unsigned char opt, int *is_ip, int *is_name);
|
||||||
void reread_dhcp(void);
|
void reread_dhcp(void);
|
||||||
|
|
||||||
/* forward.c */
|
/* forward.c */
|
||||||
@@ -752,6 +765,7 @@ void server_gone(struct server *server);
|
|||||||
struct frec *get_new_frec(time_t now, int *wait);
|
struct frec *get_new_frec(time_t now, int *wait);
|
||||||
|
|
||||||
/* network.c */
|
/* network.c */
|
||||||
|
int indextoname(int fd, int index, char *name);
|
||||||
int local_bind(int fd, union mysockaddr *addr, char *intname, int is_tcp);
|
int local_bind(int fd, union mysockaddr *addr, char *intname, int is_tcp);
|
||||||
int random_sock(int family);
|
int random_sock(int family);
|
||||||
void pre_allocate_sfds(void);
|
void pre_allocate_sfds(void);
|
||||||
@@ -760,15 +774,14 @@ void check_servers(void);
|
|||||||
int enumerate_interfaces();
|
int enumerate_interfaces();
|
||||||
struct listener *create_wildcard_listeners(void);
|
struct listener *create_wildcard_listeners(void);
|
||||||
struct listener *create_bound_listeners(void);
|
struct listener *create_bound_listeners(void);
|
||||||
int iface_check(int family, struct all_addr *addr,
|
int iface_check(int family, struct all_addr *addr, char *name, int *indexp);
|
||||||
struct ifreq *ifr, int *indexp);
|
|
||||||
int fix_fd(int fd);
|
int fix_fd(int fd);
|
||||||
struct in_addr get_ifaddr(char *intr);
|
struct in_addr get_ifaddr(char *intr);
|
||||||
|
|
||||||
/* dhcp.c */
|
/* dhcp.c */
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
void dhcp_init(void);
|
void dhcp_init(void);
|
||||||
void dhcp_packet(time_t now);
|
void dhcp_packet(time_t now);
|
||||||
char *get_domain(struct in_addr addr);
|
|
||||||
struct dhcp_context *address_available(struct dhcp_context *context,
|
struct dhcp_context *address_available(struct dhcp_context *context,
|
||||||
struct in_addr addr,
|
struct in_addr addr,
|
||||||
struct dhcp_netid *netids);
|
struct dhcp_netid *netids);
|
||||||
@@ -791,8 +804,10 @@ struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct i
|
|||||||
char *strip_hostname(char *hostname);
|
char *strip_hostname(char *hostname);
|
||||||
char *host_from_dns(struct in_addr addr);
|
char *host_from_dns(struct in_addr addr);
|
||||||
char *get_domain(struct in_addr addr);
|
char *get_domain(struct in_addr addr);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* lease.c */
|
/* lease.c */
|
||||||
|
#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();
|
||||||
void lease_init(time_t now);
|
void lease_init(time_t now);
|
||||||
@@ -809,16 +824,21 @@ void lease_prune(struct dhcp_lease *target, time_t now);
|
|||||||
void lease_update_from_configs(void);
|
void lease_update_from_configs(void);
|
||||||
int do_script_run(time_t now);
|
int do_script_run(time_t now);
|
||||||
void rerun_scripts(void);
|
void rerun_scripts(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* rfc2131.c */
|
/* rfc2131.c */
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
||||||
size_t sz, time_t now, int unicast_dest, int *is_inform);
|
size_t sz, time_t now, int unicast_dest, int *is_inform);
|
||||||
unsigned char *extended_hwaddr(int hwtype, int hwlen, unsigned char *hwaddr,
|
unsigned char *extended_hwaddr(int hwtype, int hwlen, unsigned char *hwaddr,
|
||||||
int clid_len, unsigned char *clid, int *len_out);
|
int clid_len, unsigned char *clid, int *len_out);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* dnsmasq.c */
|
/* dnsmasq.c */
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
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
|
||||||
void send_event(int fd, int event, int data);
|
void send_event(int fd, int event, int data);
|
||||||
void clear_cache_and_reload(time_t now);
|
void clear_cache_and_reload(time_t now);
|
||||||
|
|
||||||
@@ -847,7 +867,7 @@ void emit_dbus_signal(int action, char *mac, char *hostname, char *addr);
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* helper.c */
|
/* helper.c */
|
||||||
#ifndef NO_FORK
|
#if defined(HAVE_DHCP) && !defined(NO_FORK)
|
||||||
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,
|
||||||
|
|||||||
+5
-16
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -667,19 +667,8 @@ void receive_query(struct listener *listen, time_t now)
|
|||||||
|
|
||||||
/* enforce available interface configuration */
|
/* enforce available interface configuration */
|
||||||
|
|
||||||
if (if_index == 0)
|
if (!indextoname(listen->fd, if_index, ifr.ifr_name) ||
|
||||||
return;
|
!iface_check(listen->family, &dst_addr, ifr.ifr_name, &if_index))
|
||||||
|
|
||||||
#ifdef SIOCGIFNAME
|
|
||||||
ifr.ifr_ifindex = if_index;
|
|
||||||
if (ioctl(listen->fd, SIOCGIFNAME, &ifr) == -1)
|
|
||||||
return;
|
|
||||||
#else
|
|
||||||
if (!if_indextoname(if_index, ifr.ifr_name))
|
|
||||||
return;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!iface_check(listen->family, &dst_addr, &ifr, &if_index))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (listen->family == AF_INET &&
|
if (listen->family == AF_INET &&
|
||||||
|
|||||||
+7
-27
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
main process.
|
main process.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef NO_FORK
|
#if defined(HAVE_DHCP) && !defined(NO_FORK)
|
||||||
|
|
||||||
static void my_setenv(const char *name, const char *value, int *error);
|
static void my_setenv(const char *name, const char *value, int *error);
|
||||||
|
|
||||||
@@ -93,7 +93,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
/* kill daemon */
|
/* kill daemon */
|
||||||
send_event(event_fd, EVENT_DIE, 0);
|
send_event(event_fd, EVENT_DIE, 0);
|
||||||
/* return error */
|
/* return error */
|
||||||
send_event(err_fd, EVENT_HUSER_ERR, errno);;
|
send_event(err_fd, EVENT_HUSER_ERR, errno);
|
||||||
}
|
}
|
||||||
_exit(0);
|
_exit(0);
|
||||||
}
|
}
|
||||||
@@ -276,28 +276,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
|
|
||||||
static void my_setenv(const char *name, const char *value, int *error)
|
static void my_setenv(const char *name, const char *value, int *error)
|
||||||
{
|
{
|
||||||
if (*error == 0)
|
if (*error == 0 && setenv(name, value, 1) != 0)
|
||||||
{
|
*error = errno;
|
||||||
#if defined(HAVE_SOLARIS_NETWORK) && !defined(HAVE_SOLARIS_PRIVS)
|
|
||||||
/* old Solaris is missing setenv..... */
|
|
||||||
char *p;
|
|
||||||
|
|
||||||
if (!(p = malloc(strlen(name) + strlen(value) + 2)))
|
|
||||||
*error = ENOMEM;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
strcpy(p, name);
|
|
||||||
strcat(p, "=");
|
|
||||||
strcat(p, value);
|
|
||||||
|
|
||||||
if (putenv(p) != 0)
|
|
||||||
*error = errno;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
if (setenv(name, value, 1) != 0)
|
|
||||||
*error = errno;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* pack up lease data into a buffer */
|
/* pack up lease data into a buffer */
|
||||||
|
|||||||
+9
-5
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,12 +10,14 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP
|
||||||
|
|
||||||
static struct dhcp_lease *leases = NULL, *old_leases = NULL;
|
static struct dhcp_lease *leases = NULL, *old_leases = NULL;
|
||||||
static int dns_dirty, file_dirty, leases_left;
|
static int dns_dirty, file_dirty, leases_left;
|
||||||
|
|
||||||
@@ -57,7 +59,7 @@ void lease_init(time_t now)
|
|||||||
if (!leasestream)
|
if (!leasestream)
|
||||||
die(_("cannot open or create lease file %s: %s"), daemon->lease_file, EC_FILE);
|
die(_("cannot open or create lease file %s: %s"), daemon->lease_file, EC_FILE);
|
||||||
|
|
||||||
/* a+ mode lease pointer at end. */
|
/* a+ mode leaves pointer at end. */
|
||||||
rewind(leasestream);
|
rewind(leasestream);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -235,7 +237,7 @@ void lease_update_file(time_t now)
|
|||||||
if (next_event == 0 || difftime(next_event, LEASE_RETRY + now) > 0.0)
|
if (next_event == 0 || difftime(next_event, LEASE_RETRY + now) > 0.0)
|
||||||
next_event = LEASE_RETRY + now;
|
next_event = LEASE_RETRY + now;
|
||||||
|
|
||||||
my_syslog(LOG_ERR, _("failed to write %s: %s (retry in %us)"),
|
my_syslog(MS_DHCP | LOG_ERR, _("failed to write %s: %s (retry in %us)"),
|
||||||
daemon->lease_file, strerror(err),
|
daemon->lease_file, strerror(err),
|
||||||
(unsigned int)difftime(next_event, now));
|
(unsigned int)difftime(next_event, now));
|
||||||
}
|
}
|
||||||
@@ -608,6 +610,8 @@ int do_script_run(time_t now)
|
|||||||
return 0; /* nothing to do */
|
return 0; /* nothing to do */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -248,6 +248,10 @@ static void log_write(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* priority is one of LOG_DEBUG, LOG_INFO, LOG_NOTICE, etc. See sys/syslog.h.
|
||||||
|
OR'd to priority can be MS_TFTP, MS_DHCP, ... to be able to do log separation between
|
||||||
|
DNS, DHCP and TFTP services.
|
||||||
|
*/
|
||||||
void my_syslog(int priority, const char *format, ...)
|
void my_syslog(int priority, const char *format, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
@@ -256,10 +260,18 @@ void my_syslog(int priority, const char *format, ...)
|
|||||||
char *p;
|
char *p;
|
||||||
size_t len;
|
size_t len;
|
||||||
pid_t pid = getpid();
|
pid_t pid = getpid();
|
||||||
|
char *func = "";
|
||||||
|
|
||||||
|
if ((LOG_FACMASK & priority) == MS_TFTP)
|
||||||
|
func = "-tftp";
|
||||||
|
else if ((LOG_FACMASK & priority) == MS_DHCP)
|
||||||
|
func = "-dhcp";
|
||||||
|
|
||||||
|
priority = LOG_PRI(priority);
|
||||||
|
|
||||||
if (log_stderr)
|
if (log_stderr)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "dnsmasq: ");
|
fprintf(stderr, "dnsmasq%s: ", func);
|
||||||
va_start(ap, format);
|
va_start(ap, format);
|
||||||
vfprintf(stderr, format, ap);
|
vfprintf(stderr, format, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
@@ -306,7 +318,8 @@ void my_syslog(int priority, const char *format, ...)
|
|||||||
if (!log_to_file)
|
if (!log_to_file)
|
||||||
p += sprintf(p, "<%d>", priority | log_fac);
|
p += sprintf(p, "<%d>", priority | log_fac);
|
||||||
|
|
||||||
p += sprintf(p, "%.15s dnsmasq[%d]: ", ctime(&time_now) + 4, (int)pid);
|
p += sprintf(p, "%.15s dnsmasq%s[%d]: ", ctime(&time_now) + 4, func, (int)pid);
|
||||||
|
|
||||||
len = p - entry->payload;
|
len = p - entry->payload;
|
||||||
va_start(ap, format);
|
va_start(ap, format);
|
||||||
len += vsnprintf(p, MAX_MESSAGE - len, format, ap) + 1; /* include zero-terminator */
|
len += vsnprintf(p, MAX_MESSAGE - len, format, ap) + 1; /* include zero-terminator */
|
||||||
|
|||||||
+66
-31
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -31,6 +31,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
static struct iovec iov;
|
static struct iovec iov;
|
||||||
|
static u32 netlink_pid;
|
||||||
|
|
||||||
static void nl_err(struct nlmsghdr *h);
|
static void nl_err(struct nlmsghdr *h);
|
||||||
static void nl_routechange(struct nlmsghdr *h);
|
static void nl_routechange(struct nlmsghdr *h);
|
||||||
@@ -38,6 +39,7 @@ static void nl_routechange(struct nlmsghdr *h);
|
|||||||
void netlink_init(void)
|
void netlink_init(void)
|
||||||
{
|
{
|
||||||
struct sockaddr_nl addr;
|
struct sockaddr_nl addr;
|
||||||
|
socklen_t slen = sizeof(addr);
|
||||||
|
|
||||||
addr.nl_family = AF_NETLINK;
|
addr.nl_family = AF_NETLINK;
|
||||||
addr.nl_pad = 0;
|
addr.nl_pad = 0;
|
||||||
@@ -59,48 +61,63 @@ void netlink_init(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (daemon->netlinkfd == -1)
|
if (daemon->netlinkfd == -1 ||
|
||||||
|
getsockname(daemon->netlinkfd, (struct sockaddr *)&addr, &slen) == 1)
|
||||||
die(_("cannot create netlink socket: %s"), NULL, EC_MISC);
|
die(_("cannot create netlink socket: %s"), NULL, EC_MISC);
|
||||||
|
|
||||||
iov.iov_len = 200;
|
/* save pid assigned by bind() and retrieved by getsockname() */
|
||||||
|
netlink_pid = addr.nl_pid;
|
||||||
|
|
||||||
|
iov.iov_len = 100;
|
||||||
iov.iov_base = safe_malloc(iov.iov_len);
|
iov.iov_base = safe_malloc(iov.iov_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t netlink_recv(void)
|
static ssize_t netlink_recv(void)
|
||||||
{
|
{
|
||||||
struct msghdr msg;
|
struct msghdr msg;
|
||||||
|
struct sockaddr_nl nladdr;
|
||||||
ssize_t rc;
|
ssize_t rc;
|
||||||
|
|
||||||
msg.msg_control = NULL;
|
|
||||||
msg.msg_controllen = 0;
|
|
||||||
msg.msg_name = NULL;
|
|
||||||
msg.msg_namelen = 0;
|
|
||||||
msg.msg_iov = &iov;
|
|
||||||
msg.msg_iovlen = 1;
|
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
|
msg.msg_control = NULL;
|
||||||
|
msg.msg_controllen = 0;
|
||||||
|
msg.msg_name = &nladdr;
|
||||||
|
msg.msg_namelen = sizeof(nladdr);
|
||||||
|
msg.msg_iov = &iov;
|
||||||
|
msg.msg_iovlen = 1;
|
||||||
msg.msg_flags = 0;
|
msg.msg_flags = 0;
|
||||||
while ((rc = recvmsg(daemon->netlinkfd, &msg, MSG_PEEK)) == -1 && errno == EINTR);
|
|
||||||
|
|
||||||
/* 2.2.x doesn't suport MSG_PEEK at all, returning EOPNOTSUPP, so we just grab a
|
while ((rc = recvmsg(daemon->netlinkfd, &msg, MSG_PEEK | MSG_TRUNC)) == -1 && errno == EINTR);
|
||||||
big buffer and pray in that case. */
|
|
||||||
if (rc == -1 && errno == EOPNOTSUPP)
|
/* make buffer big enough */
|
||||||
|
if (rc != -1 && (msg.msg_flags & MSG_TRUNC))
|
||||||
{
|
{
|
||||||
if (!expand_buf(&iov, 2000))
|
/* Very new Linux kernels return the actual size needed, older ones always return truncated size */
|
||||||
return -1;
|
if ((size_t)rc == iov.iov_len)
|
||||||
break;
|
{
|
||||||
|
if (expand_buf(&iov, rc + 100))
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
expand_buf(&iov, rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rc == -1 || !(msg.msg_flags & MSG_TRUNC))
|
/* read it for real */
|
||||||
break;
|
msg.msg_flags = 0;
|
||||||
|
while ((rc = recvmsg(daemon->netlinkfd, &msg, 0)) == -1 && errno == EINTR);
|
||||||
|
|
||||||
if (!expand_buf(&iov, iov.iov_len + 100))
|
/* Make sure this is from the kernel */
|
||||||
return -1;
|
if (rc == -1 || nladdr.nl_pid == 0)
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* finally, read it for real */
|
/* discard stuff which is truncated at this point (expand_buf() may fail) */
|
||||||
while ((rc = recvmsg(daemon->netlinkfd, &msg, 0)) == -1 && errno == EINTR);
|
if (msg.msg_flags & MSG_TRUNC)
|
||||||
|
{
|
||||||
|
rc = -1;
|
||||||
|
errno = ENOMEM;
|
||||||
|
}
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
@@ -141,13 +158,20 @@ int iface_enumerate(void *parm, int (*ipv4_callback)(), int (*ipv6_callback)())
|
|||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
if ((len = netlink_recv()) == -1)
|
if ((len = netlink_recv()) == -1)
|
||||||
return 0;
|
{
|
||||||
|
if (errno == ENOBUFS)
|
||||||
|
{
|
||||||
|
sleep(1);
|
||||||
|
goto again;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
for (h = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(h, (size_t)len); h = NLMSG_NEXT(h, len))
|
for (h = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(h, (size_t)len); h = NLMSG_NEXT(h, len))
|
||||||
if (h->nlmsg_type == NLMSG_ERROR)
|
if (h->nlmsg_seq != seq || h->nlmsg_pid != netlink_pid)
|
||||||
nl_err(h);
|
|
||||||
else if (h->nlmsg_seq != seq)
|
|
||||||
nl_routechange(h); /* May be multicast arriving async */
|
nl_routechange(h); /* May be multicast arriving async */
|
||||||
|
else if (h->nlmsg_type == NLMSG_ERROR)
|
||||||
|
nl_err(h);
|
||||||
else if (h->nlmsg_type == NLMSG_DONE)
|
else if (h->nlmsg_type == NLMSG_DONE)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
@@ -208,10 +232,17 @@ int iface_enumerate(void *parm, int (*ipv4_callback)(), int (*ipv6_callback)())
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void netlink_multicast(void)
|
void netlink_multicast(void)
|
||||||
{
|
{
|
||||||
ssize_t len;
|
ssize_t len;
|
||||||
struct nlmsghdr *h;
|
struct nlmsghdr *h;
|
||||||
|
int flags;
|
||||||
|
|
||||||
|
/* don't risk blocking reading netlink messages here. */
|
||||||
|
if ((flags = fcntl(daemon->netlinkfd, F_GETFL)) == -1 ||
|
||||||
|
fcntl(daemon->netlinkfd, F_SETFL, flags | O_NONBLOCK) == -1)
|
||||||
|
return;
|
||||||
|
|
||||||
if ((len = netlink_recv()) != -1)
|
if ((len = netlink_recv()) != -1)
|
||||||
{
|
{
|
||||||
@@ -221,11 +252,15 @@ void netlink_multicast(void)
|
|||||||
else
|
else
|
||||||
nl_routechange(h);
|
nl_routechange(h);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* restore non-blocking status */
|
||||||
|
fcntl(daemon->netlinkfd, F_SETFL, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void nl_err(struct nlmsghdr *h)
|
static void nl_err(struct nlmsghdr *h)
|
||||||
{
|
{
|
||||||
struct nlmsgerr *err = NLMSG_DATA(h);
|
struct nlmsgerr *err = NLMSG_DATA(h);
|
||||||
|
|
||||||
if (err->error != 0)
|
if (err->error != 0)
|
||||||
my_syslog(LOG_ERR, _("netlink returns error: %s"), strerror(-(err->error)));
|
my_syslog(LOG_ERR, _("netlink returns error: %s"), strerror(-(err->error)));
|
||||||
}
|
}
|
||||||
@@ -234,10 +269,10 @@ static void nl_err(struct nlmsghdr *h)
|
|||||||
If this happens and we still have a DNS packet in the buffer, we re-send it.
|
If this happens and we still have a DNS packet in the buffer, we re-send it.
|
||||||
This helps on DoD links, where frequently the packet which triggers dialling is
|
This helps on DoD links, where frequently the packet which triggers dialling is
|
||||||
a DNS query, which then gets lost. By re-sending, we can avoid the lookup
|
a DNS query, which then gets lost. By re-sending, we can avoid the lookup
|
||||||
failing. */
|
failing. Note that we only accept these messages from the kernel (pid == 0) */
|
||||||
static void nl_routechange(struct nlmsghdr *h)
|
static void nl_routechange(struct nlmsghdr *h)
|
||||||
{
|
{
|
||||||
if (h->nlmsg_type == RTM_NEWROUTE)
|
if (h->nlmsg_pid == 0 && h->nlmsg_type == RTM_NEWROUTE)
|
||||||
{
|
{
|
||||||
struct rtmsg *rtm = NLMSG_DATA(h);
|
struct rtmsg *rtm = NLMSG_DATA(h);
|
||||||
int fd;
|
int fd;
|
||||||
|
|||||||
+73
-46
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,14 +10,43 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
int iface_check(int family, struct all_addr *addr,
|
#ifdef HAVE_LINUX_NETWORK
|
||||||
struct ifreq *ifr, int *indexp)
|
|
||||||
|
int indextoname(int fd, int index, char *name)
|
||||||
|
{
|
||||||
|
struct ifreq ifr;
|
||||||
|
|
||||||
|
if (index == 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
ifr.ifr_ifindex = index;
|
||||||
|
if (ioctl(fd, SIOCGIFNAME, &ifr) == -1)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
strncpy(name, ifr.ifr_name, IF_NAMESIZE);
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
int indextoname(int fd, int index, char *name)
|
||||||
|
{
|
||||||
|
if (index == 0 || !if_indextoname(index, name))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int iface_check(int family, struct all_addr *addr, char *name, int *indexp)
|
||||||
{
|
{
|
||||||
struct iname *tmp;
|
struct iname *tmp;
|
||||||
int ret = 1;
|
int ret = 1;
|
||||||
@@ -27,7 +56,6 @@ int iface_check(int family, struct all_addr *addr,
|
|||||||
|
|
||||||
if (indexp)
|
if (indexp)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_BSD_BRIDGE
|
|
||||||
/* One form of bridging on BSD has the property that packets
|
/* One form of bridging on BSD has the property that packets
|
||||||
can be recieved on bridge interfaces which do not have an IP address.
|
can be recieved on bridge interfaces which do not have an IP address.
|
||||||
We allow these to be treated as aliases of another interface which does have
|
We allow these to be treated as aliases of another interface which does have
|
||||||
@@ -36,26 +64,25 @@ int iface_check(int family, struct all_addr *addr,
|
|||||||
for (bridge = daemon->bridges; bridge; bridge = bridge->next)
|
for (bridge = daemon->bridges; bridge; bridge = bridge->next)
|
||||||
{
|
{
|
||||||
for (alias = bridge->alias; alias; alias = alias->next)
|
for (alias = bridge->alias; alias; alias = alias->next)
|
||||||
if (strncmp(ifr->ifr_name, alias->iface, IF_NAMESIZE) == 0)
|
if (strncmp(name, alias->iface, IF_NAMESIZE) == 0)
|
||||||
{
|
{
|
||||||
int newindex;
|
int newindex;
|
||||||
|
|
||||||
if (!(newindex = if_nametoindex(bridge->iface)))
|
if (!(newindex = if_nametoindex(bridge->iface)))
|
||||||
{
|
{
|
||||||
my_syslog(LOG_WARNING, _("unknown interface %s in bridge-interface"), ifr->ifr_name);
|
my_syslog(LOG_WARNING, _("unknown interface %s in bridge-interface"), name);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
*indexp = newindex;
|
*indexp = newindex;
|
||||||
strncpy(ifr->ifr_name, bridge->iface, IF_NAMESIZE);
|
strncpy(name, bridge->iface, IF_NAMESIZE);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (alias)
|
if (alias)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (daemon->if_names || (addr && daemon->if_addrs))
|
if (daemon->if_names || (addr && daemon->if_addrs))
|
||||||
@@ -63,7 +90,7 @@ int iface_check(int family, struct all_addr *addr,
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
for (tmp = daemon->if_names; tmp; tmp = tmp->next)
|
for (tmp = daemon->if_names; tmp; tmp = tmp->next)
|
||||||
if (tmp->name && (strcmp(tmp->name, ifr->ifr_name) == 0))
|
if (tmp->name && (strcmp(tmp->name, name) == 0))
|
||||||
ret = tmp->used = 1;
|
ret = tmp->used = 1;
|
||||||
|
|
||||||
for (tmp = daemon->if_addrs; tmp; tmp = tmp->next)
|
for (tmp = daemon->if_addrs; tmp; tmp = tmp->next)
|
||||||
@@ -82,7 +109,7 @@ int iface_check(int family, struct all_addr *addr,
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (tmp = daemon->if_except; tmp; tmp = tmp->next)
|
for (tmp = daemon->if_except; tmp; tmp = tmp->next)
|
||||||
if (tmp->name && (strcmp(tmp->name, ifr->ifr_name) == 0))
|
if (tmp->name && (strcmp(tmp->name, name) == 0))
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
@@ -103,16 +130,8 @@ static int iface_allowed(struct irec **irecp, int if_index,
|
|||||||
if (sockaddr_isequal(&iface->addr, addr))
|
if (sockaddr_isequal(&iface->addr, addr))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
|
||||||
ifr.ifr_ifindex = if_index;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) == -1 ||
|
if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) == -1 ||
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
!indextoname(fd, if_index, ifr.ifr_name) ||
|
||||||
ioctl(fd, SIOCGIFNAME, &ifr) == -1 ||
|
|
||||||
#else
|
|
||||||
!if_indextoname(if_index, ifr.ifr_name) ||
|
|
||||||
#endif
|
|
||||||
ioctl(fd, SIOCGIFFLAGS, &ifr) == -1)
|
ioctl(fd, SIOCGIFFLAGS, &ifr) == -1)
|
||||||
{
|
{
|
||||||
if (fd != -1)
|
if (fd != -1)
|
||||||
@@ -150,7 +169,7 @@ static int iface_allowed(struct irec **irecp, int if_index,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (addr->sa.sa_family == AF_INET &&
|
if (addr->sa.sa_family == AF_INET &&
|
||||||
!iface_check(AF_INET, (struct all_addr *)&addr->in.sin_addr, &ifr, NULL))
|
!iface_check(AF_INET, (struct all_addr *)&addr->in.sin_addr, ifr.ifr_name, NULL))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
||||||
@@ -159,7 +178,7 @@ static int iface_allowed(struct irec **irecp, int if_index,
|
|||||||
|
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
if (addr->sa.sa_family == AF_INET6 &&
|
if (addr->sa.sa_family == AF_INET6 &&
|
||||||
!iface_check(AF_INET6, (struct all_addr *)&addr->in6.sin6_addr, &ifr, NULL))
|
!iface_check(AF_INET6, (struct all_addr *)&addr->in6.sin6_addr, ifr.ifr_name, NULL))
|
||||||
return 1;
|
return 1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -217,7 +236,6 @@ static int iface_allowed_v4(struct in_addr local, int if_index,
|
|||||||
return iface_allowed((struct irec **)vparam, if_index, &addr, netmask);
|
return iface_allowed((struct irec **)vparam, if_index, &addr, netmask);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int enumerate_interfaces(void)
|
int enumerate_interfaces(void)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
@@ -366,7 +384,10 @@ struct listener *create_bound_listeners(void)
|
|||||||
{
|
{
|
||||||
struct listener *listeners = NULL;
|
struct listener *listeners = NULL;
|
||||||
struct irec *iface;
|
struct irec *iface;
|
||||||
int opt = 1;
|
int rc, opt = 1;
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
static int dad_count = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
for (iface = daemon->interfaces; iface; iface = iface->next)
|
for (iface = daemon->interfaces; iface; iface = iface->next)
|
||||||
{
|
{
|
||||||
@@ -377,6 +398,7 @@ struct listener *create_bound_listeners(void)
|
|||||||
new->tftpfd = -1;
|
new->tftpfd = -1;
|
||||||
new->tcpfd = -1;
|
new->tcpfd = -1;
|
||||||
new->fd = -1;
|
new->fd = -1;
|
||||||
|
listeners = new;
|
||||||
|
|
||||||
if (daemon->port != 0)
|
if (daemon->port != 0)
|
||||||
{
|
{
|
||||||
@@ -397,26 +419,33 @@ struct listener *create_bound_listeners(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (bind(new->tcpfd, &iface->addr.sa, sa_len(&iface->addr)) == -1 ||
|
while(1)
|
||||||
bind(new->fd, &iface->addr.sa, sa_len(&iface->addr)) == -1)
|
|
||||||
{
|
{
|
||||||
|
if ((rc = bind(new->fd, &iface->addr.sa, sa_len(&iface->addr))) != -1)
|
||||||
|
break;
|
||||||
|
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
if (iface->addr.sa.sa_family == AF_INET6 && (errno == ENODEV || errno == EADDRNOTAVAIL))
|
/* An interface may have an IPv6 address which is still undergoing DAD.
|
||||||
|
If so, the bind will fail until the DAD completes, so we try over 20 seconds
|
||||||
|
before failing. */
|
||||||
|
if (iface->addr.sa.sa_family == AF_INET6 && (errno == ENODEV || errno == EADDRNOTAVAIL) &&
|
||||||
|
dad_count++ < DAD_WAIT)
|
||||||
{
|
{
|
||||||
close(new->tcpfd);
|
sleep(1);
|
||||||
close(new->fd);
|
continue;
|
||||||
free(new);
|
|
||||||
new = NULL;
|
|
||||||
}
|
}
|
||||||
else
|
|
||||||
#endif
|
#endif
|
||||||
{
|
break;
|
||||||
prettyprint_addr(&iface->addr, daemon->namebuff);
|
|
||||||
die(_("failed to bind listening socket for %s: %s"),
|
|
||||||
daemon->namebuff, EC_BADNET);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (listen(new->tcpfd, 5) == -1)
|
|
||||||
|
if (rc == -1 || bind(new->tcpfd, &iface->addr.sa, sa_len(&iface->addr)) == -1)
|
||||||
|
{
|
||||||
|
prettyprint_addr(&iface->addr, daemon->namebuff);
|
||||||
|
die(_("failed to bind listening socket for %s: %s"),
|
||||||
|
daemon->namebuff, EC_BADNET);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (listen(new->tcpfd, 5) == -1)
|
||||||
die(_("failed to listen on socket: %s"), NULL, EC_BADNET);
|
die(_("failed to listen on socket: %s"), NULL, EC_BADNET);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -434,8 +463,6 @@ struct listener *create_bound_listeners(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (new)
|
|
||||||
listeners = new;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return listeners;
|
return listeners;
|
||||||
@@ -519,8 +546,8 @@ int local_bind(int fd, union mysockaddr *addr, char *intname, int is_tcp)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
#if defined(SO_BINDTODEVICE)
|
#if defined(SO_BINDTODEVICE)
|
||||||
if (strlen(intname) != 0 &&
|
if (intname[0] != 0 &&
|
||||||
setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, intname, sizeof(intname)) == -1)
|
setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, intname, strlen(intname)) == -1)
|
||||||
return 0;
|
return 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -534,7 +561,7 @@ static struct serverfd *allocate_sfd(union mysockaddr *addr, char *intname)
|
|||||||
|
|
||||||
/* when using random ports, servers which would otherwise use
|
/* when using random ports, servers which would otherwise use
|
||||||
the INADDR_ANY/port0 socket have sfd set to NULL */
|
the INADDR_ANY/port0 socket have sfd set to NULL */
|
||||||
if (!daemon->osport)
|
if (!daemon->osport && intname[0] == 0)
|
||||||
{
|
{
|
||||||
errno = 0;
|
errno = 0;
|
||||||
|
|
||||||
@@ -620,7 +647,7 @@ void pre_allocate_sfds(void)
|
|||||||
(daemon->options & OPT_NOWILD))
|
(daemon->options & OPT_NOWILD))
|
||||||
{
|
{
|
||||||
prettyprint_addr(&srv->addr, daemon->namebuff);
|
prettyprint_addr(&srv->addr, daemon->namebuff);
|
||||||
if (strlen(srv->interface) != 0)
|
if (srv->interface[0] != 0)
|
||||||
{
|
{
|
||||||
strcat(daemon->namebuff, " ");
|
strcat(daemon->namebuff, " ");
|
||||||
strcat(daemon->namebuff, srv->interface);
|
strcat(daemon->namebuff, srv->interface);
|
||||||
@@ -695,7 +722,7 @@ void check_servers(void)
|
|||||||
else if (!(new->flags & SERV_LITERAL_ADDRESS))
|
else if (!(new->flags & SERV_LITERAL_ADDRESS))
|
||||||
my_syslog(LOG_INFO, _("using nameserver %s#%d for %s %s"), daemon->namebuff, port, s1, s2);
|
my_syslog(LOG_INFO, _("using nameserver %s#%d for %s %s"), daemon->namebuff, port, s1, s2);
|
||||||
}
|
}
|
||||||
else if (strlen(new->interface) != 0)
|
else if (new->interface[0] != 0)
|
||||||
my_syslog(LOG_INFO, _("using nameserver %s#%d(via %s)"), daemon->namebuff, port, new->interface);
|
my_syslog(LOG_INFO, _("using nameserver %s#%d(via %s)"), daemon->namebuff, port, new->interface);
|
||||||
else
|
else
|
||||||
my_syslog(LOG_INFO, _("using nameserver %s#%d"), daemon->namebuff, port);
|
my_syslog(LOG_INFO, _("using nameserver %s#%d"), daemon->namebuff, port);
|
||||||
|
|||||||
+399
-203
File diff suppressed because it is too large.
Load diff
+24
-16
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -25,7 +25,7 @@ static int add_resource_record(HEADER *header, char *limit, int *truncp,
|
|||||||
((size_t)((pp) - (unsigned char *)(header) + (len)) <= (plen))
|
((size_t)((pp) - (unsigned char *)(header) + (len)) <= (plen))
|
||||||
|
|
||||||
#define ADD_RDLEN(header, pp, plen, len) \
|
#define ADD_RDLEN(header, pp, plen, len) \
|
||||||
(!CHECK_LEN(header, pp, plen, len) ? 0 : (int)((pp) += (len)), 1)
|
(!CHECK_LEN(header, pp, plen, len) ? 0 : (long)((pp) += (len)), 1)
|
||||||
|
|
||||||
static int extract_name(HEADER *header, size_t plen, unsigned char **pp,
|
static int extract_name(HEADER *header, size_t plen, unsigned char **pp,
|
||||||
char *name, int isExtract, int extrabytes)
|
char *name, int isExtract, int extrabytes)
|
||||||
@@ -551,15 +551,23 @@ static unsigned char *do_doctor(unsigned char *p, int count, HEADER *header, siz
|
|||||||
memcpy(&addr, p, INADDRSZ);
|
memcpy(&addr, p, INADDRSZ);
|
||||||
|
|
||||||
for (doctor = daemon->doctors; doctor; doctor = doctor->next)
|
for (doctor = daemon->doctors; doctor; doctor = doctor->next)
|
||||||
if (is_same_net(doctor->in, addr, doctor->mask))
|
{
|
||||||
{
|
if (doctor->end.s_addr == 0)
|
||||||
addr.s_addr &= ~doctor->mask.s_addr;
|
{
|
||||||
addr.s_addr |= (doctor->out.s_addr & doctor->mask.s_addr);
|
if (!is_same_net(doctor->in, addr, doctor->mask))
|
||||||
/* Since we munged the data, the server it came from is no longer authoritative */
|
continue;
|
||||||
header->aa = 0;
|
}
|
||||||
memcpy(p, &addr, INADDRSZ);
|
else if (ntohl(doctor->in.s_addr) > ntohl(addr.s_addr) ||
|
||||||
break;
|
ntohl(doctor->end.s_addr) < ntohl(addr.s_addr))
|
||||||
}
|
continue;
|
||||||
|
|
||||||
|
addr.s_addr &= ~doctor->mask.s_addr;
|
||||||
|
addr.s_addr |= (doctor->out.s_addr & doctor->mask.s_addr);
|
||||||
|
/* Since we munged the data, the server it came from is no longer authoritative */
|
||||||
|
header->aa = 0;
|
||||||
|
memcpy(p, &addr, INADDRSZ);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ADD_RDLEN(header, p, qlen, rdlen))
|
if (!ADD_RDLEN(header, p, qlen, rdlen))
|
||||||
@@ -1282,7 +1290,7 @@ size_t answer_request(HEADER *header, char *limit, size_t qlen,
|
|||||||
if (!dryrun)
|
if (!dryrun)
|
||||||
{
|
{
|
||||||
log_query(crecp->flags & ~F_FORWARD, cache_get_name(crecp), &addr,
|
log_query(crecp->flags & ~F_FORWARD, cache_get_name(crecp), &addr,
|
||||||
record_source(daemon->addn_hosts, crecp->uid));
|
record_source(crecp->uid));
|
||||||
|
|
||||||
if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
|
if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
|
||||||
crec_ttl(crecp, now), NULL,
|
crec_ttl(crecp, now), NULL,
|
||||||
@@ -1392,7 +1400,7 @@ size_t answer_request(HEADER *header, char *limit, size_t qlen,
|
|||||||
{
|
{
|
||||||
if (!dryrun)
|
if (!dryrun)
|
||||||
{
|
{
|
||||||
log_query(crecp->flags, name, NULL, record_source(daemon->addn_hosts, crecp->uid));
|
log_query(crecp->flags, name, NULL, record_source(crecp->uid));
|
||||||
if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
|
if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
|
||||||
crec_ttl(crecp, now), &nameoffset,
|
crec_ttl(crecp, now), &nameoffset,
|
||||||
T_CNAME, C_IN, "d", cache_get_name(crecp->addr.cname.cache)))
|
T_CNAME, C_IN, "d", cache_get_name(crecp->addr.cname.cache)))
|
||||||
@@ -1428,7 +1436,7 @@ size_t answer_request(HEADER *header, char *limit, size_t qlen,
|
|||||||
if (!dryrun)
|
if (!dryrun)
|
||||||
{
|
{
|
||||||
log_query(crecp->flags & ~F_REVERSE, name, &crecp->addr.addr,
|
log_query(crecp->flags & ~F_REVERSE, name, &crecp->addr.addr,
|
||||||
record_source(daemon->addn_hosts, crecp->uid));
|
record_source(crecp->uid));
|
||||||
|
|
||||||
if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
|
if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
|
||||||
crec_ttl(crecp, now), NULL, type, C_IN,
|
crec_ttl(crecp, now), NULL, type, C_IN,
|
||||||
|
|||||||
+671
-266
File diff suppressed because it is too large.
Load diff
+25
-29
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -45,9 +45,7 @@ void tftp_request(struct listener *listen, time_t now)
|
|||||||
char *filename, *mode, *p, *end, *opt;
|
char *filename, *mode, *p, *end, *opt;
|
||||||
struct sockaddr_in addr, peer;
|
struct sockaddr_in addr, peer;
|
||||||
struct msghdr msg;
|
struct msghdr msg;
|
||||||
struct cmsghdr *cmptr;
|
|
||||||
struct iovec iov;
|
struct iovec iov;
|
||||||
struct ifreq ifr;
|
|
||||||
int is_err = 1, if_index = 0;
|
int is_err = 1, if_index = 0;
|
||||||
struct iname *tmp;
|
struct iname *tmp;
|
||||||
struct tftp_transfer *transfer;
|
struct tftp_transfer *transfer;
|
||||||
@@ -62,7 +60,7 @@ void tftp_request(struct listener *listen, time_t now)
|
|||||||
char control[CMSG_SPACE(sizeof(struct in_pktinfo))];
|
char control[CMSG_SPACE(sizeof(struct in_pktinfo))];
|
||||||
#elif defined(HAVE_SOLARIS_NETWORK)
|
#elif defined(HAVE_SOLARIS_NETWORK)
|
||||||
char control[CMSG_SPACE(sizeof(unsigned int))];
|
char control[CMSG_SPACE(sizeof(unsigned int))];
|
||||||
#else
|
#elif defined(IP_RECVDSTADDR) && defined(IP_RECVIF)
|
||||||
char control[CMSG_SPACE(sizeof(struct sockaddr_dl))];
|
char control[CMSG_SPACE(sizeof(struct sockaddr_dl))];
|
||||||
#endif
|
#endif
|
||||||
} control_u;
|
} control_u;
|
||||||
@@ -88,6 +86,9 @@ void tftp_request(struct listener *listen, time_t now)
|
|||||||
addr = listen->iface->addr.in;
|
addr = listen->iface->addr.in;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
char name[IF_NAMESIZE];
|
||||||
|
struct cmsghdr *cmptr;
|
||||||
|
|
||||||
addr.sin_addr.s_addr = 0;
|
addr.sin_addr.s_addr = 0;
|
||||||
|
|
||||||
#if defined(HAVE_LINUX_NETWORK)
|
#if defined(HAVE_LINUX_NETWORK)
|
||||||
@@ -97,36 +98,32 @@ void tftp_request(struct listener *listen, time_t now)
|
|||||||
addr.sin_addr = ((struct in_pktinfo *)CMSG_DATA(cmptr))->ipi_spec_dst;
|
addr.sin_addr = ((struct in_pktinfo *)CMSG_DATA(cmptr))->ipi_spec_dst;
|
||||||
if_index = ((struct in_pktinfo *)CMSG_DATA(cmptr))->ipi_ifindex;
|
if_index = ((struct in_pktinfo *)CMSG_DATA(cmptr))->ipi_ifindex;
|
||||||
}
|
}
|
||||||
if (!(ifr.ifr_ifindex = if_index) ||
|
|
||||||
ioctl(listen->tftpfd, SIOCGIFNAME, &ifr) == -1)
|
#elif defined(HAVE_SOLARIS_NETWORK)
|
||||||
return;
|
for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
|
||||||
|
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVDSTADDR)
|
||||||
|
addr.sin_addr = *((struct in_addr *)CMSG_DATA(cmptr));
|
||||||
|
else if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVIF)
|
||||||
|
if_index = *((unsigned int *)CMSG_DATA(cmptr));
|
||||||
|
|
||||||
|
|
||||||
#elif defined(IP_RECVDSTADDR) && defined(IP_RECVIF)
|
#elif defined(IP_RECVDSTADDR) && defined(IP_RECVIF)
|
||||||
for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
|
for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
|
||||||
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVDSTADDR)
|
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVDSTADDR)
|
||||||
addr.sin_addr = *((struct in_addr *)CMSG_DATA(cmptr));
|
addr.sin_addr = *((struct in_addr *)CMSG_DATA(cmptr));
|
||||||
else if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVIF)
|
else if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVIF)
|
||||||
#ifdef HAVE_SOLARIS_NETWORK
|
if_index = ((struct sockaddr_dl *)CMSG_DATA(cmptr))->sdl_index;
|
||||||
if_index = *((unsigned int *)CMSG_DATA(cmptr));
|
|
||||||
#else
|
|
||||||
if_index = ((struct sockaddr_dl *)CMSG_DATA(cmptr))->sdl_index;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (if_index == 0 || !if_indextoname(if_index, ifr.ifr_name))
|
|
||||||
return;
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (addr.sin_addr.s_addr == 0)
|
if (!indextoname(listen->tftpfd, if_index, name) ||
|
||||||
return;
|
addr.sin_addr.s_addr == 0 ||
|
||||||
|
!iface_check(AF_INET, (struct all_addr *)&addr.sin_addr, name, &if_index))
|
||||||
if (!iface_check(AF_INET, (struct all_addr *)&addr.sin_addr,
|
|
||||||
&ifr, &if_index))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* allowed interfaces are the same as for DHCP */
|
/* allowed interfaces are the same as for DHCP */
|
||||||
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
||||||
if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
|
if (tmp->name && (strcmp(tmp->name, name) == 0))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -172,7 +169,7 @@ void tftp_request(struct listener *listen, time_t now)
|
|||||||
addr.sin_port = htons(port);
|
addr.sin_port = htons(port);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
my_syslog(LOG_ERR, _("unable to get free port for TFTP"));
|
my_syslog(MS_TFTP | LOG_ERR, _("unable to get free port for TFTP"));
|
||||||
}
|
}
|
||||||
free_transfer(transfer);
|
free_transfer(transfer);
|
||||||
return;
|
return;
|
||||||
@@ -268,7 +265,7 @@ void tftp_request(struct listener *listen, time_t now)
|
|||||||
free_transfer(transfer);
|
free_transfer(transfer);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
my_syslog(LOG_INFO, _("TFTP sent %s to %s"), daemon->namebuff, inet_ntoa(peer.sin_addr));
|
my_syslog(MS_TFTP | LOG_INFO, _("TFTP sent %s to %s"), daemon->namebuff, inet_ntoa(peer.sin_addr));
|
||||||
transfer->next = daemon->tftp_trans;
|
transfer->next = daemon->tftp_trans;
|
||||||
daemon->tftp_trans = transfer;
|
daemon->tftp_trans = transfer;
|
||||||
}
|
}
|
||||||
@@ -402,7 +399,7 @@ void check_tftp_listeners(fd_set *rset, time_t now)
|
|||||||
*(q++) = *r;
|
*(q++) = *r;
|
||||||
*q = 0;
|
*q = 0;
|
||||||
}
|
}
|
||||||
my_syslog(LOG_ERR, _("TFTP error %d %s received from %s"),
|
my_syslog(MS_TFTP | LOG_ERR, _("TFTP error %d %s received from %s"),
|
||||||
(int)ntohs(mess->block), err,
|
(int)ntohs(mess->block), err,
|
||||||
inet_ntoa(transfer->peer.sin_addr));
|
inet_ntoa(transfer->peer.sin_addr));
|
||||||
|
|
||||||
@@ -433,7 +430,7 @@ void check_tftp_listeners(fd_set *rset, time_t now)
|
|||||||
/* don't complain about timeout when we're awaiting the last
|
/* don't complain about timeout when we're awaiting the last
|
||||||
ACK, some clients never send it */
|
ACK, some clients never send it */
|
||||||
if (len != 0)
|
if (len != 0)
|
||||||
my_syslog(LOG_ERR, _("TFTP failed sending %s to %s"),
|
my_syslog(MS_TFTP | LOG_ERR, _("TFTP failed sending %s to %s"),
|
||||||
transfer->file->filename, inet_ntoa(transfer->peer.sin_addr));
|
transfer->file->filename, inet_ntoa(transfer->peer.sin_addr));
|
||||||
len = 0;
|
len = 0;
|
||||||
}
|
}
|
||||||
@@ -492,8 +489,7 @@ static ssize_t tftp_err(int err, char *packet, char *message, char *file)
|
|||||||
mess->op = htons(OP_ERR);
|
mess->op = htons(OP_ERR);
|
||||||
mess->err = htons(err);
|
mess->err = htons(err);
|
||||||
ret += (snprintf(mess->message, 500, message, file, errstr) + 1);
|
ret += (snprintf(mess->message, 500, message, file, errstr) + 1);
|
||||||
if (err != ERR_FNF)
|
my_syslog(MS_TFTP | LOG_ERR, "TFTP %s", mess->message);
|
||||||
my_syslog(LOG_ERR, "TFTP %s", mess->message);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|||||||
+15
-12
@@ -1,4 +1,4 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2008 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -10,14 +10,12 @@
|
|||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Some code in this file contributed by Rob Funk. */
|
|
||||||
|
|
||||||
/* The SURF random number generator was taken from djbdns-1.05, by
|
/* The SURF random number generator was taken from djbdns-1.05, by
|
||||||
Daniel J Berstein, which is public domain. */
|
Daniel J Bernstein, which is public domain. */
|
||||||
|
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -346,14 +344,19 @@ int parse_hex(char *in, unsigned char *out, int maxlen,
|
|||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* return 0 for no match, or (no matched octets) + 1 */
|
||||||
int memcmp_masked(unsigned char *a, unsigned char *b, int len, unsigned int mask)
|
int memcmp_masked(unsigned char *a, unsigned char *b, int len, unsigned int mask)
|
||||||
{
|
{
|
||||||
int i;
|
int i, count;
|
||||||
for (i = len - 1; i >= 0; i--, mask = mask >> 1)
|
for (count = 1, i = len - 1; i >= 0; i--, mask = mask >> 1)
|
||||||
if (!(mask & 1) && a[i] != b[i])
|
if (!(mask & 1))
|
||||||
return 0;
|
{
|
||||||
|
if (a[i] == b[i])
|
||||||
return 1;
|
count++;
|
||||||
|
else
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* _note_ may copy buffer */
|
/* _note_ may copy buffer */
|
||||||
|
|||||||
Reference in new issue
Block a user