From: Paul Mackerras <paulus@ozlabs.org>
Date: Thu, 11 Jan 2024 09:38:08 +0000 (+1100)
Subject: pppoe: Fix sending of PADT on connection termination (#470)
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=88563e591766a0cac99c171124d9dd5df2922f4c

pppoe: Fix sending of PADT on connection termination (#470)

Commit 2b4166d02ed0 ("Close discovery socket after session completed",
2020-11-26) arranged for the discovery socket to be closed when the
PPPOE session negotiation was complete.  However, the discovery socket
is used for sending a PADT message when the connection terminates, and
now that doesn't work because the socket has been closed.

To fix this, we reopen the discovery socket in order to send the PADT
message.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
---

diff --git a/pppd/plugins/pppoe/plugin.c b/pppd/plugins/pppoe/plugin.c
index c7ace96..7d4709e 100644
--- a/pppd/plugins/pppoe/plugin.c
+++ b/pppd/plugins/pppoe/plugin.c
@@ -310,6 +310,9 @@ PPPOEDisconnectDevice(void)
 		sizeof(struct sockaddr_pppox)) < 0 && errno != EALREADY)
 	error("Failed to disconnect PPPoE socket: %d %m", errno);
     close(conn->sessionSocket);
+    if (conn->discoverySocket < 0)
+	conn->discoverySocket =
+            openInterface(conn->ifName, Eth_PPPOE_Discovery, NULL);
     if (conn->discoverySocket >= 0) {
         sendPADT(conn, NULL);
 	close(conn->discoverySocket);