head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.110 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.108 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.106 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.104 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.102 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.100 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.98 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.96 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.94 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.92 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.90 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.88 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.86 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.84 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.82 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.80 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.78 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.76 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.74 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.72 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.70 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.68 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.66 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.62 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.42 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.64 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.60 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.58 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.56 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.54 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.52 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.50 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.48 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.46 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.44 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.40 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.38 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.36 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.34 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.32 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.30 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.28 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.26 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.24 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.22 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.20 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.18 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.16 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.14 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.12 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.10 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.8 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.6 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.4 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.2 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.1.0.50 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.48 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.46 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.44 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.42 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.40 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.38 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.36 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.34 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.32 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.30 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.28 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.26 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.24 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.22 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.20 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.18 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.16 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.14 pkgsrc-2008Q1:1.1.0.12 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.10 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.8 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.6 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.4 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.2 pkgsrc-2006Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2012.08.23.13.10.52; author is; state Exp; branches; next 1.1; 1.1 date 2006.11.01.15.17.14; author martin; state Exp; branches; next ; desc @@ 1.2 log @rp-pppoe couldn't find the interfaces' Ethernet address with the old code, as this used the NetBSD<5-style variable effective ifreq length. The patched code works in old and new compilation environments. Patch optimized by gimpy@@. @ text @$NetBSD$ --- src/if.c.orig 2006-04-02 14:29:42.000000000 +0000 +++ src/if.c @@@@ -99,7 +99,7 @@@@ static int dl_addrlen; static unsigned char *bpfBuffer; /* Packet filter buffer */ static int bpfLength = 0; /* Packet filter buffer length */ -static int bpfSize = 0; /* Number of unread bytes in buffer */ +int bpfSize = 0; /* Number of unread bytes in buffer */ static int bpfOffset = 0; /* Current offset in bpfBuffer */ #endif @@@@ -152,7 +152,7 @@@@ getHWaddr(int sock, char const *ifname, const struct sockaddr_dl *sdl; struct ifconf ifc; struct ifreq ifreq, *ifr; - int i; + int i,l; int found = 0; ifc.ifc_len = sizeof(inbuf); @@@@ -164,10 +164,12 @@@@ getHWaddr(int sock, char const *ifname, ifreq.ifr_name[0] = '\0'; for (i = 0; i < ifc.ifc_len; ) { ifr = (struct ifreq *)((caddr_t)ifc.ifc_req + i); - i += sizeof(ifr->ifr_name) + - (ifr->ifr_addr.sa_len > sizeof(struct sockaddr) - ? ifr->ifr_addr.sa_len - : sizeof(struct sockaddr)); + + l = sizeof(*ifr); + if (sizeof(ifr->ifr_name) + ifr->ifr_addr.sa_len > l) + l = sizeof(ifr->ifr_name) + ifr->ifr_addr.sa_len; + i += l; + if (ifr->ifr_addr.sa_family == AF_LINK) { sdl = (const struct sockaddr_dl *) &ifr->ifr_addr; if ((sdl->sdl_type == IFT_ETHER) && @ 1.1 log @Update rp-pppoe to 3.8: various internal changes, some of them bogus and reverted by patches, some of them were already present in (now removed) patches; plus: - Changed the names of commands from adsl-* to pppoe-* to more logically name the scripts. - Make the userland pppoe daemon run as "nobody" if possible, once session has started. - Make userland pppoe program somewhat safe if it is installed SUID or SGID. Note that I still do *NOT* recommend a SUID/SGID pppoe. - Fix long-standing bug in pppoe-server that passed arguments to pppd in the wrong order. @ text @d3 3 a5 3 --- src/if.c.orig 2006-04-02 16:29:42.000000000 +0200 +++ src/if.c 2006-11-01 12:15:52.000000000 +0100 @@@@ -99,7 +99,7 @@@@ d14 26 @