97aa4a517a
(duplicate) code in sys/netipsec/ipsec.c and fold it into common, INET/6 independent functions. The file local functions ipsec4_setspidx_inpcb() and ipsec6_setspidx_inpcb() were 1:1 identical after the change in r186528. Rename to ipsec_setspidx_inpcb() and remove the duplicate. Public functions ipsec[46]_get_policy() were 1:1 identical. Remove one copy and merge in the factored out code from ipsec_get_policy() into the other. The public function left is now called ipsec_get_policy() and callers were adapted. Public functions ipsec[46]_set_policy() were 1:1 identical. Rename file local ipsec_set_policy() function to ipsec_set_policy_internal(). Remove one copy of the public functions, rename the other to ipsec_set_policy() and adapt callers. Public functions ipsec[46]_hdrsiz() were logically identical (ignoring one questionable assert in the v6 version). Rename the file local ipsec_hdrsiz() to ipsec_hdrsiz_internal(), the public function to ipsec_hdrsiz(), remove the duplicate copy and adapt the callers. The v6 version had been unused anyway. Cleanup comments. Public functions ipsec[46]_in_reject() were logically identical apart from statistics. Move the common code into a file local ipsec46_in_reject() leaving vimage+statistics in small AF specific wrapper functions. Note: unfortunately we already have a public ipsec_in_reject(). Reviewed by: sam Discussed with: rwatson (renaming to *_internal) MFC after: 26 days X-MFC: keep wrapper functions for public symbols?
72 lines
2.7 KiB
C
72 lines
2.7 KiB
C
/* $FreeBSD$ */
|
|
/* $KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $ */
|
|
|
|
/*-
|
|
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the name of the project nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
/*
|
|
* IPsec controller part.
|
|
*/
|
|
|
|
#ifndef _NETIPSEC_IPSEC6_H_
|
|
#define _NETIPSEC_IPSEC6_H_
|
|
|
|
#include <net/pfkeyv2.h>
|
|
#include <netipsec/keydb.h>
|
|
|
|
#ifdef _KERNEL
|
|
extern struct ipsecstat ipsec6stat;
|
|
extern int ip6_esp_trans_deflev;
|
|
extern int ip6_esp_net_deflev;
|
|
extern int ip6_ah_trans_deflev;
|
|
extern int ip6_ah_net_deflev;
|
|
extern int ip6_ipsec_ecn;
|
|
|
|
struct inpcb;
|
|
|
|
extern int ipsec6_in_reject __P((struct mbuf *, struct inpcb *));
|
|
|
|
struct ip6_hdr;
|
|
extern const char *ipsec6_logpacketstr __P((struct ip6_hdr *, u_int32_t));
|
|
|
|
struct m_tag;
|
|
extern int ipsec6_common_input(struct mbuf **mp, int *offp, int proto);
|
|
extern int ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav,
|
|
int skip, int protoff, struct m_tag *mt);
|
|
extern void esp6_ctlinput(int, struct sockaddr *, void *);
|
|
|
|
struct ipsec_output_state;
|
|
extern int ipsec6_output_trans __P((struct ipsec_output_state *, u_char *,
|
|
struct mbuf *, struct secpolicy *, int, int *));
|
|
extern int ipsec6_output_tunnel __P((struct ipsec_output_state *,
|
|
struct secpolicy *, int));
|
|
#endif /*_KERNEL*/
|
|
|
|
#endif /*_NETIPSEC_IPSEC6_H_*/
|