Merge the NETGRAPH branch into HEAD. tty devices now use netgraph's line

discipline to do the async escaping, but no other benefits are available yet.

Change ``ifdef HAVE_DES'' to ``ifndef NODES'' for consistency.

Make the Makefile a little more sane WRT RELEASE_CRUNCH.

1 files changed, 14 insertions, 0 deletions

diff --git a/usr.sbin/ppp/physical.c b/usr.sbin/ppp/physical.c
index 8ff27c2..9bce72e 100644
--- a/usr.sbin/ppp/physical.c
+++ b/usr.sbin/ppp/physical.c
@@ -100,6 +100,7 @@
 #endif
 #ifndef NONETGRAPH
 #include "ether.h"
+#include "netgraph.h"
 #endif
 #ifndef NOATM
 #include "atm.h"
@@ -137,6 +138,9 @@ struct {
    * able to identify it as a more specific type of SOCK_DGRAM.
    */
   { ether_Create, ether_iov2device, ether_DeviceSize },
+#ifdef EXPERIMENTAL_NETGRAPH
+  { ng_Create, ng_iov2device, ng_DeviceSize },
+#endif
 #endif
 #ifndef NOATM
   /* Ditto for ATM devices */
@@ -1100,3 +1104,13 @@ physical_AwaitCarrier(struct physical *p)
 
   return CARRIER_OK;
 }
+
+
+void
+physical_SetAsyncParams(struct physical *p, u_int32_t mymap, u_int32_t hismap)
+{
+  if (p->handler && p->handler->setasyncparams)
+    return (*p->handler->setasyncparams)(p, mymap, hismap);
+
+  async_SetLinkParams(&p->async, mymap, hismap);
+}