Module Name: src
Committed By: christos
Date: Sun Mar 24 15:53:59 UTC 2013
Modified Files:
src/external/bsd/dhcp/dist/client: dhc6.c dhclient.c
src/external/bsd/dhcp/dist/common: conflex.c discover.c dispatch.c
dns.c ns_name.c
src/external/bsd/dhcp/dist/dst: base64.c
src/external/bsd/dhcp/dist/includes: dhcpd.h
src/external/bsd/dhcp/dist/omapip: dispatch.c
src/external/bsd/dhcp/dist/relay: dhcrelay.c
src/external/bsd/dhcp/dist/server: ddns.c dhcpleasequery.c dhcpv6.c
mdb6.c
Log Message:
minimal patches to compile with WARNS=1 !?!?
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/dhcp/dist/client/dhc6.c \
src/external/bsd/dhcp/dist/client/dhclient.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/dhcp/dist/common/conflex.c \
src/external/bsd/dhcp/dist/common/discover.c \
src/external/bsd/dhcp/dist/common/dispatch.c \
src/external/bsd/dhcp/dist/common/dns.c \
src/external/bsd/dhcp/dist/common/ns_name.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/dhcp/dist/dst/base64.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/dhcp/dist/includes/dhcpd.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/dhcp/dist/omapip/dispatch.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/dhcp/dist/relay/dhcrelay.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/dhcp/dist/server/ddns.c \
src/external/bsd/dhcp/dist/server/dhcpleasequery.c \
src/external/bsd/dhcp/dist/server/dhcpv6.c \
src/external/bsd/dhcp/dist/server/mdb6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcp/dist/client/dhc6.c
diff -u src/external/bsd/dhcp/dist/client/dhc6.c:1.1.1.1 src/external/bsd/dhcp/dist/client/dhc6.c:1.2
--- src/external/bsd/dhcp/dist/client/dhc6.c:1.1.1.1 Sun Mar 24 11:45:59 2013
+++ src/external/bsd/dhcp/dist/client/dhc6.c Sun Mar 24 11:53:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhc6.c,v 1.1.1.1 2013/03/24 15:45:59 christos Exp $ */
+/* $NetBSD: dhc6.c,v 1.2 2013/03/24 15:53:58 christos Exp $ */
/* dhc6.c - DHCPv6 client routines. */
@@ -4790,7 +4790,7 @@ unconfigure6(struct client_state *client
}
}
-void
+static void
refresh_info_request6(void *input)
{
struct client_state *client;
Index: src/external/bsd/dhcp/dist/client/dhclient.c
diff -u src/external/bsd/dhcp/dist/client/dhclient.c:1.1.1.1 src/external/bsd/dhcp/dist/client/dhclient.c:1.2
--- src/external/bsd/dhcp/dist/client/dhclient.c:1.1.1.1 Sun Mar 24 11:45:58 2013
+++ src/external/bsd/dhcp/dist/client/dhclient.c Sun Mar 24 11:53:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhclient.c,v 1.1.1.1 2013/03/24 15:45:58 christos Exp $ */
+/* $NetBSD: dhclient.c,v 1.2 2013/03/24 15:53:58 christos Exp $ */
/* dhclient.c
@@ -3696,7 +3696,7 @@ static void shutdown_exit (void *foo)
*/
/* The first and second stages are pretty similar so we combine them */
-void
+static void
client_dns_remove_action(dhcp_ddns_cb_t *ddns_cb,
isc_result_t eresult)
{
@@ -3863,7 +3863,7 @@ client_dns_update_timeout (void *cp)
*/
/* The first and second stages are pretty similar so we combine them */
-void
+static void
client_dns_update_action(dhcp_ddns_cb_t *ddns_cb,
isc_result_t eresult)
{
Index: src/external/bsd/dhcp/dist/common/conflex.c
diff -u src/external/bsd/dhcp/dist/common/conflex.c:1.1.1.1 src/external/bsd/dhcp/dist/common/conflex.c:1.2
--- src/external/bsd/dhcp/dist/common/conflex.c:1.1.1.1 Sun Mar 24 11:45:52 2013
+++ src/external/bsd/dhcp/dist/common/conflex.c Sun Mar 24 11:53:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: conflex.c,v 1.1.1.1 2013/03/24 15:45:52 christos Exp $ */
+/* $NetBSD: conflex.c,v 1.2 2013/03/24 15:53:58 christos Exp $ */
/* conflex.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: conflex.c,v 1.1.1.1 2013/03/24 15:45:52 christos Exp $");
+__RCSID("$NetBSD: conflex.c,v 1.2 2013/03/24 15:53:58 christos Exp $");
#include "dhcpd.h"
#include <ctype.h>
@@ -388,7 +388,7 @@ next_raw_token(const char **rval, unsign
* warning in the GENERAL NOTES ABOUT TOKENS above though.)
*/
-enum dhcp_token
+static enum dhcp_token
do_peek_token(const char **rval, unsigned int *rlen,
struct parse *cfile, isc_boolean_t raw) {
int x;
Index: src/external/bsd/dhcp/dist/common/discover.c
diff -u src/external/bsd/dhcp/dist/common/discover.c:1.1.1.1 src/external/bsd/dhcp/dist/common/discover.c:1.2
--- src/external/bsd/dhcp/dist/common/discover.c:1.1.1.1 Sun Mar 24 11:45:52 2013
+++ src/external/bsd/dhcp/dist/common/discover.c Sun Mar 24 11:53:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: discover.c,v 1.1.1.1 2013/03/24 15:45:52 christos Exp $ */
+/* $NetBSD: discover.c,v 1.2 2013/03/24 15:53:58 christos Exp $ */
/* discover.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: discover.c,v 1.1.1.1 2013/03/24 15:45:52 christos Exp $");
+__RCSID("$NetBSD: discover.c,v 1.2 2013/03/24 15:53:58 christos Exp $");
#include "dhcpd.h"
@@ -798,7 +798,7 @@ struct iface_info {
*
* The iface_conf_list structure maintains state for this process.
*/
-int
+static int
begin_iface_scan(struct iface_conf_list *ifaces) {
if (getifaddrs(&ifaces->head) != 0) {
log_error("Error getting interfaces; %m");
@@ -814,7 +814,7 @@ begin_iface_scan(struct iface_conf_list
* Returns information in the info structure.
* Sets err to 1 if there is an error, otherwise 0.
*/
-int
+static int
next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) {
if (ifaces->next == NULL) {
*err = 0;
@@ -838,7 +838,7 @@ next_iface(struct iface_info *info, int
/*
* End scan of interfaces.
*/
-void
+static void
end_iface_scan(struct iface_conf_list *ifaces) {
freeifaddrs(ifaces->head);
ifaces->head = NULL;
@@ -847,7 +847,7 @@ end_iface_scan(struct iface_conf_list *i
#endif
/* XXX: perhaps create drealloc() rather than do it manually */
-void
+static void
add_ipv4_addr_to_interface(struct interface_info *iface,
const struct in_addr *addr) {
/*
@@ -884,7 +884,7 @@ add_ipv4_addr_to_interface(struct interf
#ifdef DHCPv6
/* XXX: perhaps create drealloc() rather than do it manually */
-void
+static void
add_ipv6_addr_to_interface(struct interface_info *iface,
const struct in6_addr *addr) {
/*
Index: src/external/bsd/dhcp/dist/common/dispatch.c
diff -u src/external/bsd/dhcp/dist/common/dispatch.c:1.1.1.1 src/external/bsd/dhcp/dist/common/dispatch.c:1.2
--- src/external/bsd/dhcp/dist/common/dispatch.c:1.1.1.1 Sun Mar 24 11:45:52 2013
+++ src/external/bsd/dhcp/dist/common/dispatch.c Sun Mar 24 11:53:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatch.c,v 1.1.1.1 2013/03/24 15:45:52 christos Exp $ */
+/* $NetBSD: dispatch.c,v 1.2 2013/03/24 15:53:58 christos Exp $ */
/* dispatch.c
@@ -118,7 +118,7 @@ dispatch(void)
isc_result_totext (status));
}
-void
+static void
isclib_timer_callback(isc_task_t *taskp,
isc_event_t *eventp)
{
Index: src/external/bsd/dhcp/dist/common/dns.c
diff -u src/external/bsd/dhcp/dist/common/dns.c:1.1.1.1 src/external/bsd/dhcp/dist/common/dns.c:1.2
--- src/external/bsd/dhcp/dist/common/dns.c:1.1.1.1 Sun Mar 24 11:45:53 2013
+++ src/external/bsd/dhcp/dist/common/dns.c Sun Mar 24 11:53:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dns.c,v 1.1.1.1 2013/03/24 15:45:53 christos Exp $ */
+/* $NetBSD: dns.c,v 1.2 2013/03/24 15:53:58 christos Exp $ */
/* dns.c
@@ -217,7 +217,7 @@ trace_type_t *trace_ddns_output;
* 64 bits pointer of cb
*/
-void
+static void
trace_ddns_input_write(dhcp_ddns_cb_t *ddns_cb, isc_result_t result)
{
trace_iov_t iov[2];
@@ -318,7 +318,7 @@ trace_ddns_input_stop(trace_type_t *ttyp
* contents of cb
*/
-isc_result_t
+static isc_result_t
trace_ddns_output_write(dns_client_t *client, dns_rdataclass_t rdclass,
dns_name_t *zonename, dns_namelist_t *prerequisites,
dns_namelist_t *updates, isc_sockaddrlist_t *servers,
Index: src/external/bsd/dhcp/dist/common/ns_name.c
diff -u src/external/bsd/dhcp/dist/common/ns_name.c:1.1.1.1 src/external/bsd/dhcp/dist/common/ns_name.c:1.2
--- src/external/bsd/dhcp/dist/common/ns_name.c:1.1.1.1 Sun Mar 24 11:45:53 2013
+++ src/external/bsd/dhcp/dist/common/ns_name.c Sun Mar 24 11:53:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ns_name.c,v 1.1.1.1 2013/03/24 15:45:53 christos Exp $ */
+/* $NetBSD: ns_name.c,v 1.2 2013/03/24 15:53:58 christos Exp $ */
/*
* Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
@@ -243,6 +243,7 @@ MRns_name_pton(const char *src, u_char *
return (0);
}
+#ifdef notdef
/*
* MRns_name_ntol(src, dst, dstsiz)
* Convert a network strings labels into all lowercase.
@@ -252,7 +253,7 @@ MRns_name_pton(const char *src, u_char *
* Enforces label and domain length limits.
*/
-int
+static int
MRns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz) {
const u_char *cp;
u_char *dn, *eom;
@@ -289,6 +290,7 @@ MRns_name_ntol(const u_char *src, u_char
*dn++ = '\0';
return (dn - dst);
}
+#endif
/*
* MRns_name_unpack(msg, eom, src, dst, dstsiz)
@@ -468,6 +470,7 @@ cleanup:
return (dstp - dst);
}
+#ifdef notdef
/*
* MRns_name_uncompress(msg, eom, src, dst, dstsiz)
* Expand compressed domain name to presentation format.
@@ -476,7 +479,7 @@ cleanup:
* note:
* Root domain returns as "." not "".
*/
-int
+static int
MRns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
char *dst, size_t dstsiz)
{
@@ -489,6 +492,7 @@ MRns_name_uncompress(const u_char *msg,
return (-1);
return (n);
}
+#endif
/*
* MRns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr)
@@ -515,13 +519,14 @@ MRns_name_compress(const char *src, u_ch
return (MRns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr));
}
+#ifdef notdef
/*
* MRns_name_skip(ptrptr, eom)
* Advance *ptrptr to skip over the compressed name it points at.
* return:
* 0 on success, -1 (with errno set) on failure.
*/
-int
+static int
MRns_name_skip(const u_char **ptrptr, const u_char *eom) {
const u_char *cp;
u_int n;
@@ -549,6 +554,7 @@ MRns_name_skip(const u_char **ptrptr, co
*ptrptr = cp;
return (0);
}
+#endif
/* Private. */
Index: src/external/bsd/dhcp/dist/dst/base64.c
diff -u src/external/bsd/dhcp/dist/dst/base64.c:1.1.1.1 src/external/bsd/dhcp/dist/dst/base64.c:1.2
--- src/external/bsd/dhcp/dist/dst/base64.c:1.1.1.1 Sun Mar 24 11:45:56 2013
+++ src/external/bsd/dhcp/dist/dst/base64.c Sun Mar 24 11:53:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: base64.c,v 1.1.1.1 2013/03/24 15:45:56 christos Exp $ */
+/* $NetBSD: base64.c,v 1.2 2013/03/24 15:53:58 christos Exp $ */
/*
* Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
@@ -69,6 +69,7 @@ static const char rcsid[] = "Id: base64.
#include "cdefs.h"
#include "osdep.h"
#include "arpa/nameser.h"
+#include "dst_internal.h"
#define Assert(Cond) if (!(Cond)) abort()
@@ -206,10 +207,8 @@ b64_ntop(u_char const *src, size_t srcle
*/
int
-b64_pton(src, target, targsize)
- char const *src;
- u_char *target;
- size_t targsize;
+/*###207 [cc] error: no previous prototype for 'b64_pton'%%%*/
+b64_pton(char const *src, u_char *target, size_t targsize)
{
int tarindex, state, ch;
char *pos;
Index: src/external/bsd/dhcp/dist/includes/dhcpd.h
diff -u src/external/bsd/dhcp/dist/includes/dhcpd.h:1.1.1.1 src/external/bsd/dhcp/dist/includes/dhcpd.h:1.2
--- src/external/bsd/dhcp/dist/includes/dhcpd.h:1.1.1.1 Sun Mar 24 11:45:50 2013
+++ src/external/bsd/dhcp/dist/includes/dhcpd.h Sun Mar 24 11:53:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcpd.h,v 1.1.1.1 2013/03/24 15:45:50 christos Exp $ */
+/* $NetBSD: dhcpd.h,v 1.2 2013/03/24 15:53:58 christos Exp $ */
/* dhcpd.h
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: dhcpd.h,v 1.1.1.1 2013/03/24 15:45:50 christos Exp $");
+__RCSID("$NetBSD: dhcpd.h,v 1.2 2013/03/24 15:53:58 christos Exp $");
#include "config.h"
@@ -3535,7 +3535,7 @@ isc_result_t renew_leases(struct ia_xx *
isc_result_t release_leases(struct ia_xx *ia);
isc_result_t decline_leases(struct ia_xx *ia);
void schedule_lease_timeout(struct ipv6_pool *pool);
-void schedule_all_ipv6_lease_timeouts();
+void schedule_all_ipv6_lease_timeouts(void);
void mark_hosts_unavailable(void);
void mark_phosts_unavailable(void);
Index: src/external/bsd/dhcp/dist/omapip/dispatch.c
diff -u src/external/bsd/dhcp/dist/omapip/dispatch.c:1.1.1.1 src/external/bsd/dhcp/dist/omapip/dispatch.c:1.2
--- src/external/bsd/dhcp/dist/omapip/dispatch.c:1.1.1.1 Sun Mar 24 11:45:57 2013
+++ src/external/bsd/dhcp/dist/omapip/dispatch.c Sun Mar 24 11:53:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatch.c,v 1.1.1.1 2013/03/24 15:45:57 christos Exp $ */
+/* $NetBSD: dispatch.c,v 1.2 2013/03/24 15:53:59 christos Exp $ */
/* dispatch.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: dispatch.c,v 1.1.1.1 2013/03/24 15:45:57 christos Exp $");
+__RCSID("$NetBSD: dispatch.c,v 1.2 2013/03/24 15:53:59 christos Exp $");
#include "dhcpd.h"
@@ -127,7 +127,7 @@ trigger_event(struct eventqueue **queue)
* 1 is delete, 0 is leave in place
*/
#define SOCKDELETE 1
-int
+static int
omapi_iscsock_cb(isc_task_t *task,
isc_socket_t *socket,
void *cbarg,
Index: src/external/bsd/dhcp/dist/relay/dhcrelay.c
diff -u src/external/bsd/dhcp/dist/relay/dhcrelay.c:1.1.1.1 src/external/bsd/dhcp/dist/relay/dhcrelay.c:1.2
--- src/external/bsd/dhcp/dist/relay/dhcrelay.c:1.1.1.1 Sun Mar 24 11:46:00 2013
+++ src/external/bsd/dhcp/dist/relay/dhcrelay.c Sun Mar 24 11:53:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcrelay.c,v 1.1.1.1 2013/03/24 15:46:00 christos Exp $ */
+/* $NetBSD: dhcrelay.c,v 1.2 2013/03/24 15:53:59 christos Exp $ */
/* dhcrelay.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: dhcrelay.c,v 1.1.1.1 2013/03/24 15:46:00 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.2 2013/03/24 15:53:59 christos Exp $");
#include "dhcpd.h"
#include <syslog.h>
@@ -165,7 +165,7 @@ static const char url[] =
" server0 [ ... serverN]\n\n"
#endif
-static void usage() {
+static void usage(void) {
log_fatal(DHCRELAY_USAGE);
}
Index: src/external/bsd/dhcp/dist/server/ddns.c
diff -u src/external/bsd/dhcp/dist/server/ddns.c:1.1.1.1 src/external/bsd/dhcp/dist/server/ddns.c:1.2
--- src/external/bsd/dhcp/dist/server/ddns.c:1.1.1.1 Sun Mar 24 11:46:03 2013
+++ src/external/bsd/dhcp/dist/server/ddns.c Sun Mar 24 11:53:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ddns.c,v 1.1.1.1 2013/03/24 15:46:03 christos Exp $ */
+/* $NetBSD: ddns.c,v 1.2 2013/03/24 15:53:59 christos Exp $ */
/* ddns.c
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: ddns.c,v 1.1.1.1 2013/03/24 15:46:03 christos Exp $");
+__RCSID("$NetBSD: ddns.c,v 1.2 2013/03/24 15:53:59 christos Exp $");
#include "dhcpd.h"
#include "dst/md5.h"
@@ -726,7 +726,7 @@ ddns_updates(struct packet *packet, stru
* our caller (or his ...) will do the write.
*/
-isc_result_t
+static isc_result_t
ddns_update_lease_text(dhcp_ddns_cb_t *ddns_cb,
struct binding_scope **inscope)
{
@@ -827,6 +827,7 @@ ddns_update_lease_text(dhcp_ddns_cb_t
return(ISC_R_SUCCESS);
}
+#ifdef notdef
/*
* This function should be called when update_lease_ptr function fails.
* It does inform user about the condition, provides some hints how to
@@ -844,7 +845,7 @@ ddns_update_lease_text(dhcp_ddns_cb_t
* only hide the real problem - a misconfiguration. Proper solution
* is to log the problem, die and let the user fix his config file.
*/
-void
+static void
update_lease_failed(struct lease *lease,
struct iasubopt *lease6,
dhcp_ddns_cb_t *ddns_cb,
@@ -901,6 +902,7 @@ update_lease_failed(struct lease *lease,
"address %s. Lease database inconsistent. Unable to recover."
" Terminating.", file, line, lease_address);
}
+#endif
/*
* utility function to update found lease. It does extra checks
@@ -909,7 +911,7 @@ update_lease_failed(struct lease *lease,
* to update wrong lease. See also safe_lease6_update.
*/
-void
+static void
safe_lease_update(struct lease *lease,
dhcp_ddns_cb_t *oldcb,
dhcp_ddns_cb_t *newcb,
@@ -977,7 +979,7 @@ safe_lease_update(struct lease *lease,
lease->ddns_cb = newcb;
}
-void
+static void
safe_lease6_update(struct iasubopt *lease6,
dhcp_ddns_cb_t *oldcb,
dhcp_ddns_cb_t *newcb,
@@ -1060,7 +1062,7 @@ safe_lease6_update(struct iasubopt *leas
* using the same value twice allows me more flexibility.
*/
-isc_result_t
+static isc_result_t
ddns_update_lease_ptr(struct lease *lease,
struct iasubopt *lease6,
dhcp_ddns_cb_t *ddns_cb,
@@ -1180,7 +1182,7 @@ ddns_update_lease_ptr(struct lease *l
return(ISC_R_SUCCESS);
}
-void
+static void
ddns_ptr_add(dhcp_ddns_cb_t *ddns_cb,
isc_result_t eresult)
{
@@ -1224,7 +1226,7 @@ ddns_ptr_add(dhcp_ddns_cb_t *ddns_cb,
* if not we cleanup and leave.
*/
-void
+static void
ddns_ptr_remove(dhcp_ddns_cb_t *ddns_cb,
isc_result_t eresult)
{
@@ -1290,7 +1292,7 @@ ddns_ptr_remove(dhcp_ddns_cb_t *ddns_cb,
* -- "Interaction between DHCP and DNS"
*/
-void
+static void
ddns_fwd_srv_add2(dhcp_ddns_cb_t *ddns_cb,
isc_result_t eresult)
{
@@ -1364,7 +1366,7 @@ ddns_fwd_srv_add2(dhcp_ddns_cb_t *ddns_c
return;
}
-void
+static void
ddns_fwd_srv_add1(dhcp_ddns_cb_t *ddns_cb,
isc_result_t eresult)
{
@@ -1493,7 +1495,7 @@ ddns_fwd_srv_connector(struct lease
* -- "Interaction between DHCP and DNS"
*/
-void
+static void
ddns_fwd_srv_rem2(dhcp_ddns_cb_t *ddns_cb,
isc_result_t eresult)
{
@@ -1531,7 +1533,7 @@ ddns_fwd_srv_rem2(dhcp_ddns_cb_t *ddns_c
* if not we cleanup and leave.
*/
-void
+static void
ddns_fwd_srv_rem1(dhcp_ddns_cb_t *ddns_cb,
isc_result_t eresult)
{
Index: src/external/bsd/dhcp/dist/server/dhcpleasequery.c
diff -u src/external/bsd/dhcp/dist/server/dhcpleasequery.c:1.1.1.1 src/external/bsd/dhcp/dist/server/dhcpleasequery.c:1.2
--- src/external/bsd/dhcp/dist/server/dhcpleasequery.c:1.1.1.1 Sun Mar 24 11:46:00 2013
+++ src/external/bsd/dhcp/dist/server/dhcpleasequery.c Sun Mar 24 11:53:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcpleasequery.c,v 1.1.1.1 2013/03/24 15:46:00 christos Exp $ */
+/* $NetBSD: dhcpleasequery.c,v 1.2 2013/03/24 15:53:59 christos Exp $ */
/*
* Copyright (C) 2006-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
@@ -60,7 +60,7 @@ next_uid(const struct lease *lease) {
return lease->n_uid;
}
-void
+static void
get_newest_lease(struct lease **retval,
struct lease *lease,
struct lease *(*next)(const struct lease *)) {
Index: src/external/bsd/dhcp/dist/server/dhcpv6.c
diff -u src/external/bsd/dhcp/dist/server/dhcpv6.c:1.1.1.1 src/external/bsd/dhcp/dist/server/dhcpv6.c:1.2
--- src/external/bsd/dhcp/dist/server/dhcpv6.c:1.1.1.1 Sun Mar 24 11:46:04 2013
+++ src/external/bsd/dhcp/dist/server/dhcpv6.c Sun Mar 24 11:53:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcpv6.c,v 1.1.1.1 2013/03/24 15:46:04 christos Exp $ */
+/* $NetBSD: dhcpv6.c,v 1.2 2013/03/24 15:53:59 christos Exp $ */
/*
* Copyright (C) 2006-2011 by Internet Systems Consortium, Inc. ("ISC")
@@ -382,7 +382,7 @@ get_client_id(struct packet *packet, str
* Client Identifier option or that do include a Server Identifier
* option.
*/
-int
+static int
valid_client_msg(struct packet *packet, struct data_string *client_id) {
int ret_val;
struct option_cache *oc;
@@ -475,7 +475,7 @@ exit:
* server's DUID.
* - the message does not include a Client Identifier option.
*/
-int
+static int
valid_client_resp(struct packet *packet,
struct data_string *client_id,
struct data_string *server_id)
@@ -564,7 +564,7 @@ exit:
*
* - The message includes an IA option.
*/
-int
+static int
valid_client_info_req(struct packet *packet, struct data_string *server_id) {
int ret_val;
struct option_cache *oc;
@@ -4605,8 +4605,13 @@ iterate_over_ia_na(struct data_string *r
const struct data_string *client_id,
const struct data_string *server_id,
const char *packet_type,
- void (*ia_na_match)(),
- void (*ia_na_nomatch)())
+ void (*ia_na_match)(const struct data_string *,
+ const struct data_string *,
+ struct iasubopt *),
+ void (*ia_na_nomatch)(const struct data_string *,
+ const struct data_string *,
+ u_int32_t *, struct packet *, char *,
+ int *, int))
{
struct option_state *opt_state;
struct host_decl *packet_host;
@@ -5123,8 +5128,13 @@ iterate_over_ia_pd(struct data_string *r
const struct data_string *client_id,
const struct data_string *server_id,
const char *packet_type,
- void (*ia_pd_match)(),
- void (*ia_pd_nomatch)())
+ void (*ia_pd_match)(const struct data_string *,
+ const struct data_string *,
+ struct iasubopt *),
+ void (*ia_pd_nomatch)(const struct data_string *,
+ const struct data_string *,
+ u_int32_t *, struct packet *, char *,
+ int *, int))
{
struct data_string reply_new;
int reply_len;
Index: src/external/bsd/dhcp/dist/server/mdb6.c
diff -u src/external/bsd/dhcp/dist/server/mdb6.c:1.1.1.1 src/external/bsd/dhcp/dist/server/mdb6.c:1.2
--- src/external/bsd/dhcp/dist/server/mdb6.c:1.1.1.1 Sun Mar 24 11:46:04 2013
+++ src/external/bsd/dhcp/dist/server/mdb6.c Sun Mar 24 11:53:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mdb6.c,v 1.1.1.1 2013/03/24 15:46:04 christos Exp $ */
+/* $NetBSD: mdb6.c,v 1.2 2013/03/24 15:53:59 christos Exp $ */
/*
* Copyright (C) 2007-2011 by Internet Systems Consortium, Inc. ("ISC")
@@ -1350,7 +1350,7 @@ prefix6_exists(const struct ipv6_pool *p
*
* This is used for host entries and the addresses of the server itself.
*/
-isc_result_t
+static isc_result_t
mark_lease_unavailable(struct ipv6_pool *pool, const struct in6_addr *addr) {
struct iasubopt *dummy_iasubopt;
isc_result_t result;
