Deleted Added
full compact
tcp_syncache.c (121307) tcp_syncache.c (122062)
1/*-
2 * Copyright (c) 2001 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by Jonathan Lemon
6 * and NAI Labs, the Security Research Division of Network Associates, Inc.
7 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
8 * DARPA CHATS research program.

--- 17 unchanged lines hidden (view full) ---

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
1/*-
2 * Copyright (c) 2001 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by Jonathan Lemon
6 * and NAI Labs, the Security Research Division of Network Associates, Inc.
7 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
8 * DARPA CHATS research program.

--- 17 unchanged lines hidden (view full) ---

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $FreeBSD: head/sys/netinet/tcp_syncache.c 121307 2003-10-21 18:28:36Z silby $
34 * $FreeBSD: head/sys/netinet/tcp_syncache.c 122062 2003-11-04 16:02:05Z ume $
35 */
36
37#include "opt_inet6.h"
38#include "opt_ipsec.h"
39#include "opt_mac.h"
40#include "opt_tcpdebug.h"
41
42#include <sys/param.h>

--- 48 unchanged lines hidden (view full) ---

91#endif /*IPSEC*/
92
93#ifdef FAST_IPSEC
94#include <netipsec/ipsec.h>
95#ifdef INET6
96#include <netipsec/ipsec6.h>
97#endif
98#include <netipsec/key.h>
35 */
36
37#include "opt_inet6.h"
38#include "opt_ipsec.h"
39#include "opt_mac.h"
40#include "opt_tcpdebug.h"
41
42#include <sys/param.h>

--- 48 unchanged lines hidden (view full) ---

91#endif /*IPSEC*/
92
93#ifdef FAST_IPSEC
94#include <netipsec/ipsec.h>
95#ifdef INET6
96#include <netipsec/ipsec6.h>
97#endif
98#include <netipsec/key.h>
99#define IPSEC
100#endif /*FAST_IPSEC*/
101
102#include <machine/in_cksum.h>
103#include <vm/uma.h>
104
105static int tcp_syncookies = 1;
106SYSCTL_INT(_net_inet_tcp, OID_AUTO, syncookies, CTLFLAG_RW,
107 &tcp_syncookies, 0,

--- 508 unchanged lines hidden (view full) ---

616 else
617#endif
618 inp->inp_laddr.s_addr = INADDR_ANY;
619 inp->inp_lport = 0;
620 goto abort;
621 }
622#ifdef IPSEC
623 /* copy old policy into new socket's */
99#endif /*FAST_IPSEC*/
100
101#include <machine/in_cksum.h>
102#include <vm/uma.h>
103
104static int tcp_syncookies = 1;
105SYSCTL_INT(_net_inet_tcp, OID_AUTO, syncookies, CTLFLAG_RW,
106 &tcp_syncookies, 0,

--- 508 unchanged lines hidden (view full) ---

615 else
616#endif
617 inp->inp_laddr.s_addr = INADDR_ANY;
618 inp->inp_lport = 0;
619 goto abort;
620 }
621#ifdef IPSEC
622 /* copy old policy into new socket's */
623 if (ipsec_copy_pcbpolicy(sotoinpcb(lso)->inp_sp, inp->inp_sp))
624 printf("syncache_expand: could not copy policy\n");
625#endif
626#ifdef FAST_IPSEC
627 /* copy old policy into new socket's */
624 if (ipsec_copy_policy(sotoinpcb(lso)->inp_sp, inp->inp_sp))
625 printf("syncache_expand: could not copy policy\n");
626#endif
627#ifdef INET6
628 if (sc->sc_inc.inc_isipv6) {
629 struct inpcb *oinp = sotoinpcb(lso);
630 struct in6_addr laddr6;
631 struct sockaddr_in6 *sin6;

--- 811 unchanged lines hidden ---
628 if (ipsec_copy_policy(sotoinpcb(lso)->inp_sp, inp->inp_sp))
629 printf("syncache_expand: could not copy policy\n");
630#endif
631#ifdef INET6
632 if (sc->sc_inc.inc_isipv6) {
633 struct inpcb *oinp = sotoinpcb(lso);
634 struct in6_addr laddr6;
635 struct sockaddr_in6 *sin6;

--- 811 unchanged lines hidden ---