From 677aa53dfefc4ebf9523fc3006f05fd2073b5dd8 Mon Sep 17 00:00:00 2001 From: pali <7141871+pali@users.noreply.github.com> Date: Fri, 7 Aug 2020 02:24:49 +0200 Subject: [PATCH] Fix -W option for pppoe-discovery utility (#157) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit pppoe-discovery's -W option is totally broken. pppoe-discovery currently expects that Host-Unique attribute equals to its own process pid if set. This patch fixes parsing received PPPoE PADO packets when -W option is set. Same implementation is in pppd pppoe plugin. Signed-off-by: Pali Rohár Signed-off-by: Paul Mackerras --- pppd/plugins/rp-pppoe/pppoe-discovery.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c index f19c6d8..1a243fe 100644 --- a/pppd/plugins/rp-pppoe/pppoe-discovery.c +++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c @@ -328,14 +328,10 @@ void parseForHostUniq(UINT16_t type, UINT16_t len, unsigned char *data, void *extra) { - int *val = (int *) extra; - if (type == TAG_HOST_UNIQ && len == sizeof(pid_t)) { - pid_t tmp; - memcpy(&tmp, data, len); - if (tmp == getpid()) { - *val = 1; - } - } + PPPoETag *tag = extra; + + if (type == TAG_HOST_UNIQ && len == ntohs(tag->length)) + tag->length = memcmp(data, tag->payload, len); } /********************************************************************** @@ -352,7 +348,7 @@ parseForHostUniq(UINT16_t type, UINT16_t len, unsigned char *data, int packetIsForMe(PPPoEConnection *conn, PPPoEPacket *packet) { - int forMe = 0; + PPPoETag hostUniq = conn->hostUniq; /* If packet is not directed to our MAC address, forget it */ if (memcmp(packet->ethHdr.h_dest, conn->myEth, ETH_ALEN)) return 0; @@ -360,8 +356,8 @@ packetIsForMe(PPPoEConnection *conn, PPPoEPacket *packet) /* If we're not using the Host-Unique tag, then accept the packet */ if (!conn->hostUniq.length) return 1; - parsePacket(packet, parseForHostUniq, &forMe); - return forMe; + parsePacket(packet, parseForHostUniq, &hostUniq); + return !hostUniq.length; } /********************************************************************** -- 2.39.2