diff --git a/dist/dhcpcd/README b/dist/dhcpcd/README deleted file mode 100644 index c3bea6d81670..000000000000 --- a/dist/dhcpcd/README +++ /dev/null @@ -1,65 +0,0 @@ -dhcpcd-4 - DHCP client daemon -Copyright 2006-2008 Roy Marples - - -Installation ------------- -Edit config.h to match your building requirements. -Then just make; make install -man dhcpcd for command line options - - -Notes ------ -If you're cross compiling you may need to set the below knobs to avoid -automatic tests. -OS=BSD | Linux - -If you're building for a NOMMU system where fork() does not work, you should -add -DTHERE_IS_NO_FORK to your CFLAGS. - -You can change the default dir with these knobs. -For example, to satisfy FHS compliance you would do this:- -LIBEXECDIR=/lib/dhcpcd -DBDIR=/var/lib/dhcpcd - -We now default to using -std=c99. For 64-bit linux, this always works, but -for 32-bit linux it requires either gnu99 or a patch to asm/types.h. -Most distros patch linux headers so this should work fine. -linux-2.6.24 finally ships with a working 32-bit header. -If your linux headers are older, or your distro hasn't patched them you can -set CSTD=gnu99 to work around this. - - -Hooks ------ -Not all the hooks in hook.d are installed by default. -By default we install 01-test.sh, 10-resolv.conf.sh and 15-hostname.sh. -To add more simply add them in the HOOKSCRIPTS variable. -make HOOKSCRIPTS=50-ntp.sh install - - -Compatibility -------------- -If you require compatibility with dhcpcd-3 and older style variables, -you can install 50-dhcpcd-compat.sh into the directory $LIBEXECDIR/dhcpcd.hook.d -We don't install this by default. -You should also add -DCMDLINE_COMPAT to your CFLAGS if you need to be fully -commandline compatible with prior versions. - -dhcpcd-3 enabled DUID support by default - this has changed in dhcpcd-4. -You can enable it via the --duid, -D command line option or by using the -duid directive in dhcpcd.conf. -If CMDLINE_COMPAT is defined the we renable DUID support by default IF -the dhcpcd.duid file exits. This keeps the clients working as they were, -which is good. - -dhcpcd-4 is NOT fully commandline compatible with dhcpcd-2 and older and -changes the meaning of some options. - - -ChangeLog ---------- -We no longer supply a ChangeLog. -However, you're more than welcome to read the git commit comments at -http://git.marples.name/?p=dhcpcd/.git;a=summary diff --git a/dist/dhcpcd/bpf-filter.h b/dist/dhcpcd/bpf-filter.h deleted file mode 100644 index adcc8bbb4260..000000000000 --- a/dist/dhcpcd/bpf-filter.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef BPF_ETHCOOK -# define BPF_ETHCOOK 0 -#endif -#ifndef BPF_WHOLEPACKET -# define BPF_WHOLEPACKET ~0U -#endif -static const struct bpf_insn const arp_bpf_filter [] = { -#ifndef BPF_SKIPTYPE - /* Make sure this is an ARP packet... */ - BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 12), - BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ETHERTYPE_ARP, 0, 3), -#endif - - /* Make sure this is an ARP REPLY... */ - BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 20 + BPF_ETHCOOK), - BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ARPOP_REPLY, 0, 1), - - /* If we passed all the tests, ask for the whole packet. */ - BPF_STMT(BPF_RET + BPF_K, BPF_WHOLEPACKET), - - /* Otherwise, drop it. */ - BPF_STMT(BPF_RET + BPF_K, 0), -}; -static const size_t arp_bpf_filter_len = - sizeof(arp_bpf_filter) / sizeof(arp_bpf_filter[0]); - - -/* dhcp_bpf_filter taken from bpf.c in dhcp-3.1.0 - * - * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996-2003 by Internet Software Consortium - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Internet Systems Consortium, Inc. - * 950 Charter Street - * Redwood City, CA 94063 - * - * http://www.isc.org/ - */ - -static const struct bpf_insn const dhcp_bpf_filter [] = { -#ifndef BPF_SKIPTYPE - /* Make sure this is an IP packet... */ - BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 12), - BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ETHERTYPE_IP, 0, 8), -#endif - - /* Make sure it's a UDP packet... */ - BPF_STMT(BPF_LD + BPF_B + BPF_ABS, 23 + BPF_ETHCOOK), - BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 0, 6), - - /* Make sure this isn't a fragment... */ - BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 20 + BPF_ETHCOOK), - BPF_JUMP(BPF_JMP + BPF_JSET + BPF_K, 0x1fff, 4, 0), - - /* Get the IP header length... */ - BPF_STMT(BPF_LDX + BPF_B + BPF_MSH, 14 + BPF_ETHCOOK), - - /* Make sure it's to the right port... */ - BPF_STMT(BPF_LD + BPF_H + BPF_IND, 16 + BPF_ETHCOOK), - BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, DHCP_CLIENT_PORT, 0, 1), - - /* If we passed all the tests, ask for the whole packet. */ - BPF_STMT(BPF_RET + BPF_K, BPF_WHOLEPACKET), - - /* Otherwise, drop it. */ - BPF_STMT(BPF_RET + BPF_K, 0), -}; -static const size_t dhcp_bpf_filter_len = - sizeof(dhcp_bpf_filter) / sizeof(dhcp_bpf_filter[0]); diff --git a/dist/dhcpcd/bpf.c b/dist/dhcpcd/bpf.c deleted file mode 100644 index 37a92f3d205f..000000000000 --- a/dist/dhcpcd/bpf.c +++ /dev/null @@ -1,203 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "config.h" -#include "common.h" -#include "dhcp.h" -#include "logger.h" -#include "net.h" -#include "bpf-filter.h" - -int -open_socket(struct interface *iface, int protocol) -{ - int fd = -1; - struct ifreq ifr; - int buf_len = 0; - struct bpf_version pv; - struct bpf_program pf; -#ifdef BIOCIMMEDIATE - int flags; -#endif -#ifdef _PATH_BPF - fd = open(_PATH_BPF, O_RDWR | O_NONBLOCK); -#else - char *device; - int n = 0; - - device = xmalloc(sizeof(char) * PATH_MAX); - do { - snprintf(device, PATH_MAX, "/dev/bpf%d", n++); - fd = open(device, O_RDWR | O_NONBLOCK); - } while (fd == -1 && errno == EBUSY); - free(device); -#endif - - if (fd == -1) - return -1; - - if (ioctl(fd, BIOCVERSION, &pv) == -1) - goto eexit; - if (pv.bv_major != BPF_MAJOR_VERSION || - pv.bv_minor < BPF_MINOR_VERSION) { - logger(LOG_ERR, "BPF version mismatch - recompile " PACKAGE); - goto eexit; - } - - memset(&ifr, 0, sizeof(ifr)); - strlcpy(ifr.ifr_name, iface->name, sizeof(ifr.ifr_name)); - if (ioctl(fd, BIOCSETIF, &ifr) == -1) - goto eexit; - - /* Get the required BPF buffer length from the kernel. */ - if (ioctl(fd, BIOCGBLEN, &buf_len) == -1) - goto eexit; - if (iface->buffer_size != (size_t)buf_len) { - free(iface->buffer); - iface->buffer_size = buf_len; - iface->buffer = xmalloc(buf_len); - iface->buffer_len = iface->buffer_pos = 0; - } - -#ifdef BIOCIMMEDIATE - flags = 1; - if (ioctl(fd, BIOCIMMEDIATE, &flags) == -1) - goto eexit; -#endif - - /* Install the DHCP filter */ - if (protocol == ETHERTYPE_ARP) { - pf.bf_insns = UNCONST(arp_bpf_filter); - pf.bf_len = arp_bpf_filter_len; - } else { - pf.bf_insns = UNCONST(dhcp_bpf_filter); - pf.bf_len = dhcp_bpf_filter_len; - } - if (ioctl(fd, BIOCSETF, &pf) == -1) - goto eexit; - - if (iface->fd != -1) - close(iface->fd); - - close_on_exec(fd); - iface->fd = fd; - - return fd; - -eexit: - free(iface->buffer); - iface->buffer = NULL; - close(fd); - return -1; -} - -ssize_t -send_raw_packet(const struct interface *iface, int type, - const void *data, ssize_t len) -{ - struct iovec iov[2]; - struct ether_header hw; - - memset(&hw, 0, sizeof(hw)); - memset(&hw.ether_dhost, 0xff, ETHER_ADDR_LEN); - hw.ether_type = htons(type); - iov[0].iov_base = &hw; - iov[0].iov_len = sizeof(hw); - iov[1].iov_base = UNCONST(data); - iov[1].iov_len = len; - - return writev(iface->fd, iov, 2); -} - -/* BPF requires that we read the entire buffer. - * So we pass the buffer in the API so we can loop on >1 dhcp packet. */ -ssize_t -get_packet(struct interface *iface, void *data, ssize_t len) -{ - struct bpf_hdr packet; - struct ether_header hw; - ssize_t bytes; - const unsigned char *payload, *d; - - for (;;) { - if (iface->buffer_len == 0) { - bytes = read(iface->fd, iface->buffer, - iface->buffer_size); - if (bytes == -1) - return errno == EAGAIN ? 0 : -1; - else if ((size_t)bytes < sizeof(packet)) - return -1; - iface->buffer_len = bytes; - iface->buffer_pos = 0; - } - bytes = -1; - memcpy(&packet, iface->buffer + iface->buffer_pos, - sizeof(packet)); - if (packet.bh_caplen != packet.bh_datalen) - goto next; /* Incomplete packet, drop. */ - if (iface->buffer_pos + packet.bh_caplen + packet.bh_hdrlen > - iface->buffer_len) - goto next; /* Packet beyond buffer, drop. */ - memcpy(&hw, iface->buffer + packet.bh_hdrlen, sizeof(hw)); - payload = iface->buffer + packet.bh_hdrlen + sizeof(hw); - if (hw.ether_type == htons(ETHERTYPE_ARP)) { - bytes = packet.bh_caplen - sizeof(hw); - if (bytes > len) - bytes = len; - memcpy(data, payload, bytes); - } else if (valid_udp_packet(payload) >= 0) { - bytes = get_udp_data(&d, payload); - if (bytes > len) - bytes = len; - memcpy(data, d, bytes); - } else - bytes = -1; -next: - iface->buffer_pos += BPF_WORDALIGN(packet.bh_hdrlen + - packet.bh_caplen); - if (iface->buffer_pos >= iface->buffer_len) - iface->buffer_len = iface->buffer_pos = 0; - if (bytes != -1) - return bytes; - } -} diff --git a/dist/dhcpcd/client.c b/dist/dhcpcd/client.c deleted file mode 100644 index 9342a43b6cc0..000000000000 --- a/dist/dhcpcd/client.c +++ /dev/null @@ -1,1315 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include - -#ifdef __linux__ -# include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "config.h" -#include "common.h" -#include "client.h" -#include "configure.h" -#include "dhcp.h" -#include "dhcpcd.h" -#include "net.h" -#include "logger.h" -#include "signals.h" - -#ifdef ENABLE_IPV4LL -# ifndef ENABLE_ARP - # error "IPv4LL requires ENABLE_ARP to work" -# endif -#define IPV4LL_LEASETIME 20 -#endif - -/* Some platforms don't define INFTIM */ -#ifndef INFTIM -# define INFTIM -1 -#endif - -/* This is out mini timeout. - * Basically we resend the last request every TIMEOUT_MINI seconds. */ -#define TIMEOUT_MINI 3 -/* Except for an infinite timeout. We keep adding TIMEOUT_MINI to - * ourself until TIMEOUT_MINI_INF is reached. */ -#define TIMEOUT_MINI_INF 60 - -#define STATE_INIT 0 -#define STATE_REQUESTING 1 -#define STATE_BOUND 2 -#define STATE_RENEWING 3 -#define STATE_REBINDING 4 -#define STATE_REBOOT 5 -#define STATE_RENEW_REQUESTED 6 -#define STATE_RELEASED 7 - -/* We should define a maximum for the NAK exponential backoff */ -#define NAKOFF_MAX 60 - -#define SOCKET_CLOSED 0 -#define SOCKET_OPEN 1 - -/* Indexes for pollfds */ -#define POLLFD_SIGNAL 0 -#define POLLFD_IFACE 1 - -struct if_state { - int options; - struct interface *interface; - struct dhcp_message *dhcp; - struct dhcp_message *old_dhcp; - struct dhcp_lease lease; - time_t start; - time_t last_sent; - time_t last_type; - int state; - long timeout; - time_t nakoff; - uint32_t xid; - int socket; - int *pidfd; -}; - -struct dhcp_op { - uint8_t value; - const char *name; -}; - -static const struct dhcp_op const dhcp_ops[] = { - { DHCP_DISCOVER, "DHCP_DISCOVER" }, - { DHCP_OFFER, "DHCP_OFFER" }, - { DHCP_REQUEST, "DHCP_REQUEST" }, - { DHCP_DECLINE, "DHCP_DECLINE" }, - { DHCP_ACK, "DHCP_ACK" }, - { DHCP_NAK, "DHCP_NAK" }, - { DHCP_RELEASE, "DHCP_RELEASE" }, - { DHCP_INFORM, "DHCP_INFORM" }, - { 0, NULL } -}; - -static const char * -get_dhcp_op(uint8_t type) -{ - const struct dhcp_op *d; - - for (d = dhcp_ops; d->name; d++) - if (d->value == type) - return d->name; - return NULL; -} - -static int -daemonise(struct if_state *state, const struct options *options) -{ - pid_t pid; - sigset_t full; - sigset_t old; -#ifdef THERE_IS_NO_FORK - char **argv; - int i; -#endif - - if (state->options & DHCPCD_DAEMONISED || - !(options->options & DHCPCD_DAEMONISE)) - return 0; - - sigfillset(&full); - sigprocmask(SIG_SETMASK, &full, &old); - -#ifndef THERE_IS_NO_FORK - logger(LOG_DEBUG, "forking to background"); - switch (pid = fork()) { - case -1: - logger(LOG_ERR, "fork: %s", strerror(errno)); - exit(EXIT_FAILURE); - /* NOTREACHED */ - case 0: - setsid(); - close_fds(); - /* Clear pending signals */ - signal_clear(); - break; - default: - /* Reset signals as we're the parent about to exit. */ - signal_reset(); - break; - } -#else - logger(LOG_INFO, "forking to background"); - - /* We need to add --daemonise to our options */ - argv = xmalloc (sizeof(char *) * (dhcpcd_argc + 4)); - argv[0] = dhcpcd; - for (i = 1; i < dhcpcd_argc; i++) - argv[i] = dhcpcd_argv[i]; - argv[i] = (char *)"--daemonised"; - if (dhcpcd_skiproutes) { - argv[++i] = (char *)"--skiproutes"; - argv[++i] = dhcpcd_skiproutes; - } - argv[i + 1] = NULL; - - switch (pid = vfork()) { - case -1: - logger(LOG_ERR, "vfork: %s", strerror(errno)); - _exit(EXIT_FAILURE); - case 0: - signal_reset(); - sigprocmask(SIG_SETMASK, &old, NULL); - execvp(dhcpcd, argv); - /* Must not use stdio here. */ - write(STDERR_FILENO, "exec failed\n", 12); - _exit(EXIT_FAILURE); - } - - free(argv); -#endif - - /* Done with the fd now */ - if (pid != 0) { - writepid(*state->pidfd, pid); - close(*state->pidfd); - *state->pidfd = -1; - } - - sigprocmask(SIG_SETMASK, &old, NULL); - - state->state = STATE_BOUND; - if (pid == 0) { - state->options |= DHCPCD_DAEMONISED; - return 0; - } - - state->options |= DHCPCD_PERSISTENT | DHCPCD_FORKED; - return -1; -} - - -#ifdef ENABLE_DUID -#define THIRTY_YEARS_IN_SECONDS 946707779 -static size_t -get_duid(unsigned char *duid, const struct interface *iface) -{ - FILE *f; - uint16_t type = 0; - uint16_t hw = 0; - uint32_t ul; - time_t t; - int x = 0; - unsigned char *p = duid; - size_t len = 0, l = 0; - char *buffer = NULL, *line, *option; - - /* If we already have a DUID then use it as it's never supposed - * to change once we have one even if the interfaces do */ - if ((f = fopen(DUID, "r"))) { - while ((get_line(&buffer, &len, f))) { - line = buffer; - while ((option = strsep(&line, " \t"))) - if (*option != '\0') - break; - if (!option || *option == '\0' || *option == '#') - continue; - l = hwaddr_aton(NULL, option); - if (l && l <= DUID_LEN) { - hwaddr_aton(duid, option); - break; - } - l = 0; - } - fclose(f); - free(buffer); - if (l) - return l; - } else { - if (errno != ENOENT) - return 0; - } - - /* No file? OK, lets make one based on our interface */ - if (!(f = fopen(DUID, "w"))) - return 0; - - type = htons(1); /* DUI-D-LLT */ - memcpy(p, &type, 2); - p += 2; - - hw = htons(iface->family); - memcpy(p, &hw, 2); - p += 2; - - /* time returns seconds from jan 1 1970, but DUID-LLT is - * seconds from jan 1 2000 modulo 2^32 */ - t = time(NULL) - THIRTY_YEARS_IN_SECONDS; - ul = htonl(t & 0xffffffff); - memcpy(p, &ul, 4); - p += 4; - - /* Finally, add the MAC address of the interface */ - memcpy(p, iface->hwaddr, iface->hwlen); - p += iface->hwlen; - - len = p - duid; - - x = fprintf(f, "%s\n", hwaddr_ntoa(duid, len)); - fclose(f); - - /* Failed to write the duid? scrub it, we cannot use it */ - if (x < 1) { - len = 0; - unlink(DUID); - } - - return len; -} -#endif - -#ifdef ENABLE_IPV4LL -static int -ipv4ll_get_address(struct interface *iface, struct dhcp_lease *lease) { - struct in_addr addr; - - for (;;) { - addr.s_addr = htonl(LINKLOCAL_ADDR | - (((uint32_t)abs((int)arc4random()) - % 0xFD00) + 0x0100)); - errno = 0; - if (!arp_claim(iface, addr)) - break; - /* Our ARP may have been interrupted */ - if (errno) - return -1; - } - - lease->addr.s_addr = addr.s_addr; - - /* Finally configure some DHCP like lease times */ - lease->leasetime = IPV4LL_LEASETIME; - lease->renewaltime = lease->leasetime * 0.5; - lease->rebindtime = lease->leasetime * 0.875; - - return 0; -} -#endif - -static void -get_lease(struct dhcp_lease *lease, const struct dhcp_message *dhcp) -{ - lease->addr.s_addr = dhcp->yiaddr; - if (get_option_addr(&lease->net.s_addr, dhcp, DHCP_SUBNETMASK) == -1) - lease->net.s_addr = get_netmask(dhcp->yiaddr); - if (get_option_uint32(&lease->leasetime, dhcp, DHCP_LEASETIME) != 0) - lease->leasetime = DEFAULT_LEASETIME; - if (get_option_uint32(&lease->renewaltime, dhcp, DHCP_RENEWALTIME) != 0) - lease->renewaltime = 0; - if (get_option_uint32(&lease->rebindtime, dhcp, DHCP_REBINDTIME) != 0) - lease->rebindtime = 0; - lease->frominfo = 0; -} - -static int -get_old_lease(struct if_state *state, const struct options *options) -{ - struct interface *iface = state->interface; - struct dhcp_lease *lease = &state->lease; - struct dhcp_message *dhcp; - struct timeval tv; - unsigned int offset = 0; - struct stat sb; - - if (!IN_LINKLOCAL(ntohl(iface->addr.s_addr))) - logger(LOG_INFO, "trying to use old lease in `%s'", - iface->leasefile); - if ((dhcp = read_lease(iface)) == NULL) { - if (errno != ENOENT) - logger(LOG_INFO, "read_lease: %s", strerror(errno)); - goto eexit; - } - if (stat(iface->leasefile, &sb) == -1) { - logger(LOG_ERR, "stat: %s", strerror(errno)); - goto eexit; - } - get_lease(&state->lease, dhcp); - lease->frominfo = 1; - lease->leasedfrom = sb.st_mtime; - - /* Vitaly important we remove the server information here */ - state->lease.server.s_addr = 0; - dhcp->servername[0] = '\0'; - -#ifdef ENABLE_ARP - /* Check that no-one is using the address */ - if (options->options & DHCPCD_ARP && - (options->options & DHCPCD_LASTLEASE || - (options->options & DHCPCD_IPV4LL && - IN_LINKLOCAL(ntohl(dhcp->yiaddr))))) { - if (arp_claim(iface, lease->addr) == -1) - goto eexit; - } - - /* Ok, lets use this */ - if (IN_LINKLOCAL(ntohl(dhcp->yiaddr))) { - if (options->options & DHCPCD_IPV4LL) { - free(state->old_dhcp); - state->old_dhcp = state->dhcp; - state->dhcp = dhcp; - return 0; - } - goto eexit; - } -#endif - -#ifndef THERE_IS_NO_FORK - if (!(state->options & DHCPCD_LASTLEASE)) - goto eexit; -#endif - - /* Ensure that we can still use the lease */ - if (gettimeofday(&tv, NULL) == -1) { - logger(LOG_ERR, "gettimeofday: %s", strerror(errno)); - goto eexit; - } - - offset = tv.tv_sec - lease->leasedfrom; - if (lease->leasedfrom && - tv.tv_sec - lease->leasedfrom > lease->leasetime) - { - logger(LOG_ERR, "lease expired %u seconds ago", - offset + lease->leasetime); - goto eexit; - } - - if (lease->leasedfrom == 0) - offset = 0; - state->timeout = lease->renewaltime - offset; - iface->start_uptime = uptime(); - free(state->old_dhcp); - state->old_dhcp = state->dhcp; - state->dhcp = dhcp; - return 0; - -eexit: - lease->addr.s_addr = 0; - free(dhcp); - return -1; -} - -static int -client_setup(struct if_state *state, const struct options *options) -{ - struct interface *iface = state->interface; - struct dhcp_lease *lease = &state->lease; - struct in_addr addr; - struct in_addr net; - size_t duid_len = 0; -#ifdef ENABLE_DUID - unsigned char *duid = NULL; - uint32_t ul; -#endif - - state->state = STATE_INIT; - state->last_type = DHCP_DISCOVER; - state->nakoff = 1; - state->options = options->options; - - if (options->request_address.s_addr == 0 && - (options->options & DHCPCD_INFORM || - options->options & DHCPCD_REQUEST || - options->options & DHCPCD_DAEMONISED)) - { - if (get_old_lease(state, options) != 0) - return -1; - state->timeout = 0; - - if (!(options->options & DHCPCD_DAEMONISED) && - IN_LINKLOCAL(ntohl(lease->addr.s_addr))) - { - logger(LOG_ERR, "cannot request a link local address"); - return -1; - } -#ifdef THERE_IS_NO_FORK - if (options->options & DHCPCD_DAEMONISED) { - state->state = STATE_BOUND; - state->timeout = state->lease.renewaltime; - iface->addr.s_addr = lease->addr.s_addr; - iface->net.s_addr = lease->net.s_addr; - get_option_addr(&lease->server.s_addr, - state->dhcp, DHCP_SERVERID); - } -#endif - } else { - lease->addr.s_addr = options->request_address.s_addr; - lease->net.s_addr = options->request_netmask.s_addr; - } - - if (*options->clientid) { - /* Attempt to see if the ClientID is a hardware address */ - iface->clientid_len = hwaddr_aton(NULL, options->clientid); - if (iface->clientid_len) { - iface->clientid = xmalloc(iface->clientid_len); - hwaddr_aton(iface->clientid, options->clientid); - } else { - /* Nope, so mark it as-is */ - iface->clientid_len = strlen(options->clientid) + 1; - iface->clientid = xmalloc(iface->clientid_len); - *iface->clientid = '\0'; - memcpy(iface->clientid + 1, - options->clientid, iface->clientid_len - 1); - } - } else if (options->options & DHCPCD_CLIENTID) { -#ifdef ENABLE_DUID - if (options->options & DHCPCD_DUID) { - duid = xmalloc(DUID_LEN); - duid_len = get_duid(duid, iface); - if (duid_len == 0) - logger(LOG_ERR, "get_duid: %s", - strerror(errno)); - } - - if (duid_len > 0) { - logger(LOG_INFO, "DUID = %s", - hwaddr_ntoa(duid, duid_len)); - - iface->clientid_len = duid_len + 5; - iface->clientid = xmalloc(iface->clientid_len); - *iface->clientid = 255; /* RFC 4361 */ - - /* IAID is 4 bytes, so if the iface name is 4 bytes - * use it */ - if (strlen(iface->name) == 4) { - memcpy(iface->clientid + 1, iface->name, 4); - } else { - /* Name isn't 4 bytes, so use the index */ - ul = htonl(if_nametoindex(iface->name)); - memcpy(iface->clientid + 1, &ul, 4); - } - - memcpy(iface->clientid + 5, duid, duid_len); - free(duid); - } -#endif - if (duid_len == 0) { - iface->clientid_len = iface->hwlen + 1; - iface->clientid = xmalloc(iface->clientid_len); - *iface->clientid = iface->family; - memcpy(iface->clientid + 1, iface->hwaddr, iface->hwlen); - } - } - - /* Remove all existing addresses. - * After all, we ARE a DHCP client whose job it is to configure the - * interface. We only do this on start, so persistent addresses - * can be added afterwards by the user if needed. */ - if (!(options->options & DHCPCD_TEST) && - !(options->options & DHCPCD_DAEMONISED)) - { - if (!(options->options & DHCPCD_INFORM)) { - while (get_address(iface->name, &addr, &net) == 1) { - logger(LOG_DEBUG, "deleting IP address %s/%d", - inet_ntoa(addr), - inet_ntocidr(lease->net)); - if (del_address(iface->name, &addr, &net) == -1) - { - logger(LOG_ERR, "delete_address: %s", - strerror(errno)); - break; - } - } - } else if (has_address(iface->name, - &lease->addr, &lease->net) < 1) - { - /* The inform address HAS to be configured for it to - * work with most DHCP servers */ - /* add_address */ - addr.s_addr = lease->addr.s_addr | ~lease->net.s_addr; - logger(LOG_DEBUG, "adding IP address %s/%d", - inet_ntoa(lease->addr), - inet_ntocidr(lease->net)); - if (add_address(iface->name, &lease->addr, - &lease->net, &addr) == -1) - { - logger(LOG_ERR, "add_address: %s", - strerror(errno)); - return -1; - } - iface->addr.s_addr = lease->addr.s_addr; - iface->net.s_addr = lease->net.s_addr; - } - } - - return 0; -} - -static int -do_socket(struct if_state *state, int mode) -{ - if (state->interface->fd >= 0) { - close(state->interface->fd); - state->interface->fd = -1; - } - if (mode == SOCKET_CLOSED && state->interface->udp_fd >= 0) { - close(state->interface->udp_fd); - state->interface->udp_fd = -1; - } - - /* We need to bind to a port, otherwise we generate ICMP messages - * that cannot connect the port when we have an address. - * We don't actually use this fd at all, instead using our packet - * filter socket. */ - if (mode == SOCKET_OPEN && - state->interface->udp_fd == -1 && - state->lease.addr.s_addr != 0) - if (open_udp_socket(state->interface) == -1) { - logger(LOG_ERR, "open_udp_socket: %s", strerror(errno)); - return -1; - } - - if (mode == SOCKET_OPEN) - if (open_socket(state->interface, ETHERTYPE_IP) == -1) { - logger(LOG_ERR, "open_socket: %s", strerror(errno)); - return -1; - } - state->socket = mode; - return 0; -} - -static ssize_t -send_message(struct if_state *state, int type, const struct options *options) -{ - struct dhcp_message *dhcp; - uint8_t *udp; - ssize_t len; - ssize_t r; - struct in_addr from; - struct in_addr to; - - logger(LOG_DEBUG, "sending %s with xid 0x%x", - get_dhcp_op(type), state->xid); - state->last_type = type; - state->last_sent = uptime(); - len = make_message(&dhcp, state->interface, &state->lease, state->xid, - type, options); - from.s_addr = dhcp->ciaddr; - if (from.s_addr) - to.s_addr = state->lease.server.s_addr; - else - to.s_addr = 0; - if (to.s_addr) { - r = send_packet(state->interface, to, (uint8_t *)dhcp, len); - if (r == -1) - logger(LOG_ERR, "send_packet: %s", strerror(errno)); - } else { - len = make_udp_packet(&udp, (uint8_t *)dhcp, len, from, to); - free(dhcp); - r = send_raw_packet(state->interface, ETHERTYPE_IP, udp, len); - if (r == -1) - logger(LOG_ERR, "send_raw_packet: %s", strerror(errno)); - free(udp); - } - return r; -} - -static void -drop_config(struct if_state *state, const char *reason, const struct options *options) -{ - configure(state->interface, reason, NULL, state->dhcp, - &state->lease, options, 0); - free(state->old_dhcp); - state->old_dhcp = NULL; - free(state->dhcp); - state->dhcp = NULL; - - state->lease.addr.s_addr = 0; -} - -static int -wait_for_packet(struct pollfd *fds, struct if_state *state, - const struct options *options) -{ - struct dhcp_lease *lease = &state->lease; - struct interface *iface = state->interface; - int timeout = 0; - int retval = 0; - - if (!(state->timeout > 0 || - (options->timeout == 0 && - (state->state != STATE_INIT || state->xid)))) { - /* We need to zero our signal fd, otherwise we will block - * trying to read a signal. */ - fds[POLLFD_SIGNAL].revents = 0; - return 0; - } - - fds[POLLFD_IFACE].fd = iface->fd; - - if ((options->timeout == 0 && state->xid) || - (lease->leasetime == ~0U && - state->state == STATE_BOUND)) - { - logger(LOG_DEBUG, "waiting for infinity"); - while (retval == 0) { - if (iface->fd == -1) - retval = poll(fds, 1, INFTIM); - else { - /* Slow down our requests */ - if (timeout < TIMEOUT_MINI_INF) - timeout += TIMEOUT_MINI; - else if (timeout > TIMEOUT_MINI_INF) - timeout = TIMEOUT_MINI_INF; - - retval = poll(fds, 2, timeout * 1000); - if (retval == -1 && errno == EINTR) { - /* If interupted, continue as normal as - * the signal will be delivered down - * the pipe */ - retval = 0; - continue; - } - if (retval == 0) - send_message(state, state->last_type, - options); - } - } - - return retval; - } - - /* Resend our message if we're getting loads of packets. - * As we use BPF or LPF, we shouldn't hit this as much, but it's - * still nice to have. */ - if (iface->fd > -1 && uptime() - state->last_sent >= TIMEOUT_MINI) - send_message(state, state->last_type, options); - - logger(LOG_DEBUG, "waiting for %lu seconds", state->timeout); - /* If we're waiting for a reply, then we re-send the last - * DHCP request periodically in-case of a bad line */ - retval = 0; - while (state->timeout > 0 && retval == 0) { - if (iface->fd == -1) - timeout = (int)state->timeout; - else { - timeout = TIMEOUT_MINI; - if (state->timeout < timeout) - timeout = (int)state->timeout; - } - timeout *= 1000; - state->start = uptime(); - retval = poll(fds, iface->fd == -1 ? 1 : 2, timeout); - state->timeout -= uptime() - state->start; - if (retval == -1 && errno == EINTR) { - /* If interupted, continue as normal as the signal - * will be delivered down the pipe */ - retval = 0; - continue; - } - if (retval == 0 && iface->fd != -1 && state->timeout > 0) - send_message(state, state->last_type, options); - } - - return retval; -} - -static int -handle_signal(int sig, struct if_state *state, const struct options *options) -{ - struct dhcp_lease *lease = &state->lease; - - switch (sig) { - case SIGINT: - logger(LOG_INFO, "received SIGINT, stopping"); - drop_config(state, "STOP", options); - return -1; - case SIGTERM: - logger(LOG_INFO, "received SIGTERM, stopping"); - drop_config(state, "STOP", options); - return -1; - - case SIGALRM: - logger (LOG_INFO, "received SIGALRM, renewing lease"); - switch (state->state) { - case STATE_BOUND: - case STATE_RENEWING: - case STATE_REBINDING: - state->state = STATE_RENEW_REQUESTED; - break; - case STATE_RENEW_REQUESTED: - case STATE_REQUESTING: - case STATE_RELEASED: - state->state = STATE_INIT; - break; - } - state->timeout = 0; - state->xid = 0; - return 0; - - case SIGHUP: - if (state->state != STATE_BOUND && - state->state != STATE_RENEWING && - state->state != STATE_REBINDING) - { - logger(LOG_ERR, - "received SIGHUP, but no lease to release"); - return -1; - } - - logger (LOG_INFO, "received SIGHUP, releasing lease"); - if (!IN_LINKLOCAL(ntohl(lease->addr.s_addr))) { - do_socket(state, SOCKET_OPEN); - state->xid = arc4random(); - send_message(state, DHCP_RELEASE, options); - do_socket(state, SOCKET_CLOSED); - } - drop_config(state, "RELEASE", options); - return -1; - - default: - logger (LOG_ERR, - "received signal %d, but don't know what to do with it", - sig); - } - - return -1; -} - -static int -handle_timeout(struct if_state *state, const struct options *options) -{ - struct dhcp_lease *lease = &state->lease; - struct interface *iface = state->interface; - int gotlease = -1; - const char *reason = NULL; - - /* No NAK, so reset the backoff */ - state->nakoff = 1; - - if (state->state == STATE_INIT && state->xid != 0) { - if (!IN_LINKLOCAL(ntohl(iface->addr.s_addr))) { - if (iface->addr.s_addr != 0 && - !(state->options & DHCPCD_INFORM)) - logger(LOG_ERR, "lost lease"); - else - logger(LOG_ERR, "timed out"); - } - - do_socket(state, SOCKET_CLOSED); - - if (options->options & DHCPCD_INFORM || - options->options & DHCPCD_TEST) - return -1; - - if (state->options & DHCPCD_IPV4LL || - state->options & DHCPCD_LASTLEASE) - { - errno = 0; - gotlease = get_old_lease(state, options); - if (gotlease == 0) { - if (!(state->options & DHCPCD_DAEMONISED)) - reason = "REBOOT"; - } else if (errno == EINTR) - return 0; - } - -#ifdef ENABLE_IPV4LL - if (state->options & DHCPCD_IPV4LL && gotlease != 0) { - logger(LOG_INFO, "probing for an IPV4LL address"); - errno = 0; - gotlease = ipv4ll_get_address(iface, lease); - if (gotlease != 0) { - if (errno == EINTR) - return 0; - } else { - free(state->old_dhcp); - state->old_dhcp = state->dhcp; - state->dhcp = xmalloc(sizeof(*state->dhcp)); - memset(state->dhcp, 0, sizeof(*state->dhcp)); - state->dhcp->yiaddr = lease->addr.s_addr; - state->dhcp->options[0] = DHCP_END; - state->lease.frominfo = 0; - reason = "IPV4LL"; - } - } -#endif - - if (gotlease != 0) { - if (state->dhcp && !IN_LINKLOCAL(state->dhcp->yiaddr)) - reason = "EXPIRE"; - if (!reason) - reason = "FAIL"; - drop_config(state, reason, options); - if (!(state->options & DHCPCD_DAEMONISED)) - return -1; - } - if (!(state->options & DHCPCD_DAEMONISED) && - IN_LINKLOCAL(ntohl(lease->addr.s_addr))) - logger(LOG_WARNING, "using IPV4LL address %s", - inet_ntoa(lease->addr)); - if (!reason) - reason = "TIMEOUT"; - if (configure(iface, reason, - state->dhcp, state->old_dhcp, - lease, options, 1) == 0) - if (daemonise(state, options) == -1) - return -1; - state->timeout = lease->renewaltime; - state->xid = 0; - return 0; - } - - switch (state->state) { - case STATE_INIT: - state->xid = arc4random(); - do_socket(state, SOCKET_OPEN); - state->timeout = options->timeout; - iface->start_uptime = uptime (); - if (lease->addr.s_addr == 0) { - if (!IN_LINKLOCAL(ntohl(iface->addr.s_addr))) - logger(LOG_INFO, "broadcasting for a lease"); - send_message (state, DHCP_DISCOVER, options); - } else if (state->options & DHCPCD_INFORM) { - logger(LOG_INFO, "broadcasting inform for %s", - inet_ntoa(lease->addr)); - send_message(state, DHCP_INFORM, options); - state->state = STATE_REQUESTING; - } else { - logger(LOG_INFO, "broadcasting for a lease of %s", - inet_ntoa(lease->addr)); - send_message(state, DHCP_REQUEST, options); - state->state = STATE_REQUESTING; - } - - break; - case STATE_BOUND: - case STATE_RENEW_REQUESTED: - if (IN_LINKLOCAL(ntohl(lease->addr.s_addr))) { - lease->addr.s_addr = 0; - state->state = STATE_INIT; - state->xid = 0; - break; - } - state->state = STATE_RENEWING; - state->xid = arc4random(); - /* FALLTHROUGH */ - case STATE_RENEWING: - iface->start_uptime = uptime(); - logger(LOG_INFO, "renewing lease of %s",inet_ntoa(lease->addr)); - do_socket(state, SOCKET_OPEN); - send_message(state, DHCP_REQUEST, options); - state->timeout = lease->rebindtime - lease->renewaltime; - state->state = STATE_REBINDING; - break; - case STATE_REBINDING: - logger(LOG_ERR, "lost lease, attemping to rebind"); - lease->addr.s_addr = 0; - do_socket(state, SOCKET_OPEN); - if (state->xid == 0) - state->xid = arc4random(); - lease->server.s_addr = 0; - send_message(state, DHCP_REQUEST, options); - state->timeout = lease->leasetime - lease->rebindtime; - state->state = STATE_REQUESTING; - break; - case STATE_REQUESTING: - state->state = STATE_INIT; - do_socket(state, SOCKET_CLOSED); - state->timeout = 0; - break; - case STATE_RELEASED: - lease->leasetime = 0; - break; - } - - return 0; -} - -static int -handle_dhcp(struct if_state *state, struct dhcp_message **dhcpp, - const struct options *options) -{ - struct timespec ts; - struct dhcp_message *dhcp = *dhcpp; - struct interface *iface = state->interface; - struct dhcp_lease *lease = &state->lease; - char *addr; - struct in_addr saddr; - uint8_t type; - struct timeval tv; - int r; - const char *reason = NULL; - - if (get_option_uint8(&type, dhcp, DHCP_MESSAGETYPE) == -1) { - logger(LOG_ERR, "no DHCP type in message"); - return -1; - } - - /* We should restart on a NAK */ - if (type == DHCP_NAK) { - addr = get_option_string(dhcp, DHCP_MESSAGE); - logger(LOG_INFO, "received NAK: %s", addr); - free(addr); - state->state = STATE_INIT; - state->timeout = 0; - state->xid = 0; - lease->addr.s_addr = 0; - - /* If we constantly get NAKS then we should slowly back off */ - if (state->nakoff > 0) { - logger(LOG_DEBUG, "sleeping for %lu seconds", - (unsigned long)state->nakoff); - ts.tv_sec = state->nakoff; - ts.tv_nsec = 0; - state->nakoff *= 2; - if (state->nakoff > NAKOFF_MAX) - state->nakoff = NAKOFF_MAX; - nanosleep(&ts, NULL); - } - - return 0; - } - - /* No NAK, so reset the backoff */ - state->nakoff = 1; - - if (type == DHCP_OFFER && state->state == STATE_INIT) { - lease->addr.s_addr = dhcp->yiaddr; - addr = xstrdup(inet_ntoa(lease->addr)); - r = get_option_addr(&lease->server.s_addr, dhcp, DHCP_SERVERID); - if (dhcp->servername[0] && r == 0) - logger(LOG_INFO, "offered %s from %s `%s'", - addr, inet_ntoa(lease->server), - dhcp->servername); - else if (r == 0) - logger(LOG_INFO, "offered %s from %s", - addr, inet_ntoa(lease->server)); - else - logger(LOG_INFO, "offered %s", addr); - free(addr); - - if (state->options & DHCPCD_TEST) { - exec_script(options, iface->name, "TEST", dhcp, NULL); - free(dhcp); - return 0; - } - - free(dhcp); - send_message(state, DHCP_REQUEST, options); - state->state = STATE_REQUESTING; - - return 0; - } - - if (type == DHCP_OFFER) { - saddr.s_addr = dhcp->yiaddr; - logger(LOG_INFO, "got subsequent offer of %s, ignoring ", - inet_ntoa(saddr)); - free(dhcp); - return 0; - } - - /* We should only be dealing with acks */ - if (type != DHCP_ACK) { - logger(LOG_ERR, "%d not an ACK or OFFER", type); - free(dhcp); - return 0; - } - - switch (state->state) { - case STATE_RENEW_REQUESTED: - case STATE_REQUESTING: - case STATE_RENEWING: - case STATE_REBINDING: - break; - default: - logger(LOG_ERR, "wrong state %d", state->state); - } - - do_socket(state, SOCKET_CLOSED); - -#ifdef ENABLE_ARP - if (options->options & DHCPCD_ARP && - iface->addr.s_addr != lease->addr.s_addr) - { - errno = 0; - if (arp_claim(iface, lease->addr) && errno != EINTR) { - free(dhcp); - do_socket(state, SOCKET_OPEN); - send_message(state, DHCP_DECLINE, options); - do_socket(state, SOCKET_CLOSED); - - state->xid = 0; - state->timeout = 0; - state->state = STATE_INIT; - state->lease.addr.s_addr = 0; - - /* RFC 2131 says that we should wait for 10 seconds - * before doing anything else */ - logger(LOG_INFO, "sleeping for 10 seconds"); - ts.tv_sec = 10; - ts.tv_nsec = 0; - nanosleep(&ts, NULL); - return 0; - } else if (errno == EINTR) { - free(dhcp); - return 0; - } - } -#endif - - free(state->old_dhcp); - state->old_dhcp = state->dhcp; - state->dhcp = dhcp; - *dhcpp = NULL; - - if (options->options & DHCPCD_INFORM) { - if (options->request_address.s_addr != 0) - lease->addr.s_addr = options->request_address.s_addr; - else - lease->addr.s_addr = iface->addr.s_addr; - - logger(LOG_INFO, "received approval for %s", - inet_ntoa(lease->addr)); - state->timeout = options->leasetime; - if (state->timeout == 0) - state->timeout = DEFAULT_LEASETIME; - state->state = STATE_INIT; - reason = "INFORM"; - } else { - if (gettimeofday(&tv, NULL) == 0) - lease->leasedfrom = tv.tv_sec; - - get_lease(lease, dhcp); - - if (lease->leasetime == ~0U) { - lease->renewaltime = lease->rebindtime = lease->leasetime; - state->timeout = 1; /* So we wait for infinity */ - logger(LOG_INFO, "leased %s for infinity", - inet_ntoa(lease->addr)); - state->state = STATE_BOUND; - } else { - logger(LOG_INFO, "leased %s for %u seconds", - inet_ntoa(lease->addr), lease->leasetime); - - if (lease->rebindtime >= lease->leasetime) { - lease->rebindtime = (lease->leasetime * 0.875); - logger(LOG_ERR, - "rebind time greater than lease " - "time, forcing to %u seconds", - lease->rebindtime); - } - - if (lease->renewaltime > lease->rebindtime) { - lease->renewaltime = (lease->leasetime * 0.5); - logger(LOG_ERR, - "renewal time greater than rebind time, " - "forcing to %u seconds", - lease->renewaltime); - } - - if (!lease->renewaltime) { - lease->renewaltime = (lease->leasetime * 0.5); - logger(LOG_INFO, - "no renewal time supplied, assuming %d seconds", - lease->renewaltime); - } else - logger(LOG_DEBUG, "renew in %u seconds", - lease->renewaltime); - - if (!lease->rebindtime) { - lease->rebindtime = (lease->leasetime * 0.875); - logger(LOG_INFO, - "no rebind time supplied, assuming %d seconds", - lease->rebindtime); - } else - logger(LOG_DEBUG, "rebind in %u seconds", - lease->rebindtime); - - state->timeout = lease->renewaltime; - } - - state->state = STATE_BOUND; - } - - state->xid = 0; - if (!reason) { - if (state->old_dhcp) { - if (state->old_dhcp->yiaddr == dhcp->yiaddr && - lease->server.s_addr) - reason = "RENEW"; - else - reason = "REBIND"; - } else - reason = "BOUND"; - } - r = configure(iface, reason, dhcp, state->old_dhcp, - &state->lease, options, 1); - if (r != 0) - return -1; - return daemonise(state, options); -} - -static int -handle_packet(struct if_state *state, const struct options *options) -{ - struct interface *iface = state->interface; - struct dhcp_message *dhcp; - uint8_t *p; - ssize_t bytes; - - /* We loop through until our buffer is empty. - * The benefit is that if we get >1 DHCP packet in our buffer and - * the first one fails for any reason, we can use the next. */ - - dhcp = xmalloc(sizeof(*dhcp)); - for(;;) { - memset(dhcp, 0, sizeof(*dhcp)); - bytes = get_packet(iface, dhcp, sizeof(*dhcp)); - if (bytes == -1 || bytes == 0) - break; - if (dhcp->cookie != htonl(MAGIC_COOKIE)) { - logger(LOG_DEBUG, "bogus cookie, ignoring"); - continue; - } - if (state->xid != dhcp->xid) { - logger(LOG_DEBUG, - "ignoring packet with xid 0x%x as" - " it's not ours (0x%x)", - dhcp->xid, state->xid); - continue; - } - /* We should ensure that the packet is terminated correctly - * if we have space for the terminator */ - if ((size_t)bytes < sizeof(struct dhcp_message)) { - p = (uint8_t *)dhcp + bytes - 1; - while (p > dhcp->options && *p == DHCP_PAD) - p--; - if (*p != DHCP_END) - *++p = DHCP_END; - } - if (handle_dhcp(state, &dhcp, options) == 0) { - if (state->options & DHCPCD_TEST) - return -1; - return 0; - } - if (state->options & DHCPCD_FORKED) - return -1; - } - - free(dhcp); - return -1; -} - -int -dhcp_run(const struct options *options, int *pidfd) -{ - struct interface *iface; - struct if_state *state = NULL; - struct pollfd fds[] = { - { -1, POLLIN, 0 }, - { -1, POLLIN, 0 } - }; - int retval = -1; - int sig; - - iface = read_interface(options->interface, options->metric); - if (!iface) { - logger(LOG_ERR, "read_interface: %s", strerror(errno)); - goto eexit; - } - - logger(LOG_INFO, "hardware address = %s", - hwaddr_ntoa(iface->hwaddr, iface->hwlen)); - - state = xzalloc(sizeof(*state)); - state->pidfd = pidfd; - state->interface = iface; - - if (client_setup(state, options) == -1) - goto eexit; - if (signal_init() == -1) - goto eexit; - if (signal_setup() == -1) - goto eexit; - - fds[POLLFD_SIGNAL].fd = signal_fd(); - for (;;) { - retval = wait_for_packet(fds, state, options); - - /* We should always handle our signals first */ - if ((sig = (signal_read(&fds[POLLFD_SIGNAL]))) != -1) { - retval = handle_signal(sig, state, options); - } else if (retval == 0) - retval = handle_timeout(state, options); - else if (retval > 0 && - state->socket != SOCKET_CLOSED && - fds[POLLFD_IFACE].revents & POLLIN) - retval = handle_packet(state, options); - else if (retval == -1 && errno == EINTR) { - /* The interupt will be handled above */ - retval = 0; - } else { - logger(LOG_ERR, "poll: %s", strerror(errno)); - retval = -1; - } - - if (retval != 0) - break; - } - -eexit: - if (iface) { - do_socket(state, SOCKET_CLOSED); - free_routes(iface->routes); - free(iface->clientid); - free(iface->buffer); - free(iface); - } - - if (state) { - if (state->options & DHCPCD_FORKED) - retval = 0; - if (state->options & DHCPCD_DAEMONISED) - unlink(options->pidfile); - free(state->dhcp); - free(state->old_dhcp); - free(state); - } - - return retval; -} diff --git a/dist/dhcpcd/client.h b/dist/dhcpcd/client.h deleted file mode 100644 index 35a5e37cf42e..000000000000 --- a/dist/dhcpcd/client.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef CLIENT_H -#define CLIENT_H - -#include "dhcpcd.h" - -int dhcp_run(const struct options *, int *); - -#endif diff --git a/dist/dhcpcd/common.c b/dist/dhcpcd/common.c deleted file mode 100644 index 32df8844b20d..000000000000 --- a/dist/dhcpcd/common.c +++ /dev/null @@ -1,271 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include - -#include -#include -#ifdef BSD -# include -#endif -#include -#include -#include -#include -#include -#include - -#include "common.h" -#include "logger.h" - -#ifndef _PATH_DEVNULL -# define _PATH_DEVNULL "/dev/null" -#endif - -/* Handy routine to read very long lines in text files. - * This means we read the whole line and avoid any nasty buffer overflows. */ -ssize_t -get_line(char **line, size_t *len, FILE *fp) -{ - char *p; - size_t last = 0; - - while(!feof(fp)) { - if (*line == NULL || last != 0) { - *len += BUFSIZ; - *line = xrealloc(*line, *len); - } - p = *line + last; - memset(p, 0, BUFSIZ); - fgets(p, BUFSIZ, fp); - last += strlen(p); - if (last && (*line)[last - 1] == '\n') { - (*line)[last - 1] = '\0'; - break; - } - } - return last; -} - -/* Simple hack to return a random number without arc4random */ -#ifndef HAVE_ARC4RANDOM -uint32_t arc4random(void) -{ - int fd; - static unsigned long seed = 0; - - if (!seed) { - fd = open("/dev/urandom", 0); - if (fd == -1 || read(fd, &seed, sizeof(seed)) == -1) - seed = time(0); - if (fd >= 0) - close(fd); - - srandom(seed); - } - - return (uint32_t)random(); -} -#endif - -/* strlcpy is nice, shame glibc does not define it */ -#if HAVE_STRLCPY -#else -size_t -strlcpy(char *dst, const char *src, size_t size) -{ - const char *s = src; - size_t n = size; - - if (n && --n) - do { - if (!(*dst++ = *src++)) - break; - } while (--n); - - if (!n) { - if (size) - *dst = '\0'; - while (*src++); - } - - return src - s - 1; -} -#endif - -#if HAVE_CLOSEFROM -#else -int -closefrom(int fd) -{ - int max = getdtablesize(); - int i; - int r = 0; - - for (i = fd; i < max; i++) - r += close(i); - return r; -} -#endif - -/* Close our fd's */ -int -close_fds(void) -{ - int fd; - - if ((fd = open(_PATH_DEVNULL, O_RDWR)) == -1) - return -1; - - dup2(fd, fileno(stdin)); - dup2(fd, fileno(stdout)); - dup2(fd, fileno(stderr)); - if (fd > 2) - close(fd); - return 0; -} - -int -close_on_exec(int fd) -{ - int flags; - - if ((flags = fcntl(fd, F_GETFD, 0)) == -1 - || fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1) - { - logger(LOG_ERR, "fcntl: %s", strerror(errno)); - return -1; - } - return 0; -} - -/* Handy function to get the time. - * We only care about time advancements, not the actual time itself - * Which is why we use CLOCK_MONOTONIC, but it is not available on all - * platforms. - */ -int -get_time(struct timeval *tp) -{ -#if defined(_POSIX_MONOTONIC_CLOCK) && defined(CLOCK_MONOTONIC) - struct timespec ts; - static clockid_t posix_clock; - static int posix_clock_set = 0; - - if (!posix_clock_set) { - if (sysconf(_SC_MONOTONIC_CLOCK) >= 0) - posix_clock = CLOCK_MONOTONIC; - else - posix_clock = CLOCK_REALTIME; - posix_clock_set = 1; - } - - if (clock_gettime(posix_clock, &ts) == -1) - return -1; - - tp->tv_sec = ts.tv_sec; - tp->tv_usec = ts.tv_nsec / 1000; - return 0; -#else - return gettimeofday(tp, NULL); -#endif -} - -time_t -uptime(void) -{ - struct timeval tp; - - if (get_time(&tp) == -1) - return -1; - return tp.tv_sec; -} - -int -writepid(int fd, pid_t pid) -{ - char spid[16]; - ssize_t len; - - if (ftruncate(fd, (off_t)0) == -1) - return -1; - snprintf(spid, sizeof(spid), "%u", pid); - len = pwrite(fd, spid, strlen(spid), (off_t)0); - if (len != (ssize_t)strlen(spid)) - return -1; - return 0; -} - -void * -xmalloc(size_t s) -{ - void *value = malloc(s); - - if (value) - return value; - logger(LOG_ERR, "memory exhausted"); - exit (EXIT_FAILURE); - /* NOTREACHED */ -} - -void * -xzalloc(size_t s) -{ - void *value = xmalloc(s); - - memset(value, 0, s); - return value; -} - -void * -xrealloc(void *ptr, size_t s) -{ - void *value = realloc(ptr, s); - - if (value) - return (value); - logger(LOG_ERR, "memory exhausted"); - exit(EXIT_FAILURE); - /* NOTREACHED */ -} - -char * -xstrdup(const char *str) -{ - char *value; - - if (!str) - return NULL; - - if ((value = strdup(str))) - return value; - - logger(LOG_ERR, "memory exhausted"); - exit(EXIT_FAILURE); - /* NOTREACHED */ -} diff --git a/dist/dhcpcd/common.h b/dist/dhcpcd/common.h deleted file mode 100644 index 9df668a809cd..000000000000 --- a/dist/dhcpcd/common.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef COMMON_H -#define COMMON_H - -/* string.h pulls in features.h so the below define checks work */ -#include -#include -#include -#include -#include - -#if __GNUC__ > 2 || defined(__INTEL_COMPILER) -# define _unused __attribute__((__unused__)) -#else -# define _unused -#endif - -#ifndef HAVE_ARC4RANDOM -# ifdef __GLIBC__ -uint32_t arc4random(void); -#else -# define HAVE_ARC4RANDOM -# endif -#endif - -#ifndef HAVE_STRLCPY -# define HAVE_STRLCPY 1 -#endif -/* Only GLIBC doesn't support strlcpy */ -#ifdef __GLIBC__ -# if !defined(__UCLIBC__) && !defined (__dietlibc__) -# undef HAVE_STRLCPY -size_t strlcpy(char *, const char *, size_t); -# endif -#endif - -#ifndef HAVE_CLOSEFROM -#define HAVE_CLOSEFROM 1 -#endif -#if defined(__linux__) || defined(__FreeBSD__) -# undef HAVE_CLOSEFROM -int closefrom(int); -#endif - -int close_fds(void); -int close_on_exec(int); -ssize_t get_line(char **, size_t *, FILE *); -int get_time(struct timeval *); -time_t uptime(void); -int writepid(int, pid_t); -void *xrealloc(void *, size_t); -void *xmalloc(size_t); -void *xzalloc(size_t); -char *xstrdup(const char *); - -#endif diff --git a/dist/dhcpcd/config.h b/dist/dhcpcd/config.h deleted file mode 100644 index 4415b89c105e..000000000000 --- a/dist/dhcpcd/config.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef CONFIG_H -#define CONFIG_H - -#define PACKAGE "dhcpcd" -#define VERSION "4.0.0-beta5" - -/* You can enable/disable various chunks of optional code here. - * You would only do this to try and shrink the end binary if dhcpcd - * was running on a low memory device */ -#define ENABLE_ARP - -/* IPV4LL, aka ZeroConf, aka APIPA, aka RFC 3927. - * Needs ARP. */ -#define ENABLE_IPV4LL - -/* - * By default we don't add a local link route if we got a routeable address. - * This is because dhcpcd can't really decide which interface should allow - * link local routing when we have more than one interface. - * Ideally the host network scripts should add the link local route for us. - * If not, you can define this to get dhcpcd to always add the link local route. - */ -// #define ENABLE_IPV4LL_ALWAYSROUTE - -/* Allow dhcpcd to create a DUID (LLT) and use it to make an IAID for the - * ClientID. Even enabled here, we need a config directive to actually use it - * so this toggle is just to remove it from dhcpcd to make the binary smaller. - * You can always create your own DUID file that just contains the - * hex string that represents the DUID. - * See RFC 3315 for details on this. */ -#define ENABLE_DUID - -/* Some systems do not have a working fork. */ -/* #define THERE_IS_NO_FORK */ - -/* Paths to things */ -#ifndef SYSCONFDIR -# define SYSCONFDIR "/etc" -#endif -#ifndef LIBEXECDIR -# define LIBEXECDIR "/libexec" -#endif -#ifndef RUNDIR -# define RUNDIR "/var/run" -#endif -#ifndef DBDIR -# define DBDIR "/var/db" -#endif - -#ifndef CONFIG -# define CONFIG SYSCONFDIR "/" PACKAGE ".conf" -#endif -#ifndef SCRIPT -# define SCRIPT LIBEXECDIR "/" PACKAGE "-run-hooks" -#endif -#ifndef DUID -# define DUID SYSCONFDIR "/" PACKAGE ".duid" -#endif -#ifndef LEASEFILE -# define LEASEFILE DBDIR "/" PACKAGE "-%s.lease" -#endif -#ifndef PIDFILE -# define PIDFILE RUNDIR "/" PACKAGE "-%s.pid" -#endif - -#define UNCONST(a) ((void *)(unsigned long)(const void *)(a)) - -#endif diff --git a/dist/dhcpcd/configure.c b/dist/dhcpcd/configure.c deleted file mode 100644 index 5c08c32e3a0d..000000000000 --- a/dist/dhcpcd/configure.c +++ /dev/null @@ -1,497 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include - -#include -#include - -#include -#include -#include -#include -#include - -#include "config.h" -#include "common.h" -#include "configure.h" -#include "dhcp.h" -#include "dhcpcd.h" -#include "logger.h" -#include "net.h" -#include "signals.h" - -#define DEFAULT_PATH "PATH=/usr/bin:/usr/sbin:/bin:/sbin" - -int -exec_script(const struct options *options, const char *iface, - const char *reason, - const struct dhcp_message *dhcpn, const struct dhcp_message *dhcpo) -{ - char *const argv[2] = { UNCONST(options->script), NULL }; - char **env = NULL, **ep; - char *path; - ssize_t e, elen; - int ret = 0; - pid_t pid; - int status = 0; - sigset_t full; - sigset_t old; - - logger(LOG_DEBUG, "exec `%s'", options->script); - - /* Make our env */ - elen = 4; - env = xmalloc(sizeof(char *) * (elen + 1)); - path = getenv("PATH"); - if (path) { - e = strlen("PATH") + strlen(path) + 2; - env[0] = xmalloc(e); - snprintf(env[0], e, "PATH=%s", path); - } else - env[0] = xstrdup(DEFAULT_PATH); - e = strlen("interface") + strlen(iface) + 2; - env[1] = xmalloc(e); - snprintf(env[1], e, "interface=%s", iface); - e = strlen("reason") + strlen(reason) + 2; - env[2] = xmalloc(e); - snprintf(env[2], e, "reason=%s", reason); - e = 20; - env[3] = xmalloc(e); - snprintf(env[3], e, "pid=%d", getpid()); - if (dhcpo) { - e = configure_env(NULL, NULL, dhcpo, options); - if (e > 0) { - env = xrealloc(env, sizeof(char *) * (elen + e + 1)); - elen += configure_env(env + elen, "old", dhcpo, options); - } - } - if (dhcpn) { - e = configure_env(NULL, NULL, dhcpn, options); - if (e > 0) { - env = xrealloc(env, sizeof(char *) * (elen + e + 1)); - elen += configure_env(env + elen, "new", dhcpn, options); - } - } - /* Add our base environment */ - if (options->environ) { - e = 0; - while (options->environ[e++]) - ; - env = xrealloc(env, sizeof(char *) * (elen + e + 1)); - e = 0; - while (options->environ[e]) { - env[elen + e] = xstrdup(options->environ[e]); - e++; - } - elen += e; - } - env[elen] = '\0'; - - /* OK, we need to block signals */ - sigfillset(&full); - sigprocmask(SIG_SETMASK, &full, &old); - -#ifdef THERE_IS_NO_FORK - signal_reset(); - pid = vfork(); -#else - pid = fork(); -#endif - - switch (pid) { - case -1: -#ifdef THERE_IS_NO_FORK - logger(LOG_ERR, "vfork: %s", strerror(errno)); -#else - logger(LOG_ERR, "fork: %s", strerror(errno)); -#endif - ret = -1; - break; - case 0: -#ifndef THERE_IS_NO_FORK - signal_reset(); -#endif - sigprocmask(SIG_SETMASK, &old, NULL); - execve(options->script, argv, env); - logger(LOG_ERR, "%s: %s", options->script, strerror(errno)); - _exit(111); - /* NOTREACHED */ - } - -#ifdef THERE_IS_NO_FORK - signal_setup(); -#endif - - /* Restore our signals */ - sigprocmask(SIG_SETMASK, &old, NULL); - - /* Wait for the script to finish */ - while (waitpid(pid, &status, 0) == -1) { - if (errno != EINTR) { - logger(LOG_ERR, "waitpid: %s", strerror(errno)); - status = -1; - break; - } - } - - /* Cleanup */ - ep = env; - while (*ep) - free(*ep++); - free(env); - - return status; -} - -static struct rt * -reverse_routes(struct rt *routes) -{ - struct rt *rt; - struct rt *rtn = NULL; - - while (routes) { - rt = routes->next; - routes->next = rtn; - rtn = routes; - routes = rt; - } - return rtn; -} - -static int -delete_route(const char *iface, struct rt *rt, int metric) -{ - char *addr; - int retval; - - addr = xstrdup(inet_ntoa(rt->dest)); - logger(LOG_DEBUG, "removing route %s/%d via %s", - addr, inet_ntocidr(rt->net), inet_ntoa(rt->gate)); - free(addr); - retval = del_route(iface, &rt->dest, &rt->net, &rt->gate, metric); - if (retval != 0) - logger(LOG_ERR," del_route: %s", strerror(errno)); - return retval; - -} - -static int -delete_routes(struct interface *iface, int metric) -{ - struct rt *rt; - struct rt *rtn; - int retval = 0; - - rt = reverse_routes(iface->routes); - while (rt) { - rtn = rt->next; - retval += delete_route(iface->name, rt, metric); - free(rt); - rt = rtn; - } - iface->routes = NULL; - - return retval; -} - -static int -in_routes(const struct rt *routes, const struct rt *rt) -{ - while (routes) { - if (routes->dest.s_addr == rt->dest.s_addr && - routes->net.s_addr == rt->net.s_addr && - routes->gate.s_addr == rt->gate.s_addr) - return 0; - routes = routes->next; - } - return -1; -} - -static int -configure_routes(struct interface *iface, const struct dhcp_message *dhcp, - const struct options *options) -{ - struct rt *rt, *ort; - struct rt *rtn = NULL, *nr = NULL; - int remember; - int retval = 0; - char *addr; - -#ifdef THERE_IS_NO_FORK - char *skipp; - size_t skiplen; - int skip = 0; - - free(dhcpcd_skiproutes); - /* We can never have more than 255 routes. So we need space - * for 255 3 digit numbers and commas */ - skiplen = 255 * 4 + 1; - skipp = dhcpcd_skiproutes = xmalloc(sizeof(char) * skiplen); - *skipp = '\0'; -#endif - - ort = get_option_routes(dhcp); - -#ifdef ENABLE_IPV4LL_ALWAYSROUTE - if (options->options & DHCPCD_IPV4LL && - IN_PRIVATE(ntohl(dhcp->yiaddr))) - { - for (rt = ort; rt; rt = rt->next) { - /* Check if we have already got a link locale route - * dished out by the DHCP server */ - if (rt->dest.s_addr == htonl(LINKLOCAL_ADDR) && - rt->net.s_addr == htonl(LINKLOCAL_MASK)) - break; - rtn = rt; - } - - if (!rt) { - rt = xmalloc(sizeof(*rt)); - rt->dest.s_addr = htonl(LINKLOCAL_ADDR); - rt->net.s_addr = htonl(LINKLOCAL_MASK); - rt->gate.s_addr = 0; - rt->next = NULL; - if (rtn) - rtn->next = rt; - else - ort = rt; - } - } -#endif - -#ifdef THERE_IS_NO_FORK - if (dhcpcd_skiproutes) { - int i = -1; - char *sk, *skp, *token; - free_routes(iface->routes); - for (rt = ort; rt; rt = rt->next) { - i++; - /* Check that we did add this route or not */ - sk = skp = xstrdup(dhcpcd_skiproutes); - while ((token = strsep(&skp, ","))) { - if (isdigit((unsigned char)*token) && - atoi(token) == i) - break; - } - free(sk); - if (token) - continue; - if (nr) { - rtn->next = xmalloc(sizeof(*rtn)); - rtn = rtn->next; - } else { - nr = rtn = xmalloc(sizeof(*rtn)); - } - rtn->dest.s_addr = rt->dest.s_addr; - rtn->net.s_addr = rt->net.s_addr; - rtn->gate.s_addr = rt->gate.s_addr; - rtn->next = NULL; - } - iface->routes = nr; - nr = NULL; - - /* We no longer need this */ - free(dhcpcd_skiproutes); - dhcpcd_skiproutes = NULL; - } -#endif - - /* Now remove old routes we no longer use. - * We should do this in reverse order. */ - iface->routes = reverse_routes(iface->routes); - for (rt = iface->routes; rt; rt = rt->next) - if (in_routes(ort, rt) != 0) - delete_route(iface->name, rt, options->metric); - - for (rt = ort; rt; rt = rt->next) { - /* Don't set default routes if not asked to */ - if (rt->dest.s_addr == 0 && - rt->net.s_addr == 0 && - !(options->options & DHCPCD_GATEWAY)) - continue; - - addr = xstrdup(inet_ntoa(rt->dest)); - logger(LOG_DEBUG, "adding route to %s/%d via %s", - addr, inet_ntocidr(rt->net), inet_ntoa(rt->gate)); - free(addr); - remember = add_route(iface->name, &rt->dest, - &rt->net, &rt->gate, - options->metric); - retval += remember; - - /* If we failed to add the route, we may have already added it - ourselves. If so, remember it again. */ - if (remember < 0) { - if (errno != EEXIST) - logger(LOG_ERR, "add_route: %s", - strerror(errno)); - if (in_routes(iface->routes, rt) == 0) - remember = 1; - } - - /* This login is split from above due to the #ifdef below */ - if (remember >= 0) { - if (nr) { - rtn->next = xmalloc(sizeof(*rtn)); - rtn = rtn->next; - } else { - nr = rtn = xmalloc(sizeof(*rtn)); - } - rtn->dest.s_addr = rt->dest.s_addr; - rtn->net.s_addr = rt->net.s_addr; - rtn->gate.s_addr = rt->gate.s_addr; - rtn->next = NULL; - } -#ifdef THERE_IS_NO_FORK - /* If we have daemonised yet we need to record which routes - * we failed to add so we can skip them */ - else if (!(options->options & DHCPCD_DAEMONISED)) { - /* We can never have more than 255 / 4 routes, - * so 3 chars is plently */ - printf("foo\n"); - if (*skipp) - *skipp++ = ','; - skipp += snprintf(skipp, - dhcpcd_skiproutes + skiplen - skipp, - "%d", skip); - } - skip++; -#endif - } - free_routes(ort); - free_routes(iface->routes); - iface->routes = nr; - -#ifdef THERE_IS_NO_FORK - if (dhcpcd_skiproutes) { - if (*dhcpcd_skiproutes) - *skipp = '\0'; - else { - free(dhcpcd_skiproutes); - dhcpcd_skiproutes = NULL; - } - } -#endif - - return retval; -} - -int -configure(struct interface *iface, const char *reason, - const struct dhcp_message *dhcp, const struct dhcp_message *old, - const struct dhcp_lease *lease, const struct options *options, - int up) -{ - struct in_addr addr; - struct in_addr net; - struct in_addr brd; -#ifdef __linux__ - struct in_addr dest; - struct in_addr gate; -#endif - - /* Grab our IP config */ - if (dhcp == NULL || dhcp->yiaddr == 0) - up = 0; - else { - addr.s_addr = dhcp->yiaddr; - /* Ensure we have all the needed values */ - if (get_option_addr(&net.s_addr, dhcp, DHCP_SUBNETMASK) == -1) - net.s_addr = get_netmask(addr.s_addr); - if (get_option_addr(&brd.s_addr, dhcp, DHCP_BROADCAST) == -1) - brd.s_addr = addr.s_addr | ~net.s_addr; - } - - /* If we aren't up, then reset the interface as much as we can */ - if (!up) { - /* Only reset things if we had set them before */ - if (iface->addr.s_addr != 0) { - if (!(options->options & DHCPCD_KEEPADDRESS)) { - delete_routes(iface, options->metric); - logger(LOG_DEBUG, "deleting IP address %s/%d", - inet_ntoa(iface->addr), - inet_ntocidr(iface->net)); - if (del_address(iface->name, &iface->addr, - &iface->net) == -1 && - errno != ENOENT) - logger(LOG_ERR, "del_address: %s", - strerror(errno)); - iface->addr.s_addr = 0; - iface->net.s_addr = 0; - } - } - - exec_script(options, iface->name, reason, NULL, old); - return 0; - } - - /* This also changes netmask */ - if (!(options->options & DHCPCD_INFORM) || - !has_address(iface->name, &addr, &net)) { - logger(LOG_DEBUG, "adding IP address %s/%d", - inet_ntoa(addr), inet_ntocidr(net)); - if (add_address(iface->name, &addr, &net, &brd) == -1 && - errno != EEXIST) - { - logger(LOG_ERR, "add_address: %s", strerror(errno)); - return -1; - } - } - - /* Now delete the old address if different */ - if (iface->addr.s_addr != addr.s_addr && - iface->addr.s_addr != 0 && - !(options->options & DHCPCD_KEEPADDRESS)) - del_address(iface->name, &iface->addr, &iface->net); - -#ifdef __linux__ - /* On linux, we need to change the subnet route to have our metric. */ - if (iface->addr.s_addr != lease->addr.s_addr && - options->metric > 0 && net.s_addr != INADDR_BROADCAST) - { - dest.s_addr = addr.s_addr & net.s_addr; - gate.s_addr = 0; - add_route(iface->name, &dest, &net, &gate, options->metric); - del_route(iface->name, &dest, &net, &gate, 0); - } -#endif - - configure_routes(iface, dhcp, options); - up = (iface->addr.s_addr != addr.s_addr || - iface->net.s_addr != net.s_addr); - iface->addr.s_addr = addr.s_addr; - iface->net.s_addr = net.s_addr; - - if (!lease->frominfo) - if (write_lease(iface, dhcp) == -1) - logger(LOG_ERR, "write_lease: %s", strerror(errno)); - - exec_script(options, iface->name, reason, dhcp, old); - return 0; -} diff --git a/dist/dhcpcd/configure.h b/dist/dhcpcd/configure.h deleted file mode 100644 index c4c731cec2b6..000000000000 --- a/dist/dhcpcd/configure.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef DHCPCONFIG_H -#define DHCPCONFIG_H - -#include "dhcpcd.h" -#include "dhcp.h" -#include "net.h" - -int exec_script(const struct options *, const char *, const char *, - const struct dhcp_message *, const struct dhcp_message *); -int configure(struct interface *, const char *, - const struct dhcp_message *, const struct dhcp_message *, - const struct dhcp_lease *, const struct options *, int); - -#endif diff --git a/dist/dhcpcd/dhcp.c b/dist/dhcpcd/dhcp.c deleted file mode 100644 index c8abd0fbfcf0..000000000000 --- a/dist/dhcpcd/dhcp.c +++ /dev/null @@ -1,1202 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include - -#include "config.h" -#include "common.h" -#include "dhcp.h" - -#define REQUEST (1 << 0) -#define UINT8 (1 << 1) -#define UINT16 (1 << 2) -#define SINT16 (1 << 3) -#define UINT32 (1 << 4) -#define SINT32 (1 << 5) -#define IPV4 (1 << 6) -#define STRING (1 << 7) -#define PAIR (1 << 8) -#define ARRAY (1 << 9) -#define RFC3361 (1 << 10) -#define RFC3397 (1 << 11) -#define RFC3442 (1 << 12) - -#define IPV4R IPV4 | REQUEST - -/* Our aggregate option buffer. - * We ONLY use this when options are split, which for most purposes is - * practically never. See RFC3396 for details. */ -static uint8_t *dhcp_opt_buffer = NULL; - -struct dhcp_opt { - uint8_t option; - int type; - const char *var; -}; - -static const struct dhcp_opt const dhcp_opts[] = { - { 1, IPV4 | REQUEST, "subnet_mask" }, - { 2, UINT32, "time_offset" }, - { 3, IPV4 | ARRAY | REQUEST, "routers" }, - { 4, IPV4 | ARRAY, "time_servers" }, - { 5, IPV4 | ARRAY, "ien116_name_servers" }, - { 6, IPV4 | ARRAY, "domain_name_servers" }, - { 7, IPV4 | ARRAY, "log_servers" }, - { 8, IPV4 | ARRAY, "cookie_servers" }, - { 9, IPV4 | ARRAY, "lpr_servers" }, - { 10, IPV4 | ARRAY, "impress_servers" }, - { 11, IPV4 | ARRAY, "resource_location_servers" }, - { 12, STRING, "host_name" }, - { 13, UINT16, "boot_size" }, - { 14, STRING, "merit_dump" }, - { 15, STRING, "domain_name" }, - { 16, IPV4, "swap_server" }, - { 17, STRING, "root_path" }, - { 18, STRING, "extensions_path" }, - { 19, UINT8, "ip_forwarding" }, - { 20, UINT8, "non_local_source_routing" }, - { 21, IPV4 | ARRAY, "policy_filter" }, - { 22, SINT16, "max_dgram_reassembly" }, - { 23, UINT16, "default_ip_ttl" }, - { 24, UINT32, "path_mtu_aging_timeout" }, - { 25, UINT16 | ARRAY, "path_mtu_plateau_table" }, - { 26, UINT16, "interface_mtu" }, - { 27, UINT8, "all_subnets_local" }, - { 28, IPV4 | REQUEST, "broadcast_address" }, - { 29, UINT8, "perform_mask_discovery" }, - { 30, UINT8, "mask_supplier" }, - { 31, UINT8, "router_discovery" }, - { 32, IPV4, "router_solicitation_address" }, - { 33, IPV4 | ARRAY | REQUEST, "static_routes" }, - { 34, UINT8, "trailer_encapsulation" }, - { 35, UINT32, "arp_cache_timeout" }, - { 36, UINT16, "ieee802_3_encapsulation" }, - { 37, UINT8, "default_tcp_ttl" }, - { 38, UINT32, "tcp_keepalive_interval" }, - { 39, UINT8, "tcp_keepalive_garbage" }, - { 40, STRING, "nis_domain" }, - { 41, IPV4 | ARRAY, "nis_servers" }, - { 42, IPV4 | ARRAY, "ntp_servers" }, - { 43, STRING, "vendor_encapsulated_options" }, - { 44, IPV4 | ARRAY, "netbios_name_servers" }, - { 45, IPV4, "netbios_dd_server" }, - { 46, UINT8, "netbios_node_type" }, - { 47, STRING, "netbios_scope" }, - { 48, IPV4 | ARRAY, "font_servers" }, - { 49, IPV4 | ARRAY, "x_display_manager" }, - { 50, IPV4, "dhcp_requested_address" }, - { 51, UINT32 | REQUEST, "dhcp_lease_time" }, - { 52, UINT8, "dhcp_option_overload" }, - { 53, UINT8, "dhcp_message_type" }, - { 54, IPV4, "dhcp_server_identifier" }, - { 55, UINT8 | ARRAY, "dhcp_parameter_request_list" }, - { 56, STRING, "dhcp_message" }, - { 57, UINT16, "dhcp_max_message_size" }, - { 58, UINT32 | REQUEST, "dhcp_renewal_time" }, - { 59, UINT32 | REQUEST, "dhcp_rebinding_time" }, - { 64, STRING, "nisplus_domain" }, - { 65, IPV4 | ARRAY, "nisplus_servers" }, - { 66, STRING, "tftp_server_name" }, - { 67, STRING, "bootfile_name" }, - { 68, IPV4 | ARRAY, "mobile_ip_home_agent" }, - { 69, IPV4 | ARRAY, "smtp_server" }, - { 70, IPV4 | ARRAY, "pop_server" }, - { 71, IPV4 | ARRAY, "nntp_server" }, - { 72, IPV4 | ARRAY, "www_server" }, - { 73, IPV4 | ARRAY, "finger_server" }, - { 74, IPV4 | ARRAY, "irc_server" }, - { 75, IPV4 | ARRAY, "streettalk_server" }, - { 76, IPV4 | ARRAY, "streettalk_directory_assistance_server" }, - { 77, STRING, "user_class" }, - { 85, IPV4 | ARRAY, "nds_servers" }, - { 86, STRING, "nds_tree_name" }, - { 87, STRING, "nds_context" }, - { 88, STRING | RFC3397, "bcms_controller_names" }, - { 89, IPV4 | ARRAY, "bcms_controller_address" }, - { 91, UINT32, "client_last_transaction_time" }, - { 92, IPV4 | ARRAY, "associated_ip" }, - { 98, STRING, "uap_servers" }, - { 112, IPV4 | ARRAY, "netinfo_server_address" }, - { 113, STRING, "netinfo_server_tag" }, - { 114, STRING, "default_url" }, - { 118, IPV4, "subnet_selection" }, - { 119, STRING | RFC3397, "domain_search" }, - { 121, RFC3442 | REQUEST, "classless_static_routes" }, - { 249, RFC3442, "ms-classless_static_routes" }, - { 0, 0, NULL } -}; - -void -print_options(void) -{ - const struct dhcp_opt *opt; - - for (opt = dhcp_opts; opt->option; opt++) - if (opt->var) - printf("%03d %s\n", opt->option, opt->var); -} - -int make_reqmask(uint8_t *mask, char **opts, int add) -{ - char *token; - char *p = *opts; - const struct dhcp_opt *opt; - - while ((token = strsep(&p, ", "))) { - if (*token == '\0') - continue; - for (opt = dhcp_opts; opt->option; opt++) { - if (!opt->var) - continue; - if (strcmp(opt->var, token) == 0) { - if (add == 1) - add_reqmask(mask, - opt->option); - else - del_reqmask(mask, - opt->option); - break; - } - } - if (!opt->option) { - *opts = token; - errno = ENOENT; - return -1; - } - } - return 0; -} - -static int -valid_length(uint8_t option, int dl, int *type) -{ - const struct dhcp_opt *opt; - ssize_t sz; - - if (dl == 0) - return -1; - - for (opt = dhcp_opts; opt->option; opt++) { - if (opt->option != option) - continue; - - if (type) - *type = opt->type; - - if (opt->type == 0 || opt->type & STRING || opt->type & RFC3442) - return 0; - - sz = 0; - if (opt->type & UINT32 || opt->type & IPV4) - sz = sizeof(uint32_t); - if (opt->type & UINT16) - sz = sizeof(uint16_t); - if (opt->type & UINT8) - sz = sizeof(uint8_t); - if (opt->type & IPV4 || opt->type & ARRAY) - return dl % sz; - return (dl == sz ? 0 : -1); - } - - /* unknown option, so let it pass */ - return 0; -} - -static void -free_option_buffer(void) -{ - free(dhcp_opt_buffer); -} - -#define get_option_raw(dhcp, opt) get_option(dhcp, opt, NULL, NULL) -static const uint8_t * -get_option(const struct dhcp_message *dhcp, uint8_t opt, int *len, int *type) -{ - const uint8_t *p = dhcp->options; - const uint8_t *e = p + sizeof(dhcp->options); - uint8_t l, ol = 0; - uint8_t o = 0; - uint8_t overl = 0; - uint8_t *bp = NULL; - const uint8_t *op = NULL; - int bl = 0; - - while (p < e) { - o = *p++; - if (o == opt) { - if (op) { - if (!dhcp_opt_buffer) { - dhcp_opt_buffer = xmalloc(sizeof(struct dhcp_message)); - atexit(free_option_buffer); - } - if (!bp) - bp = dhcp_opt_buffer; - memcpy(bp, op, ol); - bp += ol; - } - ol = *p; - op = p + 1; - bl += ol; - } - switch (o) { - case DHCP_PAD: - continue; - case DHCP_END: - if (overl & 1) { - /* bit 1 set means parse boot file */ - overl &= ~1; - p = dhcp->bootfile; - e = p + sizeof(dhcp->bootfile); - } else if (overl & 2) { - /* bit 2 set means parse server name */ - overl &= ~2; - p = dhcp->servername; - e = p + sizeof(dhcp->servername); - } else - goto exit; - break; - case DHCP_OPTIONSOVERLOADED: - /* Ensure we only get this option once */ - if (!overl) - overl = p[1]; - break; - } - l = *p++; - p += l; - } - -exit: - if (valid_length(o, bl, type) == -1) { - errno = EINVAL; - return NULL; - } - if (len) - *len = bl; - if (bp) { - memcpy(bp, op, ol); - return (const uint8_t *)&dhcp_opt_buffer; - } - if (op) - return op; - errno = ENOENT; - return NULL; -} - -int -get_option_addr(uint32_t *a, const struct dhcp_message *dhcp, uint8_t option) -{ - const uint8_t *p = get_option_raw(dhcp, option); - - if (!p) - return -1; - memcpy(a, p, sizeof(*a)); - return 0; -} - -int -get_option_uint32(uint32_t *i, const struct dhcp_message *dhcp, uint8_t option) -{ - uint32_t a; - - if (get_option_addr(&a, dhcp, option) == -1) - return -1; - - *i = ntohl(a); - return 0; -} - -int -get_option_uint16(uint16_t *i, const struct dhcp_message *dhcp, uint8_t option) -{ - const uint8_t *p = get_option_raw(dhcp, option); - uint16_t d; - - if (!p) - return -1; - memcpy(&d, p, sizeof(d)); - *i = ntohs(d); - return 0; -} - -int -get_option_uint8(uint8_t *i, const struct dhcp_message *dhcp, uint8_t option) -{ - const uint8_t *p = get_option_raw(dhcp, option); - - if (!p) - return -1; - *i = *(p); - return 0; -} - -/* Decode an RFC3397 DNS search order option into a space - * seperated string. Returns length of string (including - * terminating zero) or zero on error. out may be NULL - * to just determine output length. */ -static ssize_t -decode_rfc3397(char *out, ssize_t len, int pl, const uint8_t *p) -{ - const uint8_t *r, *q = p; - int count = 0, l, hops; - uint8_t ltype; - - while (q - p < pl) { - r = NULL; - hops = 0; - while ((l = *q++)) { - ltype = l & 0xc0; - if (ltype == 0x80 || ltype == 0x40) - return 0; - else if (ltype == 0xc0) { /* pointer */ - l = (l & 0x3f) << 8; - l |= *q++; - /* save source of first jump. */ - if (!r) - r = q; - hops++; - if (hops > 255) - return 0; - q = p + l; - if (q - p >= pl) - return 0; - } else { - /* straightforward name segment, add with '.' */ - count += l + 1; - if (out) { - if ((ssize_t)l + 1 > len) { - errno = ENOBUFS; - return -1; - } - memcpy(out, q, l); - out += l; - *out++ = '.'; - len -= l; - len--; - } - q += l; - } - } - /* change last dot to space */ - if (out) - *(out - 1) = ' '; - if (r) - q = r; - } - - /* change last space to zero terminator */ - if (out) - *(out - 1) = 0; - - return count; -} - -static ssize_t -decode_rfc3442(char *out, ssize_t len, int pl, const uint8_t *p) -{ - const uint8_t *e; - ssize_t bytes = 0; - ssize_t b; - uint8_t cidr; - uint8_t ocets; - struct in_addr addr; - char *o = out; - - /* Minimum is 5 -first is CIDR and a router length of 4 */ - if (pl < 5) { - errno = EINVAL; - return -1; - } - - e = p + pl; - while (p < e) { - cidr = *p++; - if (cidr > 32) { - errno = EINVAL; - return -1; - } - ocets = (cidr + 7) / 8; - if (!out) { - p += 4 + ocets; - bytes += ((4 * 4) * 2) + 4; - continue; - } - if ((((4 * 4) * 2) + 4) > len) { - errno = ENOBUFS; - return -1; - } - if (o != out) { - *o++ = ' '; - len--; - } - /* If we have ocets then we have a destination and netmask */ - if (ocets > 0) { - addr.s_addr = 0; - memcpy(&addr.s_addr, p, (size_t)ocets); - b = snprintf(o, len, "%s/%d", inet_ntoa(addr), cidr); - p += ocets; - } else - b = snprintf(o, len, "0.0.0.0/0"); - o += b; - len -= b; - - /* Finally, snag the router */ - memcpy(&addr.s_addr, p, 4); - p += 4; - b = snprintf(o, len, " %s", inet_ntoa(addr)); - o += b; - len -= b; - } - - if (out) - return o - out; - return bytes; -} - -static struct rt * -decode_rfc3442_rt(int dl, const uint8_t *data) -{ - const uint8_t *p = data; - const uint8_t *e; - uint8_t cidr; - uint8_t ocets; - struct rt *routes = NULL; - struct rt *rt = NULL; - - /* Minimum is 5 -first is CIDR and a router length of 4 */ - if (dl < 5) - return NULL; - - e = p + dl; - while (p < e) { - cidr = *p++; - if (cidr > 32) { - free_routes(routes); - errno = EINVAL; - return NULL; - } - - if (rt) { - rt->next = xzalloc(sizeof(*rt)); - rt = rt->next; - } else { - routes = rt = xzalloc(sizeof(*routes)); - } - rt->next = NULL; - - ocets = (cidr + 7) / 8; - /* If we have ocets then we have a destination and netmask */ - if (ocets > 0) { - memcpy(&rt->dest.s_addr, p, (size_t)ocets); - memset(&rt->net.s_addr, 255, (size_t)ocets - 1); - memset((uint8_t *)&rt->net.s_addr + - (ocets - 1), - (256 - (1 << (32 - cidr) % 8)), 1); - p += ocets; - } else { - rt->dest.s_addr = 0; - rt->net.s_addr = 0; - } - - /* Finally, snag the router */ - memcpy(&rt->gate.s_addr, p, 4); - p += 4; - } - return routes; -} - -static char * -decode_rfc3361(int dl, const uint8_t *data) -{ - uint8_t enc; - unsigned int l; - char *sip = NULL; - struct in_addr addr; - char *p; - - if (dl < 2) { - errno = EINVAL; - return 0; - } - - enc = *data++; - dl--; - switch (enc) { - case 0: - if ((l = decode_rfc3397(NULL, 0, dl, data)) > 0) { - sip = xmalloc(l); - decode_rfc3397(sip, l, dl, data); - } - break; - case 1: - if (dl == 0 || dl % 4 != 0) { - errno = EINVAL; - break; - } - addr.s_addr = INADDR_BROADCAST; - l = ((dl / sizeof(addr.s_addr)) * ((4 * 4) + 1)) + 1; - sip = p = xmalloc(l); - while (l != 0) { - memcpy(&addr.s_addr, data, sizeof(addr.s_addr)); - data += sizeof(addr.s_addr); - p += snprintf(p, l - (p - sip), "%s ", inet_ntoa(addr)); - l -= sizeof(addr.s_addr); - } - *--p = '\0'; - break; - default: - errno = EINVAL; - return 0; - } - - return sip; -} - -char * -get_option_string(const struct dhcp_message *dhcp, uint8_t option) -{ - int type; - int len; - const uint8_t *p; - char *s; - - p = get_option(dhcp, option, &len, &type); - if (!p || *p == '\0') - return NULL; - - if (type & RFC3397) { - type = decode_rfc3397(NULL, 0, len, p); - if (!type) { - errno = EINVAL; - return NULL; - } - s = xmalloc(sizeof(char) * type); - decode_rfc3397(s, type, len, p); - return s; - } - - if (type & RFC3361) - return decode_rfc3361(len, p); - - s = xmalloc(sizeof(char) * (len + 1)); - memcpy(s, p, len); - s[len] = '\0'; - return s; -} - -/* This calculates the netmask that we should use for static routes. - * This IS different from the calculation used to calculate the netmask - * for an interface address. */ -static uint32_t -route_netmask(uint32_t ip_in) -{ - /* used to be unsigned long - check if error */ - uint32_t p = ntohl(ip_in); - uint32_t t; - - if (IN_CLASSA(p)) - t = ~IN_CLASSA_NET; - else { - if (IN_CLASSB(p)) - t = ~IN_CLASSB_NET; - else { - if (IN_CLASSC(p)) - t = ~IN_CLASSC_NET; - else - t = 0; - } - } - - while (t & p) - t >>= 1; - - return (htonl(~t)); -} - -/* We need to obey routing options. - * If we have a CSR then we only use that. - * Otherwise we add static routes and then routers. */ -struct rt * -get_option_routes(const struct dhcp_message *dhcp) -{ - const uint8_t *p; - const uint8_t *e; - struct rt *routes = NULL; - struct rt *route = NULL; - int len; - - /* If we have CSR's then we MUST use these only */ - p = get_option(dhcp, DHCP_CSR, &len, NULL); - /* Check for crappy MS option */ - if (!p) - p = get_option(dhcp, DHCP_MSCSR, &len, NULL); - if (p) { - routes = decode_rfc3442_rt(len, p); - if (routes) - return routes; - } - - /* OK, get our static routes first. */ - p = get_option(dhcp, DHCP_STATICROUTE, &len, NULL); - if (p) { - e = p + len; - while (p < e) { - if (route) { - route->next = xmalloc(sizeof(*route)); - route = route->next; - } else - routes = route = xmalloc(sizeof(*routes)); - route->next = NULL; - memcpy(&route->dest.s_addr, p, 4); - p += 4; - memcpy(&route->gate.s_addr, p, 4); - p += 4; - route->net.s_addr = route_netmask(route->dest.s_addr); - } - } - - /* Now grab our routers */ - p = get_option(dhcp, DHCP_ROUTER, &len, NULL); - if (p) { - e = p + len; - while (p < e) { - if (route) { - route->next = xzalloc(sizeof(*route)); - route = route->next; - } else - routes = route = xzalloc(sizeof(*route)); - memcpy(&route->gate.s_addr, p, 4); - p += 4; - } - } - - return routes; -} - -ssize_t -make_message(struct dhcp_message **message, - const struct interface *iface, const struct dhcp_lease *lease, - uint32_t xid, uint8_t type, const struct options *options) -{ - struct dhcp_message *dhcp; - uint8_t *d, *m, *p; - const char *c; - uint8_t *n_params = NULL; - size_t l; - time_t up = uptime() - iface->start_uptime; - uint32_t ul; - uint16_t sz; - const struct dhcp_opt *opt; - - dhcp = xzalloc(sizeof (*dhcp)); - m = (uint8_t *)dhcp; - p = (uint8_t *)&dhcp->options; - - if ((type == DHCP_INFORM || - type == DHCP_RELEASE || - type == DHCP_REQUEST) && - !IN_LINKLOCAL(ntohl(iface->addr.s_addr))) - { - dhcp->ciaddr = iface->addr.s_addr; - /* Just incase we haven't actually configured the address yet */ - if (type == DHCP_INFORM && iface->addr.s_addr == 0) - dhcp->ciaddr = lease->addr.s_addr; - /* Zero the address if we're currently on a different subnet */ - if (type == DHCP_REQUEST && - iface->net.s_addr != lease->net.s_addr) - dhcp->ciaddr = 0; - } - - dhcp->op = DHCP_BOOTREQUEST; - dhcp->hwtype = iface->family; - switch (iface->family) { - case ARPHRD_ETHER: - case ARPHRD_IEEE802: - dhcp->hwlen = ETHER_ADDR_LEN; - memcpy(&dhcp->chaddr, &iface->hwaddr, ETHER_ADDR_LEN); - break; - case ARPHRD_IEEE1394: - case ARPHRD_INFINIBAND: - dhcp->hwlen = 0; - if (dhcp->ciaddr == 0) - dhcp->flags = htons(BROADCAST_FLAG); - break; - } - - if (up < 0 || up > (time_t)UINT16_MAX) - dhcp->secs = htons((uint16_t)UINT16_MAX); - else - dhcp->secs = htons(up); - dhcp->xid = xid; - dhcp->cookie = htonl(MAGIC_COOKIE); - - *p++ = DHCP_MESSAGETYPE; - *p++ = 1; - *p++ = type; - - if (type == DHCP_REQUEST) { - *p++ = DHCP_MAXMESSAGESIZE; - *p++ = 2; - sz = get_mtu(iface->name); - if (sz < MTU_MIN) { - if (set_mtu(iface->name, MTU_MIN) == 0) - sz = MTU_MIN; - } - sz = htons(sz); - memcpy(p, &sz, 2); - p += 2; - } - - if (iface->clientid_len > 0) { - *p++ = DHCP_CLIENTID; - *p++ = iface->clientid_len; - memcpy(p, iface->clientid, iface->clientid_len); - p+= iface->clientid_len; - } - - if (type != DHCP_DECLINE && type != DHCP_RELEASE) { - if (options->userclass_len > 0) { - *p++ = DHCP_USERCLASS; - *p++ = options->userclass_len; - memcpy(p, &options->userclass, options->userclass_len); - p += options->userclass_len; - } - - if (*options->classid > 0) { - *p++ = DHCP_CLASSID; - *p++ = l = strlen(options->classid); - memcpy(p, options->classid, l); - p += l; - } - } - - if (type == DHCP_DISCOVER || type == DHCP_REQUEST) { -#define PUTADDR(_type, _val) \ - { \ - *p++ = _type; \ - *p++ = 4; \ - memcpy(p, &_val.s_addr, 4); \ - p += 4; \ - } - if (lease->addr.s_addr && - lease->addr.s_addr != iface->addr.s_addr && - !IN_LINKLOCAL(ntohl(lease->addr.s_addr))) - { - PUTADDR(DHCP_IPADDRESS, lease->addr); - if (lease->server.s_addr) - PUTADDR(DHCP_SERVERID, lease->server); - } -#undef PUTADDR - - if (options->leasetime != 0) { - *p++ = DHCP_LEASETIME; - *p++ = 4; - ul = htonl(options->leasetime); - memcpy(p, &ul, 4); - p += 4; - } - } - - if (type == DHCP_DISCOVER || - type == DHCP_INFORM || - type == DHCP_REQUEST) - { - if (options->hostname[0]) { - if (options->fqdn == FQDN_DISABLE) { - *p++ = DHCP_HOSTNAME; - *p++ = l = strlen(options->hostname); - memcpy(p, options->hostname, l); - p += l; - } else { - /* Draft IETF DHC-FQDN option (81) */ - *p++ = DHCP_FQDN; - *p++ = strlen(options->hostname) + 5; - /* - * Flags: 0000NEOS - * S: 1 => Client requests Server to update - * a RR in DNS as well as PTR - * O: 1 => Server indicates to client that - * DNS has been updated - * E: 1 => Name data is DNS format - * N: 1 => Client requests Server to not - * update DNS - */ - *p++ = (options->fqdn & 0x9) | 0x4; - *p++ = 0; /* from server for PTR RR */ - *p++ = 0; /* from server for A RR if S=1 */ - c = options->hostname; - d = p++; - while (*c) { - if (*c == '.') { - *d = p - d - 1; - d = p++; - } else - *p++ = (uint8_t) *c; - c++; - } - *p ++ = 0; - } - } - - *p++ = DHCP_PARAMETERREQUESTLIST; - n_params = p; - *p++ = 0; - for (opt = dhcp_opts; opt->option; opt++) { - if (!(opt->type & REQUEST || - has_reqmask(options->reqmask, opt->option))) - continue; - switch (opt->option) { - case DHCP_RENEWALTIME: /* FALLTHROUGH */ - case DHCP_REBINDTIME: - if (type == DHCP_INFORM) - continue; - break; - } - *p++ = opt->option; - } - *n_params = p - n_params - 1; - } - *p++ = DHCP_END; - -#ifdef BOOTP_MESSAGE_LENTH_MIN - /* Some crappy DHCP servers think they have to obey the BOOTP minimum - * message length. - * They are wrong, but we should still cater for them. */ - while (p - m < BOOTP_MESSAGE_LENTH_MIN) - *p++ = DHCP_PAD; -#endif - - *message = dhcp; - return p - m; -} - -ssize_t -write_lease(const struct interface *iface, const struct dhcp_message *dhcp) -{ - int fd; - ssize_t bytes = sizeof(*dhcp); - const uint8_t *p = dhcp->options; - const uint8_t *e = p + sizeof(dhcp->options); - uint8_t l; - uint8_t o = 0; - - fd = open(iface->leasefile, O_WRONLY | O_CREAT | O_TRUNC, 0400); - if (fd == -1) - return -1; - - /* Only write as much as we need */ - while (p < e) { - o = *p; - if (o == DHCP_END) { - bytes = p - (const uint8_t *)dhcp; - break; - } - p++; - if (o != DHCP_PAD) { - l = *p++; - p += l; - } - } - bytes = write(fd, dhcp, bytes); - close(fd); - return bytes; -} - -struct dhcp_message * -read_lease(const struct interface *iface) -{ - int fd; - struct dhcp_message *dhcp; - ssize_t bytes; - - fd = open(iface->leasefile, O_RDONLY); - if (fd == -1) - return NULL; - dhcp = xmalloc(sizeof(*dhcp)); - memset(dhcp, 0, sizeof(*dhcp)); - bytes = read(fd, dhcp, sizeof(*dhcp)); - close(fd); - if (bytes < 0) { - free(dhcp); - dhcp = NULL; - } - return dhcp; -} - -static ssize_t -print_string(char *s, ssize_t len, int dl, const uint8_t *data) -{ - uint8_t c; - const uint8_t *e; - ssize_t bytes = 0; - ssize_t r; - - e = data + dl; - while (data < e) { - c = *data++; - if (!isascii(c) || !isprint(c)) { - if (s) { - if (len < 5) { - errno = ENOBUFS; - return -1; - } - r = snprintf(s, len, "\\%03o", c); - len -= r; - bytes += r; - s += r; - } else - bytes += 4; - continue; - } - switch (c) { - case '"': /* FALLTHROUGH */ - case '\'': /* FALLTHROUGH */ - case '$': /* FALLTHROUGH */ - case '`': /* FALLTHROUGH */ - case '\\': /* FALLTHROUGH */ - if (s) { - if (len < 3) { - errno = ENOBUFS; - return -1; - } - *s++ = '\\'; - len--; - } - bytes++; - break; - } - if (s) { - *s++ = c; - len--; - } - bytes++; - } - - /* NULL */ - if (s) - *s = '\0'; - bytes++; - return bytes; -} - -static ssize_t -print_option(char *s, ssize_t len, int type, int dl, const uint8_t *data) -{ - const uint8_t *e, *t; - uint16_t u16; - int16_t s16; - uint32_t u32; - int32_t s32; - struct in_addr addr; - ssize_t bytes = 0; - ssize_t l; - char *tmp; - - if (type & RFC3397) { - l = decode_rfc3397(NULL, 0, dl, data); - if (l < 1) - return l; - tmp = xmalloc(l); - decode_rfc3397(tmp, l, dl, data); - l = print_string(s, len, l - 1, (uint8_t *)tmp); - free(tmp); - return l; - } - - if (type & RFC3442) - return decode_rfc3442(s, len, dl, data); - - if (type & STRING) { - /* Some DHCP servers return NULL strings */ - if (*data == '\0') - return 0; - return print_string(s, len, dl, data); - } - - if (!s) { - if (type & UINT8) - l = 3; - else if (type & UINT16) - l = 5; - else if (type & SINT16) - l = 6; - else if (type & UINT32) - l = 10; - else if (type & SINT32) - l = 11; - else if (type & IPV4) - l = 16; - else { - errno = EINVAL; - return -1; - } - return (l + 1) * dl; - } - - t = data; - e = data + dl; - while (data < e) { - if (data != t) { - *s++ = ' '; - bytes++; - len--; - } - if (type & UINT8) { - l = snprintf(s, len, "%d", *data); - data++; - } else if (type & UINT16) { - memcpy(&u16, data, sizeof(u16)); - u16 = ntohs(u16); - l = snprintf(s, len, "%d", u16); - data += sizeof(u16); - } else if (type & SINT16) { - memcpy(&s16, data, sizeof(s16)); - s16 = ntohs(s16); - l = snprintf(s, len, "%d", s16); - data += sizeof(s16); - } else if (type & UINT32) { - memcpy(&u32, data, sizeof(u32)); - u32 = ntohl(u32); - l = snprintf(s, len, "%d", u32); - data += sizeof(u32); - } else if (type & SINT32) { - memcpy(&s32, data, sizeof(s32)); - s32 = ntohl(s32); - l = snprintf(s, len, "%d", s32); - data += sizeof(s32); - } else if (type & IPV4) { - memcpy(&addr.s_addr, data, sizeof(addr.s_addr)); - l = snprintf(s, len, "%s", inet_ntoa(addr)); - data += sizeof(addr.s_addr); - } else - l = 0; - len -= l; - bytes += l; - s += l; - } - - return bytes; -} - -static void -setvar(char ***e, const char *prefix, const char *var, const char *value) -{ - size_t len = strlen(prefix) + strlen(var) + strlen(value) + 4; - - **e = xmalloc(len); - snprintf(**e, len, "%s_%s=%s", prefix, var, value); - (*e)++; -} - -ssize_t -configure_env(char **env, const char *prefix, const struct dhcp_message *dhcp, - const struct options *options) -{ - unsigned int i; - const uint8_t *p; - int pl; - struct in_addr addr; - struct in_addr net; - struct in_addr brd; - char *val, *v; - const struct dhcp_opt *opt; - ssize_t len, e = 0; - char **ep; - char cidr[4]; - uint8_t overl = 0; - - get_option_uint8(&overl, dhcp, DHCP_OPTIONSOVERLOADED); - - if (!env) { - for (opt = dhcp_opts; opt->option; opt++) { - if (!opt->var) - continue; - if (has_reqmask(options->nomask, opt->option)) - continue; - if (get_option_raw(dhcp, opt->option)) - e++; - } - if (dhcp->yiaddr) - e += 5; - if (*dhcp->bootfile && !(overl & 1)) - e++; - if (*dhcp->servername && !(overl & 2)) - e++; - return e; - } - - ep = env; - if (dhcp->yiaddr) { - /* Set some useful variables that we derive from the DHCP - * message but are not necessarily in the options */ - addr.s_addr = dhcp->yiaddr; - setvar(&ep, prefix, "ip_address", inet_ntoa(addr)); - if (get_option_addr(&net.s_addr, dhcp, DHCP_SUBNETMASK) == -1) { - net.s_addr = get_netmask(addr.s_addr); - setvar(&ep, prefix, "subnet_mask", inet_ntoa(net)); - } - i = inet_ntocidr(net); - snprintf(cidr, sizeof(cidr), "%d", inet_ntocidr(net)); - setvar(&ep, prefix, "subnet_cidr", cidr); - if (get_option_addr(&brd.s_addr, dhcp, DHCP_BROADCAST) == -1) { - brd.s_addr = addr.s_addr | ~net.s_addr; - setvar(&ep, prefix, "broadcast_address", inet_ntoa(net)); - } - addr.s_addr = dhcp->yiaddr & net.s_addr; - setvar(&ep, prefix, "network_number", inet_ntoa(addr)); - } - - if (*dhcp->bootfile && !(overl & 1)) - setvar(&ep, prefix, "filename", (const char *)dhcp->bootfile); - if (*dhcp->servername && !(overl & 2)) - setvar(&ep, prefix, "server_name", (const char *)dhcp->servername); - - for (opt = dhcp_opts; opt->option; opt++) { - if (!opt->var) - continue; - if (has_reqmask(options->nomask, opt->option)) - continue; - val = NULL; - p = get_option(dhcp, opt->option, &pl, NULL); - if (!p) - continue; - len = print_option(NULL, 0, opt->type, pl, p); - if (len < 0) - return -1; - e = strlen(prefix) + strlen(opt->var) + len + 4; - v = val = *ep++ = xmalloc(e); - v += snprintf(val, e, "%s_%s=", prefix, opt->var); - if (len != 0) - print_option(v, len, opt->type, pl, p); - } - - return ep - env; -} diff --git a/dist/dhcpcd/dhcp.h b/dist/dhcpcd/dhcp.h deleted file mode 100644 index 5e6810e078c8..000000000000 --- a/dist/dhcpcd/dhcp.h +++ /dev/null @@ -1,184 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef DHCP_H -#define DHCP_H - -#include - -#include - -#include "config.h" -#include "dhcpcd.h" -#include "net.h" - -/* Max MTU - defines dhcp option length */ -#define MTU_MAX 1500 -#define MTU_MIN 576 - -/* UDP port numbers for DHCP */ -#define DHCP_SERVER_PORT 67 -#define DHCP_CLIENT_PORT 68 - -#define MAGIC_COOKIE 0x63825363 -#define BROADCAST_FLAG 0x8000 - -/* DHCP message OP code */ -#define DHCP_BOOTREQUEST 1 -#define DHCP_BOOTREPLY 2 - -/* DHCP message type */ -#define DHCP_DISCOVER 1 -#define DHCP_OFFER 2 -#define DHCP_REQUEST 3 -#define DHCP_DECLINE 4 -#define DHCP_ACK 5 -#define DHCP_NAK 6 -#define DHCP_RELEASE 7 -#define DHCP_INFORM 8 - -/* DHCP options */ -enum DHCP_OPTIONS -{ - DHCP_PAD = 0, - DHCP_SUBNETMASK = 1, - DHCP_ROUTER = 3, - DHCP_DNSSERVER = 6, - DHCP_HOSTNAME = 12, - DHCP_DNSDOMAIN = 15, - DHCP_BROADCAST = 28, - DHCP_STATICROUTE = 33, - DHCP_NISDOMAIN = 40, - DHCP_NISSERVER = 41, - DHCP_NTPSERVER = 42, - DHCP_IPADDRESS = 50, - DHCP_LEASETIME = 51, - DHCP_OPTIONSOVERLOADED = 52, - DHCP_MESSAGETYPE = 53, - DHCP_SERVERID = 54, - DHCP_PARAMETERREQUESTLIST = 55, - DHCP_MESSAGE = 56, - DHCP_MAXMESSAGESIZE = 57, - DHCP_RENEWALTIME = 58, - DHCP_REBINDTIME = 59, - DHCP_CLASSID = 60, - DHCP_CLIENTID = 61, - DHCP_USERCLASS = 77, /* RFC 3004 */ - DHCP_FQDN = 81, - DHCP_DNSSEARCH = 119, /* RFC 3397 */ - DHCP_CSR = 121, /* RFC 3442 */ - DHCP_MSCSR = 249, /* MS code for RFC 3442 */ - DHCP_END = 255 -}; - -/* SetFQDNHostName values - lsnybble used in flags - * byte (see buildmsg.c), hsnybble to create order - * and to allow 0x00 to mean disable - */ -enum FQQN { - FQDN_DISABLE = 0x00, - FQDN_NONE = 0x18, - FQDN_PTR = 0x20, - FQDN_BOTH = 0x31 -}; - -struct fqdn -{ - uint8_t flags; - uint8_t r1; - uint8_t r2; - char *name; -}; - -/* Sizes for DHCP options */ -#define DHCP_CHADDR_LEN 16 -#define SERVERNAME_LEN 64 -#define BOOTFILE_LEN 128 -#define DHCP_UDP_LEN (20 + 8) -#define DHCP_BASE_LEN (4 + 4 + 2 + 2 + 4 + 4 + 4 + 4 + 4) -#define DHCP_RESERVE_LEN (4 + 4 + 4 + 4 + 2) -#define DHCP_FIXED_LEN (DHCP_BASE_LEN + DHCP_CHADDR_LEN + \ - + SERVERNAME_LEN + BOOTFILE_LEN) -#define DHCP_OPTION_LEN (MTU_MAX - DHCP_FIXED_LEN - DHCP_UDP_LEN \ - - DHCP_RESERVE_LEN) - -/* Some crappy DHCP servers require the BOOTP minimum length */ -#define BOOTP_MESSAGE_LENTH_MIN 300 - -struct dhcp_message { - uint8_t op; /* message type */ - uint8_t hwtype; /* hardware address type */ - uint8_t hwlen; /* hardware address length */ - uint8_t hwopcount; /* should be zero in client message */ - uint32_t xid; /* transaction id */ - uint16_t secs; /* elapsed time in sec. from boot */ - uint16_t flags; - uint32_t ciaddr; /* (previously allocated) client IP */ - uint32_t yiaddr; /* 'your' client IP address */ - uint32_t siaddr; /* should be zero in client's messages */ - uint32_t giaddr; /* should be zero in client's messages */ - uint8_t chaddr[DHCP_CHADDR_LEN]; /* client's hardware address */ - uint8_t servername[SERVERNAME_LEN]; /* server host name */ - uint8_t bootfile[BOOTFILE_LEN]; /* boot file name */ - uint32_t cookie; - uint8_t options[DHCP_OPTION_LEN]; /* message options - cookie */ -}; - -struct dhcp_lease { - struct in_addr addr; - struct in_addr net; - uint32_t leasetime; - uint32_t renewaltime; - uint32_t rebindtime; - struct in_addr server; - uint32_t leasedfrom; - uint8_t frominfo; -}; - -#define add_reqmask(var, val) (var[val >> 3] |= 1 << (val & 7)) -#define del_reqmask(var, val) (var[val >> 3] &= ~(1 << (val & 7))) -#define has_reqmask(var, val) (var[val >> 3] & (1 << (val & 7))) -int make_reqmask(uint8_t *, char **, int); -void print_options(void); -//const uint8_t *get_option(const struct dhcp_message *, uint8_t); -char *get_option_string(const struct dhcp_message *, uint8_t); -int get_option_addr(uint32_t *, const struct dhcp_message *, uint8_t); -int get_option_uint32(uint32_t *, const struct dhcp_message *, uint8_t); -int get_option_uint16(uint16_t *, const struct dhcp_message *, uint8_t); -int get_option_uint8(uint8_t *, const struct dhcp_message *, uint8_t); -struct rt *get_option_routes(const struct dhcp_message *); -ssize_t configure_env(char **, const char *, const struct dhcp_message *, - const struct options *); - -ssize_t make_message(struct dhcp_message **, - const struct interface *, const struct dhcp_lease *, - uint32_t, uint8_t, const struct options *); -int valid_dhcp_packet(unsigned char *); - -ssize_t write_lease(const struct interface *, const struct dhcp_message *); -struct dhcp_message *read_lease(const struct interface *iface); -#endif diff --git a/dist/dhcpcd/dhcpcd-run-hooks.8.in b/dist/dhcpcd/dhcpcd-run-hooks.8.in deleted file mode 100644 index a5452030d611..000000000000 --- a/dist/dhcpcd/dhcpcd-run-hooks.8.in +++ /dev/null @@ -1,105 +0,0 @@ -.\" Copyright 2006-2008 Roy Marples -.\" All rights reserved -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd May 21, 2008 -.Dt DHCPCD.SH 8 SMM -.Sh NAME -.Nm dhcpcd-run-hooks -.Nd DHCP client configuration script -.Sh DESCRIPTION -.Nm -is used by -.Xr dhcpcd 8 -to run any system or user defined hook scripts. -System hook scripts are found in -.Pa @HOOKDIR@ -and the user defined hook is -.Pa @SYSCONFDIR@/dhcpcd.hook . -The default install supplies hook scripts for configuring -.Pa /etc/resolv.conf -and the hostname. -Your distribution may have included other hook scripts to say configure -ntp or ypbind. -A test hook is also supplied that simply echos the dhcp variables to the -console from DISCOVER message. -.Pp -Each time -.Nm -is invoked, -.Ev $interface -is set to the interface that -.Nm dhcpcd -is run on and -.Ev $reason -is to the reason why -.Nm -was invoked. -DHCP information to be configured is held in variables starting with the word -new_ and old DHCP information to be removed is held in variables starting with -the word old_. -.Nm dhcpcd -can display the full list of variables it knows how about by using the -.Fl V , -variables -argument. -.Pp -Here's a list of reasons why -.Nm -could be invoked: -.Bl -tag -width indent -.It Dv BOUND -dhcpcd obtained a new lease from a DHCP server. -.It Dv RENEW -dhcpcd renewed it's lease. -.It Dv REBIND -dhcpcd has rebound to a new DHCP server. -.It Dv REBOOT -dhcpcd successfully requested a lease from a DHCP server. -.It Dv EXPIRE -dhcpcd's lease expired and it failed to obtain a new one. -.It Dv IPV4LL -dhcpcd failed to contact any DHCP servers but did obtain an IPV4LL address. -.It Dv FAIL -dhcpcd failed to contact any DHCP servers or use an old lease. -.It Dv TIMEOUT -dhcpcd failed to contact any DHCP servers but was able to use an old lease. -.It Dv TEST -dhcpcd received an OFFER from a DHCP server but will not configure the -interface. -This is primarily used to test the variables are filled correctly for the -script to process them. -.El -.Sh FILES -When -.Nm -runs, it loads -.Pa @SYSCONFDIR@/dhcpcd.hook -and any scripts found in -.Pa @HOOKDIR@ -in a lexical order. -.Sh SEE ALSO -.Xr dhcpcd 8 -.Sh AUTHORS -.An Roy Marples -.Sh BUGS -Please report them to http://bugs.marples.name diff --git a/dist/dhcpcd/dhcpcd-run-hooks.in b/dist/dhcpcd/dhcpcd-run-hooks.in deleted file mode 100644 index 7fd8b091dd1a..000000000000 --- a/dist/dhcpcd/dhcpcd-run-hooks.in +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# dhcpcd client configuration script - -# Handy functions for our hooks to use -signature="# Generated by dhcpcd for ${interface}" -save_conf() -{ - if [ -f "$1" ]; then - rm -f "$1"-pre."${interface}" - mv -f "$1" "$1"-pre."${interface}" - fi -} -restore_conf() -{ - [ -f "$1"-pre."${interface}" ] || return 1 - rm -f "$1" - mv -f "$1"-pre."${interface}" "$1" -} - -# We source each script into this one so that scripts run earlier can -# remove variables from the environment so later scripts don't see them. -# Thus, the user can create their dhcpcd.hook script to configure -# /etc/resolv.conf how they want and stop the system scripts ever updating it. -for hook in \ - @SYSCONFDIR@/dhcpcd.hook \ - @HOOKDIR@/* -do - for skip in ${skip_hooks}; do - case "${hook}" in - "${skip}") continue 2;; - */[0-9][0-9]"-${skip}") continue 2;; - */[0-9][0-9]"-${skip}.sh") continue 2;; - esac - done - if [ -f "${hook}" ]; then - . "${hook}" - fi -done diff --git a/dist/dhcpcd/dhcpcd.8.in b/dist/dhcpcd/dhcpcd.8.in deleted file mode 100644 index eefe0a4b7e85..000000000000 --- a/dist/dhcpcd/dhcpcd.8.in +++ /dev/null @@ -1,347 +0,0 @@ -.\" Copyright 2006-2008 Roy Marples -.\" All rights reserved -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd May 21, 2008 -.Dt DHCPCD 8 SMM -.Sh NAME -.Nm dhcpcd -.Nd an RFC 2131 compliant DHCP client -.Sh SYNOPSIS -.Nm -.Op Fl dknpADEGLSTV -.Op Fl c , -script Ar script -.Op Fl f , -config Ar file -.Op Fl h , -hostname Ar hostname -.Op Fl i , -classid Ar classid -.Op Fl l , -leasetime Ar seconds -.Op Fl m , -metric Ar metric -.Op Fl o , -option Ar option -.Op Fl r , -request Ar address -.Op Fl t , -timeout Ar seconds -.Op Fl u , -userclass Ar class -.Op Fl C , -nohook Ar hook -.Op Fl F , -fqdn Ar FQDN -.Op Fl I , -clientid Ar clientid -.Op Fl O , -nooption Ar option -.Ar interface -.Nm -.Fl k , -release -.Ar interface -.Nm -.Fl x , -exit -.Ar interface -.Sh DESCRIPTION -.Nm -is an implementation of the DHCP client specified in -.Rs -.%T "RFC 2131" -.Re -.Nm -gets the host information -.Po -IP address, routes, etc -.Pc -from a DHCP server and configures the network -.Ar interface -of the -machine on which it is running. -.Nm -will then write DNS information to -.Xr resolvconf 8 , -if available, otherwise directly to -.Pa /etc/resolv.conf . -If the hostname is currenly blank, (null) or localhost then -.Nm -will set the hostname to the one supplied by the DHCP server. -.Nm -then daemonises and waits for the lease renewal time to lapse. -Then it attempts to renew its lease and reconfigure if the new lease changes. -.Ss Local Link configuration -If -.Nm -failed to obtain a lease, it will probe for a valid IPv4LL address -.Po -aka Zeroconf, aka APIPA -.Pc . -Once obtained it will probe every 10 seconds for a DHCP server to get a -proper address. -.Pp -Even when -.Nm -obtains a proper lease, it will still add a Local Link route -.Po -165.254.0.0/16 -.Pc -so that the host can communicate with clients using these addresses. -.Pp -When using IPv4LL, -.Nm -will always succeed and return a 0 exit code. To disable this behaviour, you -can use the -.Fl L , -noipv4ll -option. -.Ss Hooking into DHCP events -.Nm -will run -.Pa @SCRIPT@ , -or the script specified by the -.Fl c , -script -option. -This script will run each script found in -.Pa @HOOKDIR@ -in a lexical order. -The default installation supplies the scripts -.Pa test , -.Pa resolv.conf -and -.Pa hostname . -You can disable each script by using the -.Fl C , -nohook -option. -See -.Xr dhcpcd-run-hooks 8 -for details on how these scripts work. -.Nm -currently ignores the exit code of the script. -.Ss Fine tuning -You can fine tune the behaviour of -.Nm -with the following options: -.Bl -tag -width indent -.It Fl c , -script Ar script -Use this -.Ar script -instead of the default -.Pa @SCRIPT@ . -.It Fl d , -debug -Echo debug and informational messages to the console. -Subsequent debug options stop -.Nm -from daemonising. -.It Fl f , -config Ar file -Specify a config to load instead of -.Pa @SYSCONFDIR@/dhcpcd.conf . -.Nm -always processes the config file before any command line options. -.It Fl h , -hostname Ar hostname -By default, -.Nm -will send the current hostname to the DHCP server so it can register in DNS. -You can use this option to specify the -.Ar hostname -sent, or an empty string to -stop any -.Ar hostname -from being sent. -.It Fl i , -classid Ar classid -Override the DHCP vendor -.Ar classid -field we send. The default is -dhcpcd . -If not set then none is sent. -.It Fl k , -release -This causes an existing -.Nm -process running on the -.Ar interface -to release it's lease, deconfigure the -.Ar interface -and then exit. -.It Fl l , -leasetime Ar seconds -Request a specific lease time in -.Ar seconds . -By default -.Nm -does not request any lease time and leaves the it in the hands of the -DHCP server. -.It Fl m , -metric Ar metric -Added routes will use the -.Ar metric -on systems where this is supported -.Po -presently only Linux -.Pc . -Route metrics allow the addition of routes to the same destination across -different interfaces, the lower the metric the more it is preferred. -.It Fl o , -option Ar option -Request the DHCP -.Ar option -variable for use in -.Pa @SCRIPT@ . -.It Fl n , -renew -Notifies an existing -.Nm -process running on the -.Ar interface -to renew it's lease. If -.Nm -is not running, then it starts up as normal. -.It Fl p , -persistent -.Nm -normally deconfigures the -.Ar interface -and configuration when it exits. -Sometimes, this isn't desirable if for example you have root mounted over NFS. -You can use this option to stop this from happening. -.It Fl r , -request Op Ar address -.Nm -normally sends a DHCP Broadcast to find servers to offer an address. -.Nm -will then request the address used. -You can use this option to skip the broadcast step and just request an -.Ar address . -The downside is if you request an -.Ar address -the DHCP server does not know about or the DHCP server is not -authorative, it will remain silent. -In this situation, we go back to the init state and broadcast again. -If no -.Ar address -is given then we use the first address currently assigned to the -.Ar interface . -.It Fl s , -inform Op Ar address Op / Ar cidr -Behaves exactly like -.Fl r , -request -as above, but sends a DHCP inform instead of a request. -This requires the interface to be configured first. -This does not get a lease as such, just notifies the DHCP server of the -.Ar address -we are using. -If we fail to contact a DHCP server then we return a failure instead of falling -back on IPv4LL. -.It Fl t , -timeout Ar seconds -Timeout after -.Ar seconds , -instead of the default 20. -A setting of 0 -.Ar seconds -causes -.Nm -to wait forever to get a lease. -.It Fl u , -userclass Ar class -Tags the DHCP message with the userclass -.Ar class . -DHCP servers use this give memebers of the class DHCP options other than the -default, without having to know things like hardware address or hostname. -.It Fl D , -duid -Generate an -.Rs -.%T "RFC 4361" -.Re -compliant clientid. -This requires persistent storage and not all DHCP servers work with it so it's -not enabled by default. -The DUID generated will be held in -.Pa @SYSCONFDIR@/dhcpcd.duid -and should not be copied to other hosts. -.It Fl E , -lastlease -If -.Nm -cannot obtain a lease, then try to use the last lease we got for the -interface if it hasn't yet expired. -.It Fl F , -fqdn Ar fqdn -Requests that the DHCP server updates DNS using FQDN instead of just a -hostname. -Valid values for -.Ar fqdn -are none, ptr and both. -The current hostname or the hostname specified using the -.Fl h , -hostname -option must be a FQDN. -.Nm -itself never does any DNS updates. -.It Fl I , -clientid Ar clientid -Change the default clientid sent from the interface hardware address. -If the string is of the format 01:02:03 then it is encoded as hex. -If not set then none is sent. -.El -.Ss Restriciting behaviour -.Nm -will try to do as much as it can by default. -However, there are sometimes situations where you don't want the things to be -configured exactly how the the DHCP server wants. -Here are some option that deal with turning these bits off. -.Bl -tag -width indent -.It Fl A , -noarp -Don't request or claim the address by ARP. -.It Fl G , -nogateway -Don't set any default routes. -.It Fl C , -nohook Ar script -Don't run this hook script. -Matches full name, or prefixed with 2 numbers optionally ending with -.Pa .sh . -.Pp -So to stop dhcpcd from touching your DNS settings you would do:- -.D1 dhcpcd -C resolv.conf -.It Fl L , -noipv4ll -Don't use IPv4LL at all. -.It Fl O , -nooption Ar option -Don't request the specified option. -If no option given, then don't request any options other than those to -configure the interface and routing. -.It Fl T, -test -On receipt of discover messages we just call -.Pa @SCRIPT@ -with the reason of TEST which echo's the DHCP variables found in the message -to the console. -The interface configuration isn't touched and neither are any configuration -files. -.It Fl V, -variables -Display a list of option codes and the associated variable for use in -.Xr dhcpcd-run-hooks 8 . -.El -.Sh NOTES -.Nm -requires a Berkley Packet Filter, or BPF device on BSD based systems and a -Linux Socket Filter, or LPF device on Linux based systems. -.Sh FILES -.Bl -ohang -.It Pa @SYSCONFDIR@/dhcpcd.conf -Configuration file for dhcpcd. -If you always use the same options, put them here. -.It Pa @SYSCONFDIR@/dhcpcd.duid -Text file that holds the DUID used to identify the host. -.It Pa @SCRIPT@ -Bourne shell script that is run when we configure or deconfigure an interface. -.It Pa @HOOKDIR@ -A directory containing bourne shell scripts that are run by the above script. -Each script can be disabled by using the -.Fl C , -nohook -option described above. -.It Pa @DBDIR@/dhcpcd\- Ns Ar interface Ns .lease -The actual DHCP message send by the server. We use this when reading the last -lease and use the files mtime as when it was issued. -.El -.Sh SEE ALSO -.Xr dhcpcd.conf 5 , -.Xr dhcpcd-run-hooks 8 , -.Xr resolv.conf 5 , -.Xr resolvconf 8 , -.Sh STANDARDS -RFC 2131, RFC 2132, RFC 2855, RFC 3004, RFC 3361, RFC 3396, RFC 3397, -RFC 3442, RFC 3927, RFC 4361, RFC 4390, RFC 4702. -.Sh AUTHORS -.An Roy Marples -.Sh BUGS -Please report them to http://bugs.marples.name diff --git a/dist/dhcpcd/dhcpcd.c b/dist/dhcpcd/dhcpcd.c deleted file mode 100644 index 4ca3dc17d1e0..000000000000 --- a/dist/dhcpcd/dhcpcd.c +++ /dev/null @@ -1,852 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -const char copyright[] = "Copyright (c) 2006-2008 Roy Marples"; - -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "config.h" -#include "client.h" -#include "dhcpcd.h" -#include "dhcp.h" -#include "net.h" -#include "logger.h" - -/* Don't set any optional arguments here so we retain POSIX - * compatibility with getopt */ -#define OPTS "c:df:h:i:kl:m:no:pr:s:t:u:xAC:DEF:GI:LO:TV" - -static int doversion = 0; -static int dohelp = 0; -static const struct option longopts[] = { - {"script", required_argument, NULL, 'c'}, - {"debug", no_argument, NULL, 'd'}, - {"config", required_argument, NULL, 'f'}, - {"hostname", optional_argument, NULL, 'h'}, - {"classid", optional_argument, NULL, 'i'}, - {"release", no_argument, NULL, 'k'}, - {"leasetime", required_argument, NULL, 'l'}, - {"metric", required_argument, NULL, 'm'}, - {"renew", no_argument, NULL, 'n'}, - {"option", required_argument, NULL, 'o'}, - {"persistent", no_argument, NULL, 'p'}, - {"inform", optional_argument, NULL, 's'}, - {"request", optional_argument, NULL, 'r'}, - {"timeout", required_argument, NULL, 't'}, - {"userclass", required_argument, NULL, 'u'}, - {"exit", no_argument, NULL, 'x'}, - {"noarp", no_argument, NULL, 'A'}, - {"nohook", required_argument, NULL, 'C'}, - {"duid", no_argument, NULL, 'D'}, - {"lastlease", no_argument, NULL, 'E'}, - {"fqdn", optional_argument, NULL, 'F'}, - {"nogateway", no_argument, NULL, 'G'}, - {"clientid", optional_argument, NULL, 'I'}, - {"noipv4ll", no_argument, NULL, 'L'}, - {"nooption", optional_argument, NULL, 'O'}, - {"test", no_argument, NULL, 'T'}, - {"variables", no_argument, NULL, 'V'}, - {"help", no_argument, &dohelp, 1}, - {"version", no_argument, &doversion, 1}, -#ifdef THERE_IS_NO_FORK - {"daemonised", no_argument, NULL, 'X'}, - {"skiproutes", required_argument, NULL, 'Z'}, -#endif -#ifdef CMDLINE_COMPAT - {"nohostname", no_argument, NULL, 'H'}, - {"nomtu", no_argument, NULL, 'M'}, - {"nontp", no_argument, NULL, 'N'}, - {"nodns", no_argument, NULL, 'R'}, - {"msscr", no_argument, NULL, 'S'}, - {"nonis", no_argument, NULL, 'Y'}, -#endif - {NULL, 0, NULL, '\0'} -}; - -#ifdef THERE_IS_NO_FORK -char dhcpcd[PATH_MAX]; -char **dhcpcd_argv = NULL; -int dhcpcd_argc = 0; -char *dhcpcd_skiproutes = NULL; -#define EXTRA_OPTS "XZ:" -#endif - -#ifdef CMDLINE_COMPAT -# define EXTRA_OPTS "HMNRSY" -#endif - -#ifndef EXTRA_OPTS -# define EXTRA_OPTS -#endif - -static int -atoint(const char *s) -{ - char *t; - long n; - - errno = 0; - n = strtol(s, &t, 0); - if ((errno != 0 && n == 0) || s == t || - (errno == ERANGE && (n == LONG_MAX || n == LONG_MIN))) - { - logger(LOG_ERR, "`%s' out of range", s); - return -1; - } - - return (int)n; -} - -static pid_t -read_pid(const char *pidfile) -{ - FILE *fp; - pid_t pid = 0; - - if ((fp = fopen(pidfile, "r")) == NULL) { - errno = ENOENT; - return 0; - } - - fscanf(fp, "%d", &pid); - fclose(fp); - - return pid; -} - -static void -usage(void) -{ - printf("usage: "PACKAGE" [-dknpxADEGHLOSTV] [-c script] [-f file ] [-h hostname]\n" - " [-i classID ] [-l leasetime] [-m metric] [-o option] [-r ipaddr]\n" - " [-s ipaddr] [-t timeout] [-u userclass] [-F none|ptr|both]\n" - " [-I clientID] [-C hookscript] \n"); -} - -static char * -add_environ(struct options *options, const char *value, int uniq) -{ - char **newlist; - char **lst = options->environ; - size_t i = 0, l, lv; - char *match = NULL, *p; - - match = xstrdup(value); - p = strchr(match, '='); - if (p) - *p++ = '\0'; - l = strlen(match); - - while (lst && lst[i]) { - if (match && strncmp(lst[i], match, l) == 0) { - if (uniq) { - free(lst[i]); - lst[i] = xstrdup(value); - } else { - /* Append a space and the value to it */ - l = strlen(lst[i]); - lv = strlen(p); - lst[i] = xrealloc(lst[i], l + lv + 2); - lst[i][l] = ' '; - memcpy(lst[i] + l + 1, p, lv); - lst[i][l + lv + 1] = '\0'; - } - free(match); - return lst[i]; - } - i++; - } - - newlist = xrealloc(lst, sizeof(char *) * (i + 2)); - newlist[i] = xstrdup(value); - newlist[i + 1] = NULL; - options->environ = newlist; - free(match); - return newlist[i]; -} - -static int -parse_option(int opt, char *oarg, struct options *options) -{ - static int userclasses = 0; - int i; - int j; - char *p; - size_t s; - - switch(opt) { - case 'h': - if (!oarg) - *options->hostname = '\0'; - else if (strlen(oarg) >= MAXHOSTNAMELEN) { - logger(LOG_ERR, - "`%s' too long for HostName string, max is %d", - oarg, MAXHOSTNAMELEN); - return -1; - } else - strlcpy(options->hostname, oarg, - sizeof(options->hostname)); - break; - case 'i': - if (!oarg) { - *options->classid = '\0'; - } else if (strlen(oarg) >= CLASS_ID_MAX_LEN) { - logger(LOG_ERR, - "`%s' too long for ClassID string, max is %d", - oarg, CLASS_ID_MAX_LEN); - return -1; - } else - strlcpy(options->classid, oarg, - sizeof(options->classid)); - break; - case 'l': - if (*oarg == '-') { - logger(LOG_ERR, - "leasetime must be a positive value"); - return -1; - } - errno = 0; - options->leasetime = (uint32_t)strtol(oarg, NULL, 0); - if (errno == EINVAL || errno == ERANGE) { - logger(LOG_ERR, "`%s' out of range", oarg); - return -1; - } - break; - case 'm': - options->metric = atoint(oarg); - if (options->metric < 0) { - logger(LOG_ERR, "metric must be a positive value"); - return -1; - } - break; - case 'o': - if (make_reqmask(options->reqmask, &oarg, 1) != 0) { - logger(LOG_ERR, "unknown option `%s'", oarg); - return -1; - } - break; - case 'p': - options->options |= DHCPCD_PERSISTENT; - break; - case 's': - options->options |= DHCPCD_INFORM; - options->options &= ~DHCPCD_ARP; - if (!oarg || strlen(optarg) == 0) { - options->request_address.s_addr = 0; - break; - } else { - if ((p = strchr(oarg, '/'))) { - /* nullify the slash, so the -r option - * can read the address */ - *p++ = '\0'; - if (sscanf(p, "%d", &i) != 1 || - inet_cidrtoaddr(i, &options->request_netmask) != 0) - { - logger(LOG_ERR, - "`%s' is not a valid CIDR", - p); - return -1; - } - } - } - /* FALLTHROUGH */ - case 'r': - if (!(options->options & DHCPCD_INFORM)) - options->options |= DHCPCD_REQUEST; - if (strlen(oarg) > 0 && - !inet_aton(oarg, &options->request_address)) - { - logger(LOG_ERR, "`%s' is not a valid IP address", - oarg); - return -1; - } - break; - case 't': - options->timeout = atoint(oarg); - if (options->timeout < 0) { - logger (LOG_ERR, "timeout must be a positive value"); - return -1; - } - break; - case 'u': - j = 0; - for (i = 0; i < userclasses; i++) - j += (int)options->userclass[j] + 1; - if (j + 1 + strlen(oarg) >= USERCLASS_MAX_LEN) { - logger(LOG_ERR, - "userclass overrun, max is %d", - USERCLASS_MAX_LEN); - return -1; - } - userclasses++; - memcpy(options->userclass + j + 1 , - oarg, strlen(optarg)); - options->userclass[j] = strlen(oarg); - options->userclass_len += (strlen(oarg)) + 1; - break; - case 'A': - options->options &= ~DHCPCD_ARP; - /* IPv4LL requires ARP */ - options->options &= ~DHCPCD_IPV4LL; - break; - case 'C': - /* Commas to spaces for shell */ - while ((p = strchr(oarg, ','))) - *p = ' '; - s = strlen("skip_hooks=") + strlen(oarg) + 1; - p = xmalloc(sizeof(char) * s); - snprintf(p, s, "skip_hooks=%s", oarg); - add_environ(options, p, 0); - free(p); - break; - case 'D': - options->options |= DHCPCD_DUID; - break; - case 'E': - options->options |= DHCPCD_LASTLEASE; - break; - case 'F': - if (!oarg) { - options->fqdn = FQDN_BOTH; - break; - } - if (strncmp(oarg, "none", strlen(optarg)) == 0) - options->fqdn = FQDN_NONE; - else if (strncmp(oarg, "ptr", strlen(optarg)) == 0) - options->fqdn = FQDN_PTR; - else if (strncmp(oarg, "both", strlen(optarg)) == 0) - options->fqdn = FQDN_BOTH; - else { - logger(LOG_ERR, "invalid value `%s' for FQDN", - oarg); - return -1; - } - break; - case 'G': - options->options &= ~DHCPCD_GATEWAY; - break; - case 'I': - if (oarg) { - if (strlen(oarg) >= CLIENT_ID_MAX_LEN) { - logger(LOG_ERR, "`%s' is too long for" - " ClientID, max is %d", - oarg, CLIENT_ID_MAX_LEN); - return -1; - } - if (strlcpy(options->clientid, oarg, - sizeof(options->clientid)) == 0) { - /* empty string disabled duid */ - options->options &= ~DHCPCD_DUID; - options->options &= ~DHCPCD_CLIENTID; - } - } else { - options->clientid[0] = '\0'; - options->options &= ~DHCPCD_DUID; - options->options &= ~DHCPCD_CLIENTID; - } - break; - case 'L': - options->options &= ~DHCPCD_IPV4LL; - break; - default: - return 0; - } - - return 1; -} - -static int -parse_config_line(const char *opt, char *line, struct options *options) -{ - unsigned int i; - - for (i = 0; i < sizeof(longopts) / sizeof(longopts[0]); i++) { - if (!longopts[i].name || - strcmp(longopts[i].name, opt) != 0) - continue; - - if (longopts[i].has_arg == required_argument && !line) { - fprintf(stderr, - PACKAGE ": option requires an argument -- %s\n", - opt); - return -1; - } - - return parse_option(longopts[i].val, line, options); - } - - fprintf(stderr, PACKAGE ": unknown option -- %s\n", opt); - return -1; -} - -int -main(int argc, char **argv) -{ - struct options *options; - int opt; - int option_index = 0; - char *prefix; - pid_t pid; - int debug = 0; - int i, r; - int pidfd = -1; - int sig = 0; - int retval = EXIT_FAILURE; - char *line, *option, *p, *lp, *buffer = NULL; - char lt; - size_t len = 0; - FILE *f; - char *cf = NULL; - char *intf = NULL; - - closefrom(3); - openlog(PACKAGE, LOG_PID, LOG_LOCAL0); - -#ifdef THERE_IS_NO_FORK - dhcpcd_argv = argv; - dhcpcd_argc = argc; - if (!realpath(argv[0], dhcpcd)) { - fprintf(stderr, "unable to resolve the path `%s': %s", - argv[0], strerror(errno)); - goto abort; - } -#endif - - options = xzalloc(sizeof(*options)); - options->script = SCRIPT; - snprintf(options->classid, CLASS_ID_MAX_LEN, "%s %s", - PACKAGE, VERSION); - - options->options |= DHCPCD_GATEWAY | DHCPCD_DAEMONISE | DHCPCD_CLIENTID; -#ifdef ENABLE_ARP - options->options |= DHCPCD_ARP; - #ifdef ENABLE_IPV4LL - options->options |= DHCPCD_IPV4LL; - #endif -#endif - - options->timeout = DEFAULT_TIMEOUT; - -#ifdef CMDLINE_COMPAT - add_reqmask(options->reqmask, DHCP_DNSSERVER); - add_reqmask(options->reqmask, DHCP_DNSDOMAIN); - add_reqmask(options->reqmask, DHCP_DNSSEARCH); - add_reqmask(options->reqmask, DHCP_NISSERVER); - add_reqmask(options->reqmask, DHCP_NISDOMAIN); - add_reqmask(options->reqmask, DHCP_NTPSERVER); - - /* If the duid file exists, then enable duid by default - * This means we don't break existing clients that easily :) */ -# ifdef ENABLE_DUID - if ((f = fopen(DUID, "r"))) { - options->options |= DHCPCD_DUID; - fclose(f); - } -# endif -#endif - - gethostname(options->hostname, sizeof(options->hostname)); - if (strcmp(options->hostname, "(none)") == 0 || - strcmp(options->hostname, "localhost") == 0) - *options->hostname = '\0'; - - while ((opt = getopt_long(argc, argv, OPTS EXTRA_OPTS, - longopts, &option_index)) != -1) - { - switch (opt) { - case 0: - if (longopts[option_index].flag) - break; - logger(LOG_ERR, "option `%s' should set a flag", - longopts[option_index].name); - goto abort; - case 'f': - cf = optarg; - break; - case 'V': - print_options(); - goto abort; - case '?': - usage(); - goto abort; - } - } - - if (doversion) { - printf(""PACKAGE" "VERSION"\n"); - printf("Compile time options:" -#ifdef ENABLE_ARP - " ARP" -#endif -#ifdef ENABLE_DUID - " DUID" -#endif -#ifdef ENABLE_IPV4LL - " IPV4LL" -#endif -#ifdef THERE_IS_NO_FORK - " THERE_IS_NO_FORK" -#endif - "\n"); - } - - if (dohelp) - usage(); - - if (optind < argc) { - if (strlen(argv[optind]) >= IF_NAMESIZE) { - logger(LOG_ERR, - "`%s' too long for an interface name (max=%d)", - argv[optind], IF_NAMESIZE); - goto abort; - } - strlcpy(options->interface, argv[optind], - sizeof(options->interface)); - } else { - /* If only version was requested then exit now */ - if (doversion || dohelp) { - retval = 0; - goto abort; - } - - logger(LOG_ERR, "no interface specified"); - goto abort; - } - - /* Parse our options file */ - f = fopen(cf ? cf : CONFIG, "r"); - if (f) { - r = 1; - while ((get_line(&buffer, &len, f))) { - line = buffer; - while ((option = strsep(&line, " \t"))) - if (*option != '\0') - break; - if (!option || *option == '\0' || *option == '#') - continue; - /* Trim leading whitespace */ - if (line) { - while (*line != '\0' && (*line == ' ' || *line == '\t')) - line++; - } - /* Trim trailing whitespace */ - lt = '\\'; - if (line && *line) { - p = line + strlen(line) - 1; - while (p != line && (*p == ' ' || *p == '\t')) { - /* Remember the last char trimmed */ - lt = *p; - *p-- = '\0'; - } - } - /* Remove quotes if present */ - if (line && *line == '"') { - p = line + strlen(line) - 1; - if (*p == '"') { - line++; - *p = '\0'; - } - } - /* Process escapes */ - lp = p = line; - while (p && *p) { - if (*p == '\\') - p++; - /* EOL? */ - if (*p == '\0') { - /* Restore the last char trimmed */ - *lp++ = lt; - break; - } - *lp++ = *p++; - } - if (lp) - *lp = '\0'; - if (strcmp(option, "interface") == 0) { - free(intf); - intf = xstrdup(line); - continue; - } - /* If we're in an interface block don't use these - * options unless it's for us */ - if (intf && strcmp(intf, options->interface) != 0) - continue; - r = parse_config_line(option, line, options); - if (r != 1) - break; - } - free(buffer); - free(intf); - fclose(f); - if (r == 0) - usage(); - if (r != 1) - goto abort; - } else { - if (errno != ENOENT || cf) { - logger(LOG_ERR, "fopen `%s': %s", cf ? cf : CONFIG, - strerror(errno)); - goto abort; - } - } - - optind = 0; - while ((opt = getopt_long(argc, argv, OPTS EXTRA_OPTS, - longopts, &option_index)) != -1) - { - switch (opt) { - case 'd': - debug++; - switch (debug) { - case 1: - setloglevel(LOG_DEBUG); - break; - case 2: - options->options &= ~DHCPCD_DAEMONISE; - break; - } - break; - case 'f': - break; -#ifdef THERE_IS_NO_FORK - case 'X': - options->options |= DHCPCD_DAEMONISED; - close_fds(); - break; - case 'Z': - dhcpcd_skiproutes = xstrdup(optarg); - break; -#endif - case 'k': - sig = SIGHUP; - break; - case 'n': - sig = SIGALRM; - break; - case 'x': - sig = SIGTERM; - break; - case 'O': - if (make_reqmask(options->reqmask, &optarg, -1) != 0) { - logger(LOG_ERR, "unknown option `%s'", optarg); - return -1; - } - if (make_reqmask(options->nomask, &optarg, 1) != 0) { - logger(LOG_ERR, "unknown option `%s'", optarg); - return -1; - } - break; - case 'T': - options->options |= DHCPCD_TEST | DHCPCD_PERSISTENT; - break; -#ifdef CMDLINE_COMPAT - case 'H': /* FALLTHROUGH */ - case 'M': - break; - case 'N': - del_reqmask(options->reqmask, DHCP_NTPSERVER); - break; - case 'R': - del_reqmask(options->reqmask, DHCP_DNSSERVER); - del_reqmask(options->reqmask, DHCP_DNSDOMAIN); - del_reqmask(options->reqmask, DHCP_DNSSEARCH); - break; - case 'S': - add_reqmask(options->reqmask, DHCP_MSCSR); - break; - case 'Y': - del_reqmask(options->reqmask, DHCP_NISSERVER); - del_reqmask(options->reqmask, DHCP_NISDOMAIN); - break; -#endif - default: - i = parse_option(opt, optarg, options); - if (i == 1) - break; - if (i == 0) - usage(); - goto abort; - } - } - - if ((p = strchr(options->hostname, '.'))) { - if (options->fqdn == FQDN_DISABLE) - *p = '\0'; - } else { - if (options->fqdn != FQDN_DISABLE) { - logger(LOG_WARNING, "hostname `%s' is not a FQDN", - options->hostname); - options->fqdn = FQDN_DISABLE; - } - } - if (options->fqdn != FQDN_DISABLE) - del_reqmask(options->reqmask, DHCP_HOSTNAME); - - if (options->request_address.s_addr == 0 && - options->options & DHCPCD_INFORM) - { - if (get_address(options->interface, - &options->request_address, - &options->request_netmask) == 0) - options->options |= DHCPCD_KEEPADDRESS; - } - - if (IN_LINKLOCAL(ntohl(options->request_address.s_addr))) { - logger(LOG_ERR, - "you are not allowed to request a link local address"); - goto abort; - } - - if (geteuid()) - logger(LOG_WARNING, PACKAGE " will not work correctly unless" - " run as root"); - - prefix = xmalloc(sizeof(char) * (IF_NAMESIZE + 3)); - snprintf(prefix, IF_NAMESIZE, "%s: ", options->interface); - setlogprefix(prefix); - snprintf(options->pidfile, sizeof(options->pidfile), PIDFILE, - options->interface); - free(prefix); - - chdir("/"); - umask(022); - - if (options->options & DHCPCD_TEST) { - if (options->options & DHCPCD_REQUEST || - options->options & DHCPCD_INFORM) { - logger(LOG_ERR, - "cannot test with --inform or --request"); - goto abort; - } - - if (options->options & DHCPCD_LASTLEASE) { - logger(LOG_ERR, "cannot test with --lastlease"); - goto abort; - } - - if (sig != 0) { - logger(LOG_ERR, - "cannot test with --release or --renew"); - goto abort; - } - } - - if (sig != 0) { - i = -1; - pid = read_pid(options->pidfile); - if (pid != 0) - logger(LOG_INFO, "sending signal %d to pid %d", - sig, pid); - - if (!pid || (i = kill(pid, sig))) - logger(sig == SIGALRM ? LOG_INFO : LOG_ERR, - ""PACKAGE" not running"); - - if (pid != 0 && (sig != SIGALRM || i != 0)) - unlink(options->pidfile); - - if (i == 0) { - retval = EXIT_SUCCESS; - goto abort; - } - - if (sig != SIGALRM) - goto abort; - } - - if (!(options->options & DHCPCD_TEST) && - !(options->options & DHCPCD_DAEMONISED)) - { - if ((pid = read_pid(options->pidfile)) > 0 && - kill(pid, 0) == 0) - { - logger(LOG_ERR, ""PACKAGE - " already running on pid %d (%s)", - pid, options->pidfile); - goto abort; - } - - pidfd = open(options->pidfile, - O_WRONLY | O_CREAT | O_NONBLOCK, 0664); - if (pidfd == -1) { - logger(LOG_ERR, "open `%s': %s", - options->pidfile, strerror(errno)); - goto abort; - } - - /* Lock the file so that only one instance of dhcpcd runs - * on an interface */ - if (flock(pidfd, LOCK_EX | LOCK_NB) == -1) { - logger(LOG_ERR, "flock `%s': %s", - options->pidfile, strerror(errno)); - goto abort; - } - - close_on_exec(pidfd); - writepid(pidfd, getpid()); - logger(LOG_INFO, PACKAGE " " VERSION " starting"); - } - - if (dhcp_run(options, &pidfd) == 0) - retval = EXIT_SUCCESS; - -abort: - /* If we didn't daemonise then we need to punt the pidfile now */ - if (pidfd > -1) { - close(pidfd); - unlink(options->pidfile); - } - if (options->environ) { - len = 0; - while (options->environ[len]) - free(options->environ[len++]); - free(options->environ); - } - free(options); - -#ifdef THERE_IS_NO_FORK - /* There may have been an error before the dhcp_run function - * clears this, so just do it here to be safe */ - free(dhcpcd_skiproutes); -#endif - - exit(retval); - /* NOTREACHED */ -} diff --git a/dist/dhcpcd/dhcpcd.conf b/dist/dhcpcd/dhcpcd.conf deleted file mode 100644 index 240c4f7626c3..000000000000 --- a/dist/dhcpcd/dhcpcd.conf +++ /dev/null @@ -1,8 +0,0 @@ -# A sample configuration for dhcpcd. -# See dhcpcd.conf(5) for details. - -# dhcpcd-run-hooks uses these options. -option domain_name_servers, domain_name, domain_search, host_name - -# Most distros have ntp support. -option ntp_servers diff --git a/dist/dhcpcd/dhcpcd.conf.5.in b/dist/dhcpcd/dhcpcd.conf.5.in deleted file mode 100644 index d7ecfd7c6ff9..000000000000 --- a/dist/dhcpcd/dhcpcd.conf.5.in +++ /dev/null @@ -1,125 +0,0 @@ -.\" Copyright 2006-2008 Roy Marples -.\" All rights reserved -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd May 20, 2008 -.Dt DHCPCD.CONF 5 SMM -.Sh NAME -.Nm dhcpcd.conf -.Nd dhcpcd configuration file -.Sh DESCRIPTION -Although -.Nm dhcpcd -can do everything from the command line, there are cases where it's just easier -to do it once in a configuration file. -Most of the options found in -.Xr dhcpcd 8 -can be used here. -The first word on the line is the option and the rest of the line is the value. -Leading and trailing whitespace for the option and value are trimmed. -You can escape characters in the value using the \\ character. -.Pp -Blank lines and lines starting with # are ignored. -.Pp -Here's a list of available options: -.Bl -tag -width indent -.It Ic classid Ar string -Change the default classid sent from dhcpcd-version. -If not set then none is sent. -.It Ic clientid Ar string -Change the default clientid sent from the interface hardware address. -If the string is of the format 01:02:03 then it is encoded as hex. -If not set then none is sent. -.It Ic duid -Generate an -.Rs -.%T "RFC 4361" -.Re -compliant clientid. -This requires persistent storage and not all DHCP servers work with it so it's -not enabled by default. -The duid generated will be held in -.Pa @SYSCONFDIR@/dhcpcd.duid -and should not be copied to other hosts. -.It Ic hostname Ar name -Sends specified -.Ar hostname -to the DHCP server so it can be registered in DNS. If -.Ar hostname -if a FQDN (ie, contains a .) then it will be encoded as such. -.It Ic fqdn Op none | ptr | both -none disables FQDN encoding, ptr just asks the DHCP server to update the PTR -record of the host in DNS whereas both also updates the A record. -The current hostname or the hostname specified using the -.Fl h , -hostname -option must be a FQDN. -.Nm dhcpcd -itself never does any DNS updates. -.It Ic interface Ar interface -Subsequent options are only parsed for this -.Ar interface . -.It Ic leasetime Ar seconds -Request a leasetime of -.Ar seconds . -.It Ic noarp -Don't send any ARP requests. -This also disables IPv4LL. -.It Ic nogateway -Don't install any default routes. -.It Ic nohook Ar script -Don't run this hook script. -Matches full name, or prefixed with 2 numbers optionally ending with -.Pa .sh . -.It Ic noipv4ll -Don't attempt to obtain an IPv4LL address if we failed to get one via DHCP. -See -.Rs -.%T "RFC 3927" -.Re -.It Ic option Ar dhcp-option -Requests the -.Ar dhcp-option -from the server. -It can be a variable to be used in -.Xr dhcpcd-run-hooks 8 -or the numerical value. -You can specify more seperated by commas, spaces or more option lines. -.It Ic script Ar script -Use -.Ar script -instead of the default -.Pa @SCRIPT@ . -.It Ic timeout Ar seconds -The default timeout for waiting for a DHCP response is 20 seconds which may -be too long or too short and can be changed here. -.It Ic userclass Ar string -Tag the DHCP messages with the userclass. -You can specify more than one. -.El -.Sh SEE ALSO -.Xr dhcpcd-run-hooks 8 , -.Xr dhcpcd 8 -.Sh AUTHORS -.An Roy Marples -.Sh BUGS -Please report them to http://bugs.marples.name diff --git a/dist/dhcpcd/dhcpcd.h b/dist/dhcpcd/dhcpcd.h deleted file mode 100644 index 76fe30bd3306..000000000000 --- a/dist/dhcpcd/dhcpcd.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef DHCPCD_H -#define DHCPCD_H - -#include -#include - -#include -#include - -#include - -#include "common.h" - -#define DEFAULT_TIMEOUT 20 -#define DEFAULT_LEASETIME 3600 /* 1 hour */ - -#define CLASS_ID_MAX_LEN 48 -#define CLIENT_ID_MAX_LEN 48 -#define USERCLASS_MAX_LEN 255 - -#ifdef THERE_IS_NO_FORK -extern char dhcpcd[PATH_MAX]; -extern char **dhcpcd_argv; -extern int dhcpcd_argc; -extern char *dhcpcd_skiproutes; -#endif - -#define DHCPCD_ARP (1 << 0) -#define DHCPCD_DOMAIN (1 << 2) -#define DHCPCD_GATEWAY (1 << 3) -#define DHCPCD_LASTLEASE (1 << 7) -#define DHCPCD_INFORM (1 << 8) -#define DHCPCD_REQUEST (1 << 9) -#define DHCPCD_IPV4LL (1 << 10) -#define DHCPCD_DUID (1 << 11) -#define DHCPCD_PERSISTENT (1 << 12) -#define DHCPCD_KEEPADDRESS (1 << 13) -#define DHCPCD_DAEMONISE (1 << 14) -#define DHCPCD_DAEMONISED (1 << 15) -#define DHCPCD_TEST (1 << 16) -#define DHCPCD_FORKED (1 << 17) -#define DHCPCD_HOSTNAME (1 << 18) -#define DHCPCD_CLIENTID (1 << 19) - -struct options { - char interface[IF_NAMESIZE]; - char hostname[MAXHOSTNAMELEN]; - int fqdn; - char classid[CLASS_ID_MAX_LEN]; - char clientid[CLIENT_ID_MAX_LEN]; - char userclass[USERCLASS_MAX_LEN]; - uint8_t reqmask[256 / 8]; - uint8_t nomask[256 / 8]; - size_t userclass_len; - uint32_t leasetime; - time_t timeout; - int metric; - int options; - - struct in_addr request_address; - struct in_addr request_netmask; - - char **environ; - const char *script; - char pidfile[PATH_MAX]; -}; - -#endif diff --git a/dist/dhcpcd/hook.d/01-test b/dist/dhcpcd/hook.d/01-test deleted file mode 100644 index 9586075d8dc8..000000000000 --- a/dist/dhcpcd/hook.d/01-test +++ /dev/null @@ -1,6 +0,0 @@ -# Just echo our DHCP options we have - -if [ "${reason}" = "TEST" ]; then - env | grep "^\(interface\|pid\|reason\|skip_hooks\)=" - env | grep "^\(new_\|old_\)" | sort -fi diff --git a/dist/dhcpcd/hook.d/10-resolv.conf b/dist/dhcpcd/hook.d/10-resolv.conf deleted file mode 100644 index 437c116778c4..000000000000 --- a/dist/dhcpcd/hook.d/10-resolv.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Generate /etc/resolv.conf -# Support resolvconf(8) if available - -make_resolv_conf() -{ - if [ -z "${new_domain_name_servers}" -a \ - -z "${new_domain_name}" -a \ - -z "${new_domain_search}" ]; then - return 0 - fi - local x= conf="${signature}\n" - if [ -n "${new_domain_search}" ]; then - conf="${conf}search ${new_domain_search}\n" - elif [ -n "${new_domain_name}" ]; then - conf="${conf}search ${new_domain_name}\n" - fi - for x in ${new_domain_name_servers}; do - conf="${conf}nameserver ${x}\n" - done - if type resolvconf >/dev/null 2>&1; then - printf "${conf}" | resolvconf -a "${interface}" - else - save_conf /etc/resolv.conf - printf "${conf}" > /etc/resolv.conf - fi -} - -restore_resolv_conf() -{ - if type resolvconf >/dev/null 2>&1; then - resolvconf -d "${interface}" -f - else - restore_conf /etc/resolv.conf || return 0 - fi -} - -case "${reason}" in -BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) make_resolv_conf;; -EXPIRE|FAIL|IPV4LL|RELEASE|STOP) restore_resolv_conf;; -esac diff --git a/dist/dhcpcd/hook.d/14-lookup-hostname b/dist/dhcpcd/hook.d/14-lookup-hostname deleted file mode 100644 index b9ce458a927e..000000000000 --- a/dist/dhcpcd/hook.d/14-lookup-hostname +++ /dev/null @@ -1,33 +0,0 @@ -# Lookup the hostname in DNS if not set - -lookup_hostname() -{ - local h= - # Silly ISC programs love to send error text to stdout - if type dig >/dev/null 2>&1; then - h=`dig +short -x ${new_ip_address}` - if [ $? = 0 ]; then - echo "${h}" | sed 's/\.$//' - return 0 - fi - elif type host >/dev/null 2>&1; then - h=`host ${new_ip_address}` - if [ $? = 0 ]; then - echo "${h}" \ - | sed 's/.* domain name pointer \(.*\)./\1/' - return 0 - fi - fi - return 1 -} - -set_hostname() -{ - if [ -z "${new_host_name}" ]; then - export new_host_name="$(lookup_hostname)" - fi -} - -case "${reason}" in -BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) set_hostname;; -esac diff --git a/dist/dhcpcd/hook.d/15-hostname b/dist/dhcpcd/hook.d/15-hostname deleted file mode 100644 index 500ec0f21c54..000000000000 --- a/dist/dhcpcd/hook.d/15-hostname +++ /dev/null @@ -1,21 +0,0 @@ -# Set the hostname from DHCP data if required - -need_hostname() -{ - case "$(hostname)" in - ""|"(none)"|localhost) [ -n "${new_host_name}" ];; - "${old_host_name}") true;; - *) false;; - esac -} - -set_hostname() -{ - if need_hostname; then - hostname "${new_host_name}" - fi -} - -case "${reason}" in -BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) set_hostname;; -esac diff --git a/dist/dhcpcd/hook.d/50-ntp.conf b/dist/dhcpcd/hook.d/50-ntp.conf deleted file mode 100644 index a7e8e0bd14b2..000000000000 --- a/dist/dhcpcd/hook.d/50-ntp.conf +++ /dev/null @@ -1,51 +0,0 @@ -# Sample dhcpcd hook script for ntp - -# Detect OpenRC or BSD rc -# Distributions may want to just have their command here instead of this -if type rc-service >/dev/null 2>&1 && rc-service --exists ntpd; then - ntpd_restart_cmd="rc-service -- ntpd --ifstarted --quiet restart" -elif [ -x /etc/rc.d/ntpd ]; then - ntpd_restart_cmd="/etc/rc.d/ntpd restart" -elif [ -x /usr/local/etc/rc.d/ntpd ]; then - ntpd_restart_cmd="/usr/local/etc/rc.d/ntpd restart" -fi - -make_ntp_conf() -{ - [ -z "${new_ntp_servers}" ] && return 0 - local cf=/etc/ntp.conf."${interface}" x= - echo "${signature}" > "${cf}" - echo "restrict default noquery notrust nomodify" >> "${cf}" - echo "restrict 127.0.0.1" >> "${cf}" - for x in ${new_ntp_servers}; do - echo "restrict ${x} nomodify notrap noquery" >> "${cf}" - echo "server ${x}" >> "${cf}" - done - if [ ! -e /etc/ntp.conf ]; then - false - elif type cmp >/dev/null 2>&1; then - cmp -s /etc/ntp.conf "${cf}" - elif type diff >/dev/null 2>&1; then - diff -q /etc/ntp.conf "${cf}" >/dev/null - else - false - fi - if [ $? = 0 ]; then - rm -f "${cf}" - else - save_conf /etc/ntp.conf - mv -f "${cf}" /etc/ntp.conf - [ -n "${ntpd_restart_cmd}" ] && ${ntpd_restart_cmd} - fi -} - -restore_ntp_conf() -{ - restore_conf /etc/ntp.conf || return 0 - [ -n "${ntpd_restart_cmd}" ] && ${ntpd_restart_cmd} -} - -case "${reason}" in -BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) make_ntp_conf;; -EXPIRE|FAIL|IPV4LL|RELEASE|STOP) restore_ntp_conf;; -esac diff --git a/dist/dhcpcd/if-bsd.c b/dist/dhcpcd/if-bsd.c deleted file mode 100644 index 2cc0c2f35e8d..000000000000 --- a/dist/dhcpcd/if-bsd.c +++ /dev/null @@ -1,187 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "config.h" -#include "common.h" -#include "dhcp.h" -#include "net.h" - -/* Darwin doesn't define this for some very odd reason */ -#ifndef SA_SIZE -# define SA_SIZE(sa) \ - ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \ - sizeof(long) : \ - 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) ) -#endif - -int -if_address(const char *ifname, const struct in_addr *address, - const struct in_addr *netmask, const struct in_addr *broadcast, - int action) -{ - int s; - int retval; - struct ifaliasreq ifa; - union { - struct sockaddr *sa; - struct sockaddr_in *sin; - } _s; - - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - return -1; - - memset(&ifa, 0, sizeof(ifa)); - strlcpy(ifa.ifra_name, ifname, sizeof(ifa.ifra_name)); - -#define ADDADDR(_var, _addr) \ - _s.sa = &_var; \ - _s.sin->sin_family = AF_INET; \ - _s.sin->sin_len = sizeof(*_s.sin); \ - memcpy(&_s.sin->sin_addr, _addr, sizeof(_s.sin->sin_addr)); - - ADDADDR(ifa.ifra_addr, address); - ADDADDR(ifa.ifra_mask, netmask); - if (action >= 0) { - ADDADDR(ifa.ifra_broadaddr, broadcast); - } -#undef ADDADDR - - if (action < 0) - retval = ioctl(s, SIOCDIFADDR, &ifa); - else - retval = ioctl(s, SIOCAIFADDR, &ifa); - close(s); - return retval; -} - -int -if_route(const char *ifname, const struct in_addr *destination, - const struct in_addr *netmask, const struct in_addr *gateway, - _unused int metric, int action) -{ - int s; - static int seq; - union sockunion { - struct sockaddr sa; - struct sockaddr_in sin; -#ifdef INET6 - struct sockaddr_in6 sin6; -#endif - struct sockaddr_dl sdl; - struct sockaddr_storage ss; - } su; - struct rtm - { - struct rt_msghdr hdr; - char buffer[sizeof(su) * 3]; - } rtm; - char *bp = rtm.buffer; - size_t l; - unsigned char *hwaddr; - size_t hwlen = 0; - int retval = 0; - - if ((s = socket(PF_ROUTE, SOCK_RAW, 0)) == -1) - return -1; - - memset(&rtm, 0, sizeof(rtm)); - rtm.hdr.rtm_version = RTM_VERSION; - rtm.hdr.rtm_seq = ++seq; - if (action == 0) - rtm.hdr.rtm_type = RTM_CHANGE; - else if (action > 0) - rtm.hdr.rtm_type = RTM_ADD; - else - rtm.hdr.rtm_type = RTM_DELETE; - rtm.hdr.rtm_flags = RTF_UP | RTF_STATIC; - if (netmask->s_addr == INADDR_BROADCAST) - rtm.hdr.rtm_flags |= RTF_HOST; - - /* This order is important */ - rtm.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY | RTA_NETMASK; - -#define ADDADDR(_addr) \ - memset (&su, 0, sizeof(su)); \ - su.sin.sin_family = AF_INET; \ - su.sin.sin_len = sizeof(su.sin); \ - memcpy (&su.sin.sin_addr, _addr, sizeof(su.sin.sin_addr)); \ - l = SA_SIZE (&(su.sa)); \ - memcpy (bp, &(su), l); \ - bp += l; - - ADDADDR(destination); - - if (gateway->s_addr == INADDR_ANY) { - /* Make us a link layer socket */ - hwaddr = xmalloc(sizeof(unsigned char) * HWADDR_LEN); - do_interface(ifname, hwaddr, &hwlen, NULL, 0, 0); - memset(&su, 0, sizeof(su)); - su.sdl.sdl_len = sizeof(su.sdl); - su.sdl.sdl_family = AF_LINK; - su.sdl.sdl_nlen = strlen(ifname); - memcpy(&su.sdl.sdl_data, ifname, (size_t)su.sdl.sdl_nlen); - su.sdl.sdl_alen = hwlen; - memcpy(((unsigned char *)&su.sdl.sdl_data) + su.sdl.sdl_nlen, - hwaddr, (size_t)su.sdl.sdl_alen); - - l = SA_SIZE(&(su.sa)); - memcpy(bp, &su, l); - bp += l; - free(hwaddr); - } else { - rtm.hdr.rtm_flags |= RTF_GATEWAY; - ADDADDR(gateway); - } - - ADDADDR(netmask); -#undef ADDADDR - - rtm.hdr.rtm_msglen = l = bp - (char *)&rtm; - if (write(s, &rtm, l) == -1) - retval = -1; - close(s); - return retval; -} diff --git a/dist/dhcpcd/logger.c b/dist/dhcpcd/logger.c deleted file mode 100644 index e9d3de467175..000000000000 --- a/dist/dhcpcd/logger.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include - -#include "common.h" -#include "logger.h" - -static int loglevel = LOG_WARNING; -static char logprefix[12] = {0}; - -struct logname { - int level; - const char *name; -}; -static const struct logname const lognames[] = { - { LOG_DEBUG, "debug" }, - { LOG_INFO, "info" }, - { LOG_WARNING, "warning" }, - { LOG_ERR, "error" }, - { -1, NULL } -}; - -int -logtolevel(const char *priority) -{ - const struct logname *lt; - - if (isdigit((unsigned char)*priority)) - return atoi(priority); - for (lt = lognames; lt->name; lt++) - if (!strcasecmp(priority, lt->name)) - return lt->level; - return -1; -} - -void -setloglevel(int level) -{ - loglevel = level; -} - -void -setlogprefix(const char *prefix) -{ - strlcpy(logprefix, prefix, sizeof(logprefix)); -} - -void -logger(int level, const char *fmt, ...) -{ - va_list p, p2; - FILE *f = stderr; - size_t len, fmt2len; - char *fmt2, *pf; - - va_start(p, fmt); - va_copy(p2, p); - - if (level <= LOG_ERR || level <= loglevel) { - fprintf(f, "%s", logprefix); - vfprintf(f, fmt, p); - fputc('\n', f); - - /* stdout, stderr may be re-directed to some kind of buffer. - * So we always flush to ensure it's written. */ - fflush(f); - } - - if (level < LOG_DEBUG || level <= loglevel) { - len = strlen(logprefix); - fmt2len = strlen(fmt) + len + 1; - fmt2 = pf = malloc(sizeof(char) * fmt2len); - if (fmt2) { - strlcpy(pf, logprefix, fmt2len); - pf += len; - strlcpy(pf, fmt, fmt2len - len); - vsyslog(level, fmt2, p2); - free(fmt2); - } else { - vsyslog(level, fmt, p2); - syslog(LOG_ERR, "logger: memory exhausted"); - exit(EXIT_FAILURE); - } - } - - va_end(p2); - va_end(p); -} diff --git a/dist/dhcpcd/logger.h b/dist/dhcpcd/logger.h deleted file mode 100644 index cde4864df69f..000000000000 --- a/dist/dhcpcd/logger.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef LOGGER_H -#define LOGGER_H - -#if defined(__GNUC__) -# define _PRINTF_LIKE(_one, _two) __attribute__ ((__format__ (__printf__, _one, _two))) -#else -# define _PRINTF_LIKE(_one, _two) -#endif - -#include - -int logtolevel(const char *); -void setloglevel(int); -void setlogprefix(const char *); -void logger(int, const char *, ...) _PRINTF_LIKE (2, 3); - -#endif diff --git a/dist/dhcpcd/net.c b/dist/dhcpcd/net.c deleted file mode 100644 index 2d5b0c4b9e12..000000000000 --- a/dist/dhcpcd/net.c +++ /dev/null @@ -1,800 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include - -#include -#include -#include -#include -#ifdef __linux__ -#include -#include -#endif -#include -#include -#define __FAVOR_BSD /* Nasty glibc hack so we can use BSD semantics for UDP */ -#include -#undef __FAVOR_BSD -#include -#ifdef AF_LINK -# include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "config.h" -#include "common.h" -#include "dhcp.h" -#include "logger.h" -#include "net.h" -#include "signals.h" - -int -inet_ntocidr(struct in_addr address) -{ - int cidr = 0; - uint32_t mask = htonl(address.s_addr); - - while (mask) { - cidr++; - mask <<= 1; - } - - return cidr; -} - -int -inet_cidrtoaddr (int cidr, struct in_addr *addr) -{ - int ocets; - - if (cidr < 0 || cidr > 32) { - errno = EINVAL; - return -1; - } - ocets = (cidr + 7) / 8; - - addr->s_addr = 0; - if (ocets > 0) { - memset(&addr->s_addr, 255, (size_t)ocets - 1); - memset((unsigned char *)&addr->s_addr + (ocets - 1), - (256 - (1 << (32 - cidr) % 8)), 1); - } - - return 0; -} - -uint32_t -get_netmask(uint32_t addr) -{ - uint32_t dst; - - if (addr == 0) - return 0; - - dst = htonl(addr); - if (IN_CLASSA(dst)) - return ntohl(IN_CLASSA_NET); - if (IN_CLASSB (dst)) - return ntohl(IN_CLASSB_NET); - if (IN_CLASSC (dst)) - return ntohl(IN_CLASSC_NET); - - return 0; -} - -char * -hwaddr_ntoa(const unsigned char *hwaddr, size_t hwlen) -{ - static char buffer[(HWADDR_LEN * 3) + 1]; - char *p = buffer; - size_t i; - - for (i = 0; i < hwlen && i < HWADDR_LEN; i++) { - if (i > 0) - *p ++= ':'; - p += snprintf(p, 3, "%.2x", hwaddr[i]); - } - - *p ++= '\0'; - - return buffer; -} - -size_t -hwaddr_aton(unsigned char *buffer, const char *addr) -{ - char c[3]; - const char *p = addr; - unsigned char *bp = buffer; - size_t len = 0; - - c[2] = '\0'; - while (*p) { - c[0] = *p++; - c[1] = *p++; - /* Ensure that next data is EOL or a seperator with data */ - if (!(*p == '\0' || (*p == ':' && *(p + 1) != '\0'))) { - errno = EINVAL; - return 0; - } - /* Ensure that digits are hex */ - if (isxdigit((unsigned char)c[0]) == 0 || - isxdigit((unsigned char)c[1]) == 0) - { - errno = EINVAL; - return 0; - } - p++; - if (bp) - *bp++ = (unsigned char)strtol(c, NULL, 16); - else - len++; - } - - if (bp) - return bp - buffer; - return len; -} - -int -do_interface(const char *ifname, - _unused unsigned char *hwaddr, _unused size_t *hwlen, - struct in_addr *addr, struct in_addr *net, int get) -{ - int s; - struct ifconf ifc; - int retval = 0; - int len = 10 * sizeof(struct ifreq); - int lastlen = 0; - char *p; - union { - char *buffer; - struct ifreq *ifr; - } ifreqs; - struct sockaddr_in address; - struct ifreq *ifr; - struct sockaddr_in netmask; - -#ifdef AF_LINK - struct sockaddr_dl sdl; -#endif - - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - return -1; - - /* Not all implementations return the needed buffer size for - * SIOGIFCONF so we loop like so for all until it works */ - memset(&ifc, 0, sizeof(ifc)); - for (;;) { - ifc.ifc_len = len; - ifc.ifc_buf = xmalloc((size_t)len); - if (ioctl(s, SIOCGIFCONF, &ifc) == -1) { - if (errno != EINVAL || lastlen != 0) { - close(s); - free(ifc.ifc_buf); - return -1; - } - } else { - if (ifc.ifc_len == lastlen) - break; - lastlen = ifc.ifc_len; - } - - free(ifc.ifc_buf); - ifc.ifc_buf = NULL; - len *= 2; - } - - for (p = (char *)ifc.ifc_buf; p < (char *)ifc.ifc_buf + ifc.ifc_len;) { - /* Cast the ifc buffer to an ifreq cleanly */ - ifreqs.buffer = p; - ifr = ifreqs.ifr; - -#ifndef __linux__ - if (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_ifru)) - p += offsetof(struct ifreq, ifr_ifru) + - ifr->ifr_addr.sa_len; - else -#endif - p += sizeof(*ifr); - - if (strcmp(ifname, ifr->ifr_name) != 0) - continue; - -#ifdef AF_LINK - if (hwaddr && hwlen && ifr->ifr_addr.sa_family == AF_LINK) { - memcpy(&sdl, &ifr->ifr_addr, sizeof(sdl)); - *hwlen = sdl.sdl_alen; - memcpy(hwaddr, sdl.sdl_data + sdl.sdl_nlen, - (size_t)sdl.sdl_alen); - retval = 1; - break; - } -#endif - - if (ifr->ifr_addr.sa_family == AF_INET) { - memcpy(&address, &ifr->ifr_addr, sizeof(address)); - if (ioctl(s, SIOCGIFNETMASK, ifr) == -1) - continue; - memcpy(&netmask, &ifr->ifr_addr, sizeof(netmask)); - if (get) { - addr->s_addr = address.sin_addr.s_addr; - net->s_addr = netmask.sin_addr.s_addr; - retval = 1; - break; - } else { - if (address.sin_addr.s_addr == addr->s_addr && - (!net || - netmask.sin_addr.s_addr == net->s_addr)) - { - retval = 1; - break; - } - } - } - - } - - close(s); - free(ifc.ifc_buf); - return retval; -} - -struct interface * -read_interface(const char *ifname, _unused int metric) -{ - int s; - struct ifreq ifr; - struct interface *iface = NULL; - unsigned char *hwaddr = NULL; - size_t hwlen = 0; - sa_family_t family = 0; -#ifdef __linux__ - char *p; -#endif - - memset(&ifr, 0, sizeof(ifr)); - strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - return NULL; - -#ifdef __linux__ - strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(s, SIOCGIFHWADDR, &ifr) == -1) - goto eexit; - - switch (ifr.ifr_hwaddr.sa_family) { - case ARPHRD_ETHER: - case ARPHRD_IEEE802: - hwlen = ETHER_ADDR_LEN; - break; - case ARPHRD_IEEE1394: - hwlen = EUI64_ADDR_LEN; - case ARPHRD_INFINIBAND: - hwlen = INFINIBAND_ADDR_LEN; - break; - } - - hwaddr = xmalloc(sizeof(unsigned char) * HWADDR_LEN); - memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, hwlen); - family = ifr.ifr_hwaddr.sa_family; -#else - ifr.ifr_metric = metric; - strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(s, SIOCSIFMETRIC, &ifr) == -1) - goto eexit; - - hwaddr = xmalloc(sizeof(unsigned char) * HWADDR_LEN); - if (do_interface(ifname, hwaddr, &hwlen, NULL, NULL, 0) != 1) - goto eexit; - - family = ARPHRD_ETHER; -#endif - - strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(s, SIOCGIFMTU, &ifr) == -1) - goto eexit; - - /* Ensure that the MTU is big enough for DHCP */ - if (ifr.ifr_mtu < MTU_MIN) { - ifr.ifr_mtu = MTU_MIN; - strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(s, SIOCSIFMTU, &ifr) == -1) - goto eexit; - } - - strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); -#ifdef __linux__ - /* We can only bring the real interface up */ - if ((p = strchr(ifr.ifr_name, ':'))) - *p = '\0'; -#endif - if (ioctl(s, SIOCGIFFLAGS, &ifr) == -1) - goto eexit; - - if (!(ifr.ifr_flags & IFF_UP) || !(ifr.ifr_flags & IFF_RUNNING)) { - ifr.ifr_flags |= IFF_UP | IFF_RUNNING; - if (ioctl(s, SIOCSIFFLAGS, &ifr) != 0) - goto eexit; - } - - iface = xzalloc(sizeof(*iface)); - strlcpy(iface->name, ifname, IF_NAMESIZE); - snprintf(iface->leasefile, PATH_MAX, LEASEFILE, ifname); - memcpy(&iface->hwaddr, hwaddr, hwlen); - iface->hwlen = hwlen; - - iface->family = family; - iface->arpable = !(ifr.ifr_flags & (IFF_NOARP | IFF_LOOPBACK)); - - /* 0 is a valid fd, so init to -1 */ - iface->fd = -1; - iface->udp_fd = -1; - -eexit: - close(s); - free(hwaddr); - return iface; -} - -int -do_mtu(const char *ifname, short int mtu) -{ - struct ifreq ifr; - int r; - int s; - - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - return -1; - - memset(&ifr, 0, sizeof(ifr)); - strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - ifr.ifr_mtu = mtu; - r = ioctl(s, mtu ? SIOCSIFMTU : SIOCGIFMTU, &ifr); - close(s); - if (r == -1) - return -1; - return ifr.ifr_mtu; -} - -void -free_routes(struct rt *routes) -{ - struct rt *r; - - while (routes) { - r = routes->next; - free(routes); - routes = r; - } -} - -int -open_udp_socket(struct interface *iface) -{ - int s; - union sockunion { - struct sockaddr sa; - struct sockaddr_in sin; - } su; - int n = 1; - - if ((s = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) - return -1; - - memset(&su, 0, sizeof(su)); - su.sin.sin_family = AF_INET; - su.sin.sin_port = htons(DHCP_CLIENT_PORT); - su.sin.sin_addr.s_addr = iface->addr.s_addr; - if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &n, sizeof(n)) == -1) - goto eexit; - /* As we don't actually use this socket for anything, set - * the receiver buffer to 1 */ - if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, &n, sizeof(n)) == -1) - goto eexit; - if (bind(s, &su.sa, sizeof(su)) == -1) - goto eexit; - - iface->udp_fd = s; - close_on_exec(s); - return 0; - -eexit: - close(s); - return -1; -} - -ssize_t -send_packet(const struct interface *iface, struct in_addr to, - const uint8_t *data, ssize_t len) -{ - union sockunion { - struct sockaddr sa; - struct sockaddr_in sin; - } su; - - memset(&su, 0, sizeof(su)); - su.sin.sin_family = AF_INET; - su.sin.sin_addr.s_addr = to.s_addr; - su.sin.sin_port = htons(DHCP_SERVER_PORT); - - return sendto(iface->udp_fd, data, len, 0, &su.sa, sizeof(su)); -} - -struct udp_dhcp_packet -{ - struct ip ip; - struct udphdr udp; - struct dhcp_message dhcp; -}; - -static uint16_t -checksum(const void *data, uint16_t len) -{ - const uint8_t *addr = data; - uint32_t sum = 0; - - while (len > 1) { - sum += addr[0] * 256 + addr[1]; - addr += 2; - len -= 2; - } - - if (len == 1) - sum += *addr * 256; - - sum = (sum >> 16) + (sum & 0xffff); - sum += (sum >> 16); - - sum = htons(sum); - - return ~sum; -} - -ssize_t -make_udp_packet(uint8_t **packet, const uint8_t *data, size_t length, - struct in_addr source, struct in_addr dest) -{ - struct udp_dhcp_packet *udpp; - struct ip *ip; - struct udphdr *udp; - - udpp = xzalloc(sizeof(*udpp)); - ip = &udpp->ip; - udp = &udpp->udp; - - /* OK, this is important :) - * We copy the data to our packet and then create a small part of the - * ip structure and an invalid ip_len (basically udp length). - * We then fill the udp structure and put the checksum - * of the whole packet into the udp checksum. - * Finally we complete the ip structure and ip checksum. - * If we don't do the ordering like so then the udp checksum will be - * broken, so find another way of doing it! */ - - memcpy(&udpp->dhcp, data, length); - - ip->ip_p = IPPROTO_UDP; - ip->ip_src.s_addr = source.s_addr; - if (dest.s_addr == 0) - ip->ip_dst.s_addr = INADDR_BROADCAST; - else - ip->ip_dst.s_addr = dest.s_addr; - - udp->uh_sport = htons(DHCP_CLIENT_PORT); - udp->uh_dport = htons(DHCP_SERVER_PORT); - udp->uh_ulen = htons(sizeof(*udp) + length); - ip->ip_len = udp->uh_ulen; - udp->uh_sum = checksum(udpp, sizeof(*udpp)); - - ip->ip_v = IPVERSION; - ip->ip_hl = 5; - ip->ip_id = 0; - ip->ip_tos = IPTOS_LOWDELAY; - ip->ip_len = htons (sizeof(*ip) + sizeof(*udp) + length); - ip->ip_id = 0; - ip->ip_off = htons(IP_DF); /* Don't fragment */ - ip->ip_ttl = IPDEFTTL; - - ip->ip_sum = checksum(ip, sizeof(*ip)); - - *packet = (uint8_t *)udpp; - return sizeof(*ip) + sizeof(*udp) + length; -} - -ssize_t -get_udp_data(const uint8_t **data, const uint8_t *udp) -{ - struct udp_dhcp_packet packet; - - memcpy(&packet, udp, sizeof(packet)); - *data = udp + offsetof(struct udp_dhcp_packet, dhcp); - return ntohs(packet.ip.ip_len) - sizeof(packet.ip) - sizeof(packet.udp); -} - -int -valid_udp_packet(const uint8_t *data) -{ - struct udp_dhcp_packet packet; - uint16_t bytes; - uint16_t ipsum; - uint16_t iplen; - uint16_t udpsum; - struct in_addr source; - struct in_addr dest; - int retval = 0; - - memcpy(&packet, data, sizeof(packet)); - bytes = ntohs(packet.ip.ip_len); - ipsum = packet.ip.ip_sum; - iplen = packet.ip.ip_len; - udpsum = packet.udp.uh_sum; - - if (0 != checksum(&packet.ip, sizeof(packet.ip))) { - errno = EINVAL; - return -1; - } - - packet.ip.ip_sum = 0; - memcpy(&source, &packet.ip.ip_src, sizeof(packet.ip.ip_src)); - memcpy(&dest, &packet.ip.ip_dst, sizeof(packet.ip.ip_dst)); - memset(&packet.ip, 0, sizeof(packet.ip)); - packet.udp.uh_sum = 0; - - packet.ip.ip_p = IPPROTO_UDP; - memcpy(&packet.ip.ip_src, &source, sizeof(packet.ip.ip_src)); - memcpy(&packet.ip.ip_dst, &dest, sizeof(packet.ip.ip_dst)); - packet.ip.ip_len = packet.udp.uh_ulen; - if (udpsum && udpsum != checksum(&packet, bytes)) { - errno = EINVAL; - retval = -1; - } - - return retval; -} - -#ifdef ENABLE_ARP -/* These are really for IPV4LL */ -#define NPROBES 3 -#define PROBE_INTERVAL 200 -#define NCLAIMS 2 -#define CLAIM_INTERVAL 200 - -static int -send_arp(const struct interface *iface, int op, struct in_addr sip, - const unsigned char *taddr, struct in_addr tip) -{ - struct arphdr *arp; - size_t arpsize; - unsigned char *p; - int retval; - - arpsize = sizeof(*arp) + 2 * iface->hwlen + 2 *sizeof(sip); - - arp = xzalloc(arpsize); - arp->ar_hrd = htons(iface->family); - arp->ar_pro = htons(ETHERTYPE_IP); - arp->ar_hln = iface->hwlen; - arp->ar_pln = sizeof(sip); - arp->ar_op = htons(op); - p = (unsigned char *)arp; - p += sizeof(*arp); - memcpy(p, iface->hwaddr, iface->hwlen); - p += iface->hwlen; - memcpy(p, &sip, sizeof(sip)); - p += sizeof(sip); - - if (taddr != NULL) - memcpy(p, taddr, iface->hwlen); - else - memset(p, 0, iface->hwlen); - p += iface->hwlen; - memcpy(p, &tip, sizeof(tip)); - - retval = send_raw_packet(iface, ETHERTYPE_ARP, arp, arpsize); - if (retval == -1) - logger(LOG_ERR,"send_packet: %s", strerror(errno)); - free(arp); - return retval; -} - -int -arp_claim(struct interface *iface, struct in_addr address) -{ - struct arphdr reply; - uint8_t arp_reply[sizeof(reply) + 2 * 4 /* IPv4 */ + 2 * 8 /* EUI64 */]; - struct in_addr reply_ipv4; - struct ether_addr reply_mac; - long timeout = 0; - int retval = -1; - int nprobes = 0; - int nclaims = 0; - struct in_addr null_address; - struct pollfd fds[] = { - { -1, POLLIN, 0 }, - { -1, POLLIN, 0 } - }; - int bytes; - int s = 0; - struct timeval stopat; - struct timeval now; - - if (!iface->arpable) { - logger(LOG_DEBUG, "interface `%s' is not ARPable", iface->name); - return 0; - } - - if (!IN_LINKLOCAL(ntohl(iface->addr.s_addr)) && - !IN_LINKLOCAL(ntohl(address.s_addr))) - logger(LOG_INFO, - "checking %s is available on attached networks", - inet_ntoa(address)); - - if (!open_socket(iface, ETHERTYPE_ARP)) { - logger (LOG_ERR, "open_socket: %s", strerror(errno)); - return -1; - } - - fds[0].fd = signal_fd(); - fds[1].fd = iface->fd; - memset(&null_address, 0, sizeof(null_address)); - - for (;;) { - s = 0; - - /* Only poll if we have a timeout */ - if (timeout > 0) { - s = poll(fds, 2, timeout); - if (s == -1) { - if (errno == EINTR) { - if (signal_exists(NULL) == -1) { - errno = 0; - continue; - } else - break; - } - - logger(LOG_ERR, "poll: `%s'", strerror(errno)); - break; - } - } - - /* Timed out */ - if (s == 0) { - if (nprobes < NPROBES) { - nprobes ++; - timeout = PROBE_INTERVAL; - logger(LOG_DEBUG, "sending ARP probe #%d", - nprobes); - if (send_arp(iface, ARPOP_REQUEST, - null_address, NULL, - address) == -1) - break; - - /* IEEE1394 cannot set ARP target address - * according to RFC2734 */ - if (nprobes >= NPROBES && - iface->family == ARPHRD_IEEE1394) - nclaims = NCLAIMS; - } else if (nclaims < NCLAIMS) { - nclaims ++; - timeout = CLAIM_INTERVAL; - logger(LOG_DEBUG, "sending ARP claim #%d", - nclaims); - if (send_arp(iface, ARPOP_REQUEST, - address, iface->hwaddr, - address) == -1) - break; - } else { - /* No replies, so done */ - retval = 0; - break; - } - - /* Setup our stop time */ - if (get_time(&stopat) != 0) - break; - stopat.tv_usec += timeout; - continue; - } - - /* We maybe ARP flooded, so check our time */ - if (get_time(&now) != 0) - break; - if (timercmp(&now, &stopat, >)) { - timeout = 0; - continue; - } - - if (!(fds[1].revents & POLLIN)) - continue; - for(;;) { - memset(arp_reply, 0, sizeof(arp_reply)); - bytes = get_packet(iface, - arp_reply, sizeof(arp_reply)); - if (bytes == -1 || bytes == 0) - break; - - memcpy(&reply, arp_reply, sizeof(reply)); - /* Only these types are recognised */ - if (reply.ar_op != htons(ARPOP_REPLY)) - continue; - /* Protocol must be IP. */ - if (reply.ar_pro != htons(ETHERTYPE_IP)) - continue; - if (reply.ar_pln != sizeof(reply_ipv4)) - continue; - if ((size_t)bytes < sizeof(reply) + 2 * - (4 + reply.ar_hln) || - reply.ar_hln > 8) - continue; - - memcpy(&reply_mac, - arp_reply + sizeof(reply), reply.ar_hln); - memcpy(&reply_ipv4, - arp_reply + sizeof(reply) + reply.ar_hln, - reply.ar_hln); - - /* Ensure the ARP reply is for the our address */ - if (reply_ipv4.s_addr != address.s_addr) - continue; - - /* Some systems send a reply back from our hwaddress, - * which is wierd */ - if (reply.ar_hln == iface->hwlen && - memcmp(&reply_mac, iface->hwaddr, - iface->hwlen) == 0) - continue; - - logger(LOG_ERR, "ARPOP_REPLY received from %s (%s)", - inet_ntoa(reply_ipv4), - hwaddr_ntoa((unsigned char *)&reply_mac, - (size_t)reply.ar_hln)); - retval = -1; - goto eexit; - } - } - -eexit: - close(iface->fd); - iface->fd = -1; - return retval; -} -#endif diff --git a/dist/dhcpcd/net.h b/dist/dhcpcd/net.h deleted file mode 100644 index d821fdbd6367..000000000000 --- a/dist/dhcpcd/net.h +++ /dev/null @@ -1,176 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef INTERFACE_H -#define INTERFACE_H - -#include -#include -#include - -#include -#include -#include - -#include - -#include "config.h" - -#ifdef ENABLE_DUID -#ifndef DUID_LEN -# define DUID_LEN 128 + 2 -#endif -#endif - -#define EUI64_ADDR_LEN 8 -#define INFINIBAND_ADDR_LEN 20 - -/* Linux 2.4 doesn't define this */ -#ifndef ARPHRD_IEEE1394 -# define ARPHRD_IEEE1394 24 -#endif - -/* The BSD's don't define this yet */ -#ifndef ARPHRD_INFINIBAND -# define ARPHRD_INFINIBAND 32 -#endif - -#define HWADDR_LEN 20 - -/* Work out if we have a private address or not - * 10/8 - * 172.16/12 - * 192.168/16 - */ -#ifndef IN_PRIVATE -# define IN_PRIVATE(addr) (((addr & IN_CLASSA_NET) == 0x0a000000) || \ - ((addr & 0xfff00000) == 0xac100000) || \ - ((addr & IN_CLASSB_NET) == 0xc0a80000)) -#endif - -#define LINKLOCAL_ADDR 0xa9fe0000 -#define LINKLOCAL_MASK 0xffff0000 -#define LINKLOCAL_BRDC 0xa9feffff - -#ifndef IN_LINKLOCAL -# define IN_LINKLOCAL(addr) ((addr & IN_CLASSB_NET) == LINKLOCAL_ADDR) -#endif - -/* There is an argument that this should be converted to an STAIL using - * queue(3). However, that isn't readily available on all libc's that - * dhcpcd works on. The only benefit of STAILQ over this is the ability to - * quickly loop backwards through the list - currently we reverse the list - * and then move through it forwards. This isn't that much of a big deal - * though as the norm is to just have one default route, and an IPV4LL route. - * You can (and do) get more routes in the DHCP message, but not enough to - * really warrant a change to STAIL queue for performance reasons. */ -struct rt { - struct in_addr dest; - struct in_addr net; - struct in_addr gate; - struct rt *next; -}; - -struct interface -{ - char name[IF_NAMESIZE]; - sa_family_t family; - unsigned char hwaddr[HWADDR_LEN]; - size_t hwlen; - int arpable; - - int fd; - int udp_fd; - size_t buffer_size, buffer_len, buffer_pos; - unsigned char *buffer; - -#ifdef __linux__ - int socket_protocol; -#endif - - char leasefile[PATH_MAX]; - - struct in_addr addr; - struct in_addr net; - struct rt *routes; - - time_t start_uptime; - - unsigned char *clientid; - size_t clientid_len; -}; - -uint32_t get_netmask(uint32_t); -char *hwaddr_ntoa(const unsigned char *, size_t); -size_t hwaddr_aton(unsigned char *, const char *); - -struct interface *read_interface(const char *, int); -int do_mtu(const char *, short int); -#define get_mtu(iface) do_mtu(iface, 0) -#define set_mtu(iface, mtu) do_mtu(iface, mtu) - -int inet_ntocidr(struct in_addr); -int inet_cidrtoaddr(int, struct in_addr *); - -int do_interface(const char *, unsigned char *, size_t *, - struct in_addr *, struct in_addr *, int); -int if_address(const char *, const struct in_addr *, const struct in_addr *, - const struct in_addr *, int); -#define add_address(ifname, addr, net, brd) \ - if_address(ifname, addr, net, brd, 1) -#define del_address(ifname, addr, net) \ - if_address(ifname, addr, net, NULL, -1) -#define has_address(ifname, addr, net) \ - do_interface(ifname, NULL, NULL, addr, net, 0) -#define get_address(ifname, addr, net) \ - do_interface(ifname, NULL, NULL, addr, net, 1) - -int if_route(const char *, const struct in_addr *, const struct in_addr *, - const struct in_addr *, int, int); -#define add_route(ifname, dest, mask, gate, metric) \ - if_route(ifname, dest, mask, gate, metric, 1) -#define del_route(ifname, dest, mask, gate, metric) \ - if_route(ifname, dest, mask, gate, metric, -1) -void free_routes(struct rt *); - -int open_udp_socket(struct interface *); -ssize_t make_udp_packet(uint8_t **, const uint8_t *, size_t, - struct in_addr, struct in_addr); -ssize_t get_udp_data(const uint8_t **, const uint8_t *); -int valid_udp_packet(const uint8_t *); - -int open_socket(struct interface *, int); -ssize_t send_packet(const struct interface *, struct in_addr, - const uint8_t *, ssize_t); -ssize_t send_raw_packet(const struct interface *, int, - const void *, ssize_t); -ssize_t get_packet(struct interface *, void *, ssize_t); - -#ifdef ENABLE_ARP -int arp_claim(struct interface *, struct in_addr); -#endif -#endif diff --git a/dist/dhcpcd/signals.c b/dist/dhcpcd/signals.c deleted file mode 100644 index d0d27aa756db..000000000000 --- a/dist/dhcpcd/signals.c +++ /dev/null @@ -1,170 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include - -#include -#include -#include -#include -#include - -#include "common.h" -#include "signals.h" - -static int signal_pipe[2]; -static int signals[5]; - -static const int handle_sigs[] = { - SIGHUP, - SIGALRM, - SIGTERM, - SIGINT -}; - -static void -signal_handler(int sig) -{ - unsigned int i = 0; - int serrno = errno; - - /* Add a signal to our stack */ - while (signals[i]) - i++; - if (i <= sizeof(signals) / sizeof(signals[0])) - signals[i] = sig; - - write(signal_pipe[1], &sig, sizeof(sig)); - - /* Restore errno */ - errno = serrno; -} - -int -signal_fd(void) -{ - return (signal_pipe[0]); -} - -/* Check if we have a signal or not */ -int -signal_exists(const struct pollfd *fd) -{ - if (signals[0] || (fd && fd->revents & POLLIN)) - return 0; - return -1; -} - -/* Read a signal from the signal pipe. Returns 0 if there is - * no signal, -1 on error (and sets errno appropriately), and - * your signal on success */ -int -signal_read(struct pollfd *fd) -{ - int sig = -1; - unsigned int i = 0; - char buf[16]; - size_t bytes; - - /* Pop a signal off the our stack */ - if (signals[0]) { - sig = signals[0]; - while (i < (sizeof(signals) / sizeof(signals[0])) - 1) { - signals[i] = signals[i + 1]; - if (!signals[++i]) - break; - } - } - - if (fd && fd->revents & POLLIN) { - memset(buf, 0, sizeof(buf)); - bytes = read(signal_pipe[0], buf, sizeof(buf)); - - if (bytes >= sizeof(sig)) - memcpy(&sig, buf, sizeof(sig)); - - /* We need to clear us from rset if nothing left in the buffer - * in case we are called many times */ - if (bytes == sizeof(sig)) - fd->revents = 0; - } - - return sig; -} - -/* Call this before doing anything else. Sets up the socket pair - * and installs the signal handler */ -int -signal_init(void) -{ - if (pipe(signal_pipe) == -1) - return -1; - - /* Stop any scripts from inheriting us */ - close_on_exec(signal_pipe[0]); - close_on_exec(signal_pipe[1]); - - memset(signals, 0, sizeof(signals)); - return 0; -} - -static int -signal_handle(void (*func)(int), int restore) -{ - unsigned int i; - struct sigaction sa, sa_old; - - memset(&sa, 0, sizeof(sa)); - sa.sa_handler = func; - sigemptyset(&sa.sa_mask); - - for (i = 0; i < sizeof(handle_sigs) / sizeof(handle_sigs[0]); i++) - if (sigaction(handle_sigs[i], &sa, &sa_old) == -1) - return -1; - if (restore && sigaction(handle_sigs[i], &sa_old, NULL) == -1) - return -1; - return 0; -} - -int -signal_setup(void) -{ - return signal_handle(signal_handler, 0); -} - -int -signal_reset(void) -{ - return signal_handle(SIG_DFL, 0); -} - -int -signal_clear(void) -{ - return signal_handle(SIG_IGN, 1); -} diff --git a/dist/dhcpcd/signals.h b/dist/dhcpcd/signals.h deleted file mode 100644 index 6101b7280e85..000000000000 --- a/dist/dhcpcd/signals.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright 2006-2008 Roy Marples - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef SIGNAL_H -#define SIGNAL_H - -#include - -int signal_init(void); -int signal_setup(void); -int signal_reset(void); -int signal_clear(void); -int signal_fd(void); -int signal_exists(const struct pollfd *); -int signal_read(struct pollfd *); - -#endif diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index aac07e05e0a8..bbc15419df8d 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.758 2008/07/22 21:07:59 dyoung Exp $ +# $NetBSD: mi,v 1.759 2008/07/27 19:31:02 joerg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -134,9 +134,13 @@ ./libexec base-sys-root ./libexec/dhcpcd-hooks base-dhcpcd-root ./libexec/dhcpcd-hooks/01-test base-dhcpcd-root -./libexec/dhcpcd-hooks/10-resolv.conf base-dhcpcd-root -./libexec/dhcpcd-hooks/14-lookup-hostname base-dhcpcd-root -./libexec/dhcpcd-hooks/15-hostname base-dhcpcd-root +./libexec/dhcpcd-hooks/10-mtu base-dhcpcd-root +./libexec/dhcpcd-hooks/10-resolv.conf base-obsolete obsolete +./libexec/dhcpcd-hooks/14-lookup-hostname base-obsolete obsolete +./libexec/dhcpcd-hooks/15-hostname base-obsolete obsolete +./libexec/dhcpcd-hooks/20-resolv.conf base-dhcpcd-root +./libexec/dhcpcd-hooks/29-lookup-hostname base-dhcpcd-root +./libexec/dhcpcd-hooks/30-hostname base-dhcpcd-root ./libexec/dhcpcd-hooks/50-ntp.conf base-dhcpcd-root ./libexec/dhcpcd-run-hooks base-dhcpcd-root ./libexec/lfs_cleanerd base-sysutil-bin diff --git a/etc/Makefile b/etc/Makefile index 5e1841681c55..3263f34e2386 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.356 2008/07/23 01:57:19 dyoung Exp $ +# $NetBSD: Makefile,v 1.357 2008/07/27 19:31:03 joerg Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -336,7 +336,7 @@ install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV .for subdir in . atf defaults bluetooth iscsi mtree namedb pam.d powerd rc.d root skel ssh ${MAKEDIRTARGET} ${subdir} configinstall .endfor - ${MAKEDIRTARGET} ${NETBSDSRCDIR}/sbin/dhcpcd configinstall + ${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/bsd/dhcpcd/sbin/dhcpcd configinstall ${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.bin/mail configinstall .if (${MKPF} != "no") ${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.sbin/pf configinstall diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index adfc4e959062..77d3e2259db6 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf,v 1.94 2008/06/20 15:21:56 yamt Exp $ +# $NetBSD: rc.conf,v 1.95 2008/07/27 19:31:03 joerg Exp $ # # /etc/defaults/rc.conf -- # default configuration of /etc/rc.conf @@ -153,7 +153,7 @@ racoon=NO # IKE daemon auto_ifconfig=YES # config all avail. interfaces net_interfaces="" # used only if above is NO flushroutes=YES # flush routes in netstart -dhcpcd_flags="" # For ifconfig_XXX=dhcp. +dhcpcd_flags="-q" # For ifconfig_XXX=dhcp. dhclient=NO # behave as a DHCP client dhclient_flags="" # blank: config all interfaces ntpdate=NO ntpdate_flags="-b -s" # May need '-u' thru firewall diff --git a/external/bsd/Makefile b/external/bsd/Makefile index f3ef21a6362e..9d6acd96243d 100644 --- a/external/bsd/Makefile +++ b/external/bsd/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2008/07/16 00:41:50 christos Exp $ +# $NetBSD: Makefile,v 1.3 2008/07/27 19:31:03 joerg Exp $ .include +SUBDIR+= dhcpcd .if (${MKLDAP} != "no") SUBDIR+= openldap .endif diff --git a/external/bsd/dhcpcd/Makefile b/external/bsd/dhcpcd/Makefile new file mode 100644 index 000000000000..ad80ac02c242 --- /dev/null +++ b/external/bsd/dhcpcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2008/07/27 19:31:03 joerg Exp $ + +SUBDIR= sbin + +.include diff --git a/external/bsd/dhcpcd/sbin/Makefile b/external/bsd/dhcpcd/sbin/Makefile new file mode 100644 index 000000000000..ea69ff07a58e --- /dev/null +++ b/external/bsd/dhcpcd/sbin/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2008/07/27 19:31:03 joerg Exp $ + +SUBDIR= dhcpcd + +.include diff --git a/external/bsd/dhcpcd/sbin/Makefile.inc b/external/bsd/dhcpcd/sbin/Makefile.inc new file mode 100644 index 000000000000..47c530845490 --- /dev/null +++ b/external/bsd/dhcpcd/sbin/Makefile.inc @@ -0,0 +1,11 @@ +# $NetBSD: Makefile.inc,v 1.1 2008/07/27 19:31:03 joerg Exp $ + +.include + +WARNS?= 3 +BINDIR= /sbin + +.if (${MKDYNAMICROOT} == "no") +LDSTATIC?= -static +.endif + diff --git a/sbin/dhcpcd/Makefile b/external/bsd/dhcpcd/sbin/dhcpcd/Makefile similarity index 76% rename from sbin/dhcpcd/Makefile rename to external/bsd/dhcpcd/sbin/dhcpcd/Makefile index 3d27f590248c..225a9e2d826f 100644 --- a/sbin/dhcpcd/Makefile +++ b/external/bsd/dhcpcd/sbin/dhcpcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/05/26 20:17:00 joerg Exp $ +# $NetBSD: Makefile,v 1.1 2008/07/27 19:31:03 joerg Exp $ # PROG= dhcpcd @@ -7,7 +7,7 @@ SRCS= bpf.c client.c common.c configure.c dhcp.c dhcpcd.c \ .include -DIST= ${NETBSDSRCDIR}/dist/dhcpcd +DIST= ${NETBSDSRCDIR}/external/bsd/dhcpcd/dist .PATH: ${DIST} CPPFLAGS+= -I${DIST} @@ -18,10 +18,10 @@ SCRIPTSDIR_dhcpcd-run-hooks= /libexec CONFIGFILES= dhcpcd.conf FILESDIR_dhcpcd.conf= /etc -HOOKS= 01-test 10-resolv.conf 14-lookup-hostname \ - 15-hostname 50-ntp.conf +HOOKS= 01-test 10-mtu 20-resolv.conf 29-lookup-hostname \ + 30-hostname 50-ntp.conf -FILES= ${HOOKS:C,^,${DIST}/hook.d/,} +FILES= ${HOOKS:C,^,${DIST}/dhcpcd-hooks/,} FILESDIR= /libexec/dhcpcd-hooks MAN= dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8 diff --git a/sbin/Makefile b/sbin/Makefile index b800bf3e75b4..bd3c67e1638f 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2008/05/24 19:39:31 joerg Exp $ +# $NetBSD: Makefile,v 1.112 2008/07/27 19:31:03 joerg Exp $ # @(#)Makefile 8.5 (Berkeley) 3/31/94 # Not ported: XNSrouted enpload scsiformat startslip @@ -7,7 +7,7 @@ .include SUBDIR= amrctl apmlabel atactl badsect bioctl brconfig ccdconfig \ - dhcpcd disklabel dkctl dkscan_bsdlabel dmesg \ + disklabel dkctl dkscan_bsdlabel dmesg \ drvctl edlabel fastboot fdisk fsck fsirand gpt ifconfig init ldconfig \ mbrlabel mknod modload modunload mount newbtconf nologin \ pdisk ping pppoectl raidctl reboot rcorder rndctl route routed \