Deleted Added
full compact
ip_gre.c (257176) ip_gre.c (263152)
1/* $NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $ */
2
3/*-
4 * Copyright (c) 1998 The NetBSD Foundation, Inc.
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Heiko W.Rupp <hwr@pilhuhn.de>

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

33
34/*
35 * deencapsulate tunneled packets and send them on
36 * output half is in net/if_gre.[ch]
37 * This currently handles IPPROTO_GRE, IPPROTO_MOBILE
38 */
39
40#include <sys/cdefs.h>
1/* $NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $ */
2
3/*-
4 * Copyright (c) 1998 The NetBSD Foundation, Inc.
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Heiko W.Rupp <hwr@pilhuhn.de>

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

33
34/*
35 * deencapsulate tunneled packets and send them on
36 * output half is in net/if_gre.[ch]
37 * This currently handles IPPROTO_GRE, IPPROTO_MOBILE
38 */
39
40#include <sys/cdefs.h>
41__FBSDID("$FreeBSD: head/sys/netinet/ip_gre.c 257176 2013-10-26 17:58:36Z glebius $");
41__FBSDID("$FreeBSD: head/sys/netinet/ip_gre.c 263152 2014-03-14 06:29:43Z glebius $");
42
43#include "opt_inet.h"
42
43#include "opt_inet.h"
44#include "opt_atalk.h"
45#include "opt_inet6.h"
46
47#include <sys/param.h>
48#include <sys/systm.h>
49#include <sys/mbuf.h>
50#include <sys/socket.h>
51#include <sys/socketvar.h>
52#include <sys/protosw.h>

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

69#include <netinet/ip.h>
70#include <netinet/ip_var.h>
71#include <netinet/ip_gre.h>
72#include <machine/in_cksum.h>
73#else
74#error "ip_gre requires INET"
75#endif
76
44#include "opt_inet6.h"
45
46#include <sys/param.h>
47#include <sys/systm.h>
48#include <sys/mbuf.h>
49#include <sys/socket.h>
50#include <sys/socketvar.h>
51#include <sys/protosw.h>

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

68#include <netinet/ip.h>
69#include <netinet/ip_var.h>
70#include <netinet/ip_gre.h>
71#include <machine/in_cksum.h>
72#else
73#error "ip_gre requires INET"
74#endif
75
77#ifdef NETATALK
78#include <netatalk/at.h>
79#include <netatalk/at_var.h>
80#include <netatalk/at_extern.h>
81#endif
82
83/* Needs IP headers. */
84#include <net/if_gre.h>
85
86#include <machine/stdarg.h>
87
88#if 1
89void gre_inet_ntoa(struct in_addr in); /* XXX */
90#endif

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

174 af = AF_INET;
175 break;
176#ifdef INET6
177 case ETHERTYPE_IPV6:
178 isr = NETISR_IPV6;
179 af = AF_INET6;
180 break;
181#endif
76/* Needs IP headers. */
77#include <net/if_gre.h>
78
79#include <machine/stdarg.h>
80
81#if 1
82void gre_inet_ntoa(struct in_addr in); /* XXX */
83#endif

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

167 af = AF_INET;
168 break;
169#ifdef INET6
170 case ETHERTYPE_IPV6:
171 isr = NETISR_IPV6;
172 af = AF_INET6;
173 break;
174#endif
182#ifdef NETATALK
183 case ETHERTYPE_ATALK:
184 isr = NETISR_ATALK1;
185 af = AF_APPLETALK;
186 break;
187#endif
188 default:
189 /* Others not yet supported. */
190 return (m);
191 }
192 break;
193 default:
194 /* Others not yet supported. */
195 return (m);

--- 141 unchanged lines hidden ---
175 default:
176 /* Others not yet supported. */
177 return (m);
178 }
179 break;
180 default:
181 /* Others not yet supported. */
182 return (m);

--- 141 unchanged lines hidden ---