From d819922fa1906e5c8c3f65fa171fab11fffb8798 Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Fri, 22 Oct 2010 12:01:23 +0200 Subject: [PATCH 1/3] Remove all nss requests after a reconnect Currently we do not handle the open nss request after a reconnect and wait until they timeout (which is a couple of minutes!). This patch adds a handler that terminates all requests after a reconnect. Then responder will return matching cache entries or nothing. --- src/responder/common/responder.h | 2 ++ src/responder/common/responder_dp.c | 19 +++++++++++++++++++ src/responder/nss/nsssrv.c | 6 +++++- 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/src/responder/common/responder.h b/src/responder/common/responder.h index 980e561..783f9e4 100644 --- a/src/responder/common/responder.h +++ b/src/responder/common/responder.h @@ -161,6 +161,8 @@ struct cli_protocol_version *register_cli_protocol_version(void); typedef void (*sss_dp_callback_t)(uint16_t err_maj, uint32_t err_min, const char *err_msg, void *ptr); +void handle_requests_after_reconnect(void); + int sss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *callback_memctx, sss_dp_callback_t callback, void *callback_ctx, int timeout, const char *domain, diff --git a/src/responder/common/responder_dp.c b/src/responder/common/responder_dp.c index fd7b976..f8c3b6f 100644 --- a/src/responder/common/responder_dp.c +++ b/src/responder/common/responder_dp.c @@ -107,6 +107,25 @@ static int sss_dp_req_destructor(void *ptr) return 0; } +static bool reconnect_handler(hash_entry_t *item, void *user_data) +{ + struct sss_dp_req *sdp_req = talloc_get_type(item->value.ptr, + struct sss_dp_req); + + return (talloc_free(sdp_req) == EOK ? true : false); +} + +void handle_requests_after_reconnect(void) +{ + int ret; + + ret = hash_iterate(dp_requests, reconnect_handler, NULL); + if (ret != HASH_SUCCESS) { + DEBUG(1, ("hash_iterate failed, " + "not all request might be handled after reconnect.\n")); + } +} + static void sdp_req_timeout(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *ptr) diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c index 4f5aa62..dfb0312 100644 --- a/src/responder/nss/nsssrv.c +++ b/src/responder/nss/nsssrv.c @@ -39,6 +39,7 @@ #include "dbus/dbus.h" #include "sbus/sssd_dbus.h" #include "responder/common/responder_packet.h" +#include "responder/common/responder.h" #include "providers/data_provider.h" #include "monitor/monitor_interfaces.h" #include "sbus/sbus_client.h" @@ -143,7 +144,10 @@ static void nss_dp_reconnect_init(struct sbus_connection *conn, DATA_PROVIDER_VERSION, "NSS"); /* all fine */ - if (ret == EOK) return; + if (ret == EOK) { + handle_requests_after_reconnect(); + return; + } } /* Failed to reconnect */ -- 1.7.2.3