From 11865d0baa7788c6a49c3f8bc0d552d2a3999bcb Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Mon, 4 Jun 2012 16:28:28 +0400 Subject: Revert "implemented delayed fd close (speeds up session termination process)" Low interface creation/deletion rate is kernel issue and should be fixed in 3.5. This reverts commit 9ae4a0151805229face3385e6c966de90c7fec29. --- accel-pppd/ctrl/l2tp/l2tp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'accel-pppd/ctrl/l2tp') diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index c629bb35..d8a98f8d 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -26,7 +26,6 @@ #include "crypto.h" #include "connlimit.h" -#include "fdtrash.h" #include "memdebug.h" @@ -117,6 +116,7 @@ static void l2tp_disconnect(struct l2tp_conn_t *conn) struct l2tp_packet_t *pack; triton_md_unregister_handler(&conn->hnd); + close(conn->hnd.fd); if (conn->timeout_timer.tpd) triton_timer_del(&conn->timeout_timer); @@ -139,12 +139,10 @@ static void l2tp_disconnect(struct l2tp_conn_t *conn) pthread_mutex_unlock(&l2tp_lock); if (conn->ppp.fd != -1) - fdtrash_add(conn->ppp.fd); + close(conn->ppp.fd); if (conn->tunnel_fd != -1) - fdtrash_add(conn->tunnel_fd); - - fdtrash_add(conn->hnd.fd); + close(conn->tunnel_fd); triton_event_fire(EV_CTRL_FINISHED, &conn->ppp); -- cgit v1.2.3