Attachment #179081 for bug #216265





#if !defined(NETGRAPH_MPPC_COMPRESSION) && !defined(NETGRAPH_MPPC_ENCRYPTION)
#ifdef KLD_MODULE
#define NETGRAPH_MPPC_COMPRESSION
#define NETGRAPH_MPPC_ENCRYPTION
#else
/* This case is indicative of an error in sys/conf files */

#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

		rtn = MPPC_Compress(&source, &dest, &sourceCnt,
			&destCnt, d->history, flags, 0);

		/* Check return value */
		KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__));
		if ((rtn & MPPC_EXPANDED) == 0
		    && (rtn & MPPC_COMP_OK) == MPPC_COMP_OK) {
			outlen -= destCnt;     

		rtn = MPPC_Decompress(&source, &dest,
			&sourceCnt, &destCnt, d->history, flags);

		/* Check return value */
		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",

Lines 509-515 Link Here

(-)sys/conf/options (-1 lines)
509	NETGRAPH_KSOCKET opt_netgraph.h	509	NETGRAPH_KSOCKET opt_netgraph.h
510	NETGRAPH_L2TP opt_netgraph.h	510	NETGRAPH_L2TP opt_netgraph.h
511	NETGRAPH_LMI opt_netgraph.h	511	NETGRAPH_LMI opt_netgraph.h
512	# MPPC compression requires proprietary files (not included)
513	NETGRAPH_MPPC_COMPRESSION opt_netgraph.h	512	NETGRAPH_MPPC_COMPRESSION opt_netgraph.h
514	NETGRAPH_MPPC_ENCRYPTION opt_netgraph.h	513	NETGRAPH_MPPC_ENCRYPTION opt_netgraph.h
515	NETGRAPH_NAT opt_netgraph.h	514	NETGRAPH_NAT opt_netgraph.h

Lines 758-765 Link Here

(-)sys/conf/NOTES (-2 / +1 lines)
758	options NETGRAPH_KSOCKET	758	options NETGRAPH_KSOCKET
759	options NETGRAPH_L2TP	759	options NETGRAPH_L2TP
760	options NETGRAPH_LMI	760	options NETGRAPH_LMI
761	# MPPC compression requires proprietary files (not included)	761	options NETGRAPH_MPPC_COMPRESSION
762	#options NETGRAPH_MPPC_COMPRESSION
763	options NETGRAPH_MPPC_ENCRYPTION	762	options NETGRAPH_MPPC_ENCRYPTION
764	options NETGRAPH_NETFLOW	763	options NETGRAPH_NETFLOW
765	options NETGRAPH_NAT	764	options NETGRAPH_NAT

Return to bug 216265

Lines 66-72 Link Here

(-)sys/netgraph/ng_mppc.c (-6 / +1 lines)
66		66
67	#if !defined(NETGRAPH_MPPC_COMPRESSION) && !defined(NETGRAPH_MPPC_ENCRYPTION)	67	#if !defined(NETGRAPH_MPPC_COMPRESSION) && !defined(NETGRAPH_MPPC_ENCRYPTION)
68	#ifdef KLD_MODULE	68	#ifdef KLD_MODULE
69	/* XXX NETGRAPH_MPPC_COMPRESSION isn't functional yet */	69	#define NETGRAPH_MPPC_COMPRESSION
70	#define NETGRAPH_MPPC_ENCRYPTION	70	#define NETGRAPH_MPPC_ENCRYPTION
71	#else	71	#else
72	/* This case is indicative of an error in sys/conf files */	72	/* This case is indicative of an error in sys/conf files */
Lines 81-87 static MALLOC_DEFINE(M_NETGRAPH_MPPC, "n Link Here
81	#endif	81	#endif
82		82
83	#ifdef NETGRAPH_MPPC_COMPRESSION	83	#ifdef NETGRAPH_MPPC_COMPRESSION
84	/* XXX this file doesn't exist yet, but hopefully someday it will... */
85	#include <net/mppc.h>	84	#include <net/mppc.h>
86	#endif	85	#endif
87	#ifdef NETGRAPH_MPPC_ENCRYPTION	86	#ifdef NETGRAPH_MPPC_ENCRYPTION
Lines 542-549 err1: Link Here
542	rtn = MPPC_Compress(&source, &dest, &sourceCnt,	541	rtn = MPPC_Compress(&source, &dest, &sourceCnt,
543	&destCnt, d->history, flags, 0);	542	&destCnt, d->history, flags, 0);
544		543
545	/* Check return value */
546	KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__));
547	if ((rtn & MPPC_EXPANDED) == 0	544	if ((rtn & MPPC_EXPANDED) == 0
548	&& (rtn & MPPC_COMP_OK) == MPPC_COMP_OK) {	545	&& (rtn & MPPC_COMP_OK) == MPPC_COMP_OK) {
549	outlen -= destCnt;	546	outlen -= destCnt;
Lines 804-811 failed: Link Here
804	rtn = MPPC_Decompress(&source, &dest,	801	rtn = MPPC_Decompress(&source, &dest,
805	&sourceCnt, &destCnt, d->history, flags);	802	&sourceCnt, &destCnt, d->history, flags);
806		803
807	/* Check return value */
808	KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__));
809	if ((rtn & MPPC_DEST_EXHAUSTED) != 0	804	if ((rtn & MPPC_DEST_EXHAUSTED) != 0
810	\|\| (rtn & MPPC_DECOMP_OK) != MPPC_DECOMP_OK) {	805	\|\| (rtn & MPPC_DECOMP_OK) != MPPC_DECOMP_OK) {
811	log(LOG_ERR, "%s: decomp returned 0x%x",	806	log(LOG_ERR, "%s: decomp returned 0x%x",