Deleted Added
full compact
if_gre.h (103120) if_gre.h (103842)
1/* $NetBSD: if_gre.h,v 1.10 2002/02/24 17:22:20 martin Exp $ */
1/* $NetBSD: if_gre.h,v 1.10 2002/02/24 17:22:20 martin Exp $ */
2/* $FreeBSD: head/sys/net/if_gre.h 103120 2002-09-09 08:25:00Z sobomax $ */
2/* $FreeBSD: head/sys/net/if_gre.h 103842 2002-09-23 06:25:08Z alfred $ */
3
4/*
5 * Copyright (c) 1998 The NetBSD Foundation, Inc.
6 * All rights reserved
7 *
8 * This code is derived from software contributed to The NetBSD Foundation
9 * by Heiko W.Rupp <hwr@pilhuhn.de>
10 *

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

79 u_int_32 key inserted by encapsulator e.g. for
80 authentication
81 Present if (key_pres ==1 ).
82 u_int_32 seq_num Sequence number to allow for packet order
83 Present if (seq_pres ==1 ).
84 struct gre_sre[] routing Routing fileds (see below)
85 Present if (rt_pres == 1)
86 */
3
4/*
5 * Copyright (c) 1998 The NetBSD Foundation, Inc.
6 * All rights reserved
7 *
8 * This code is derived from software contributed to The NetBSD Foundation
9 * by Heiko W.Rupp <hwr@pilhuhn.de>
10 *

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

79 u_int_32 key inserted by encapsulator e.g. for
80 authentication
81 Present if (key_pres ==1 ).
82 u_int_32 seq_num Sequence number to allow for packet order
83 Present if (seq_pres ==1 ).
84 struct gre_sre[] routing Routing fileds (see below)
85 Present if (rt_pres == 1)
86 */
87} __attribute__((__packed__));
87} __packed;
88
89struct greip {
90 struct ip gi_i;
91 struct gre_h gi_g;
88
89struct greip {
90 struct ip gi_i;
91 struct gre_h gi_g;
92} __attribute__((__packed__));
92} __packed;
93
94#define gi_pr gi_i.ip_p
95#define gi_len gi_i.ip_len
96#define gi_src gi_i.ip_src
97#define gi_dst gi_i.ip_dst
98#define gi_ptype gi_g.ptype
99#define gi_flags gi_g.flags
100

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

123
124/* for mobile encaps */
125
126struct mobile_h {
127 u_int16_t proto; /* protocol and S-bit */
128 u_int16_t hcrc; /* header checksum */
129 u_int32_t odst; /* original destination address */
130 u_int32_t osrc; /* original source addr, if S-bit set */
93
94#define gi_pr gi_i.ip_p
95#define gi_len gi_i.ip_len
96#define gi_src gi_i.ip_src
97#define gi_dst gi_i.ip_dst
98#define gi_ptype gi_g.ptype
99#define gi_flags gi_g.flags
100

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

123
124/* for mobile encaps */
125
126struct mobile_h {
127 u_int16_t proto; /* protocol and S-bit */
128 u_int16_t hcrc; /* header checksum */
129 u_int32_t odst; /* original destination address */
130 u_int32_t osrc; /* original source addr, if S-bit set */
131} __attribute__((__packed__));
131} __packed;
132
133struct mobip_h {
134 struct ip mi;
135 struct mobile_h mh;
132
133struct mobip_h {
134 struct ip mi;
135 struct mobile_h mh;
136} __attribute__((__packed__));
136} __packed;
137
138
139#define MOB_H_SIZ_S (sizeof(struct mobile_h) - sizeof(u_int32_t))
140#define MOB_H_SIZ_L (sizeof(struct mobile_h))
141#define MOB_H_SBIT 0x0080
142
143#define GRE_TTL 30
144

--- 21 unchanged lines hidden ---
137
138
139#define MOB_H_SIZ_S (sizeof(struct mobile_h) - sizeof(u_int32_t))
140#define MOB_H_SIZ_L (sizeof(struct mobile_h))
141#define MOB_H_SBIT 0x0080
142
143#define GRE_TTL 30
144

--- 21 unchanged lines hidden ---