Deleted Added
full compact
ng_ppp.c (59882) ng_ppp.c (60833)
1
2/*
3 * ng_ppp.c
4 *
5 * Copyright (c) 1996-2000 Whistle Communications, Inc.
6 * All rights reserved.
7 *
8 * Subject to the following obligations and disclaimer of warranty, use and

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

31 * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY
32 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34 * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
35 * OF SUCH DAMAGE.
36 *
37 * Author: Archie Cobbs <archie@whistle.com>
38 *
1
2/*
3 * ng_ppp.c
4 *
5 * Copyright (c) 1996-2000 Whistle Communications, Inc.
6 * All rights reserved.
7 *
8 * Subject to the following obligations and disclaimer of warranty, use and

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

31 * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY
32 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34 * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
35 * OF SUCH DAMAGE.
36 *
37 * Author: Archie Cobbs <archie@whistle.com>
38 *
39 * $FreeBSD: head/sys/netgraph/ng_ppp.c 59882 2000-05-02 00:09:18Z archie $
39 * $FreeBSD: head/sys/netgraph/ng_ppp.c 60833 2000-05-23 20:41:01Z jake $
40 * $Whistle: ng_ppp.c,v 1.24 1999/11/01 09:24:52 julian Exp $
41 */
42
43/*
44 * PPP node type.
45 */
46
47#include <sys/param.h>

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

126/* We store incoming fragments this way */
127struct ng_ppp_frag {
128 int seq; /* fragment seq# */
129 u_char first; /* First in packet? */
130 u_char last; /* Last in packet? */
131 struct timeval timestamp; /* time of reception */
132 struct mbuf *data; /* Fragment data */
133 meta_p meta; /* Fragment meta */
40 * $Whistle: ng_ppp.c,v 1.24 1999/11/01 09:24:52 julian Exp $
41 */
42
43/*
44 * PPP node type.
45 */
46
47#include <sys/param.h>

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

126/* We store incoming fragments this way */
127struct ng_ppp_frag {
128 int seq; /* fragment seq# */
129 u_char first; /* First in packet? */
130 u_char last; /* Last in packet? */
131 struct timeval timestamp; /* time of reception */
132 struct mbuf *data; /* Fragment data */
133 meta_p meta; /* Fragment meta */
134 CIRCLEQ_ENTRY(ng_ppp_frag) f_qent; /* Fragment queue */
134 CIRCLEQ_ENTRY(struct ng_ppp_frag) f_qent; /* Fragment queue */
135};
136
137/* We use integer indicies to refer to the non-link hooks */
138static const char *const ng_ppp_hook_names[] = {
139 NG_PPP_HOOK_ATALK,
140#define HOOK_INDEX_ATALK 0
141 NG_PPP_HOOK_BYPASS,
142#define HOOK_INDEX_BYPASS 1

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

190 int mseq; /* min links[i].seq */
191 u_char vjCompHooked; /* VJ comp hooked up? */
192 u_char allLinksEqual; /* all xmit the same? */
193 u_char timerActive; /* frag timer active? */
194 u_int numActiveLinks; /* how many links up */
195 int activeLinks[NG_PPP_MAX_LINKS]; /* indicies */
196 u_int lastLink; /* for round robin */
197 hook_p hooks[HOOK_INDEX_MAX]; /* non-link hooks */
135};
136
137/* We use integer indicies to refer to the non-link hooks */
138static const char *const ng_ppp_hook_names[] = {
139 NG_PPP_HOOK_ATALK,
140#define HOOK_INDEX_ATALK 0
141 NG_PPP_HOOK_BYPASS,
142#define HOOK_INDEX_BYPASS 1

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

190 int mseq; /* min links[i].seq */
191 u_char vjCompHooked; /* VJ comp hooked up? */
192 u_char allLinksEqual; /* all xmit the same? */
193 u_char timerActive; /* frag timer active? */
194 u_int numActiveLinks; /* how many links up */
195 int activeLinks[NG_PPP_MAX_LINKS]; /* indicies */
196 u_int lastLink; /* for round robin */
197 hook_p hooks[HOOK_INDEX_MAX]; /* non-link hooks */
198 CIRCLEQ_HEAD(ng_ppp_fraglist, ng_ppp_frag) /* fragment queue */
198 CIRCLEQ_HEAD(ng_ppp_fraglist, struct ng_ppp_frag) /* fragment queue */
199 frags;
200 int qlen; /* fraq queue length */
201 struct callout_handle fragTimer; /* fraq queue check */
202};
203typedef struct ng_ppp_private *priv_p;
204
205/* Netgraph node methods */
206static ng_constructor_t ng_ppp_constructor;

--- 1784 unchanged lines hidden ---
199 frags;
200 int qlen; /* fraq queue length */
201 struct callout_handle fragTimer; /* fraq queue check */
202};
203typedef struct ng_ppp_private *priv_p;
204
205/* Netgraph node methods */
206static ng_constructor_t ng_ppp_constructor;

--- 1784 unchanged lines hidden ---