d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove route chaching support from ipsec code. It isn't used for some time.

Browse Source 
* remove sa_route_union declaration and route_cache member from struct secashead;
* remove key_sa_routechange() call from ICMP and ICMPv6 code;
* simplify ip_ipsec_mtu();
* remove #include <net/route.h>;

Sponsored by:	Yandex LLC
This commit is contained in:
Andrey V. Elsukov 2014-12-02 04:20:50 +00:00
parent 1fea1b0889
commit 2d957916ef
19 changed files with 5 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netinet/ip_icmp.c
View File

@ -33,7 +33,6 @@
__FBSDID("$FreeBSD$");
#include "opt_inet.h"
#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -65,10 +64,6 @@ __FBSDID("$FreeBSD$");
#include <netinet/icmp_var.h>
#ifdef INET
#ifdef IPSEC
#include <netipsec/ipsec.h>
#include <netipsec/key.h>
#endif
#include <machine/in_cksum.h>
@ -619,9 +614,6 @@ icmp_input(struct mbuf **mp, int *offp, int proto)
(struct sockaddr *)&icmpgw, fibnum);
}
pfctlinput(PRC_REDIRECT_HOST, (struct sockaddr *)&icmpsrc);
#ifdef IPSEC
key_sa_routechange((struct sockaddr *)&icmpsrc);
#endif
break;
/*

31
sys/netinet/ip_ipsec.c
View File

@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_var.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>
@ -206,35 +205,7 @@ ip_ipsec_mtu(struct mbuf *m, int mtu)
* tunnel MTU = if MTU - sizeof(IP) - ESP/AH hdrsiz
* XXX quickhack!!!
*/
struct secpolicy *sp = NULL;
int ipsecerror;
int ipsechdr;
struct route *ro;
sp = ipsec_getpolicybyaddr(m,
IPSEC_DIR_OUTBOUND,
IP_FORWARDING,
&ipsecerror);
if (sp != NULL) {
/* count IPsec header size */
ipsechdr = ipsec_hdrsiz(m, IPSEC_DIR_OUTBOUND, NULL);
/*
* find the correct route for outer IPv4
* header, compute tunnel MTU.
*/
if (sp->req != NULL &&
sp->req->sav != NULL &&
sp->req->sav->sah != NULL) {
ro = &sp->req->sav->sah->route_cache.sa_route;
if (ro->ro_rt && ro->ro_rt->rt_ifp) {
mtu = ro->ro_rt->rt_mtu ? ro->ro_rt->rt_mtu :
ro->ro_rt->rt_ifp->if_mtu;
mtu -= ipsechdr;
}
}
KEY_FREESP(&sp);
}
return mtu;
return (mtu - ipsec_hdrsiz(m, IPSEC_DIR_OUTBOUND, NULL));
}
/*

9
sys/netinet6/icmp6.c
View File

@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/domain.h>
@ -110,11 +109,6 @@ __FBSDID("$FreeBSD$");
#include <netinet6/nd6.h>
#include <netinet6/send.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>
#include <netipsec/key.h>
#endif
extern struct domain inet6domain;
VNET_PCPUSTAT_DEFINE(struct icmp6stat, icmp6stat);
@ -2472,9 +2466,6 @@ icmp6_redirect_input(struct mbuf *m, int off)
sdst.sin6_len = sizeof(struct sockaddr_in6);
bcopy(&reddst6, &sdst.sin6_addr, sizeof(struct in6_addr));
pfctlinput(PRC_REDIRECT_HOST, (struct sockaddr *)&sdst);
#ifdef IPSEC
key_sa_routechange((struct sockaddr *)&sdst);
#endif /* IPSEC */
}
freeit:

1
sys/netinet6/ip6_ipsec.c
View File

@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_var.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>

1
sys/netipsec/ipsec.c
View File

@ -56,7 +56,6 @@
#include <net/if.h>
#include <net/if_var.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>

4
sys/netipsec/ipsec.h
View File

@ -47,6 +47,10 @@
#ifdef _KERNEL
#include <sys/_lock.h>
#include <sys/_mutex.h>
#include <sys/_rwlock.h>
#define IPSEC_ASSERT(_c,_m) KASSERT(_c, _m)
#define IPSEC_IS_PRIVILEGED_SO(_so) \

1
sys/netipsec/ipsec_input.c
View File

@ -58,7 +58,6 @@
#include <net/if.h>
#include <net/if_var.h>
#include <net/pfil.h>
#include <net/route.h>
#include <net/netisr.h>
#include <net/vnet.h>

3
sys/netipsec/ipsec_mbuf.c
View File

