From e86eee143ed21592f88a46623a81f71002430459 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Mon, 24 Jan 2011 16:27:51 -0800 Subject: dhcpcd: Update to Version 5.2.10 Change-Id: I949331c7aad91b125decd51da4041983d3a352bc Signed-off-by: Dmitry Shmidt --- config.h | 84 ++++++++++------------------------------------------------------ 1 file changed, 13 insertions(+), 71 deletions(-) (limited to 'config.h') diff --git a/config.h b/config.h index 595fb94..47c795b 100644 --- a/config.h +++ b/config.h @@ -1,75 +1,17 @@ -/* - * 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. - */ +/* linux */ +#define SYSCONFDIR "/system/etc/dhcpcd" +#define SBINDIR "/system/etc/dhcpcd" +#define LIBEXECDIR "/system/etc/dhcpcd" +#define DBDIR "/data/misc/dhcp" +#define RUNDIR "/data/misc/dhcp" +#include "compat/arc4random.h" +#include "compat/closefrom.h" +#include "compat/strlcpy.h" -#ifndef CONFIG_H -#define CONFIG_H - -#define PACKAGE "dhcpcd" -#define VERSION "4.0.15" - -/* - * 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 IPV4LL_ALWAYSROUTE - -/* Some systems do not have a working fork. */ -/* #define THERE_IS_NO_FORK */ - -/* Paths to things */ -#ifndef SYSCONFDIR -# define SYSCONFDIR "/system/etc/dhcpcd" -#endif -#ifndef LIBEXECDIR -# define LIBEXECDIR "/system/etc/dhcpcd" -#endif -#ifndef RUNDIR -# define RUNDIR "/data/misc/dhcp" -#endif -#ifndef DBDIR -# define DBDIR "/data/misc/dhcp" -#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" +#ifndef MAX +#define MAX(a,b) ((a) >= (b) ? (a) : (b)) #endif +#ifndef MIN +#define MIN(a,b) ((a) <= (b) ? (a) : (b)) #endif -- cgit v1.2.3