Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mpl/dhcp/dist Merge conflicts between dhcp-4.4.2P1 ...
details: https://anonhg.NetBSD.org/src/rev/5da084027a04
branches: trunk
changeset: 364655:5da084027a04
user: christos <christos%NetBSD.org@localhost>
date: Sun Apr 03 01:10:57 2022 +0000
description:
Merge conflicts between dhcp-4.4.2P1 and dhcp-4.4.3
diffstat:
external/mpl/dhcp/dist/client/client_tables.c | 10 +-
external/mpl/dhcp/dist/client/clparse.c | 32 +-
external/mpl/dhcp/dist/client/dhc6.c | 10 +-
external/mpl/dhcp/dist/client/dhclient-script.8 | 16 +-
external/mpl/dhcp/dist/client/dhclient.8 | 8 +-
external/mpl/dhcp/dist/client/dhclient.c | 217 +-
external/mpl/dhcp/dist/client/dhclient.conf.5 | 18 +-
external/mpl/dhcp/dist/client/dhclient.leases.5 | 8 +-
external/mpl/dhcp/dist/client/tests/duid_unittest.c | 10 +-
external/mpl/dhcp/dist/common/alloc.c | 10 +-
external/mpl/dhcp/dist/common/bpf.c | 16 +-
external/mpl/dhcp/dist/common/comapi.c | 25 +-
external/mpl/dhcp/dist/common/conflex.c | 83 +-
external/mpl/dhcp/dist/common/ctrace.c | 20 +-
external/mpl/dhcp/dist/common/dhcp-eval.5 | 14 +-
external/mpl/dhcp/dist/common/dhcp-options.5 | 18 +-
external/mpl/dhcp/dist/common/dhcp4o6.c | 10 +-
external/mpl/dhcp/dist/common/discover.c | 96 +-
external/mpl/dhcp/dist/common/dispatch.c | 16 +-
external/mpl/dhcp/dist/common/dlpi.c | 176 +-
external/mpl/dhcp/dist/common/dns.c | 10 +-
external/mpl/dhcp/dist/common/ethernet.c | 10 +-
external/mpl/dhcp/dist/common/execute.c | 22 +-
external/mpl/dhcp/dist/common/fddi.c | 12 +-
external/mpl/dhcp/dist/common/icmp.c | 12 +-
external/mpl/dhcp/dist/common/inet.c | 68 +-
external/mpl/dhcp/dist/common/lpf.c | 14 +-
external/mpl/dhcp/dist/common/memory.c | 10 +-
external/mpl/dhcp/dist/common/nit.c | 10 +-
external/mpl/dhcp/dist/common/ns_name.c | 14 +-
external/mpl/dhcp/dist/common/options.c | 12 +-
external/mpl/dhcp/dist/common/packet.c | 22 +-
external/mpl/dhcp/dist/common/parse.c | 124 +-
external/mpl/dhcp/dist/common/print.c | 10 +-
external/mpl/dhcp/dist/common/raw.c | 10 +-
external/mpl/dhcp/dist/common/resolv.c | 12 +-
external/mpl/dhcp/dist/common/socket.c | 108 +-
external/mpl/dhcp/dist/common/tables.c | 15 +-
external/mpl/dhcp/dist/common/tests/option_unittest.c | 6 +-
external/mpl/dhcp/dist/common/tr.c | 18 +-
external/mpl/dhcp/dist/common/tree.c | 78 +-
external/mpl/dhcp/dist/common/upf.c | 12 +-
external/mpl/dhcp/dist/dhcpctl/callback.c | 15 +-
external/mpl/dhcp/dist/dhcpctl/cltest.c | 10 +-
external/mpl/dhcp/dist/dhcpctl/cltest2.c | 4 +-
external/mpl/dhcp/dist/dhcpctl/dhcpctl.3 | 172 +-
external/mpl/dhcp/dist/dhcpctl/dhcpctl.c | 225 ++-
external/mpl/dhcp/dist/dhcpctl/dhcpctl.h | 24 +-
external/mpl/dhcp/dist/dhcpctl/omshell.1 | 11 +-
external/mpl/dhcp/dist/dhcpctl/omshell.c | 107 +-
external/mpl/dhcp/dist/dhcpctl/remote.c | 15 +-
external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhclient-script.8 | 354 +-
external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhclient.8 | 436 ++--
external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhclient.conf.5 | 696 +++---
external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhclient.leases.5 | 50 +-
external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhcp-eval.5 | 522 ++--
external/mpl/dhcp/dist/doc/ja_JP.eucJP/dhcp-options.5 | 1370 +++++++-------
external/mpl/dhcp/dist/includes/arpa/nameser.h | 12 +-
external/mpl/dhcp/dist/includes/cdefs.h | 10 +-
external/mpl/dhcp/dist/includes/ctrace.h | 10 +-
external/mpl/dhcp/dist/includes/dhcp.h | 10 +-
external/mpl/dhcp/dist/includes/dhcp6.h | 8 +-
external/mpl/dhcp/dist/includes/dhcpd.h | 20 +-
external/mpl/dhcp/dist/includes/dhctoken.h | 11 +-
external/mpl/dhcp/dist/includes/failover.h | 8 +-
external/mpl/dhcp/dist/includes/inet.h | 11 +-
external/mpl/dhcp/dist/includes/ldap_casa.h | 51 +-
external/mpl/dhcp/dist/includes/netinet/udp.h | 8 +-
external/mpl/dhcp/dist/includes/ns_name.h | 8 +-
external/mpl/dhcp/dist/includes/omapip/alloc.h | 8 +-
external/mpl/dhcp/dist/includes/omapip/buffer.h | 11 +-
external/mpl/dhcp/dist/includes/omapip/convert.h | 8 +-
external/mpl/dhcp/dist/includes/omapip/hash.h | 8 +-
external/mpl/dhcp/dist/includes/omapip/isclib.h | 8 +-
external/mpl/dhcp/dist/includes/omapip/omapip.h | 30 +-
external/mpl/dhcp/dist/includes/omapip/omapip_p.h | 13 +-
external/mpl/dhcp/dist/includes/omapip/result.h | 68 +-
external/mpl/dhcp/dist/includes/omapip/trace.h | 10 +-
external/mpl/dhcp/dist/includes/osdep.h | 8 +-
external/mpl/dhcp/dist/includes/site.h | 3 +-
external/mpl/dhcp/dist/includes/statement.h | 9 +-
external/mpl/dhcp/dist/includes/tree.h | 14 +-
external/mpl/dhcp/dist/keama/conflex.c | 77 +-
external/mpl/dhcp/dist/keama/confparse.c | 66 +-
external/mpl/dhcp/dist/keama/data.c | 20 +-
external/mpl/dhcp/dist/keama/data.h | 8 +-
external/mpl/dhcp/dist/keama/dhctoken.h | 8 +-
external/mpl/dhcp/dist/keama/eval.c | 26 +-
external/mpl/dhcp/dist/keama/json.c | 10 +-
external/mpl/dhcp/dist/keama/keama.8 | 8 +-
external/mpl/dhcp/dist/keama/keama.c | 21 +-
external/mpl/dhcp/dist/keama/keama.h | 18 +-
external/mpl/dhcp/dist/keama/options.c | 13 +-
external/mpl/dhcp/dist/keama/parse.c | 86 +-
external/mpl/dhcp/dist/keama/print.c | 18 +-
external/mpl/dhcp/dist/keama/reduce.c | 14 +-
external/mpl/dhcp/dist/omapip/alloc.c | 43 +-
external/mpl/dhcp/dist/omapip/array.c | 13 +-
external/mpl/dhcp/dist/omapip/auth.c | 14 +-
external/mpl/dhcp/dist/omapip/buffer.c | 29 +-
external/mpl/dhcp/dist/omapip/connection.c | 163 +-
external/mpl/dhcp/dist/omapip/convert.c | 10 +-
external/mpl/dhcp/dist/omapip/dispatch.c | 153 +-
external/mpl/dhcp/dist/omapip/errwarn.c | 10 +-
external/mpl/dhcp/dist/omapip/generic.c | 24 +-
external/mpl/dhcp/dist/omapip/handle.c | 20 +-
external/mpl/dhcp/dist/omapip/hash.c | 18 +-
external/mpl/dhcp/dist/omapip/isclib.c | 14 +-
external/mpl/dhcp/dist/omapip/listener.c | 25 +-
external/mpl/dhcp/dist/omapip/message.c | 26 +-
external/mpl/dhcp/dist/omapip/omapi.3 | 20 +-
external/mpl/dhcp/dist/omapip/protocol.c | 36 +-
external/mpl/dhcp/dist/omapip/result.c | 12 +-
external/mpl/dhcp/dist/omapip/support.c | 22 +-
external/mpl/dhcp/dist/omapip/test.c | 10 +-
external/mpl/dhcp/dist/omapip/toisc.c | 10 +-
external/mpl/dhcp/dist/omapip/trace.c | 28 +-
external/mpl/dhcp/dist/relay/dhcrelay.8 | 22 +-
external/mpl/dhcp/dist/relay/dhcrelay.c | 61 +-
external/mpl/dhcp/dist/relay/tests/relay_unittests.c | 59 +-
external/mpl/dhcp/dist/server/bootp.c | 14 +-
external/mpl/dhcp/dist/server/class.c | 10 +-
external/mpl/dhcp/dist/server/confpars.c | 219 +-
external/mpl/dhcp/dist/server/db.c | 10 +-
external/mpl/dhcp/dist/server/ddns.c | 10 +-
external/mpl/dhcp/dist/server/dhcp.c | 10 +-
external/mpl/dhcp/dist/server/dhcpd.8 | 28 +-
external/mpl/dhcp/dist/server/dhcpd.c | 22 +-
external/mpl/dhcp/dist/server/dhcpd.conf.5 | 12 +-
external/mpl/dhcp/dist/server/dhcpd.leases.5 | 8 +-
external/mpl/dhcp/dist/server/failover.c | 12 +-
external/mpl/dhcp/dist/server/ldap.c | 10 +-
external/mpl/dhcp/dist/server/ldap_casa.c | 51 +-
external/mpl/dhcp/dist/server/leasechain.c | 44 +-
external/mpl/dhcp/dist/server/mdb.c | 12 +-
external/mpl/dhcp/dist/server/mdb6.c | 6 +-
external/mpl/dhcp/dist/server/omapi.c | 14 +-
external/mpl/dhcp/dist/server/salloc.c | 10 +-
external/mpl/dhcp/dist/server/stables.c | 12 +-
external/mpl/dhcp/dist/server/tests/hash_unittest.c | 12 +-
140 files changed, 4100 insertions(+), 3459 deletions(-)
diffs (truncated from 18112 to 300 lines):
diff -r dc9426c9f2e5 -r 5da084027a04 external/mpl/dhcp/dist/client/client_tables.c
--- a/external/mpl/dhcp/dist/client/client_tables.c Sun Apr 03 01:08:35 2022 +0000
+++ b/external/mpl/dhcp/dist/client/client_tables.c Sun Apr 03 01:10:57 2022 +0000
@@ -1,11 +1,11 @@
-/* $NetBSD: client_tables.c,v 1.2 2018/04/07 22:37:29 christos Exp $ */
+/* $NetBSD: client_tables.c,v 1.3 2022/04/03 01:10:57 christos Exp $ */
/* client_tables.c
Tables of information only used by client... */
/*
- * Copyright (c) 2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20,15 +20,15 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
* <info%isc.org@localhost>
* https://www.isc.org/
*
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: client_tables.c,v 1.2 2018/04/07 22:37:29 christos Exp $");
+__RCSID("$NetBSD: client_tables.c,v 1.3 2022/04/03 01:10:57 christos Exp $");
#include "dhcpd.h"
diff -r dc9426c9f2e5 -r 5da084027a04 external/mpl/dhcp/dist/client/clparse.c
--- a/external/mpl/dhcp/dist/client/clparse.c Sun Apr 03 01:08:35 2022 +0000
+++ b/external/mpl/dhcp/dist/client/clparse.c Sun Apr 03 01:10:57 2022 +0000
@@ -1,11 +1,11 @@
-/* $NetBSD: clparse.c,v 1.3 2020/08/03 21:10:56 christos Exp $ */
+/* $NetBSD: clparse.c,v 1.4 2022/04/03 01:10:57 christos Exp $ */
/* clparse.c
Parser for dhclient config and lease files... */
/*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996-2003 by Internet Software Consortium
*
* This Source Code Form is subject to the terms of the Mozilla Public
@@ -21,15 +21,15 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
* <info%isc.org@localhost>
* https://www.isc.org/
*
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: clparse.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: clparse.c,v 1.4 2022/04/03 01:10:57 christos Exp $");
#include "dhcpd.h"
#include <errno.h>
@@ -67,7 +67,7 @@
isc_result_t status;
unsigned code;
- /*
+ /*
* TODO: LATER constant is very undescriptive. We should review it and
* change it to something more descriptive or even better remove it
* completely as it is currently not used.
@@ -167,7 +167,7 @@
}
}
#endif
-
+
/* Initialize the top level client configuration. */
memset (&top_level_config, 0, sizeof top_level_config);
@@ -322,7 +322,7 @@
/*
* All we care about is DUIDs - if we get anything else
* just toss it and continue looking for DUIDs until we
- * run out of file.
+ * run out of file.
*/
if (token == DEFAULT_DUID) {
parse_client_default_duid(cfile);
@@ -382,7 +382,7 @@
end_parse (&cfile);
}
-/* client-declaration :==
+/* client-declaration :==
SEND option-decl |
DEFAULT option-decl |
SUPERSEDE option-decl |
@@ -435,7 +435,7 @@
parse_semi (cfile);
}
return;
-
+
case KEY:
skip_token(&val, (unsigned *)0, cfile);
if (ip) {
@@ -582,7 +582,7 @@
parse_warn (cfile, "expecting a policy type.");
skip_to_semi (cfile);
return;
- }
+ }
break;
case OPTION:
@@ -710,7 +710,7 @@
config -> omapi_port = tmp;
parse_semi (cfile);
return;
-
+
case DO_FORWARD_UPDATE:
skip_token(&val, (unsigned *)0, cfile);
token = next_token (&val, (unsigned *)0, cfile);
@@ -804,7 +804,7 @@
strcpy (name, val);
parse_interface_declaration (cfile, config, name);
return;
-
+
case LEASE:
skip_token(&val, (unsigned *)0, cfile);
parse_client_lease_statement (cfile, 1);
@@ -1175,7 +1175,7 @@
client -> leases = lease;
return;
}
-
+
/* The last lease in the lease file on a particular interface is
the active lease for that interface. Of course, we don't know
what the last lease in the file is until we've parsed the whole
@@ -2275,7 +2275,7 @@
"for reject statement");
skip_to_semi(cfile);
return;
- }
+ }
list = dmalloc(sizeof(struct iaddrmatchlist), MDL);
if (!list)
@@ -2292,7 +2292,7 @@
parse_warn (cfile, "expecting semicolon.");
skip_to_semi (cfile);
}
-}
+}
/* allow-deny-keyword :== BOOTP
| BOOTING
diff -r dc9426c9f2e5 -r 5da084027a04 external/mpl/dhcp/dist/client/dhc6.c
--- a/external/mpl/dhcp/dist/client/dhc6.c Sun Apr 03 01:08:35 2022 +0000
+++ b/external/mpl/dhcp/dist/client/dhc6.c Sun Apr 03 01:10:57 2022 +0000
@@ -1,9 +1,9 @@
-/* $NetBSD: dhc6.c,v 1.3 2020/08/03 21:10:56 christos Exp $ */
+/* $NetBSD: dhc6.c,v 1.4 2022/04/03 01:10:57 christos Exp $ */
/* dhc6.c - DHCPv6 client routines. */
/*
- * Copyright (c) 2012-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012-2022 Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2006-2010 by Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,14 +19,14 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
* <info%isc.org@localhost>
* https://www.isc.org/
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: dhc6.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: dhc6.c,v 1.4 2022/04/03 01:10:57 christos Exp $");
#include "dhcpd.h"
diff -r dc9426c9f2e5 -r 5da084027a04 external/mpl/dhcp/dist/client/dhclient-script.8
--- a/external/mpl/dhcp/dist/client/dhclient-script.8 Sun Apr 03 01:08:35 2022 +0000
+++ b/external/mpl/dhcp/dist/client/dhclient-script.8 Sun Apr 03 01:10:57 2022 +0000
@@ -1,8 +1,8 @@
-.\" $NetBSD: dhclient-script.8,v 1.2 2018/04/07 22:37:29 christos Exp $
+.\" $NetBSD: dhclient-script.8,v 1.3 2022/04/03 01:10:57 christos Exp $
.\"
.\" dhclient-script.8
.\"
-.\" Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (c) 1996-2003 by Internet Software Consortium
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
@@ -18,8 +18,8 @@
.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
.\" <info%isc.org@localhost>
.\" https://www.isc.org/
.\"
@@ -131,7 +131,7 @@
for example requested_subnet_mask=1. No such variable is defined for
options not requested by the client or options that don't require a
request option, such as the ip address (*_ip_address) or expiration
-time (*_expiry).
+time (*_expiry).
.PP
Before actually configuring the address, dhclient-script should
somehow ARP for it and exit with a nonzero status if it receives a
@@ -201,6 +201,12 @@
test these parameters and, if it has reason to believe they are valid,
should exit with a value of zero. If not, it should exit with a
nonzero value.
+.SH V6ONLY
+The DHCPv4 client has received a requested valid v6-only-preferred
+option. The system should disable IPv4 on the interface. On its side
+the dhclient waits for V6ONLY_WAIT seconds (the timer is carried by
+the option with a minimum of MIN_V6ONLY_WAIT) before returning in
+the INIT state.
.PP
The usual way to test a lease is to set up the network as with REBIND
(since this may be called to test more than one lease) and then ping
diff -r dc9426c9f2e5 -r 5da084027a04 external/mpl/dhcp/dist/client/dhclient.8
--- a/external/mpl/dhcp/dist/client/dhclient.8 Sun Apr 03 01:08:35 2022 +0000
+++ b/external/mpl/dhcp/dist/client/dhclient.8 Sun Apr 03 01:10:57 2022 +0000
@@ -1,8 +1,8 @@
-.\" $NetBSD: dhclient.8,v 1.3 2020/08/03 21:10:56 christos Exp $
+.\" $NetBSD: dhclient.8,v 1.4 2022/04/03 01:10:57 christos Exp $
.\"
.\" Id: dhclient.8,v 1.36 2011/04/15 21:58:12 sar Exp
.\"
-.\" Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (c) 1996-2003 by Internet Software Consortium
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
@@ -18,8 +18,8 @@
.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
.\" <info%isc.org@localhost>
.\" https://www.isc.org/
.\"
diff -r dc9426c9f2e5 -r 5da084027a04 external/mpl/dhcp/dist/client/dhclient.c
--- a/external/mpl/dhcp/dist/client/dhclient.c Sun Apr 03 01:08:35 2022 +0000
+++ b/external/mpl/dhcp/dist/client/dhclient.c Sun Apr 03 01:10:57 2022 +0000
@@ -1,11 +1,11 @@
-/* $NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $ */
+/* $NetBSD: dhclient.c,v 1.5 2022/04/03 01:10:57 christos Exp $ */
/* dhclient.c
DHCP Client. */
/*
- * Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2022 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1995-2003 by Internet Software Consortium
*
* This Source Code Form is subject to the terms of the Mozilla Public
@@ -21,8 +21,8 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
Home |
Main Index |
Thread Index |
Old Index