head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.134 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.132 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.130 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.128 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.126 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.124 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.122 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.120 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.118 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.116 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.114 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.112 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.110 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.108 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.106 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.104 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.102 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.100 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.98 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.96 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.94 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.92 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.90 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.86 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.66 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.88 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.84 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.82 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.80 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.78 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.76 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.74 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.72 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.70 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.68 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.64 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.62 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.60 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.58 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.56 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.54 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.52 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.50 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.48 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.46 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.44 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.42 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.40 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.38 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.36 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.34 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.32 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.30 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.28 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.26 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.24 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.22 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.20 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.18 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.16 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.14 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.12 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.10 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.8 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.6 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.4 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.2 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.2.0.6 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.4 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.1.1.1.0.34 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.32 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.30 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.28 pkgsrc-2008Q1:1.1.1.1.0.26 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.24 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-2007Q3:1.1.1.1.0.22 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.20 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-2007Q1:1.1.1.1.0.18 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.16 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.14 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.12 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-2006Q1:1.1.1.1.0.10 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.8 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.6 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.4 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.2 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2009.08.06.15.41.54; author dsainty; state Exp; branches; next 1.2; 1.2 date 2008.12.26.21.41.40; author hasso; state Exp; branches; next 1.1; 1.1 date 2005.01.02.02.51.44; author cube; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2005.01.02.02.51.44; author cube; state Exp; branches; next ; desc @@ 1.3 log @Linux doesn't define PPP_FCS() in for userland. pppdump.c expects PPP_FCS() to be defined however, and compilation therefore breaks in the presence of the previous version of this patch. This version of the patch reverts back to the behaviour of the distribution code for non-NetBSD systems, but retains the Pkgsrc patched behaviour of pulling in the system copy of the header file for NetBSD and DragonFly. This should only affect success or failure of the package build, so no PKGREVISION bump. @ text @$NetBSD: patch-bi,v 1.2 2008/12/26 21:41:40 hasso 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,21 @@@@ #include #include #include +#include "pppdump.h" +#ifdef __DragonFly__ +#include +#else +#ifdef __NetBSD__ +#include +#else #include "ppp_defs.h" +#endif +#endif +#ifdef __NetBSD__ +#include +#else #include "ppp-comp.h" +#endif int hexmode; int pppmode; @@@@ -51,6 +64,15 @@@@ int start_time_tenths; int tot_sent, tot_rcvd; +struct pkt { + int cnt; + int esc; + int flags; + struct compressor *comp; + void *state; + unsigned char buf[8192]; +} spkt, rpkt; + extern int optind; extern char *optarg; @@@@ -191,7 +213,7 @@@@ show_time(f, c); break; default: - printf("?%.2x\n"); + printf("?%.2x\n", c); } } } @@@@ -234,15 +256,6 @@@@ 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 }; -struct pkt { - int cnt; - int esc; - int flags; - struct compressor *comp; - void *state; - unsigned char buf[8192]; -} spkt, rpkt; - /* Values for flags */ #define CCP_ISUP 1 #define CCP_ERROR 2 @@@@ -321,7 +334,7 @@@@ ++r; if (endp - r > mru) printf(" ERROR: length (%d) > MRU (%d)\n", - endp - r, mru); + (int)(endp - r), mru); if (decompress && fcs == PPP_GOODFCS) { /* See if this is a CCP or compressed packet */ d = dbuf; @@@@ -340,8 +353,15 @@@@ && (pkt->flags & CCP_DECOMP_RUN) && pkt->state && (pkt->flags & CCP_ERR) == 0) { - rv = pkt->comp->decompress(pkt->state, r, - endp - r, d, &dn); + struct packet in, out, *outp; + in.buf = r; + in.len = endp - r; + out.buf = d; + outp = &out; + rv = pkt->comp->decompress(pkt->state, &in, + &outp); + dn = outp->len; + d = outp->buf; switch (rv) { case DECOMP_OK: p = dbuf; @@@@ -364,7 +384,10 @@@@ } } else if (pkt->state && (pkt->flags & CCP_DECOMP_RUN)) { - pkt->comp->incomp(pkt->state, r, endp - r); + struct packet in; + in.buf = r; + in.len = endp - r; + pkt->comp->incomp(pkt->state, &in); } } do { @ 1.2 log @Make it work on DragonFly. Slightly modified patch from PR 40155. @ text @d1 1 a1 1 $NetBSD: patch-bi,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $ d5 1 a5 1 @@@@ -38,8 +38,17 @@@@ a8 1 -#include "ppp_defs.h" d13 1 d15 3 d27 1 a27 1 @@@@ -51,6 +60,15 @@@@ d43 1 a43 1 @@@@ -191,7 +209,7 @@@@ d52 1 a52 1 @@@@ -234,15 +252,6 @@@@ d68 1 a68 1 @@@@ -321,7 +330,7 @@@@ d77 1 a77 1 @@@@ -340,8 +349,15 @@@@ d95 1 a95 1 @@@@ -364,7 +380,10 @@@@ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- pppdump/pppdump.c.orig 2004-02-02 04:36:46.000000000 +0100 +++ pppdump/pppdump.c @@@@ -38,8 +38,13 @@@@ d11 3 d15 1 d24 1 a24 1 @@@@ -51,6 +56,15 @@@@ time_t start_time; d40 1 a40 1 @@@@ -191,7 +205,7 @@@@ dumplog(f) d49 1 a49 1 @@@@ -234,15 +248,6 @@@@ static u_short fcstab[256] = { d65 1 a65 1 @@@@ -321,7 +326,7 @@@@ dumpppp(f) d74 1 a74 1 @@@@ -340,8 +345,15 @@@@ dumpppp(f) d92 1 a92 1 @@@@ -364,7 +376,10 @@@@ dumpppp(f) @ 1.1.1.1 log @Initial import of pppd, version 2.4.3, into the NetBSD Package Collection. The PPP Daemon is the userland part of the Point-to-Point Protocol. It works in combination with a dedicated kernel network interface usually named ppp. PPP is a very extensible protocol and pppd supports a large number of options, including compression (through various algorithms), cryptography (Microsoft's MPPE) and authentication (PAP, CHAP, Microsoft CHAP), provided the kernel has the relevant back-ends in some cases. @ text @@