diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-05-26 07:02:49 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-05-26 07:02:49 +0000 |
| commit | 27aada7658acbf572c0224288a99dc377b26fb61 (patch) | |
| tree | e8627827f238e4edb2fe87c7a5300b115df522dd | |
| parent | 8cff8c8b080f361acb3a0688c124bd50f323127b (diff) | |
| download | upstream-27aada7658acbf572c0224288a99dc377b26fb61.tar.gz upstream-27aada7658acbf572c0224288a99dc377b26fb61.tar.bz2 upstream-27aada7658acbf572c0224288a99dc377b26fb61.zip | |
ppp: do not warn if connect() before close() on pppoe terminate fails (fixes #19651)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45755
| -rw-r--r-- | package/network/services/ppp/patches/531-pppoe_no_disconnect_warning.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/package/network/services/ppp/patches/531-pppoe_no_disconnect_warning.patch b/package/network/services/ppp/patches/531-pppoe_no_disconnect_warning.patch new file mode 100644 index 0000000000..799e961cd7 --- /dev/null +++ b/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) |