Module Name: src
Committed By: maxv
Date: Mon May 28 20:45:38 UTC 2018
Modified Files:
src/crypto/dist/ipsec-tools/src/libipsec: ipsec_dump_policy.c
ipsec_strerror.h key_debug.c libpfkey.h pfkey.c pfkey_dump.c
policy_parse.y policy_token.l
Log Message:
drop __P, suggested by sevan
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c \
src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h
cvs rdiff -u -r1.25 -r1.26 src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c
cvs rdiff -u -r1.23 -r1.24 \
src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l
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/libipsec/ipsec_dump_policy.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c:1.10 src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c:1.11
--- src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c:1.10 Mon May 28 19:22:40 2018
+++ src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c Mon May 28 20:45:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_dump_policy.c,v 1.10 2018/05/28 19:22:40 maxv Exp $ */
+/* $NetBSD: ipsec_dump_policy.c,v 1.11 2018/05/28 20:45:38 maxv Exp $ */
/* Id: ipsec_dump_policy.c,v 1.10 2005/06/29 09:12:37 manubsd Exp */
@@ -63,12 +63,12 @@ static const char *ipsp_policy_strs[] =
"discard", "none", "ipsec", "entrust", "bypass",
};
-static char *ipsec_dump_ipsecrequest __P((char *, size_t,
- struct sadb_x_ipsecrequest *, size_t, int));
-static char *ipsec_dump_policy1 __P((void *, const char *, int));
-static int set_addresses __P((char *, size_t, struct sockaddr *,
- struct sockaddr *, int));
-static char *set_address __P((char *, size_t, struct sockaddr *, int));
+static char *ipsec_dump_ipsecrequest(char *, size_t,
+ struct sadb_x_ipsecrequest *, size_t, int);
+static char *ipsec_dump_policy1(void *, const char *, int);
+static int set_addresses(char *, size_t, struct sockaddr *,
+ struct sockaddr *, int);
+static char *set_address(char *, size_t, struct sockaddr *, int);
/*
* policy is sadb_x_policy buffer.
Index: src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h
diff -u src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h:1.4 src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h:1.5
--- src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h:1.4 Sat Sep 9 16:22:09 2006
+++ src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h Mon May 28 20:45:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_strerror.h,v 1.4 2006/09/09 16:22:09 manu Exp $ */
+/* $NetBSD: ipsec_strerror.h,v 1.5 2018/05/28 20:45:38 maxv Exp $ */
/* Id: ipsec_strerror.h,v 1.4 2004/06/07 09:18:46 ludvigm Exp */
@@ -35,7 +35,7 @@
#define _IPSEC_STRERROR_H
extern int __ipsec_errcode;
-extern void __ipsec_set_strerror __P((const char *));
+extern void __ipsec_set_strerror(const char *);
#define EIPSEC_NO_ERROR 0 /*success*/
#define EIPSEC_NOT_SUPPORTED 1 /*not supported*/
Index: src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.13 src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.14
--- src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.13 Mon May 28 19:39:21 2018
+++ src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c Mon May 28 20:45:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.c,v 1.13 2018/05/28 19:39:21 maxv Exp $ */
+/* $NetBSD: key_debug.c,v 1.14 2018/05/28 20:45:38 maxv Exp $ */
/* $KAME: key_debug.c,v 1.29 2001/08/16 14:25:41 itojun Exp $ */
@@ -71,35 +71,35 @@
#include "config.h"
#include "libpfkey.h"
-static void kdebug_sadb_prop __P((struct sadb_ext *));
-static void kdebug_sadb_identity __P((struct sadb_ext *));
-static void kdebug_sadb_supported __P((struct sadb_ext *));
-static void kdebug_sadb_lifetime __P((struct sadb_ext *));
-static void kdebug_sadb_sa __P((struct sadb_ext *));
-static void kdebug_sadb_address __P((struct sadb_ext *));
-static void kdebug_sadb_key __P((struct sadb_ext *));
-static void kdebug_sadb_x_sa2 __P((struct sadb_ext *));
-static void kdebug_sadb_x_policy __P((struct sadb_ext *ext));
-static void kdebug_sockaddr __P((struct sockaddr *addr));
+static void kdebug_sadb_prop(struct sadb_ext *);
+static void kdebug_sadb_identity(struct sadb_ext *);
+static void kdebug_sadb_supported(struct sadb_ext *);
+static void kdebug_sadb_lifetime(struct sadb_ext *);
+static void kdebug_sadb_sa(struct sadb_ext *);
+static void kdebug_sadb_address(struct sadb_ext *);
+static void kdebug_sadb_key(struct sadb_ext *);
+static void kdebug_sadb_x_sa2(struct sadb_ext *);
+static void kdebug_sadb_x_policy(struct sadb_ext *ext);
+static void kdebug_sockaddr(struct sockaddr *addr);
#ifdef SADB_X_EXT_NAT_T_TYPE
-static void kdebug_sadb_x_nat_t_type __P((struct sadb_ext *ext));
-static void kdebug_sadb_x_nat_t_port __P((struct sadb_ext *ext));
+static void kdebug_sadb_x_nat_t_type(struct sadb_ext *ext);
+static void kdebug_sadb_x_nat_t_port(struct sadb_ext *ext);
#ifdef SADB_X_EXT_NAT_T_FRAG
-static void kdebug_sadb_x_nat_t_frag __P((struct sadb_ext *ext));
+static void kdebug_sadb_x_nat_t_frag(struct sadb_ext *ext);
#endif
#endif
#ifdef SADB_X_EXT_PACKET
-static void kdebug_sadb_x_packet __P((struct sadb_ext *));
+static void kdebug_sadb_x_packet(struct sadb_ext *);
#endif
#ifdef SADB_X_EXT_KMADDRESS
-static void kdebug_sadb_x_kmaddress __P((struct sadb_ext *));
+static void kdebug_sadb_x_kmaddress(struct sadb_ext *);
#endif
#ifdef _KERNEL
-static void kdebug_secreplay __P((struct secreplay *));
+static void kdebug_secreplay(struct secreplay *);
#endif
#ifndef _KERNEL
Index: src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y
diff -u src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y:1.13 src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y:1.14
--- src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y:1.13 Mon May 28 19:36:42 2018
+++ src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y Mon May 28 20:45:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: policy_parse.y,v 1.13 2018/05/28 19:36:42 maxv Exp $ */
+/* $NetBSD: policy_parse.y,v 1.14 2018/05/28 20:45:38 maxv Exp $ */
/* $KAME: policy_parse.y,v 1.21 2003/12/12 08:01:26 itojun Exp $ */
@@ -107,20 +107,20 @@ static struct sockaddr *p_src = NULL;
static struct sockaddr *p_dst = NULL;
struct _val;
-extern void yyerror __P((const char *msg));
-static struct sockaddr *parse_sockaddr __P((struct _val *addrbuf,
- struct _val *portbuf));
-static int rule_check __P((void));
-static int init_x_policy __P((void));
-static int set_x_request __P((struct sockaddr *, struct sockaddr *));
-static int set_sockaddr __P((struct sockaddr *));
-static void policy_parse_request_init __P((void));
-static void *policy_parse __P((const char *, int));
-
-extern void __policy__strbuffer__init__ __P((const char *));
-extern void __policy__strbuffer__free__ __P((void));
-extern int yyparse __P((void));
-extern int yylex __P((void));
+extern void yyerror(const char *msg);
+static struct sockaddr *parse_sockaddr(struct _val *addrbuf,
+ struct _val *portbuf);
+static int rule_check(void);
+static int init_x_policy(void);
+static int set_x_request(struct sockaddr *, struct sockaddr *);
+static int set_sockaddr(struct sockaddr *);
+static void policy_parse_request_init(void);
+static void *policy_parse(const char *, int);
+
+extern void __policy__strbuffer__init__(const char *);
+extern void __policy__strbuffer__free__(void);
+extern int yyparse(void);
+extern int yylex(void);
extern char *__libipsectext; /*XXX*/
Index: src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h
diff -u src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h:1.19 src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h:1.20
--- src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h:1.19 Wed Jan 4 15:55:35 2012
+++ src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h Mon May 28 20:45:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: libpfkey.h,v 1.19 2012/01/04 15:55:35 drochner Exp $ */
+/* $NetBSD: libpfkey.h,v 1.20 2018/05/28 20:45:38 maxv Exp $ */
/* Id: libpfkey.h,v 1.13 2005/12/04 20:26:43 manubsd Exp */
@@ -45,10 +45,10 @@
#define PRIORITY_OFFSET_NEGATIVE_MAX 0x40000000
struct sadb_msg;
-extern void pfkey_sadump __P((struct sadb_msg *));
-extern void pfkey_sadump_withports __P((struct sadb_msg *));
-extern void pfkey_spdump __P((struct sadb_msg *));
-extern void pfkey_spdump_withports __P((struct sadb_msg *));
+extern void pfkey_sadump(struct sadb_msg *);
+extern void pfkey_sadump_withports(struct sadb_msg *);
+extern void pfkey_spdump(struct sadb_msg *);
+extern void pfkey_spdump_withports(struct sadb_msg *);
struct sockaddr;
struct sadb_alg;
@@ -104,63 +104,63 @@ extern int libipsec_opt;
/* IPsec Library Routines */
-int ipsec_check_keylen __P((u_int, u_int, u_int));
-int ipsec_check_keylen2 __P((u_int, u_int, u_int));
-int ipsec_get_keylen __P((u_int, u_int, struct sadb_alg *));
-char *ipsec_dump_policy_withports __P((void *, const char *));
-void ipsec_hexdump __P((const void *, int));
-const char *ipsec_strerror __P((void));
-void kdebug_sadb __P((struct sadb_msg *));
-ipsec_policy_t ipsec_set_policy __P((__ipsec_const char *, int));
-int ipsec_get_policylen __P((ipsec_policy_t));
-char *ipsec_dump_policy __P((ipsec_policy_t, __ipsec_const char *));
+int ipsec_check_keylen(u_int, u_int, u_int);
+int ipsec_check_keylen2(u_int, u_int, u_int);
+int ipsec_get_keylen(u_int, u_int, struct sadb_alg *);
+char *ipsec_dump_policy_withports(void *, const char *);
+void ipsec_hexdump(const void *, int);
+const char *ipsec_strerror(void);
+void kdebug_sadb(struct sadb_msg *);
+ipsec_policy_t ipsec_set_policy(__ipsec_const char *, int);
+int ipsec_get_policylen(ipsec_policy_t);
+char *ipsec_dump_policy(ipsec_policy_t, __ipsec_const char *);
/* PFKey Routines */
-u_int pfkey_set_softrate __P((u_int, u_int));
-u_int pfkey_get_softrate __P((u_int));
-int pfkey_send_getspi __P((int, u_int, u_int, struct sockaddr *,
- struct sockaddr *, u_int32_t, u_int32_t, u_int32_t, u_int32_t));
-int pfkey_send_getspi_nat __P((int, u_int, u_int,
+u_int pfkey_set_softrate(u_int, u_int);
+u_int pfkey_get_softrate(u_int);
+int pfkey_send_getspi(int, u_int, u_int, struct sockaddr *,
+ struct sockaddr *, u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+int pfkey_send_getspi_nat(int, u_int, u_int,
struct sockaddr *, struct sockaddr *, u_int8_t, u_int16_t, u_int16_t,
- u_int32_t, u_int32_t, u_int32_t, u_int32_t));
+ u_int32_t, u_int32_t, u_int32_t, u_int32_t);
-int pfkey_send_update2 __P((struct pfkey_send_sa_args *));
-int pfkey_send_add2 __P((struct pfkey_send_sa_args *));
-int pfkey_send_delete __P((int, u_int, u_int,
- struct sockaddr *, struct sockaddr *, u_int32_t));
-int pfkey_send_delete_all __P((int, u_int, u_int,
- struct sockaddr *, struct sockaddr *));
-int pfkey_send_get __P((int, u_int, u_int,
- struct sockaddr *, struct sockaddr *, u_int32_t));
-int pfkey_send_register __P((int, u_int));
-int pfkey_recv_register __P((int));
-int pfkey_set_supported __P((struct sadb_msg *, int));
-int pfkey_send_flush __P((int, u_int));
-int pfkey_send_dump __P((int, u_int));
-int pfkey_send_promisc_toggle __P((int, int));
-int pfkey_send_spdadd __P((int, struct sockaddr *, u_int,
- struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
-int pfkey_send_spdadd2 __P((int, struct sockaddr *, u_int,
+int pfkey_send_update2(struct pfkey_send_sa_args *);
+int pfkey_send_add2(struct pfkey_send_sa_args *);
+int pfkey_send_delete(int, u_int, u_int,
+ struct sockaddr *, struct sockaddr *, u_int32_t);
+int pfkey_send_delete_all(int, u_int, u_int,
+ struct sockaddr *, struct sockaddr *);
+int pfkey_send_get(int, u_int, u_int,
+ struct sockaddr *, struct sockaddr *, u_int32_t);
+int pfkey_send_register(int, u_int);
+int pfkey_recv_register(int);
+int pfkey_set_supported(struct sadb_msg *, int);
+int pfkey_send_flush(int, u_int);
+int pfkey_send_dump(int, u_int);
+int pfkey_send_promisc_toggle(int, int);
+int pfkey_send_spdadd(int, struct sockaddr *, u_int,
+ struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t);
+int pfkey_send_spdadd2(int, struct sockaddr *, u_int,
struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
- caddr_t, int, u_int32_t));
-int pfkey_send_spdupdate __P((int, struct sockaddr *, u_int,
- struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
-int pfkey_send_spdupdate2 __P((int, struct sockaddr *, u_int,
+ caddr_t, int, u_int32_t);
+int pfkey_send_spdupdate(int, struct sockaddr *, u_int,
+ struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t);
+int pfkey_send_spdupdate2(int, struct sockaddr *, u_int,
struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
- caddr_t, int, u_int32_t));
-int pfkey_send_spddelete __P((int, struct sockaddr *, u_int,
- struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
-int pfkey_send_spddelete2 __P((int, u_int32_t));
-int pfkey_send_spdget __P((int, u_int32_t));
-int pfkey_send_spdsetidx __P((int, struct sockaddr *, u_int,
- struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
-int pfkey_send_spdflush __P((int));
-int pfkey_send_spddump __P((int));
+ caddr_t, int, u_int32_t);
+int pfkey_send_spddelete(int, struct sockaddr *, u_int,
+ struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t);
+int pfkey_send_spddelete2(int, u_int32_t);
+int pfkey_send_spdget(int, u_int32_t);
+int pfkey_send_spdsetidx(int, struct sockaddr *, u_int,
+ struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t);
+int pfkey_send_spdflush(int);
+int pfkey_send_spddump(int);
#ifdef SADB_X_MIGRATE
-int pfkey_send_migrate __P((int, struct sockaddr *, struct sockaddr *,
+int pfkey_send_migrate(int, struct sockaddr *, struct sockaddr *,
struct sockaddr *, u_int, struct sockaddr *, u_int, u_int,
- caddr_t, int, u_int32_t));
+ caddr_t, int, u_int32_t);
#endif
/* XXX should be somewhere else !!!
@@ -171,36 +171,36 @@ int pfkey_send_migrate __P((int, struct
#endif
-int pfkey_open __P((void));
-void pfkey_close __P((int));
-int pfkey_set_buffer_size __P((int, int));
-struct sadb_msg *pfkey_recv __P((int));
-int pfkey_send __P((int, struct sadb_msg *, int));
-int pfkey_align __P((struct sadb_msg *, caddr_t *));
-int pfkey_check __P((caddr_t *));
+int pfkey_open(void);
+void pfkey_close(int);
+int pfkey_set_buffer_size(int, int);
+struct sadb_msg *pfkey_recv(int);
+int pfkey_send(int, struct sadb_msg *, int);
+int pfkey_align(struct sadb_msg *, caddr_t *);
+int pfkey_check(caddr_t *);
/*
* Deprecated, available for backward compatibility with third party
* libipsec users. Please use pfkey_send_update2 and pfkey_send_add2 instead
*/
-int pfkey_send_update __P((int, u_int, u_int, struct sockaddr *,
+int pfkey_send_update(int, u_int, u_int, struct sockaddr *,
struct sockaddr *, u_int32_t, u_int32_t, u_int,
caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
- u_int64_t, u_int64_t, u_int32_t));
-int pfkey_send_update_nat __P((int, u_int, u_int, struct sockaddr *,
+ u_int64_t, u_int64_t, u_int32_t);
+int pfkey_send_update_nat(int, u_int, u_int, struct sockaddr *,
struct sockaddr *, u_int32_t, u_int32_t, u_int,
caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
u_int64_t, u_int64_t, u_int32_t,
- u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t));
-int pfkey_send_add __P((int, u_int, u_int, struct sockaddr *,
+ u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t);
+int pfkey_send_add(int, u_int, u_int, struct sockaddr *,
struct sockaddr *, u_int32_t, u_int32_t, u_int,
caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
- u_int64_t, u_int64_t, u_int32_t));
-int pfkey_send_add_nat __P((int, u_int, u_int, struct sockaddr *,
+ u_int64_t, u_int64_t, u_int32_t);
+int pfkey_send_add_nat(int, u_int, u_int, struct sockaddr *,
struct sockaddr *, u_int32_t, u_int32_t, u_int,
caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
u_int64_t, u_int64_t, u_int32_t,
- u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t));
+ u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t);
#ifndef __SYSDEP_SA_LEN__
#define __SYSDEP_SA_LEN__
Index: src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c:1.25 src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c:1.26
--- src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c:1.25 Mon May 28 19:22:40 2018
+++ src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c Mon May 28 20:45:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pfkey.c,v 1.25 2018/05/28 19:22:40 maxv Exp $ */
+/* $NetBSD: pfkey.c,v 1.26 2018/05/28 20:45:38 maxv Exp $ */
/* $KAME: pfkey.c,v 1.47 2003/10/02 19:52:12 itojun Exp $ */
/*
@@ -52,46 +52,46 @@
#define CALLOC(size, cast) (cast)calloc(1, (size))
-static int findsupportedmap __P((int));
-static int setsupportedmap __P((struct sadb_supported *));
-static struct sadb_alg *findsupportedalg __P((u_int, u_int));
-static int pfkey_send_x1 __P((struct pfkey_send_sa_args *));
-static int pfkey_send_x2 __P((int, u_int, u_int, u_int,
- struct sockaddr *, struct sockaddr *, u_int32_t));
-static int pfkey_send_x3 __P((int, u_int, u_int));
-static int pfkey_send_x4 __P((int, u_int, struct sockaddr *, u_int,
+static int findsupportedmap(int);
+static int setsupportedmap(struct sadb_supported *);
+static struct sadb_alg *findsupportedalg(u_int, u_int);
+static int pfkey_send_x1(struct pfkey_send_sa_args *);
+static int pfkey_send_x2(int, u_int, u_int, u_int,
+ struct sockaddr *, struct sockaddr *, u_int32_t);
+static int pfkey_send_x3(int, u_int, u_int);
+static int pfkey_send_x4(int, u_int, struct sockaddr *, u_int,
struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
- char *, int, u_int32_t));
-static int pfkey_send_x5 __P((int, u_int, u_int32_t));
+ char *, int, u_int32_t);
+static int pfkey_send_x5(int, u_int, u_int32_t);
-static caddr_t pfkey_setsadbmsg __P((caddr_t, caddr_t, u_int, u_int,
- u_int, u_int32_t, pid_t));
-static caddr_t pfkey_setsadbsa __P((caddr_t, caddr_t, u_int32_t, u_int,
- u_int, u_int, u_int32_t));
-static caddr_t pfkey_setsadbaddr __P((caddr_t, caddr_t, u_int,
- struct sockaddr *, u_int, u_int));
+static caddr_t pfkey_setsadbmsg(caddr_t, caddr_t, u_int, u_int,
+ u_int, u_int32_t, pid_t);
+static caddr_t pfkey_setsadbsa(caddr_t, caddr_t, u_int32_t, u_int,
+ u_int, u_int, u_int32_t);
+static caddr_t pfkey_setsadbaddr(caddr_t, caddr_t, u_int,
+ struct sockaddr *, u_int, u_int);
#ifdef SADB_X_EXT_KMADDRESS
-static caddr_t pfkey_setsadbkmaddr __P((caddr_t, caddr_t, struct sockaddr *,
- struct sockaddr *));
+static caddr_t pfkey_setsadbkmaddr(caddr_t, caddr_t, struct sockaddr *,
+ struct sockaddr *);
#endif
-static caddr_t pfkey_setsadbkey __P((caddr_t, caddr_t, u_int, caddr_t, u_int));
-static caddr_t pfkey_setsadblifetime __P((caddr_t, caddr_t, u_int, u_int32_t,
- u_int32_t, u_int32_t, u_int32_t));
-static caddr_t pfkey_setsadbxsa2 __P((caddr_t, caddr_t, u_int32_t, u_int32_t));
+static caddr_t pfkey_setsadbkey(caddr_t, caddr_t, u_int, caddr_t, u_int);
+static caddr_t pfkey_setsadblifetime(caddr_t, caddr_t, u_int, u_int32_t,
+ u_int32_t, u_int32_t, u_int32_t);
+static caddr_t pfkey_setsadbxsa2(caddr_t, caddr_t, u_int32_t, u_int32_t);
#ifdef SADB_X_EXT_NAT_T_TYPE
-static caddr_t pfkey_set_natt_type __P((caddr_t, caddr_t, u_int, u_int8_t));
-static caddr_t pfkey_set_natt_port __P((caddr_t, caddr_t, u_int, u_int16_t));
+static caddr_t pfkey_set_natt_type(caddr_t, caddr_t, u_int, u_int8_t);
+static caddr_t pfkey_set_natt_port(caddr_t, caddr_t, u_int, u_int16_t);
#endif
#ifdef SADB_X_EXT_NAT_T_FRAG
-static caddr_t pfkey_set_natt_frag __P((caddr_t, caddr_t, u_int, u_int16_t));
+static caddr_t pfkey_set_natt_frag(caddr_t, caddr_t, u_int, u_int16_t);
#endif
#ifdef SADB_X_EXT_SEC_CTX
-static caddr_t pfkey_setsecctx __P((caddr_t, caddr_t, u_int, u_int8_t, u_int8_t,
- caddr_t, u_int16_t));
+static caddr_t pfkey_setsecctx(caddr_t, caddr_t, u_int, u_int8_t, u_int8_t,
+ caddr_t, u_int16_t);
#endif
int libipsec_opt = 0
Index: src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c:1.23 src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c:1.24
--- src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c:1.23 Mon May 28 19:36:42 2018
+++ src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c Mon May 28 20:45:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pfkey_dump.c,v 1.23 2018/05/28 19:36:42 maxv Exp $ */
+/* $NetBSD: pfkey_dump.c,v 1.24 2018/05/28 20:45:38 maxv Exp $ */
/* $KAME: pfkey_dump.c,v 1.45 2003/09/08 10:14:56 itojun Exp $ */
@@ -105,12 +105,12 @@ do { \
printf("%u ", (num)); \
} while (/*CONSTCOND*/0)
-static const char *str_ipaddr __P((struct sockaddr *));
-static const char *str_ipport __P((struct sockaddr *));
-static const char *str_prefport __P((u_int, u_int, u_int, u_int));
-static void str_upperspec __P((u_int, u_int, u_int));
-static char *str_time __P((time_t));
-static void str_lifetime_byte __P((struct sadb_lifetime *, const char *));
+static const char *str_ipaddr(struct sockaddr *);
+static const char *str_ipport(struct sockaddr *);
+static const char *str_prefport(u_int, u_int, u_int, u_int);
+static void str_upperspec(u_int, u_int, u_int);
+static char *str_time(time_t);
+static void str_lifetime_byte(struct sadb_lifetime *, const char *);
static void pfkey_sadump1(struct sadb_msg *, int);
static void pfkey_spdump1(struct sadb_msg *, int);
Index: src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l
diff -u src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l:1.9 src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l:1.10
--- src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l:1.9 Mon May 28 19:22:40 2018
+++ src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l Mon May 28 20:45:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: policy_token.l,v 1.9 2018/05/28 19:22:40 maxv Exp $ */
+/* $NetBSD: policy_token.l,v 1.10 2018/05/28 20:45:38 maxv Exp $ */
/* Id: policy_token.l,v 1.12 2005/05/05 12:32:18 manubsd Exp */
@@ -59,7 +59,7 @@
#endif
#define yylval __libipseclval /* XXX */
-int yylex __P((void));
+int yylex(void);
%}
%option noyywrap
@@ -167,8 +167,8 @@ unique { yylval.num = IPSEC_LEVEL_UNIQU
%%
-void __policy__strbuffer__init__ __P((char *));
-void __policy__strbuffer__free__ __P((void));
+void __policy__strbuffer__init__(char *);
+void __policy__strbuffer__free__(void);
static YY_BUFFER_STATE strbuffer;
