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, 12 deletions

diff --git a/usr.sbin/ppp/iface.h b/usr.sbin/ppp/iface.h
index d520e84..28c3761 100644
--- a/usr.sbin/ppp/iface.h
+++ b/usr.sbin/ppp/iface.h
@@ -29,10 +29,9 @@
 struct ifa_msghdr;
 
 struct iface_addr {
-  struct in_addr ifa;		/* local address */
-  struct in_addr mask;		/* netmask */
-  int bits;			/* netmask bits - -1 if not contiguous */
-  struct in_addr brd;		/* peer address */
+  unsigned system : 1;		/* System alias ? */
+  struct ncprange ifa;		/* local address/mask */
+  struct ncpaddr peer;		/* peer address */
 };
 
 struct iface {
@@ -41,24 +40,24 @@ struct iface {
   int flags;			/* Interface flags (IFF_*) */
   int mtu;			/* struct tuninfo MTU */
 
-  int in_addrs;			/* How many in_addr's */
-  struct iface_addr *in_addr;	/* Array of addresses (malloc'd) */
+  int addrs;			/* How many in_addr's */
+  struct iface_addr *addr;	/* Array of addresses (malloc'd) */
 };
 
 #define IFACE_CLEAR_ALL		0	/* Nuke 'em all */
-#define IFACE_CLEAR_ALIASES	1	/* Leave the IPCP address */
+#define IFACE_CLEAR_ALIASES	1	/* Leave the NCP address */
 
 #define IFACE_ADD_LAST		0	/* Just another alias */
 #define IFACE_ADD_FIRST		1	/* The IPCP address */
 #define IFACE_FORCE_ADD		2	/* OR'd with IFACE_ADD_{FIRST,LAST} */
 
-#define iface_Clear iface_inClear	/* Same for now */
+#define IFACE_SYSTEM		4	/* Set/clear SYSTEM entries */
 
 extern struct iface *iface_Create(const char *name);
-extern void iface_inClear(struct iface *, int);
-extern int iface_inAdd(struct iface *, struct in_addr, struct in_addr,
-                     struct in_addr, int);
-extern int iface_inDelete(struct iface *, struct in_addr);
+extern void iface_Clear(struct iface *, struct ncp *, int, int);
+extern int iface_Add(struct iface *, struct ncp *, const struct ncprange *,
+                     const struct ncpaddr *, int);
+extern int iface_Delete(struct iface *, struct ncp *, const struct ncpaddr *);
 extern int iface_Show(struct cmdargs const *);
 extern int iface_SetFlags(const char *, int);
 extern int iface_ClearFlags(const char *, int);