@ -37,11 +37,8 @@
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>
#include <netipsec/ipsec.h>
/*

1
sys/netipsec/ipsec_output.c
View File

@ -46,7 +46,6 @@
#include <net/if.h>
#include <net/if_var.h>
#include <net/pfil.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netinet/in.h>

25
sys/netipsec/key.c
View File

@ -59,7 +59,6 @@
#include <net/if.h>
#include <net/if_var.h>
#include <net/route.h>
#include <net/vnet.h>
#include <net/raw_cb.h>
@ -2770,10 +2769,6 @@ key_delsah(sah)
/* remove from tree of SA index */
if (__LIST_CHAINED(sah))
LIST_REMOVE(sah, chain);
if (sah->route_cache.sa_route.ro_rt) {
RTFREE(sah->route_cache.sa_route.ro_rt);
sah->route_cache.sa_route.ro_rt = (struct rtentry *)NULL;
}
free(sah, M_IPSEC_SAH);
}
}
@ -7898,26 +7893,6 @@ key_sa_recordxfer(sav, m)
return;
}
/* dumb version */
void
key_sa_routechange(dst)
struct sockaddr *dst;
{
struct secashead *sah;
struct route *ro;
SAHTREE_LOCK();
LIST_FOREACH(sah, &V_sahtree, chain) {
ro = &sah->route_cache.sa_route;
if (ro->ro_rt && dst->sa_len == ro->ro_dst.sa_len
&& bcmp(dst, &ro->ro_dst, dst->sa_len) == 0) {
RTFREE(ro->ro_rt);
ro->ro_rt = (struct rtentry *)NULL;
}
}
SAHTREE_UNLOCK();
}
static void
key_sa_chgstate(struct secasvar *sav, u_int8_t state)
{

1
sys/netipsec/key.h
View File

@ -106,7 +106,6 @@ extern void key_init __P((void));
extern void key_destroy(void);
#endif
extern void key_sa_recordxfer __P((struct secasvar *, struct mbuf *));
extern void key_sa_routechange __P((struct sockaddr *));
extern void key_sa_stir_iv __P((struct secasvar *));
#ifdef IPSEC_NAT_T
u_int16_t key_portfromsaddr(struct sockaddr *);

1
sys/netipsec/key_debug.c
View File

@ -45,7 +45,6 @@
#endif
#include <sys/socket.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netipsec/key_var.h>

8
sys/netipsec/keydb.h
View File

@ -85,12 +85,6 @@ struct seclifetime {
u_int64_t usetime;
};
union sa_route_union {
struct route sa_route;
struct route sin_route; /* Duplicate for consistency. */
struct route_in6 sin6_route;
};
/* Security Association Data Base */
struct secashead {
LIST_ENTRY(secashead) chain;
@ -105,8 +99,6 @@ struct secashead {
LIST_HEAD(_satree, secasvar) savtree[SADB_SASTATE_MAX+1];
/* SA chain */
/* The first of this list is newer SA */
union sa_route_union route_cache;
};
struct xformsw;

1
sys/netipsec/keysock.c
View File

@ -54,7 +54,6 @@
#include <net/if.h>
#include <net/vnet.h>
#include <net/raw_cb.h>
#include <net/route.h>
#include <netinet/in.h>

1
sys/netipsec/xform_ah.c
View File

@ -58,7 +58,6 @@
#include <netinet/ip_ecn.h>
#include <netinet/ip6.h>
#include <net/route.h>
#include <netipsec/ipsec.h>
#include <netipsec/ah.h>
#include <netipsec/ah_var.h>

1
sys/netipsec/xform_esp.c
View File

@ -58,7 +58,6 @@
#include <netinet/ip_ecn.h>
#include <netinet/ip6.h>
#include <net/route.h>
#include <netipsec/ipsec.h>
#include <netipsec/ah.h>
#include <netipsec/ah_var.h>

1
sys/netipsec/xform_ipcomp.c
View File

@ -48,7 +48,6 @@
#include <netinet/ip.h>
#include <netinet/ip_var.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netipsec/ipsec.h>

1
sys/netipsec/xform_ipip.c
View File

@ -54,7 +54,6 @@
#include <net/if.h>
#include <net/if_var.h>
#include <net/pfil.h>
#include <net/route.h>
#include <net/netisr.h>
#include <net/vnet.h>

1
sys/netipsec/xform_tcp.c
View File

@ -47,7 +47,6 @@
#include <netinet/tcp.h>
#include <netinet/tcp_var.h>
#include <net/route.h>
#include <net/vnet.h>
#include <netipsec/ipsec.h>