Module Name: src
Committed By: maxv
Date: Sat May 19 20:14:56 UTC 2018
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: admin.c cfparse.y evt.c
grabmyaddr.c handler.c ipsec_doi.c isakmp.c isakmp_var.h
isakmp_xauth.c localconf.c oakley.c pfkey.c remoteconf.c sainfo.c
session.c
Log Message:
Use strict prototypes, when they don't introduce more warnings than they fix.
Also localify a few functions.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/crypto/dist/ipsec-tools/src/racoon/admin.c
cvs rdiff -u -r1.50 -r1.51 src/crypto/dist/ipsec-tools/src/racoon/cfparse.y \
src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
cvs rdiff -u -r1.10 -r1.11 src/crypto/dist/ipsec-tools/src/racoon/evt.c
cvs rdiff -u -r1.36 -r1.37 \
src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
cvs rdiff -u -r1.41 -r1.42 src/crypto/dist/ipsec-tools/src/racoon/handler.c
cvs rdiff -u -r1.77 -r1.78 src/crypto/dist/ipsec-tools/src/racoon/isakmp.c
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h
cvs rdiff -u -r1.29 -r1.30 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c \
src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/dist/ipsec-tools/src/racoon/localconf.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/dist/ipsec-tools/src/racoon/oakley.c
cvs rdiff -u -r1.60 -r1.61 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/dist/ipsec-tools/src/racoon/sainfo.c
cvs rdiff -u -r1.34 -r1.35 src/crypto/dist/ipsec-tools/src/racoon/session.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/admin.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/admin.c:1.40 src/crypto/dist/ipsec-tools/src/racoon/admin.c:1.41
--- src/crypto/dist/ipsec-tools/src/racoon/admin.c:1.40 Sat May 19 19:23:15 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/admin.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: admin.c,v 1.40 2018/05/19 19:23:15 maxv Exp $ */
+/* $NetBSD: admin.c,v 1.41 2018/05/19 20:14:56 maxv Exp $ */
/* Id: admin.c,v 1.25 2006/04/06 14:31:04 manubsd Exp */
@@ -97,9 +97,7 @@ static int admin_process __P((int, char
static int admin_reply __P((int, struct admin_com *, int, vchar_t *));
static int
-admin_handler(ctx, fd)
- void *ctx;
- int fd;
+admin_handler(void *ctx, int fd)
{
int so2;
struct sockaddr_storage from;
Index: src/crypto/dist/ipsec-tools/src/racoon/cfparse.y
diff -u src/crypto/dist/ipsec-tools/src/racoon/cfparse.y:1.50 src/crypto/dist/ipsec-tools/src/racoon/cfparse.y:1.51
--- src/crypto/dist/ipsec-tools/src/racoon/cfparse.y:1.50 Sat May 19 19:32:16 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/cfparse.y Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cfparse.y,v 1.50 2018/05/19 19:32:16 maxv Exp $ */
+/* $NetBSD: cfparse.y,v 1.51 2018/05/19 20:14:56 maxv Exp $ */
/* Id: cfparse.y,v 1.66 2006/08/22 18:17:17 manubsd Exp */
@@ -172,7 +172,7 @@ static int load_x509(const char *file, c
return 0;
}
-static int process_rmconf()
+static int process_rmconf(void)
{
/* check a exchange mode */
@@ -2611,8 +2611,7 @@ insspspec(rmconf, spspec)
}
static struct secprotospec *
-dupspspec(spspec)
- struct secprotospec *spspec;
+dupspspec(struct secprotospec *spspec)
{
struct secprotospec *new;
Index: src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.50 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.51
--- src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.50 Sat May 19 19:23:15 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_doi.c,v 1.50 2018/05/19 19:23:15 maxv Exp $ */
+/* $NetBSD: ipsec_doi.c,v 1.51 2018/05/19 20:14:56 maxv Exp $ */
/* Id: ipsec_doi.c,v 1.55 2006/08/17 09:20:41 vanhu Exp */
@@ -197,9 +197,7 @@ ipsecdoi_checkph1proposal(sa, iph1)
}
static void
-print_ph1proposal(pair, s)
- struct prop_pair *pair;
- struct isakmpsa *s;
+print_ph1proposal(struct prop_pair *pair, struct isakmpsa *s)
{
struct isakmp_pl_p *prop = pair->prop;
struct isakmp_pl_t *trns = pair->trns;
@@ -3302,9 +3300,7 @@ doi2ipproto(proto)
*/
int
-ipsecdoi_subnetisaddr_v4( subnet, address )
- const vchar_t *subnet;
- const vchar_t *address;
+ipsecdoi_subnetisaddr_v4(const vchar_t *subnet, const vchar_t *address)
{
struct in_addr *mask;
@@ -3325,9 +3321,7 @@ ipsecdoi_subnetisaddr_v4( subnet, addres
#ifdef INET6
int
-ipsecdoi_subnetisaddr_v6( subnet, address )
- const vchar_t *subnet;
- const vchar_t *address;
+ipsecdoi_subnetisaddr_v6(const vchar_t *subnet, const vchar_t *address)
{
struct in6_addr *mask;
int i;
Index: src/crypto/dist/ipsec-tools/src/racoon/evt.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/evt.c:1.10 src/crypto/dist/ipsec-tools/src/racoon/evt.c:1.11
--- src/crypto/dist/ipsec-tools/src/racoon/evt.c:1.10 Thu Oct 21 06:15:28 2010
+++ src/crypto/dist/ipsec-tools/src/racoon/evt.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: evt.c,v 1.10 2010/10/21 06:15:28 tteras Exp $ */
+/* $NetBSD: evt.c,v 1.11 2018/05/19 20:14:56 maxv Exp $ */
/* Id: evt.c,v 1.5 2006/06/22 20:11:35 manubsd Exp */
@@ -216,9 +216,7 @@ evt_dump(void) {
}
static struct evt_message *
-evtmsg_create(type, optdata)
- int type;
- vchar_t *optdata;
+evtmsg_create(int type, vchar_t *optdata)
{
struct evt_message *e;
size_t len;
@@ -247,8 +245,7 @@ evtmsg_create(type, optdata)
}
static void
-evt_unsubscribe(l)
- struct evt_listener *l;
+evt_unsubscribe(struct evt_listener *l)
{
plog(LLV_DEBUG, LOCATION, NULL,
"[%d] admin connection released\n", l->fd);
@@ -260,18 +257,14 @@ evt_unsubscribe(l)
}
static int
-evt_unsubscribe_cb(ctx, fd)
- void *ctx;
- int fd;
+evt_unsubscribe_cb(void *ctx, int fd)
{
evt_unsubscribe((struct evt_listener *) ctx);
return 0;
}
static void
-evtmsg_broadcast(ll, e)
- const struct evt_listener_list *ll;
- struct evt_message *e;
+evtmsg_broadcast(const struct evt_listener_list *ll, struct evt_message *e)
{
struct evt_listener *l, *nl;
Index: src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.36 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.37
--- src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.36 Sat May 19 19:23:15 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: grabmyaddr.c,v 1.36 2018/05/19 19:23:15 maxv Exp $ */
+/* $NetBSD: grabmyaddr.c,v 1.37 2018/05/19 20:14:56 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2008 Timo Teras <[email protected]>.
@@ -81,8 +81,7 @@ struct myaddr {
static LIST_HEAD(_myaddr_list_, myaddr) configured, opened;
static void
-myaddr_delete(my)
- struct myaddr *my;
+myaddr_delete(struct myaddr *my)
{
if (my->fd != -1)
isakmp_close(my->fd);
@@ -91,8 +90,7 @@ myaddr_delete(my)
}
static int
-myaddr_configured(addr)
- struct sockaddr *addr;
+myaddr_configured(struct sockaddr *addr)
{
struct myaddr *cfg;
@@ -108,9 +106,7 @@ myaddr_configured(addr)
}
static int
-myaddr_open(addr, udp_encap)
- struct sockaddr *addr;
- int udp_encap;
+myaddr_open(struct sockaddr *addr, int udp_encap)
{
struct myaddr *my;
@@ -136,8 +132,7 @@ myaddr_open(addr, udp_encap)
}
static int
-myaddr_open_all_configured(addr)
- struct sockaddr *addr;
+myaddr_open_all_configured(struct sockaddr *addr)
{
/* create all configured, not already opened addresses */
struct myaddr *cfg;
@@ -178,8 +173,7 @@ myaddr_open_all_configured(addr)
}
static void
-myaddr_close_all_open(addr)
- struct sockaddr *addr;
+myaddr_close_all_open(struct sockaddr *addr)
{
/* delete all matching open sockets */
struct myaddr *my, *next;
@@ -195,8 +189,7 @@ myaddr_close_all_open(addr)
}
static void
-myaddr_flush_list(list)
- struct _myaddr_list_ *list;
+myaddr_flush_list(struct _myaddr_list_ *list)
{
struct myaddr *my, *next;
@@ -696,10 +689,7 @@ kernel_sync()
#define SAROUNDUP(X) ROUNDUP(((struct sockaddr *)(X))->sa_len)
static size_t
-parse_address(start, end, dest)
- caddr_t start;
- caddr_t end;
- struct sockaddr_storage *dest;
+parse_address(caddr_t start, caddr_t end, struct sockaddr_storage *dest)
{
int len;
@@ -743,8 +733,7 @@ parse_addresses(start, end, flags, addr)
}
static void
-kernel_handle_message(msg)
- caddr_t msg;
+kernel_handle_message(caddr_t msg)
{
struct rt_msghdr *rtm = (struct rt_msghdr *) msg;
struct ifa_msghdr *ifa = (struct ifa_msghdr *) msg;
Index: src/crypto/dist/ipsec-tools/src/racoon/handler.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.41 src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.42
--- src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.41 Sun Jan 1 15:57:31 2012
+++ src/crypto/dist/ipsec-tools/src/racoon/handler.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: handler.c,v 1.41 2012/01/01 15:57:31 tteras Exp $ */
+/* $NetBSD: handler.c,v 1.42 2018/05/19 20:14:56 maxv Exp $ */
/* Id: handler.c,v 1.28 2006/05/26 12:17:29 manubsd Exp */
@@ -1173,8 +1173,7 @@ rem_recvdpkt(r)
}
static void
-sweep_recvdpkt(dummy)
- struct sched *dummy;
+sweep_recvdpkt(struct sched *dummy)
{
struct recvdpkt *r, *next;
struct timeval now, diff, sweep;
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.77 src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.78
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.77 Sat May 19 19:23:15 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp.c,v 1.77 2018/05/19 19:23:15 maxv Exp $ */
+/* $NetBSD: isakmp.c,v 1.78 2018/05/19 20:14:56 maxv Exp $ */
/* Id: isakmp.c,v 1.74 2006/05/07 21:32:59 manubsd Exp */
@@ -198,9 +198,7 @@ static int frag_handler(struct ph1handle
* isakmp packet handler
*/
static int
-isakmp_handler(ctx, so_isakmp)
- void *ctx;
- int so_isakmp;
+isakmp_handler(void *ctx, int so_isakmp)
{
struct isakmp isakmp;
union {
@@ -1829,8 +1827,7 @@ isakmp_send(iph1, sbuf)
/* called from scheduler */
static void
-isakmp_ph1resend_stub(p)
- struct sched *p;
+isakmp_ph1resend_stub(struct sched *p)
{
struct ph1handle *iph1 = container_of(p, struct ph1handle, scr);
@@ -1887,8 +1884,7 @@ isakmp_ph1send(iph1)
/* called from scheduler */
static void
-isakmp_ph2resend_stub(p)
- struct sched *p;
+isakmp_ph2resend_stub(struct sched *p)
{
struct ph2handle *iph2 = container_of(p, struct ph2handle, scr);
@@ -2654,13 +2650,8 @@ isakmp_newmsgid2(iph1)
* set values into allocated buffer of isakmp header for phase 1
*/
static caddr_t
-set_isakmp_header(vbuf, iph1, nptype, etype, flags, msgid)
- vchar_t *vbuf;
- struct ph1handle *iph1;
- int nptype;
- u_int8_t etype;
- u_int8_t flags;
- u_int32_t msgid;
+set_isakmp_header(vchar_t *vbuf, struct ph1handle *iph1, int nptype,
+ u_int8_t etype, u_int8_t flags, u_int32_t msgid)
{
struct isakmp *isakmp;
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h:1.17 src/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h:1.18
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h:1.17 Fri Nov 12 10:36:37 2010
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_var.h,v 1.17 2010/11/12 10:36:37 tteras Exp $ */
+/* $NetBSD: isakmp_var.h,v 1.18 2018/05/19 20:14:56 maxv Exp $ */
/* Id: isakmp_var.h,v 1.12 2005/05/07 14:45:31 manubsd Exp */
@@ -110,10 +110,8 @@ extern struct payload_list *isakmp_plist
struct payload_list *plist, vchar_t *payload,
u_int8_t payload_type, u_int8_t free));
-static inline struct payload_list *isakmp_plist_append(plist, payload, payload_type)
- struct payload_list *plist;
- vchar_t *payload;
- u_int8_t payload_type;
+static inline struct payload_list *
+isakmp_plist_append(struct payload_list *plist, vchar_t *payload, u_int8_t payload_type)
{
return isakmp_plist_append_full(plist, payload, payload_type, 0);
}
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.29 src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.30
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.29 Sat May 19 19:32:16 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_xauth.c,v 1.29 2018/05/19 19:32:16 maxv Exp $ */
+/* $NetBSD: isakmp_xauth.c,v 1.30 2018/05/19 20:14:56 maxv Exp $ */
/* Id: isakmp_xauth.c,v 1.38 2006/08/22 18:17:17 manubsd Exp */
@@ -1316,10 +1316,8 @@ xauth_login_system(usr, pwd)
return -1;
}
-int
-xauth_group_system(usr, grp)
- char * usr;
- char * grp;
+static int
+xauth_group_system(char *usr, char *grp)
{
struct group * gr;
char * member;
Index: src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.29 src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.30
--- src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.29 Sat May 19 19:23:15 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: remoteconf.c,v 1.29 2018/05/19 19:23:15 maxv Exp $ */
+/* $NetBSD: remoteconf.c,v 1.30 2018/05/19 20:14:56 maxv Exp $ */
/* Id: remoteconf.c,v 1.38 2006/05/06 15:52:44 manubsd Exp */
@@ -163,10 +163,8 @@ rmconf_match_identity(rmconf, id_p)
}
static int
-rmconf_match_etype_and_approval(rmconf, etype, approval)
- struct remoteconf *rmconf;
- int etype;
- struct isakmpsa *approval;
+rmconf_match_etype_and_approval(struct remoteconf *rmconf, int etype,
+ struct isakmpsa *approval)
{
if (check_etypeok(rmconf, (void *) (intptr_t) etype) == 0)
return ISAKMP_NTYPE_NO_PROPOSAL_CHOSEN;
@@ -195,9 +193,7 @@ enum rmconf_match_t {
};
static int
-rmconf_match_type(rmsel, rmconf)
- struct rmconfselector *rmsel;
- struct remoteconf *rmconf;
+rmconf_match_type(struct rmconfselector *rmsel, struct remoteconf *rmconf)
{
int ret = MATCH_NONE, tmp;
@@ -345,9 +341,7 @@ struct rmconf_find_context {
};
static int
-rmconf_find(rmconf, ctx)
- struct remoteconf *rmconf;
- void *ctx;
+rmconf_find(struct remoteconf *rmconf, void *ctx)
{
struct rmconf_find_context *fctx = (struct rmconf_find_context *) ctx;
int match_type;
@@ -546,10 +540,8 @@ newrmconf()
return new;
}
-void *
-dupidvl(entry, arg)
- void *entry;
- void *arg;
+static void *
+dupidvl(void *entry, void *arg)
{
struct idspec *id;
struct idspec *old = (struct idspec *) entry;
@@ -567,10 +559,8 @@ dupidvl(entry, arg)
return NULL;
}
-void *
-duprsa(entry, arg)
- void *entry;
- void *arg;
+static void *
+duprsa(void *entry, void *arg)
{
struct rsa_key *new;
Index: src/crypto/dist/ipsec-tools/src/racoon/localconf.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/localconf.c:1.9 src/crypto/dist/ipsec-tools/src/racoon/localconf.c:1.10
--- src/crypto/dist/ipsec-tools/src/racoon/localconf.c:1.9 Thu Jun 20 15:41:18 2013
+++ src/crypto/dist/ipsec-tools/src/racoon/localconf.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: localconf.c,v 1.9 2013/06/20 15:41:18 christos Exp $ */
+/* $NetBSD: localconf.c,v 1.10 2018/05/19 20:14:56 maxv Exp $ */
/* $KAME: localconf.c,v 1.33 2001/08/09 07:32:19 sakane Exp $ */
@@ -376,8 +376,7 @@ doitype2doi(doitype)
static void
-saverestore_params(f)
- int f;
+saverestore_params(int f)
{
static u_int16_t s_port_isakmp;
Index: src/crypto/dist/ipsec-tools/src/racoon/oakley.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.25 src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.26
--- src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.25 Sat May 19 19:23:15 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/oakley.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: oakley.c,v 1.25 2018/05/19 19:23:15 maxv Exp $ */
+/* $NetBSD: oakley.c,v 1.26 2018/05/19 20:14:56 maxv Exp $ */
/* Id: oakley.c,v 1.32 2006/05/26 12:19:46 manubsd Exp */
@@ -138,8 +138,7 @@ int oakley_get_certtype(cert)
}
static vchar_t *
-dump_isakmp_payload(gen)
- struct isakmp_gen *gen;
+dump_isakmp_payload(struct isakmp_gen *gen)
{
vchar_t p;
@@ -156,8 +155,7 @@ dump_isakmp_payload(gen)
}
static vchar_t *
-dump_x509(cert)
- X509 *cert;
+dump_x509(X509 *cert)
{
vchar_t *pl;
u_char *bp;
@@ -2249,9 +2247,7 @@ struct append_cr_ctx {
};
static int
-oakley_append_rmconf_cr(rmconf, ctx)
- struct remoteconf *rmconf;
- void *ctx;
+oakley_append_rmconf_cr(struct remoteconf *rmconf, void *ctx)
{
struct append_cr_ctx *actx = (struct append_cr_ctx *) ctx;
vchar_t *buf, *asn1dn = NULL;
Index: src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.60 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.61
--- src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.60 Thu Nov 9 08:34:50 2017
+++ src/crypto/dist/ipsec-tools/src/racoon/pfkey.c Sat May 19 20:14:56 2018
@@ -1,6 +1,6 @@
-/* $NetBSD: pfkey.c,v 1.60 2017/11/09 08:34:50 knakahara Exp $ */
+/* $NetBSD: pfkey.c,v 1.61 2018/05/19 20:14:56 maxv Exp $ */
-/* $Id: pfkey.c,v 1.60 2017/11/09 08:34:50 knakahara Exp $ */
+/* $Id: pfkey.c,v 1.61 2018/05/19 20:14:56 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -200,9 +200,7 @@ static int addnewsp __P((caddr_t *, stru
* -1: fail
*/
static int
-pfkey_handler(ctx, fd)
- void *ctx;
- int fd;
+pfkey_handler(void *ctx, int fd)
{
struct sadb_msg *msg;
int len;
Index: src/crypto/dist/ipsec-tools/src/racoon/sainfo.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/sainfo.c:1.15 src/crypto/dist/ipsec-tools/src/racoon/sainfo.c:1.16
--- src/crypto/dist/ipsec-tools/src/racoon/sainfo.c:1.15 Sun Jan 1 15:29:28 2012
+++ src/crypto/dist/ipsec-tools/src/racoon/sainfo.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sainfo.c,v 1.15 2012/01/01 15:29:28 tteras Exp $ */
+/* $NetBSD: sainfo.c,v 1.16 2018/05/19 20:14:56 maxv Exp $ */
/* $KAME: sainfo.c,v 1.16 2003/06/27 07:32:39 sakane Exp $ */
@@ -226,8 +226,8 @@ delsainfo(si)
racoon_free(si);
}
-int prisainfo(s)
- struct sainfo *s;
+static int
+prisainfo(struct sainfo *s)
{
/*
* determine the matching priority
Index: src/crypto/dist/ipsec-tools/src/racoon/session.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/session.c:1.34 src/crypto/dist/ipsec-tools/src/racoon/session.c:1.35
--- src/crypto/dist/ipsec-tools/src/racoon/session.c:1.34 Sat May 19 19:47:47 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/session.c Sat May 19 20:14:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: session.c,v 1.34 2018/05/19 19:47:47 maxv Exp $ */
+/* $NetBSD: session.c,v 1.35 2018/05/19 20:14:56 maxv Exp $ */
/* $KAME: session.c,v 1.32 2003/09/24 02:01:17 jinmei Exp $ */
@@ -374,7 +374,8 @@ signal_handler(sig)
/* XXX possible mem leaks and no way to go back for now !!!
*/
-static void reload_conf(){
+static void reload_conf(void)
+{
int error;
#ifdef ENABLE_HYBRID
