Remove __P() macro.
Suggested by: kevlo Sponsored by: Yandex LLC
This commit is contained in:
Andrey V. Elsukov
parent
2e84e6eac9
commit
18961126cb
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=275438
@ -237,17 +237,17 @@ SYSCTL_VNET_PCPUSTAT(_net_inet6_ipsec6, IPSECCTL_STATS, ipsecstats,
|
||||
struct ipsecstat, ipsec6stat, "IPsec IPv6 statistics.");
|
||||
#endif /* INET6 */
|
||||
|
||||
static int ipsec_setspidx_inpcb __P((struct mbuf *, struct inpcb *));
|
||||
static int ipsec_setspidx __P((struct mbuf *, struct secpolicyindex *, int));
|
||||
static void ipsec4_get_ulp __P((struct mbuf *m, struct secpolicyindex *, int));
|
||||
static int ipsec4_setspidx_ipaddr __P((struct mbuf *, struct secpolicyindex *));
|
||||
static int ipsec_setspidx_inpcb(struct mbuf *, struct inpcb *);
|
||||
static int ipsec_setspidx(struct mbuf *, struct secpolicyindex *, int);
|
||||
static void ipsec4_get_ulp(struct mbuf *m, struct secpolicyindex *, int);
|
||||
static int ipsec4_setspidx_ipaddr(struct mbuf *, struct secpolicyindex *);
|
||||
#ifdef INET6
|
||||
static void ipsec6_get_ulp __P((struct mbuf *m, struct secpolicyindex *, int));
|
||||
static int ipsec6_setspidx_ipaddr __P((struct mbuf *, struct secpolicyindex *));
|
||||
static void ipsec6_get_ulp(struct mbuf *m, struct secpolicyindex *, int);
|
||||
static int ipsec6_setspidx_ipaddr(struct mbuf *, struct secpolicyindex *);
|
||||
#endif
|
||||
static void ipsec_delpcbpolicy __P((struct inpcbpolicy *));
|
||||
static struct secpolicy *ipsec_deepcopy_policy __P((struct secpolicy *src));
|
||||
static void vshiftl __P((unsigned char *, int, int));
|
||||
static void ipsec_delpcbpolicy(struct inpcbpolicy *);
|
||||
static struct secpolicy *ipsec_deepcopy_policy(struct secpolicy *src);
|
||||
static void vshiftl(unsigned char *, int, int);
|
||||
|
||||
MALLOC_DEFINE(M_IPSEC_INPCB, "inpcbpolicy", "inpcb-resident ipsec policy");
|
||||
|
||||
|
||||
@ -311,40 +311,39 @@ extern struct ipsecrequest *ipsec_newisr(void);
|
||||
extern void ipsec_delisr(struct ipsecrequest *);
|
||||
|
||||
struct tdb_ident;
|
||||
extern struct secpolicy *ipsec_getpolicy __P((struct tdb_ident*, u_int));
|
||||
extern struct secpolicy *ipsec_getpolicy(struct tdb_ident*, u_int);
|
||||
struct inpcb;
|
||||
extern struct secpolicy *ipsec4_checkpolicy __P((struct mbuf *, u_int, u_int,
|
||||
int *, struct inpcb *));
|
||||
extern struct secpolicy *ipsec4_checkpolicy(struct mbuf *, u_int, u_int,
|
||||
int *, struct inpcb *);
|
||||
extern struct secpolicy * ipsec_getpolicybyaddr(struct mbuf *, u_int,
|
||||
int, int *);
|
||||
|
||||
struct inpcb;
|
||||
extern int ipsec_init_policy __P((struct socket *so, struct inpcbpolicy **));
|
||||
extern int ipsec_copy_policy
|
||||
__P((struct inpcbpolicy *, struct inpcbpolicy *));
|
||||
extern u_int ipsec_get_reqlevel __P((struct ipsecrequest *));
|
||||
extern int ipsec_in_reject __P((struct secpolicy *, struct mbuf *));
|
||||
extern int ipsec_init_policy(struct socket *so, struct inpcbpolicy **);
|
||||
extern int ipsec_copy_policy(struct inpcbpolicy *, struct inpcbpolicy *);
|
||||
extern u_int ipsec_get_reqlevel(struct ipsecrequest *);
|
||||
extern int ipsec_in_reject(struct secpolicy *, struct mbuf *);
|
||||
|
||||
extern int ipsec_set_policy __P((struct inpcb *inp, int optname,
|
||||
caddr_t request, size_t len, struct ucred *cred));
|
||||
extern int ipsec_get_policy __P((struct inpcb *inpcb, caddr_t request,
|
||||
size_t len, struct mbuf **mp));
|
||||
extern int ipsec_delete_pcbpolicy __P((struct inpcb *));
|
||||
extern int ipsec4_in_reject __P((struct mbuf *, struct inpcb *));
|
||||
extern int ipsec_set_policy(struct inpcb *inp, int optname,
|
||||
caddr_t request, size_t len, struct ucred *cred);
|
||||
extern int ipsec_get_policy(struct inpcb *inpcb, caddr_t request,
|
||||
size_t len, struct mbuf **mp);
|
||||
extern int ipsec_delete_pcbpolicy(struct inpcb *);
|
||||
extern int ipsec4_in_reject(struct mbuf *, struct inpcb *);
|
||||
|
||||
struct secas;
|
||||
struct tcpcb;
|
||||
extern int ipsec_chkreplay __P((u_int32_t, struct secasvar *));
|
||||
extern int ipsec_updatereplay __P((u_int32_t, struct secasvar *));
|
||||
extern int ipsec_chkreplay(u_int32_t, struct secasvar *);
|
||||
extern int ipsec_updatereplay(u_int32_t, struct secasvar *);
|
||||
|
||||
extern size_t ipsec_hdrsiz __P((struct mbuf *, u_int, struct inpcb *));
|
||||
extern size_t ipsec_hdrsiz_tcp __P((struct tcpcb *));
|
||||
extern size_t ipsec_hdrsiz(struct mbuf *, u_int, struct inpcb *);
|
||||
extern size_t ipsec_hdrsiz_tcp(struct tcpcb *);
|
||||
|
||||
union sockaddr_union;
|
||||
extern char * ipsec_address(union sockaddr_union* sa);
|
||||
extern const char *ipsec_logsastr __P((struct secasvar *));
|
||||
extern const char *ipsec_logsastr(struct secasvar *);
|
||||
|
||||
extern void ipsec_dumpmbuf __P((struct mbuf *));
|
||||
extern void ipsec_dumpmbuf(struct mbuf *);
|
||||
|
||||
struct m_tag;
|
||||
extern int ah4_input(struct mbuf **mp, int *offp, int proto);
|
||||
@ -355,11 +354,11 @@ extern int ipcomp4_input(struct mbuf **mp, int *offp, int proto);
|
||||
extern int ipsec4_common_input(struct mbuf *m, ...);
|
||||
extern int ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
|
||||
int skip, int protoff, struct m_tag *mt);
|
||||
extern int ipsec4_process_packet __P((struct mbuf *, struct ipsecrequest *,
|
||||
int, int));
|
||||
extern int ipsec_process_done __P((struct mbuf *, struct ipsecrequest *));
|
||||
extern int ipsec4_process_packet(struct mbuf *, struct ipsecrequest *,
|
||||
int, int);
|
||||
extern int ipsec_process_done(struct mbuf *, struct ipsecrequest *);
|
||||
|
||||
extern struct mbuf *ipsec_copypkt __P((struct mbuf *));
|
||||
extern struct mbuf *ipsec_copypkt(struct mbuf *);
|
||||
|
||||
extern void m_checkalignment(const char* where, struct mbuf *m0,
|
||||
int off, int len);
|
||||
@ -378,11 +377,10 @@ extern void ipsec_bpf(struct mbuf *, struct secasvar *, int, int);
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#ifndef _KERNEL
|
||||
extern caddr_t ipsec_set_policy __P((char *, int));
|
||||
extern int ipsec_get_policylen __P((caddr_t));
|
||||
extern char *ipsec_dump_policy __P((caddr_t, char *));
|
||||
|
||||
extern const char *ipsec_strerror __P((void));
|
||||
extern caddr_t ipsec_set_policy(char *, int);
|
||||
extern int ipsec_get_policylen(caddr_t);
|
||||
extern char *ipsec_dump_policy(caddr_t, char *);
|
||||
extern const char *ipsec_strerror(void);
|
||||
|
||||
#endif /* ! KERNEL */
|
||||
|
||||
|
||||
@ -59,7 +59,7 @@ VNET_DECLARE(int, ip6_ipsec_ecn);
|
||||
#define V_ip6_ipsec_ecn VNET(ip6_ipsec_ecn)
|
||||
|
||||
struct inpcb;
|
||||
extern int ipsec6_in_reject __P((struct mbuf *, struct inpcb *));
|
||||
extern int ipsec6_in_reject(struct mbuf *, struct inpcb *);
|
||||
|
||||
struct m_tag;
|
||||
extern int ipsec6_common_input(struct mbuf **mp, int *offp, int proto);
|
||||
|
||||
@ -413,54 +413,54 @@ struct sadb_msghdr {
|
||||
static struct callout key_timer;
|
||||
#endif
|
||||
|
||||
static struct secasvar *key_allocsa_policy __P((const struct secasindex *));
|
||||
static void key_freesp_so __P((struct secpolicy **));
|
||||
static struct secasvar *key_do_allocsa_policy __P((struct secashead *, u_int));
|
||||
static void key_delsp __P((struct secpolicy *));
|
||||
static struct secpolicy *key_getsp __P((struct secpolicyindex *));
|
||||
static struct secasvar *key_allocsa_policy(const struct secasindex *);
|
||||
static void key_freesp_so(struct secpolicy **);
|
||||
static struct secasvar *key_do_allocsa_policy(struct secashead *, u_int);
|
||||
static void key_delsp(struct secpolicy *);
|
||||
static struct secpolicy *key_getsp(struct secpolicyindex *);
|
||||
static void _key_delsp(struct secpolicy *sp);
|
||||
static struct secpolicy *key_getspbyid __P((u_int32_t));
|
||||
static u_int32_t key_newreqid __P((void));
|
||||
static struct mbuf *key_gather_mbuf __P((struct mbuf *,
|
||||
const struct sadb_msghdr *, int, int, ...));
|
||||
static int key_spdadd __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static u_int32_t key_getnewspid __P((void));
|
||||
static int key_spddelete __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_spddelete2 __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_spdget __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_spdflush __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_spddump __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static struct mbuf *key_setdumpsp __P((struct secpolicy *,
|
||||
u_int8_t, u_int32_t, u_int32_t));
|
||||
static u_int key_getspreqmsglen __P((struct secpolicy *));
|
||||
static int key_spdexpire __P((struct secpolicy *));
|
||||
static struct secashead *key_newsah __P((struct secasindex *));
|
||||
static void key_delsah __P((struct secashead *));
|
||||
static struct secasvar *key_newsav __P((struct mbuf *,
|
||||
static struct secpolicy *key_getspbyid(u_int32_t);
|
||||
static u_int32_t key_newreqid(void);
|
||||
static struct mbuf *key_gather_mbuf(struct mbuf *,
|
||||
const struct sadb_msghdr *, int, int, ...);
|
||||
static int key_spdadd(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static u_int32_t key_getnewspid(void);
|
||||
static int key_spddelete(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_spddelete2(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_spdget(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_spdflush(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_spddump(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static struct mbuf *key_setdumpsp(struct secpolicy *,
|
||||
u_int8_t, u_int32_t, u_int32_t);
|
||||
static u_int key_getspreqmsglen(struct secpolicy *);
|
||||
static int key_spdexpire(struct secpolicy *);
|
||||
static struct secashead *key_newsah(struct secasindex *);
|
||||
static void key_delsah(struct secashead *);
|
||||
static struct secasvar *key_newsav(struct mbuf *,
|
||||
const struct sadb_msghdr *, struct secashead *, int *,
|
||||
const char*, int));
|
||||
const char*, int);
|
||||
#define KEY_NEWSAV(m, sadb, sah, e) \
|
||||
key_newsav(m, sadb, sah, e, __FILE__, __LINE__)
|
||||
static void key_delsav __P((struct secasvar *));
|
||||
static struct secashead *key_getsah __P((struct secasindex *));
|
||||
static struct secasvar *key_checkspidup __P((struct secasindex *, u_int32_t));
|
||||
static struct secasvar *key_getsavbyspi __P((struct secashead *, u_int32_t));
|
||||
static int key_setsaval __P((struct secasvar *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_mature __P((struct secasvar *));
|
||||
static struct mbuf *key_setdumpsa __P((struct secasvar *, u_int8_t,
|
||||
u_int8_t, u_int32_t, u_int32_t));
|
||||
static struct mbuf *key_setsadbmsg __P((u_int8_t, u_int16_t, u_int8_t,
|
||||
u_int32_t, pid_t, u_int16_t));
|
||||
static struct mbuf *key_setsadbsa __P((struct secasvar *));
|
||||
static struct mbuf *key_setsadbaddr __P((u_int16_t,
|
||||
const struct sockaddr *, u_int8_t, u_int16_t));
|
||||
static void key_delsav(struct secasvar *);
|
||||
static struct secashead *key_getsah(struct secasindex *);
|
||||
static struct secasvar *key_checkspidup(struct secasindex *, u_int32_t);
|
||||
static struct secasvar *key_getsavbyspi(struct secashead *, u_int32_t);
|
||||
static int key_setsaval(struct secasvar *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_mature(struct secasvar *);
|
||||
static struct mbuf *key_setdumpsa(struct secasvar *, u_int8_t,
|
||||
u_int8_t, u_int32_t, u_int32_t);
|
||||
static struct mbuf *key_setsadbmsg(u_int8_t, u_int16_t, u_int8_t,
|
||||
u_int32_t, pid_t, u_int16_t);
|
||||
static struct mbuf *key_setsadbsa(struct secasvar *);
|
||||
static struct mbuf *key_setsadbaddr(u_int16_t,
|
||||
const struct sockaddr *, u_int8_t, u_int16_t);
|
||||
#ifdef IPSEC_NAT_T
|
||||
static struct mbuf *key_setsadbxport(u_int16_t, u_int16_t);
|
||||
static struct mbuf *key_setsadbxtype(u_int16_t);
|
||||
@ -468,15 +468,15 @@ static struct mbuf *key_setsadbxtype(u_int16_t);
|
||||
static void key_porttosaddr(struct sockaddr *, u_int16_t);
|
||||
#define KEY_PORTTOSADDR(saddr, port) \
|
||||
key_porttosaddr((struct sockaddr *)(saddr), (port))
|
||||
static struct mbuf *key_setsadbxsa2 __P((u_int8_t, u_int32_t, u_int32_t));
|
||||
static struct mbuf *key_setsadbxpolicy __P((u_int16_t, u_int8_t,
|
||||
u_int32_t));
|
||||
static struct mbuf *key_setsadbxsa2(u_int8_t, u_int32_t, u_int32_t);
|
||||
static struct mbuf *key_setsadbxpolicy(u_int16_t, u_int8_t,
|
||||
u_int32_t);
|
||||
static struct seckey *key_dup_keymsg(const struct sadb_key *, u_int,
|
||||
struct malloc_type *);
|
||||
static struct seclifetime *key_dup_lifemsg(const struct sadb_lifetime *src,
|
||||
struct malloc_type *type);
|
||||
#ifdef INET6
|
||||
static int key_ismyaddr6 __P((struct sockaddr_in6 *));
|
||||
static int key_ismyaddr6(struct sockaddr_in6 *);
|
||||
#endif
|
||||
|
||||
/* flags for key_cmpsaidx() */
|
||||
@ -484,73 +484,75 @@ static int key_ismyaddr6 __P((struct sockaddr_in6 *));
|
||||
#define CMP_MODE_REQID 2 /* additionally HEAD, reqid, mode. */
|
||||
#define CMP_REQID 3 /* additionally HEAD, reaid. */
|
||||
#define CMP_EXACTLY 4 /* all elements. */
|
||||
static int key_cmpsaidx
|
||||
__P((const struct secasindex *, const struct secasindex *, int));
|
||||
static int key_cmpsaidx(const struct secasindex *,
|
||||
const struct secasindex *, int);
|
||||
static int key_cmpspidx_exactly(struct secpolicyindex *,
|
||||
struct secpolicyindex *);
|
||||
static int key_cmpspidx_withmask(struct secpolicyindex *,
|
||||
struct secpolicyindex *);
|
||||
static int key_sockaddrcmp(const struct sockaddr *,
|
||||
const struct sockaddr *, int);
|
||||
static int key_bbcmp(const void *, const void *, u_int);
|
||||
static u_int16_t key_satype2proto(u_int8_t);
|
||||
static u_int8_t key_proto2satype(u_int16_t);
|
||||
|
||||
static int key_cmpspidx_exactly
|
||||
__P((struct secpolicyindex *, struct secpolicyindex *));
|
||||
static int key_cmpspidx_withmask
|
||||
__P((struct secpolicyindex *, struct secpolicyindex *));
|
||||
static int key_sockaddrcmp __P((const struct sockaddr *, const struct sockaddr *, int));
|
||||
static int key_bbcmp __P((const void *, const void *, u_int));
|
||||
static u_int16_t key_satype2proto __P((u_int8_t));
|
||||
static u_int8_t key_proto2satype __P((u_int16_t));
|
||||
|
||||
static int key_getspi __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static u_int32_t key_do_getnewspi __P((struct sadb_spirange *,
|
||||
struct secasindex *));
|
||||
static int key_update __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_getspi(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static u_int32_t key_do_getnewspi(struct sadb_spirange *,
|
||||
struct secasindex *);
|
||||
static int key_update(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
#ifdef IPSEC_DOSEQCHECK
|
||||
static struct secasvar *key_getsavbyseq __P((struct secashead *, u_int32_t));
|
||||
static struct secasvar *key_getsavbyseq(struct secashead *, u_int32_t);
|
||||
#endif
|
||||
static int key_add __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_setident __P((struct secashead *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static struct mbuf *key_getmsgbuf_x1 __P((struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_delete __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_get __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_add(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_setident(struct secashead *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static struct mbuf *key_getmsgbuf_x1(struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_delete(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_delete_all(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *, u_int16_t);
|
||||
static int key_get(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
|
||||
static void key_getcomb_setlifetime __P((struct sadb_comb *));
|
||||
static struct mbuf *key_getcomb_esp __P((void));
|
||||
static struct mbuf *key_getcomb_ah __P((void));
|
||||
static struct mbuf *key_getcomb_ipcomp __P((void));
|
||||
static struct mbuf *key_getprop __P((const struct secasindex *));
|
||||
static void key_getcomb_setlifetime(struct sadb_comb *);
|
||||
static struct mbuf *key_getcomb_esp(void);
|
||||
static struct mbuf *key_getcomb_ah(void);
|
||||
static struct mbuf *key_getcomb_ipcomp(void);
|
||||
static struct mbuf *key_getprop(const struct secasindex *);
|
||||
|
||||
static int key_acquire __P((const struct secasindex *, struct secpolicy *));
|
||||
static struct secacq *key_newacq __P((const struct secasindex *));
|
||||
static struct secacq *key_getacq __P((const struct secasindex *));
|
||||
static struct secacq *key_getacqbyseq __P((u_int32_t));
|
||||
static struct secspacq *key_newspacq __P((struct secpolicyindex *));
|
||||
static struct secspacq *key_getspacq __P((struct secpolicyindex *));
|
||||
static int key_acquire2 __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_register __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_expire __P((struct secasvar *));
|
||||
static int key_flush __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_dump __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_promisc __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *));
|
||||
static int key_senderror __P((struct socket *, struct mbuf *, int));
|
||||
static int key_validate_ext __P((const struct sadb_ext *, int));
|
||||
static int key_align __P((struct mbuf *, struct sadb_msghdr *));
|
||||
static int key_acquire(const struct secasindex *, struct secpolicy *);
|
||||
static struct secacq *key_newacq(const struct secasindex *);
|
||||
static struct secacq *key_getacq(const struct secasindex *);
|
||||
static struct secacq *key_getacqbyseq(u_int32_t);
|
||||
static struct secspacq *key_newspacq(struct secpolicyindex *);
|
||||
static struct secspacq *key_getspacq(struct secpolicyindex *);
|
||||
static int key_acquire2(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_register(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_expire(struct secasvar *);
|
||||
static int key_flush(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_dump(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_promisc(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *);
|
||||
static int key_senderror(struct socket *, struct mbuf *, int);
|
||||
static int key_validate_ext(const struct sadb_ext *, int);
|
||||
static int key_align(struct mbuf *, struct sadb_msghdr *);
|
||||
static struct mbuf *key_setlifetime(struct seclifetime *src,
|
||||
u_int16_t exttype);
|
||||
static struct mbuf *key_setkey(struct seckey *src, u_int16_t exttype);
|
||||
|
||||
#if 0
|
||||
static const char *key_getfqdn __P((void));
|
||||
static const char *key_getuserfqdn __P((void));
|
||||
static const char *key_getfqdn(void);
|
||||
static const char *key_getuserfqdn(void);
|
||||
#endif
|
||||
static void key_sa_chgstate __P((struct secasvar *, u_int8_t));
|
||||
static void key_sa_chgstate(struct secasvar *, u_int8_t);
|
||||
|
||||
static __inline void
|
||||
sa_initref(struct secasvar *sav)
|
||||
@ -5474,9 +5476,6 @@ key_getmsgbuf_x1(struct mbuf *m, const struct sadb_msghdr *mhp)
|
||||
return n;
|
||||
}
|
||||
|
||||
static int key_delete_all __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *, u_int16_t));
|
||||
|
||||
/*
|
||||
* SADB_DELETE processing
|
||||
* receive
|
||||
@ -7134,8 +7133,8 @@ key_promisc(struct socket *so, struct mbuf *m, const struct sadb_msghdr *mhp)
|
||||
}
|
||||
}
|
||||
|
||||
static int (*key_typesw[]) __P((struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *)) = {
|
||||
static int (*key_typesw[])(struct socket *, struct mbuf *,
|
||||
const struct sadb_msghdr *) = {
|
||||
NULL, /* SADB_RESERVED */
|
||||
key_getspi, /* SADB_GETSPI */
|
||||
key_update, /* SADB_UPDATE */
|
||||
|
||||
@ -86,27 +86,26 @@ extern void key_freesav(struct secasvar **, const char*, int);
|
||||
#define KEY_FREESAV(psav) \
|
||||
key_freesav(psav, __FILE__, __LINE__)
|
||||
|
||||
extern void key_freeso __P((struct socket *));
|
||||
extern int key_checktunnelsanity __P((struct secasvar *, u_int,
|
||||
caddr_t, caddr_t));
|
||||
extern int key_checkrequest
|
||||
__P((struct ipsecrequest *isr, const struct secasindex *));
|
||||
|
||||
extern struct secpolicy *key_msg2sp __P((struct sadb_x_policy *,
|
||||
size_t, int *));
|
||||
extern struct mbuf *key_sp2msg __P((struct secpolicy *));
|
||||
extern int key_ismyaddr __P((struct sockaddr *));
|
||||
extern int key_spdacquire __P((struct secpolicy *));
|
||||
extern u_long key_random __P((void));
|
||||
extern void key_randomfill __P((void *, size_t));
|
||||
extern void key_freereg __P((struct socket *));
|
||||
extern int key_parse __P((struct mbuf *, struct socket *));
|
||||
extern void key_init __P((void));
|
||||
extern void key_freeso(struct socket *);
|
||||
extern int key_checktunnelsanity(struct secasvar *, u_int,
|
||||
caddr_t, caddr_t);
|
||||
extern int key_checkrequest(struct ipsecrequest *isr,
|
||||
const struct secasindex *);
|
||||
extern struct secpolicy *key_msg2sp(struct sadb_x_policy *,
|
||||
size_t, int *);
|
||||
extern struct mbuf *key_sp2msg(struct secpolicy *);
|
||||
extern int key_ismyaddr(struct sockaddr *);
|
||||
extern int key_spdacquire(struct secpolicy *);
|
||||
extern u_long key_random(void);
|
||||
extern void key_randomfill(void *, size_t);
|
||||
extern void key_freereg(struct socket *);
|
||||
extern int key_parse(struct mbuf *, struct socket *);
|
||||
extern void key_init(void);
|
||||
#ifdef VIMAGE
|
||||
extern void key_destroy(void);
|
||||
#endif
|
||||
extern void key_sa_recordxfer __P((struct secasvar *, struct mbuf *));
|
||||
extern void key_sa_stir_iv __P((struct secasvar *));
|
||||
extern void key_sa_recordxfer(struct secasvar *, struct mbuf *);
|
||||
extern void key_sa_stir_iv(struct secasvar *);
|
||||
#ifdef IPSEC_NAT_T
|
||||
u_int16_t key_portfromsaddr(struct sockaddr *);
|
||||
#define KEY_PORTFROMSADDR(saddr) \
|
||||
|
||||
@ -62,17 +62,17 @@
|
||||
#include <stdlib.h>
|
||||
#endif /* !_KERNEL */
|
||||
|
||||
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_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 *);
|
||||
|
||||
#ifdef _KERNEL
|
||||
static void kdebug_secreplay __P((struct secreplay *));
|
||||
static void kdebug_secreplay(struct secreplay *);
|
||||
#endif
|
||||
|
||||
#ifndef _KERNEL
|
||||
|
||||
@ -62,8 +62,8 @@ VNET_DECLARE(u_int32_t, key_debug_level);
|
||||
|
||||
struct sadb_msg;
|
||||
struct sadb_ext;
|
||||
extern void kdebug_sadb __P((struct sadb_msg *));
|
||||
extern void kdebug_sadb_x_policy __P((struct sadb_ext *));
|
||||
extern void kdebug_sadb(struct sadb_msg *);
|
||||
extern void kdebug_sadb_x_policy(struct sadb_ext *);
|
||||
|
||||
#ifdef _KERNEL
|
||||
struct secpolicy;
|
||||
@ -72,18 +72,18 @@ struct secasindex;
|
||||
struct secasvar;
|
||||
struct secreplay;
|
||||
struct mbuf;
|
||||
extern void kdebug_secpolicy __P((struct secpolicy *));
|
||||
extern void kdebug_secpolicyindex __P((struct secpolicyindex *));
|
||||
extern void kdebug_secasindex __P((struct secasindex *));
|
||||
extern void kdebug_secasv __P((struct secasvar *));
|
||||
extern void kdebug_mbufhdr __P((struct mbuf *));
|
||||
extern void kdebug_mbuf __P((struct mbuf *));
|
||||
extern void kdebug_secpolicy(struct secpolicy *);
|
||||
extern void kdebug_secpolicyindex(struct secpolicyindex *);
|
||||
extern void kdebug_secasindex(struct secasindex *);
|
||||
extern void kdebug_secasv(struct secasvar *);
|
||||
extern void kdebug_mbufhdr(struct mbuf *);
|
||||
extern void kdebug_mbuf(struct mbuf *);
|
||||
#endif /*_KERNEL*/
|
||||
|
||||
struct sockaddr;
|
||||
extern void kdebug_sockaddr __P((struct sockaddr *));
|
||||
extern void kdebug_sockaddr(struct sockaddr *);
|
||||
|
||||
extern void ipsec_hexdump __P((caddr_t, int));
|
||||
extern void ipsec_bindump __P((caddr_t, int));
|
||||
extern void ipsec_hexdump(caddr_t, int);
|
||||
extern void ipsec_bindump(caddr_t, int);
|
||||
|
||||
#endif /* _NETIPSEC_KEY_DEBUG_H_ */
|
||||
|
||||
@ -198,21 +198,21 @@ struct secacq {
|
||||
#define SADB_KILL_INTERVAL 600 /* six seconds */
|
||||
|
||||
/* secpolicy */
|
||||
extern struct secpolicy *keydb_newsecpolicy __P((void));
|
||||
extern void keydb_delsecpolicy __P((struct secpolicy *));
|
||||
extern struct secpolicy *keydb_newsecpolicy(void);
|
||||
extern void keydb_delsecpolicy(struct secpolicy *);
|
||||
/* secashead */
|
||||
extern struct secashead *keydb_newsecashead __P((void));
|
||||
extern void keydb_delsecashead __P((struct secashead *));
|
||||
extern struct secashead *keydb_newsecashead(void);
|
||||
extern void keydb_delsecashead(struct secashead *);
|
||||
/* secasvar */
|
||||
extern struct secasvar *keydb_newsecasvar __P((void));
|
||||
extern void keydb_refsecasvar __P((struct secasvar *));
|
||||
extern void keydb_freesecasvar __P((struct secasvar *));
|
||||
extern struct secasvar *keydb_newsecasvar(void);
|
||||
extern void keydb_refsecasvar(struct secasvar *);
|
||||
extern void keydb_freesecasvar(struct secasvar *);
|
||||
/* secreplay */
|
||||
extern struct secreplay *keydb_newsecreplay __P((size_t));
|
||||
extern void keydb_delsecreplay __P((struct secreplay *));
|
||||
extern struct secreplay *keydb_newsecreplay(size_t);
|
||||
extern void keydb_delsecreplay(struct secreplay *);
|
||||
/* secreg */
|
||||
extern struct secreg *keydb_newsecreg __P((void));
|
||||
extern void keydb_delsecreg __P((struct secreg *));
|
||||
extern struct secreg *keydb_newsecreg(void);
|
||||
extern void keydb_delsecreg(struct secreg *);
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
||||
@ -74,7 +74,7 @@ static VNET_DEFINE(struct key_cb, key_cb);
|
||||
|
||||
static struct sockaddr key_src = { 2, PF_KEY, };
|
||||
|
||||
static int key_sendup0 __P((struct rawcb *, struct mbuf *, int));
|
||||
static int key_sendup0(struct rawcb *, struct mbuf *, int);
|
||||
|
||||
VNET_PCPUSTAT_DEFINE(struct pfkeystat, pfkeystat);
|
||||
VNET_PCPUSTAT_SYSINIT(pfkeystat);
|
||||
|
||||
@ -77,11 +77,11 @@ VNET_PCPUSTAT_DECLARE(struct pfkeystat, pfkeystat);
|
||||
#define PFKEYSTAT_INC(name) PFKEYSTAT_ADD(name, 1)
|
||||
|
||||
extern int key_output(struct mbuf *m, struct socket *so, ...);
|
||||
extern int key_usrreq __P((struct socket *,
|
||||
int, struct mbuf *, struct mbuf *, struct mbuf *));
|
||||
extern int key_usrreq(struct socket *, int, struct mbuf *,
|
||||
struct mbuf *, struct mbuf *);
|
||||
|
||||
extern int key_sendup __P((struct socket *, struct sadb_msg *, u_int, int));
|
||||
extern int key_sendup_mbuf __P((struct socket *, struct mbuf *, int));
|
||||
extern int key_sendup(struct socket *, struct sadb_msg *, u_int, int);
|
||||
extern int key_sendup_mbuf(struct socket *, struct mbuf *, int);
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#endif /*_NETIPSEC_KEYSOCK_H_*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user