2012-06-19 20:03:24 +03:00
|
|
|
pppd: Close already open ppp descriptors
|
|
|
|
|
|
|
|
|
|
When using the kernel PPPoE driver in conjunction with the "persist" option,
|
|
|
|
|
the already open descriptor to /dev/ppp is not closed when the link is
|
|
|
|
|
reestablished. This eventually leads to high CPU load because the stray
|
|
|
|
|
descriptors are always reported as ready by select().
|
|
|
|
|
|
|
|
|
|
This patch closes the descriptor if it is already open when establishing a
|
|
|
|
|
new connection. It originated from the Debian project.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
|
|
|
|
|
|
2009-05-21 13:49:21 +03:00
|
|
|
--- a/pppd/sys-linux.c
|
|
|
|
|
+++ b/pppd/sys-linux.c
|
|
|
|
|
@@ -453,6 +453,13 @@ int generic_establish_ppp (int fd)
|
2009-05-21 01:36:38 +03:00
|
|
|
if (new_style_driver) {
|
|
|
|
|
int flags;
|
|
|
|
|
|
|
|
|
|
+ /* if a ppp_fd is already open, close it first */
|
|
|
|
|
+ if(ppp_fd > 0) {
|
|
|
|
|
+ close(ppp_fd);
|
|
|
|
|
+ remove_fd(ppp_fd);
|
|
|
|
|
+ ppp_fd = -1;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
/* Open an instance of /dev/ppp and connect the channel to it */
|
|
|
|
|
if (ioctl(fd, PPPIOCGCHAN, &chindex) == -1) {
|
|
|
|
|
error("Couldn't get channel number: %m");
|
