From 1ab9ab93491c12576fa771db9388bf6ab76c788c Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Mon, 4 May 1998 06:09:29 +0000 Subject: [PATCH] mods from Christos; net/ -> include/net/ --- netbsd-1.2/bsd-comp.c | 2 +- netbsd-1.2/if_ppp.c | 2 +- netbsd-1.2/if_pppvar.h | 7 ++++++- netbsd-1.2/kinstall.sh | 7 ++++--- netbsd-1.2/ppp-deflate.c | 5 ++--- netbsd-1.2/ppp_tty.c | 2 +- netbsd-1.2/slcompress.h | 8 ++++---- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/netbsd-1.2/bsd-comp.c b/netbsd-1.2/bsd-comp.c index 4ebf606..f010763 100644 --- a/netbsd-1.2/bsd-comp.c +++ b/netbsd-1.2/bsd-comp.c @@ -1,4 +1,4 @@ -/* $NetBSD: bsd-comp.c,v 1.6 1996/10/13 02:10:58 christos Exp $ */ +/* $NetBSD: bsd-comp.c,v 1.7 1997/03/12 20:26:46 christos Exp $ */ /* Id: bsd-comp.c,v 1.6 1996/08/28 06:31:58 paulus Exp */ /* Because this code is derived from the 4.3BSD compress source: diff --git a/netbsd-1.2/if_ppp.c b/netbsd-1.2/if_ppp.c index 84d94c0..cede49b 100644 --- a/netbsd-1.2/if_ppp.c +++ b/netbsd-1.2/if_ppp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $ */ +/* $NetBSD: if_ppp.c,v 1.41 1998/05/02 14:34:24 christos Exp $ */ /* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */ /* diff --git a/netbsd-1.2/if_pppvar.h b/netbsd-1.2/if_pppvar.h index 88a2801..a5c8e4b 100644 --- a/netbsd-1.2/if_pppvar.h +++ b/netbsd-1.2/if_pppvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_pppvar.h,v 1.5 1997/01/03 07:23:29 mikel Exp $ */ +/* $NetBSD: if_pppvar.h,v 1.8 1998/02/09 17:43:52 perry Exp $ */ /* Id: if_pppvar.h,v 1.3 1996/07/01 01:04:37 paulus Exp */ /* @@ -43,6 +43,9 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef _NET_IF_PPPVAR_H_ +#define _NET_IF_PPPVAR_H_ + /* * Supported network protocols. These values are used for * indexing sc_npmode. @@ -113,3 +116,5 @@ struct mbuf *ppp_dequeue __P((struct ppp_softc *sc)); int pppoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *)); #endif /* _KERNEL */ + +#endif /* _NET_IF_PPPVAR_H_ */ diff --git a/netbsd-1.2/kinstall.sh b/netbsd-1.2/kinstall.sh index a227d36..f407c3f 100755 --- a/netbsd-1.2/kinstall.sh +++ b/netbsd-1.2/kinstall.sh @@ -17,9 +17,10 @@ CONFIG=config # Copy new versions of files into /sys/net -for f in net/if_ppp.h net/ppp-comp.h net/ppp_defs.h $SRC/bsd-comp.c \ - $SRC/ppp-deflate.c $SRC/if_ppp.c $SRC/if_pppvar.h $SRC/ppp_tty.c \ - $SRC/slcompress.c $SRC/slcompress.h common/zlib.c common/zlib.h; do +for f in include/net/if_ppp.h include/net/ppp-comp.h include/net/ppp_defs.h \ + $SRC/bsd-comp.c $SRC/ppp-deflate.c $SRC/if_ppp.c $SRC/if_pppvar.h \ + $SRC/ppp_tty.c $SRC/slcompress.c $SRC/slcompress.h \ + common/zlib.c common/zlib.h; do dest=$SYS/net/$(basename $f) if [ -f $dest ]; then if ! diff -qBI '[ ]\$[IN][de].*:.*\$' $f $dest >/dev/null; then diff --git a/netbsd-1.2/ppp-deflate.c b/netbsd-1.2/ppp-deflate.c index 4a2ff64..fc4e29f 100644 --- a/netbsd-1.2/ppp-deflate.c +++ b/netbsd-1.2/ppp-deflate.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppp-deflate.c,v 1.3 1996/10/13 02:11:08 christos Exp $ */ +/* $NetBSD: ppp-deflate.c,v 1.6 1998/05/02 14:34:25 christos Exp $ */ /* Id: ppp-deflate.c,v 1.5 1997/03/04 03:33:28 paulus Exp */ /* @@ -99,7 +99,7 @@ struct compressor ppp_deflate = { z_comp_stats, /* decomp_stat */ }; -struct compressor ppp_deflate = { +struct compressor ppp_deflate_draft = { CI_DEFLATE_DRAFT, /* compress_proto */ z_comp_alloc, /* comp_alloc */ z_comp_free, /* comp_free */ @@ -115,7 +115,6 @@ struct compressor ppp_deflate = { z_incomp, /* incomp */ z_comp_stats, /* decomp_stat */ }; - /* * Space allocation and freeing routines for use by zlib routines. */ diff --git a/netbsd-1.2/ppp_tty.c b/netbsd-1.2/ppp_tty.c index 5596a4c..3ddbf46 100644 --- a/netbsd-1.2/ppp_tty.c +++ b/netbsd-1.2/ppp_tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppp_tty.c,v 1.12 1997/03/24 21:23:10 christos Exp $ */ +/* $NetBSD: ppp_tty.c,v 1.13 1997/03/25 22:33:25 christos Exp $ */ /* Id: ppp_tty.c,v 1.3 1996/07/01 01:04:11 paulus Exp */ /* diff --git a/netbsd-1.2/slcompress.h b/netbsd-1.2/slcompress.h index ca430c4..196fc1e 100644 --- a/netbsd-1.2/slcompress.h +++ b/netbsd-1.2/slcompress.h @@ -1,4 +1,4 @@ -/* $NetBSD: slcompress.h,v 1.11 1997/05/17 21:12:11 christos Exp $ */ +/* $NetBSD: slcompress.h,v 1.12 1998/02/09 17:43:56 perry Exp $ */ /* Id: slcompress.h,v 1.4 1994/09/21 06:50:08 paulus Exp */ /* @@ -43,8 +43,8 @@ * - Initial distribution. */ -#ifndef _SLCOMPRESS_H_ -#define _SLCOMPRESS_H_ +#ifndef _NET_SLCOMPRESS_H_ +#define _NET_SLCOMPRESS_H_ #define MAX_STATES 16 /* must be > 2 and < 256 */ #define MAX_HDR MLEN /* XXX 4bsd-ism: should really be 128 */ @@ -166,4 +166,4 @@ 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_ */ +#endif /* _NET_SLCOMPRESS_H_ */ -- 2.39.2