diff options
Diffstat (limited to 'net/pppd/patches/patch-bi')
| -rw-r--r-- | net/pppd/patches/patch-bi | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/net/pppd/patches/patch-bi b/net/pppd/patches/patch-bi index 298f8841a56..d5621811dc0 100644 --- a/net/pppd/patches/patch-bi +++ b/net/pppd/patches/patch-bi @@ -1,17 +1,20 @@ -$NetBSD: patch-bi,v 1.2 2008/12/26 21:41:40 hasso Exp $ +$NetBSD: patch-bi,v 1.3 2009/08/06 15:41:54 dsainty Exp $ --- pppdump/pppdump.c.orig 2004-02-01 19:36:46 -0800 +++ pppdump/pppdump.c 2008-12-10 03:22:59 -0800 -@@ -38,8 +38,17 @@ +@@ -38,8 +38,21 @@ #include <stdlib.h> #include <time.h> #include <sys/types.h> --#include "ppp_defs.h" +#include "pppdump.h" +#ifdef __DragonFly__ +#include <net/ppp_layer/ppp_defs.h> +#else ++#ifdef __NetBSD__ +#include <net/ppp_defs.h> ++#else + #include "ppp_defs.h" ++#endif +#endif +#ifdef __NetBSD__ +#include <net/ppp-comp.h> @@ -21,7 +24,7 @@ $NetBSD: patch-bi,v 1.2 2008/12/26 21:41:40 hasso Exp $ int hexmode; int pppmode; -@@ -51,6 +60,15 @@ +@@ -51,6 +64,15 @@ int start_time_tenths; int tot_sent, tot_rcvd; @@ -37,7 +40,7 @@ $NetBSD: patch-bi,v 1.2 2008/12/26 21:41:40 hasso Exp $ extern int optind; extern char *optarg; -@@ -191,7 +209,7 @@ +@@ -191,7 +213,7 @@ show_time(f, c); break; default: @@ -46,7 +49,7 @@ $NetBSD: patch-bi,v 1.2 2008/12/26 21:41:40 hasso Exp $ } } } -@@ -234,15 +252,6 @@ +@@ -234,15 +256,6 @@ 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 }; @@ -62,7 +65,7 @@ $NetBSD: patch-bi,v 1.2 2008/12/26 21:41:40 hasso Exp $ /* Values for flags */ #define CCP_ISUP 1 #define CCP_ERROR 2 -@@ -321,7 +330,7 @@ +@@ -321,7 +334,7 @@ ++r; if (endp - r > mru) printf(" ERROR: length (%d) > MRU (%d)\n", @@ -71,7 +74,7 @@ $NetBSD: patch-bi,v 1.2 2008/12/26 21:41:40 hasso Exp $ if (decompress && fcs == PPP_GOODFCS) { /* See if this is a CCP or compressed packet */ d = dbuf; -@@ -340,8 +349,15 @@ +@@ -340,8 +353,15 @@ && (pkt->flags & CCP_DECOMP_RUN) && pkt->state && (pkt->flags & CCP_ERR) == 0) { @@ -89,7 +92,7 @@ $NetBSD: patch-bi,v 1.2 2008/12/26 21:41:40 hasso Exp $ switch (rv) { case DECOMP_OK: p = dbuf; -@@ -364,7 +380,10 @@ +@@ -364,7 +384,10 @@ } } else if (pkt->state && (pkt->flags & CCP_DECOMP_RUN)) { |