From 386c7340dae9af9c0bf8b26cfaf9e207138cb7be Mon Sep 17 00:00:00 2001
From: Fabiano Fidêncio <fidencio@redhat.com>
Date: Jan 23 2017 17:46:37 +0000
Subject: RESPONDER: Make clear {reset_,}idle_timer() are related to client


Those public functions dealing with idle_timer are related to the
client's timeout. Let's make it explicit as we will introduce more
timeout handlers (this time, related to the responder itself).

Related:
https://fedorahosted.org/sssd/ticket/3245

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>

---

diff --git a/src/responder/common/responder.h b/src/responder/common/responder.h
index 40c8840..f9e18ee 100644
--- a/src/responder/common/responder.h
+++ b/src/responder/common/responder.h
@@ -317,11 +317,11 @@ bool sss_utf8_check(const uint8_t *s, size_t n);
 
 void responder_set_fd_limit(rlim_t fd_limit);
 
-errno_t reset_idle_timer(struct cli_ctx *cctx);
-void idle_handler(struct tevent_context *ev,
-                  struct tevent_timer *te,
-                  struct timeval current_time,
-                  void *data);
+errno_t reset_client_idle_timer(struct cli_ctx *cctx);
+void client_idle_handler(struct tevent_context *ev,
+                         struct tevent_timer *te,
+                         struct timeval current_time,
+                         void *data);
 
 #define GET_DOMAINS_DEFAULT_TIMEOUT 60
 
diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c
index dc6d8d3..ec2575f 100644
--- a/src/responder/common/responder_common.c
+++ b/src/responder/common/responder_common.c
@@ -358,7 +358,7 @@ static void client_fd_handler(struct tevent_context *ev,
     struct cli_ctx *cctx = talloc_get_type(ptr, struct cli_ctx);
 
     /* Always reset the idle timer on any activity */
-    ret = reset_idle_timer(cctx);
+    ret = reset_client_idle_timer(cctx);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
               "Could not create idle timer for client. "
@@ -502,7 +502,7 @@ static void accept_fd_handler(struct tevent_context *ev,
     cctx->rctx = rctx;
 
     /* Set up the idle timer */
-    ret = reset_idle_timer(cctx);
+    ret = reset_client_idle_timer(cctx);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
               "Could not create idle timer for client. "
@@ -517,14 +517,14 @@ static void accept_fd_handler(struct tevent_context *ev,
     return;
 }
 
-errno_t reset_idle_timer(struct cli_ctx *cctx)
+errno_t reset_client_idle_timer(struct cli_ctx *cctx)
 {
     struct timeval tv =
             tevent_timeval_current_ofs(cctx->rctx->client_idle_timeout, 0);
 
     talloc_zfree(cctx->idle);
 
-    cctx->idle = tevent_add_timer(cctx->ev, cctx, tv, idle_handler, cctx);
+    cctx->idle = tevent_add_timer(cctx->ev, cctx, tv, client_idle_handler, cctx);
     if (!cctx->idle) return ENOMEM;
 
     DEBUG(SSSDBG_TRACE_ALL,
@@ -534,10 +534,10 @@ errno_t reset_idle_timer(struct cli_ctx *cctx)
     return EOK;
 }
 
-void idle_handler(struct tevent_context *ev,
-                  struct tevent_timer *te,
-                  struct timeval current_time,
-                  void *data)
+void client_idle_handler(struct tevent_context *ev,
+                         struct tevent_timer *te,
+                         struct timeval current_time,
+                         void *data)
 {
     /* This connection is idle. Terminate it */
     struct cli_ctx *cctx =
diff --git a/src/responder/secrets/secsrv_cmd.c b/src/responder/secrets/secsrv_cmd.c
index 36de6ef..70679ec 100644
--- a/src/responder/secrets/secsrv_cmd.c
+++ b/src/responder/secrets/secsrv_cmd.c
@@ -584,7 +584,7 @@ static void sec_fd_handler(struct tevent_context *ev,
     struct cli_ctx *cctx = talloc_get_type(ptr, struct cli_ctx);
 
     /* Always reset the idle timer on any activity */
-    ret = reset_idle_timer(cctx);
+    ret = reset_client_idle_timer(cctx);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
               "Could not create idle timer for client. "