gre(4) no longer supports ipip. Track this change ...

This commit is contained in:
hwr 1999-01-26 21:32:39 +00:00
parent 53a99685bd
commit a1e1a2a4ad
3 changed files with 8 additions and 16 deletions

View File

@ -1,4 +1,4 @@
$Id: README.gre,v 1.3 1998/10/31 13:07:02 hwr Exp $ $Id: README.gre,v 1.4 1999/01/26 21:32:39 hwr Exp $
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
A GRE Tunnel for NetBSD A GRE Tunnel for NetBSD
@ -7,8 +7,7 @@ $Id: README.gre,v 1.3 1998/10/31 13:07:02 hwr Exp $
This is a very alpha implementation of GRE packet encapsulation. This is a very alpha implementation of GRE packet encapsulation.
Generic Route Encapsulation (GRE) is described in RFC 1701 and 1702. Generic Route Encapsulation (GRE) is described in RFC 1701 and 1702.
The interface also supports IPIP (protocol 4) encapsulation, The interface also supports MOBILE (protocol 55) as of RFC 2004 but
as described in RFC 2003 and MOBILE (protocol 55) as of RFC 2004 but
default is GRE mode. default is GRE mode.
Basically GRE allows to tunnel not only IP over IP, but also provides Basically GRE allows to tunnel not only IP over IP, but also provides
@ -19,8 +18,7 @@ the need for own tunneling in ip_mroute etc.
This implementation is (as said) still alpha, but works for me. This implementation is (as said) still alpha, but works for me.
Successful testing has been done for GRE encapsulation with Cisco routers Successful testing has been done for GRE encapsulation with Cisco routers
and NetBSD boxes as remote and with Cisco routers and Linux 2.0.35 for and NetBSD boxes as remote.
IPIP encapsulation.
The files: The files:
@ -28,9 +26,7 @@ The files:
netinet/ip_gre.[ch]: input part, deencapsulates packets. Is IP only netinet/ip_gre.[ch]: input part, deencapsulates packets. Is IP only
at the moment and only supports GRE without options. at the moment and only supports GRE without options.
netinet/in.h : Addition of IPPROTO_GRE netinet/in.h : Addition of IPPROTO_GRE
netinet/in_proto.c : Addition of protocol switch for GRE , additional netinet/in_proto.c : Addition of protocol switch for GRE
protocol switch for IPIP, when MROUTING is not
defined.
conf/files : mention new files for GRE conf/files : mention new files for GRE
greconfig.c : Utility to set/display tunnel endpoints / mode. greconfig.c : Utility to set/display tunnel endpoints / mode.
greconfig.8 : Manpage for greconfig. greconfig.8 : Manpage for greconfig.
@ -58,7 +54,6 @@ Todos/Bugs:
GRE RFC not yet fully implemented (no GRE options), no other protocols GRE RFC not yet fully implemented (no GRE options), no other protocols
yet than IP over IP. yet than IP over IP.
RFC 2003 also not yet fully supported wrt. options etc.
Code quality is surely not best and possibly not near anything like KNF Code quality is surely not best and possibly not near anything like KNF

View File

@ -1,4 +1,4 @@
.\" $NetBSD: greconfig.8,v 1.3 1998/10/31 13:07:02 hwr Exp $ .\" $NetBSD: greconfig.8,v 1.4 1999/01/26 21:32:40 hwr Exp $
.\" .\"
.\" Copyright 1998 (c) The NetBSD Foundation, Inc. .\" Copyright 1998 (c) The NetBSD Foundation, Inc.
.\" All rights reserved. .\" All rights reserved.
@ -78,7 +78,6 @@ when IP packets are to be encapsulated.
.It Fl p Ar proto .It Fl p Ar proto
Sets the way how packets are encapsulated. Currently supported values are: Sets the way how packets are encapsulated. Currently supported values are:
.Bl -tag -width aaa .Bl -tag -width aaa
.It 4 IPIP encapsulation as described in RFC 2003
.It 47 GRE encapsulation as described in RFC 1701,1702 .It 47 GRE encapsulation as described in RFC 1701,1702
.It 55 MOBILE encapsulation as described in RFC 2004 .It 55 MOBILE encapsulation as described in RFC 2004
.El .El
@ -108,8 +107,6 @@ as arguments to
.Pp .Pp
A description of GRE encapsulation can be found in RFC 1701, RFC 1702. A description of GRE encapsulation can be found in RFC 1701, RFC 1702.
.Pp .Pp
A description of IPIP encapsulation can be found in RFC 2003.
.Pp
A description of MOBILE encapsulation can be found in RFC 2004. A description of MOBILE encapsulation can be found in RFC 2004.
.Sh AUTHOR .Sh AUTHOR

View File

@ -37,7 +37,7 @@
/* /*
* greconfig - frontend to set/query tunnel endpoints * greconfig - frontend to set/query tunnel endpoints
* *
* $NetBSD: greconfig.c,v 1.3 1998/09/30 06:16:07 hwr Exp $ * $NetBSD: greconfig.c,v 1.4 1999/01/26 21:32:40 hwr Exp $
*/ */
#include <stdio.h> #include <stdio.h>
@ -101,7 +101,7 @@ main(int argc, char **argv)
exit(3); exit(3);
} }
if((proto!=4) && (proto!=47) && (proto!=55)) { if((proto!=47) && (proto!=55)) {
usage(); usage();
exit(4); exit(4);
} }
@ -168,7 +168,7 @@ void
usage(void) usage(void)
{ {
printf("greconfig -i unit [-d dst] [-s src] [-p proto] [-v]\n"); printf("greconfig -i unit [-d dst] [-s src] [-p proto] [-v]\n");
printf("unit is gre<n>, proto either 4, 47 or 55\n"); printf("unit is gre<n>, proto either 47 or 55\n");
} }
void name2sa(char *name,struct sockaddr **sa) void name2sa(char *name,struct sockaddr **sa)