d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import kernel parts of ppp-2.3.5.

Browse Source 
Obtained from: ftp://cs.anu.edu.au/pub/software/ppp
This commit is contained in:
peter 1998-06-20 16:11:31 +00:00
parent 631555ee3b
commit 82529a59a4
6 changed files with 45 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/net/if_pppvar.h
View File

@ -1,4 +1,4 @@
/* $Id: if_pppvar.h,v 1.5 1997/04/30 05:42:08 paulus Exp $ */
/* $Id: if_pppvar.h,v 1.6 1998/02/04 01:36:40 paulus Exp $ */
/*
* if_pppvar.h - private structures and declarations for PPP.
*
@ -101,6 +101,8 @@ struct ppp_softc ppp_softc[NPPP];
struct ppp_softc *pppalloc __P((pid_t pid));
void pppdealloc __P((struct ppp_softc *sc));
int pppoutput __P((struct ifnet *, struct mbuf *,
struct sockaddr *, struct rtentry *));
int pppioctl __P((struct ppp_softc *sc, int cmd, caddr_t data,
int flag, struct proc *p));
void ppp_restart __P((struct ppp_softc *sc));

5
sys/net/ppp_comp.h
View File

@ -24,7 +24,7 @@
* OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
* OR MODIFICATIONS.
*
* $Id: ppp-comp.h,v 1.10 1996/09/26 06:30:11 paulus Exp $
* $Id: ppp-comp.h,v 1.11 1998/03/25 03:33:34 paulus Exp $
*/
#ifndef _NET_PPP_COMP_H
@ -141,7 +141,8 @@ struct compressor {
/*
* Definitions for Deflate.
*/
#define CI_DEFLATE 24 /* config option for Deflate */
#define CI_DEFLATE 26 /* config option for Deflate */
#define CI_DEFLATE_DRAFT 24 /* value used in original draft RFC */
#define CILEN_DEFLATE 4 /* length of its config option */
#define DEFLATE_MIN_SIZE 8

31
sys/net/ppp_deflate.c
View File

@ -1,4 +1,4 @@
/* $Id: ppp-deflate.c,v 1.7 1997/11/27 06:06:31 paulus Exp $ */
/* $Id: ppp-deflate.c,v 1.8 1998/03/24 23:48:04 paulus Exp $ */
/*
* ppp_deflate.c - interface the zlib procedures for Deflate compression
@ -98,6 +98,23 @@ struct compressor ppp_deflate = {
z_comp_stats, /* decomp_stat */
};
struct compressor ppp_deflate = {
CI_DEFLATE_DRAFT, /* compress_proto */
z_comp_alloc, /* comp_alloc */
z_comp_free, /* comp_free */
z_comp_init, /* comp_init */
z_comp_reset, /* comp_reset */
z_compress, /* compress */
z_comp_stats, /* comp_stat */
z_decomp_alloc, /* decomp_alloc */
z_decomp_free, /* decomp_free */
z_decomp_init, /* decomp_init */
z_decomp_reset, /* decomp_reset */
z_decompress, /* decompress */
z_incomp, /* incomp */
z_comp_stats, /* decomp_stat */
};
/*
* Space allocation and freeing routines for use by zlib routines.
*/
@ -131,7 +148,8 @@ z_comp_alloc(options, opt_len)
struct deflate_state *state;
int w_size;
if (opt_len != CILEN_DEFLATE || options[0] != CI_DEFLATE
if (opt_len != CILEN_DEFLATE
|| (options[0] != CI_DEFLATE && options[0] != CI_DEFLATE_DRAFT)
|| options[1] != CILEN_DEFLATE
|| DEFLATE_METHOD(options[2]) != DEFLATE_METHOD_VAL
|| options[3] != DEFLATE_CHK_SEQUENCE)
@ -177,7 +195,8 @@ z_comp_init(arg, options, opt_len, unit, hdrlen, debug)
{
struct deflate_state *state = (struct deflate_state *) arg;
if (opt_len < CILEN_DEFLATE || options[0] != CI_DEFLATE
if (opt_len < CILEN_DEFLATE
|| (options[0] != CI_DEFLATE && options[0] != CI_DEFLATE_DRAFT)
|| options[1] != CILEN_DEFLATE
|| DEFLATE_METHOD(options[2]) != DEFLATE_METHOD_VAL
|| DEFLATE_SIZE(options[2]) != state->w_size
@ -362,7 +381,8 @@ z_decomp_alloc(options, opt_len)
struct deflate_state *state;
int w_size;
if (opt_len != CILEN_DEFLATE || options[0] != CI_DEFLATE
if (opt_len != CILEN_DEFLATE
|| (options[0] != CI_DEFLATE && options[0] != CI_DEFLATE_DRAFT)
|| options[1] != CILEN_DEFLATE
|| DEFLATE_METHOD(options[2]) != DEFLATE_METHOD_VAL
|| options[3] != DEFLATE_CHK_SEQUENCE)
@ -407,7 +427,8 @@ z_decomp_init(arg, options, opt_len, unit, hdrlen, mru, debug)
{
struct deflate_state *state = (struct deflate_state *) arg;
if (opt_len < CILEN_DEFLATE || options[0] != CI_DEFLATE
if (opt_len < CILEN_DEFLATE
|| (options[0] != CI_DEFLATE && options[0] != CI_DEFLATE_DRAFT)
|| options[1] != CILEN_DEFLATE
|| DEFLATE_METHOD(options[2]) != DEFLATE_METHOD_VAL
|| DEFLATE_SIZE(options[2]) != state->w_size

33
sys/net/slcompress.c
View File

@ -1,5 +1,4 @@
/* $NetBSD: slcompress.c,v 1.17 1997/05/17 21:12:10 christos Exp $ */
/* Id: slcompress.c,v 1.3 1996/05/24 07:04:47 paulus Exp */
/* $Id: slcompress.c,v 1.3 1996/05/24 07:04:47 paulus Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@ -67,36 +66,10 @@
#define ovbcopy bcopy
#endif
void
sl_compress_init(comp)
sl_compress_init(comp, max_state)
struct slcompress *comp;
{
register u_int i;
register struct cstate *tstate = comp->tstate;
bzero((char *)comp, sizeof(*comp));
for (i = MAX_STATES - 1; i > 0; --i) {
tstate[i].cs_id = i;
tstate[i].cs_next = &tstate[i - 1];
}
tstate[0].cs_next = &tstate[MAX_STATES - 1];
tstate[0].cs_id = 0;
comp->last_cs = &tstate[0];
comp->last_recv = 255;
comp->last_xmit = 255;
comp->flags = SLF_TOSS;
}
/*
* Like sl_compress_init, but we get to specify the maximum connection
* ID to use on transmission.
*/
void
sl_compress_setup(comp, max_state)
struct slcompress *comp;
int max_state;
int max_state;
{
register u_int i;
register struct cstate *tstate = comp->tstate;

21
sys/net/slcompress.h
View File

@ -1,5 +1,4 @@
/* $NetBSD: slcompress.h,v 1.11 1997/05/17 21:12:11 christos Exp $ */
/* Id: slcompress.h,v 1.4 1994/09/21 06:50:08 paulus Exp */
/* $Id: slcompress.h,v 1.1 1995/12/11 05:17:12 paulus Exp $ */
/*
* Copyright (c) 1989, 1993
@ -43,9 +42,6 @@
* - Initial distribution.
*/
#ifndef _SLCOMPRESS_H_
#define _SLCOMPRESS_H_
#define MAX_STATES 16 /* must be > 2 and < 256 */
#define MAX_HDR MLEN /* XXX 4bsd-ism: should really be 128 */
@ -158,12 +154,9 @@ struct slcompress {
/* flag values */
#define SLF_TOSS 1 /* tossing rcvd frames because of input err */
void sl_compress_init __P((struct slcompress *));
void sl_compress_setup __P((struct slcompress *, int));
u_int sl_compress_tcp __P((struct mbuf *,
struct ip *, struct slcompress *, int));
int sl_uncompress_tcp __P((u_char **, int, u_int, struct slcompress *));
int sl_uncompress_tcp_core __P((u_char *, int, int, u_int,
struct slcompress *, u_char **, u_int *));
#endif /* _SLCOMPRESS_H_ */
void sl_compress_init __P((struct slcompress *, int));
u_int sl_compress_tcp __P((struct mbuf *,
struct ip *, struct slcompress *, int));
int sl_uncompress_tcp __P((u_char **, int, u_int, struct slcompress *));
int sl_uncompress_tcp_core __P((u_char *, int, int, u_int,
struct slcompress *, u_char **, u_int *));

6
sys/net/zlib.c
View File

@ -10,7 +10,7 @@
* - added inflateIncomp and deflateOutputPending
* - allow strm->next_out to be NULL, meaning discard the output
*
* $Id: zlib.c,v 1.7 1997/05/22 06:44:39 paulus Exp $
* $Id: zlib.c,v 1.10 1998/03/19 04:55:37 paulus Exp $
*/
/*
@ -1147,12 +1147,12 @@ int deflateCopy (dest, source)
return Z_STREAM_ERROR;
ss = (deflate_state *) source->state;
*dest = *source;
zmemcpy(dest, source, sizeof(*dest));
ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
if (ds == Z_NULL) return Z_MEM_ERROR;
dest->state = (struct internal_state FAR *) ds;
*ds = *ss;
zmemcpy(ds, ss, sizeof(*ds));
ds->strm = dest;
ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));