o Add ipv6 support, abstracting most NCP addresses into opaque

  structures (well, they're treated as opaque).

  It's now possible to manage IPv6 interface addresses and routing
  table entries and to filter IPV6 traffic whether encapsulated or
  not.

  IPV6CP support is crude for now, and hasn't been tested against
  any other implementations.

  RADIUS and IPv6 are independent of eachother for now.

  ppp.linkup/ppp.linkdown aren't currently used by IPV6CP

o Understand all protocols(5) in filter rules rather than only a select
  few.

o Allow a mask specification for the ``delete'' command.  It's now
  possible to specifically delete one of two conflicting routes.

o When creating and deleting proxy arp entries, do it for all IPv4
  interface addresses rather than doing it just for the ``current''
  peer address.

o When iface-alias isn't in effect, don't blow away manually (via ``iface
  add'') added interface addresses.

o When listening on a tcp server (diagnostic) socket, bind so that a
  tcp46 socket is created -- allowing both IPv4 and IPv6 connections.

o When displaying ICMP traffic, don't display the icmp type twice.
  When display traffic, display at least some information about unrecognised
  traffic.

o Bump version

Inspired after filtering work by: Makoto MATSUSHITA <matusita@jp.FreeBSD.org>

1 files changed, 11 insertions, 2 deletions

diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index 7b81fd933ff7..6a2481cd42f1 100644
--- a/usr.sbin/ppp/link.c
+++ b/usr.sbin/ppp/link.c
@@ -29,6 +29,7 @@
 
 #include <sys/types.h>
 #include <netinet/in_systm.h>
+#include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
@@ -57,8 +58,10 @@
 #include "mp.h"
 #include "iplist.h"
 #include "slcompress.h"
-#include "ipcp.h"
+#include "ncpaddr.h"
 #include "ip.h"
+#include "ipcp.h"
+#include "ipv6cp.h"
 #include "auth.h"
 #include "pap.h"
 #include "chap.h"
@@ -317,10 +320,16 @@ static const struct {
   u_short proto;
   struct mbuf *(*fn)(struct bundle *, struct link *, struct mbuf *);
 } despatcher[] = {
-  { PROTO_IP, ip_Input },
+  { PROTO_IP, ipv4_Input },
+#ifndef NOINET6
+  { PROTO_IPV6, ipv6_Input },
+#endif
   { PROTO_MP, mp_Input },
   { PROTO_LCP, lcp_Input },
   { PROTO_IPCP, ipcp_Input },
+#ifndef NOINET6
+  { PROTO_IPV6CP, ipv6cp_Input },
+#endif
   { PROTO_PAP, pap_Input },
   { PROTO_CHAP, chap_Input },
   { PROTO_CCP, ccp_Input },