o Log the (payload/size) of all packet types, not just TCP packets

o  If the new ``filter-decapsulation'' is enabled, delve into UDP packets
   that contain 0xff 0x03 as the first two bytes, and if we recognise it
   as PROTO_IP, decapsulate it for the purpose of filter checking.

   If we recognise it as PROTO_<anything else> mention this for logging
   purposes only.

This change is aimed at people running PPPoUDP where the UDP traffic is
being sent over another PPP link.  It's desireable to have the top level
link connected all the time, but to have the bottom level link capable
of decapsulating the traffic and comparing the payload against the filters,
thus allowing ``set filter dial ...'' to work in tunnelled environments.

The caveat here is that the top ppp cannot employ any compression layers
without making the data unreadable for the bottom ppp.  ``disable deflate
pred1 vj'' and ``deny deflate pred1 vj'' is suggested.

1 files changed, 11 insertions, 10 deletions

diff --git a/usr.sbin/ppp/bundle.h b/usr.sbin/ppp/bundle.h
index 7007d78..5f0efc3 100644
--- a/usr.sbin/ppp/bundle.h
+++ b/usr.sbin/ppp/bundle.h
@@ -33,16 +33,17 @@
 #define	PHASE_TERMINATE		4	/* Terminating link */
 
 /* cfg.opt bit settings */
-#define OPT_IDCHECK	0x0001
-#define OPT_IFACEALIAS	0x0002
-#define OPT_KEEPSESSION	0x0004
-#define OPT_LOOPBACK	0x0008
-#define OPT_PASSWDAUTH	0x0010
-#define OPT_PROXY	0x0020
-#define OPT_PROXYALL	0x0040
-#define OPT_SROUTES	0x0080
-#define OPT_THROUGHPUT	0x0100
-#define OPT_UTMP	0x0200
+#define OPT_FILTERDECAP	0x0001
+#define OPT_IDCHECK	0x0002
+#define OPT_IFACEALIAS	0x0004
+#define OPT_KEEPSESSION	0x0008
+#define OPT_LOOPBACK	0x0010
+#define OPT_PASSWDAUTH	0x0020
+#define OPT_PROXY	0x0040
+#define OPT_PROXYALL	0x0080
+#define OPT_SROUTES	0x0100
+#define OPT_THROUGHPUT	0x0200
+#define OPT_UTMP	0x0400
 
 #define MAX_ENDDISC_CLASS 5