Просмотр исходного кода

ppp: do not warn if connect() before close() on pppoe terminate fails (fixes #19651)

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 45755
Felix Fietkau 10 лет назад
Родитель
Сommit
27aada7658

+ 14 - 0
package/network/services/ppp/patches/531-pppoe_no_disconnect_warning.patch

@@ -0,0 +1,14 @@
+--- a/pppd/plugins/rp-pppoe/plugin.c
++++ b/pppd/plugins/rp-pppoe/plugin.c
+@@ -271,9 +271,8 @@ PPPOEDisconnectDevice(void)
+     sp.sa_addr.pppoe.sid = 0;
+     memcpy(sp.sa_addr.pppoe.dev, conn->ifName, IFNAMSIZ);
+     memcpy(sp.sa_addr.pppoe.remote, conn->peerEth, ETH_ALEN);
+-    if (connect(conn->sessionSocket, (struct sockaddr *) &sp,
+-		sizeof(struct sockaddr_pppox)) < 0)
+-	error("Failed to disconnect PPPoE socket: %d %m", errno);
++    connect(conn->sessionSocket, (struct sockaddr *) &sp,
++	    sizeof(struct sockaddr_pppox));
+     close(conn->sessionSocket);
+     sendPADT(conn, NULL);
+     if (conn->discoverySocket >= 0)