svn commit: r312657 - in stable/10/sys: conf netgraph

[Pedro F. Giffuni]

Author: pfg
Date: Mon Jan 23 01:21:39 2017
New Revision: 312657
URL: https://svnweb.freebsd.org/changeset/base/312657

Log:
  MFC r312443:
  mppc - Finish pluging NETGRAPH_MPPC_COMPRESSION.
  
  There were several places where reference to compression were left
  unfinished. Furthermore, KASSERTs contained references to MPPC_INVALID
  which is not defined in the tree and therefore were sure to break with
  INVARIANTS: comment them out.
  
  Reported by:	Eugene Grosbein
  PR:		216265

Modified:
  stable/10/sys/conf/NOTES
  stable/10/sys/conf/options
  stable/10/sys/netgraph/ng_mppc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/conf/NOTES
==============================================================================
--- stable/10/sys/conf/NOTES	Mon Jan 23 01:20:58 2017	(r312656)
+++ stable/10/sys/conf/NOTES	Mon Jan 23 01:21:39 2017	(r312657)
@@ -747,8 +747,7 @@ options 	NETGRAPH_IPFW
 options 	NETGRAPH_KSOCKET
 options 	NETGRAPH_L2TP
 options 	NETGRAPH_LMI
-# MPPC compression requires proprietary files (not included)
-#options 	NETGRAPH_MPPC_COMPRESSION
+options 	NETGRAPH_MPPC_COMPRESSION
 options 	NETGRAPH_MPPC_ENCRYPTION
 options 	NETGRAPH_NETFLOW
 options 	NETGRAPH_NAT

Modified: stable/10/sys/conf/options
==============================================================================
--- stable/10/sys/conf/options	Mon Jan 23 01:20:58 2017	(r312656)
+++ stable/10/sys/conf/options	Mon Jan 23 01:21:39 2017	(r312657)
@@ -512,7 +512,6 @@ NETGRAPH_IPFW		opt_netgraph.h
 NETGRAPH_KSOCKET	opt_netgraph.h
 NETGRAPH_L2TP		opt_netgraph.h
 NETGRAPH_LMI		opt_netgraph.h
-# MPPC compression requires proprietary files (not included)
 NETGRAPH_MPPC_COMPRESSION	opt_netgraph.h
 NETGRAPH_MPPC_ENCRYPTION	opt_netgraph.h
 NETGRAPH_NAT		opt_netgraph.h

Modified: stable/10/sys/netgraph/ng_mppc.c
==============================================================================
--- stable/10/sys/netgraph/ng_mppc.c	Mon Jan 23 01:20:58 2017	(r312656)
+++ stable/10/sys/netgraph/ng_mppc.c	Mon Jan 23 01:21:39 2017	(r312657)
@@ -66,7 +66,7 @@
 
 #if !defined(NETGRAPH_MPPC_COMPRESSION) && !defined(NETGRAPH_MPPC_ENCRYPTION)
 #ifdef KLD_MODULE
-/* XXX NETGRAPH_MPPC_COMPRESSION isn't functional yet */
+#define NETGRAPH_MPPC_COMPRESSION
 #define NETGRAPH_MPPC_ENCRYPTION
 #else
 /* This case is indicative of an error in sys/conf files */
@@ -81,7 +81,6 @@ static MALLOC_DEFINE(M_NETGRAPH_MPPC, "n
 #endif
 
 #ifdef NETGRAPH_MPPC_COMPRESSION
-/* XXX this file doesn't exist yet, but hopefully someday it will... */
 #include <net/mppc.h>
 #endif
 #ifdef NETGRAPH_MPPC_ENCRYPTION
@@ -546,7 +545,7 @@ err1:
 			&destCnt, d->history, flags, 0);
 
 		/* Check return value */
-		KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__));
+		/* KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__)); */
 		if ((rtn & MPPC_EXPANDED) == 0
 		    && (rtn & MPPC_COMP_OK) == MPPC_COMP_OK) {
 			outlen -= destCnt;     
@@ -808,7 +807,7 @@ failed:
 			&sourceCnt, &destCnt, d->history, flags);
 
 		/* Check return value */
-		KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__));
+		/* KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__)); */
 		if ((rtn & MPPC_DEST_EXHAUSTED) != 0
 		    || (rtn & MPPC_DECOMP_OK) != MPPC_DECOMP_OK) {
 			log(LOG_ERR, "%s: decomp returned 0x%x",