Deleted Added
full compact
ip6_forward.c (225044) ip6_forward.c (231852)
1/*-
2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $
30 */
31
32#include <sys/cdefs.h>
1/*-
2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/netinet6/ip6_forward.c 225044 2011-08-20 17:05:11Z bz $");
33__FBSDID("$FreeBSD: head/sys/netinet6/ip6_forward.c 231852 2012-02-17 02:39:58Z bz $");
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37#include "opt_ipfw.h"
38#include "opt_ipsec.h"
39#include "opt_ipstealth.h"
40
41#include <sys/param.h>

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

357 bzero(&rin6, sizeof(struct route_in6));
358 dst = (struct sockaddr_in6 *)&rin6.ro_dst;
359 dst->sin6_len = sizeof(struct sockaddr_in6);
360 dst->sin6_family = AF_INET6;
361 dst->sin6_addr = ip6->ip6_dst;
362#ifdef IPFIREWALL_FORWARD
363again2:
364#endif
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37#include "opt_ipfw.h"
38#include "opt_ipsec.h"
39#include "opt_ipstealth.h"
40
41#include <sys/param.h>

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

357 bzero(&rin6, sizeof(struct route_in6));
358 dst = (struct sockaddr_in6 *)&rin6.ro_dst;
359 dst->sin6_len = sizeof(struct sockaddr_in6);
360 dst->sin6_family = AF_INET6;
361 dst->sin6_addr = ip6->ip6_dst;
362#ifdef IPFIREWALL_FORWARD
363again2:
364#endif
365 rin6.ro_rt = rtalloc1((struct sockaddr *)dst, 0, 0);
365 rin6.ro_rt = in6_rtalloc1((struct sockaddr *)dst, 0, 0, M_GETFIB(m));
366 if (rin6.ro_rt != NULL)
367 RT_UNLOCK(rin6.ro_rt);
368 else {
369 V_ip6stat.ip6s_noroute++;
370 in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_noroute);
371 if (mcopy) {
372 icmp6_error(mcopy, ICMP6_DST_UNREACH,
373 ICMP6_DST_UNREACH_NOROUTE, 0);

--- 315 unchanged lines hidden ---
366 if (rin6.ro_rt != NULL)
367 RT_UNLOCK(rin6.ro_rt);
368 else {
369 V_ip6stat.ip6s_noroute++;
370 in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_noroute);
371 if (mcopy) {
372 icmp6_error(mcopy, ICMP6_DST_UNREACH,
373 ICMP6_DST_UNREACH_NOROUTE, 0);

--- 315 unchanged lines hidden ---