s3: Add "smbcontrol winbindd ip-dropped <local-ip>"

This is supposed to improve the winbind reconnect time after an ip address
has been moved away from a box. Any kind of HA scenario will benefit from
this, because winbindd does not have to wait for the TCP timeout to kick in
when a local IP address has been dropped and DC replies are not received
anymore.

diff --git a/source3/librpc/idl/messaging.idl b/source3/librpc/idl/messaging.idl
index 08caa5950888b2d99510708432edb431212274b7..9041d2284d15568fb3ba09df08e7e39d44c25a67 100644 (file)
--- a/source3/librpc/idl/messaging.idl
+++ b/source3/librpc/idl/messaging.idl
@@ -83,6 +83,7 @@ interface messaging
                MSG_WINBIND_FAILED_TO_GO_ONLINE = 0x0407,
                MSG_WINBIND_VALIDATE_CACHE      = 0x0408,
                MSG_WINBIND_DUMP_DOMAIN_LIST    = 0x0409,
+               MSG_WINBIND_IP_DROPPED          = 0x040A,
 
                /* event messages */
                MSG_DUMP_EVENT_LIST             = 0x0500,

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 11ac52215576db092bfa60684c37403428449e2f..f4de0c182f1e88737ffe53807a27d91cb5d56fe5 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -717,6 +717,22 @@ static bool do_closeshare(struct messaging_context *msg_ctx,
                            strlen(argv[1]) + 1);
 }
 
+/* Tell winbindd an IP got dropped */
+
+static bool do_ip_dropped(struct messaging_context *msg_ctx,
+                         const struct server_id pid,
+                         const int argc, const char **argv)
+{
+       if (argc != 2) {
+               fprintf(stderr, "Usage: smbcontrol <dest> ip-dropped "
+                       "<ip-address>\n");
+               return False;
+       }
+
+       return send_message(msg_ctx, pid, MSG_WINBIND_IP_DROPPED, argv[1],
+                           strlen(argv[1]) + 1);
+}
+
 /* force a blocking lock retry */
 
 static bool do_lockretry(struct messaging_context *msg_ctx,
@@ -1184,6 +1200,7 @@ static const struct {
        { "debuglevel", do_debuglevel, "Display current debuglevels" },
        { "printnotify", do_printnotify, "Send a print notify message" },
        { "close-share", do_closeshare, "Forcibly disconnect a share" },
+       { "ip-dropped", do_ip_dropped, "Tell winbind that an IP got dropped" },
        { "lockretry", do_lockretry, "Force a blocking lock retry" },
        { "brl-revalidate", do_brl_revalidate, "Revalidate all brl entries" },
         { "samsync", do_samsync, "Initiate SAM synchronisation" },

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 7a9ebb8a827fadc48f75958eeb5355d462f545d7..a0078e3fb87177a14203f0d373f7d925a90dbdf6 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1064,6 +1064,10 @@ void winbindd_register_handlers(void)
                           MSG_WINBIND_DUMP_DOMAIN_LIST,
                           winbind_msg_dump_domain_list);
 
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_WINBIND_IP_DROPPED,
+                          winbind_msg_ip_dropped_parent);
+
        /* Register handler for MSG_DEBUG. */
        messaging_register(winbind_messaging_context(), NULL,
                           MSG_DEBUG,

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 8f95031007d9ca358fbe2479462cb13d3d7b3777..1129e4f29cb26b68b5c2f9817733d2f8d22e0f0c 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2570,3 +2570,36 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
        *cli = conn->netlogon_pipe;
        return NT_STATUS_OK;
 }
+
+void winbind_msg_ip_dropped(struct messaging_context *msg_ctx,
+                           void *private_data,
+                           uint32_t msg_type,
+                           struct server_id server_id,
+                           DATA_BLOB *data)
+{
+       struct winbindd_domain *domain;
+
+       if ((data == NULL)
+           || (data->data == NULL)
+           || (data->length == 0)
+           || (data->data[data->length-1] != '\0')
+           || !is_ipaddress((char *)data->data)) {
+               DEBUG(1, ("invalid msg_ip_dropped message\n"));
+               return;
+       }
+       for (domain = domain_list(); domain != NULL; domain = domain->next) {
+               char sockaddr[INET6_ADDRSTRLEN];
+               if (domain->conn.cli == NULL) {
+                       continue;
+               }
+               if (domain->conn.cli->fd == -1) {
+                       continue;
+               }
+               client_socket_addr(domain->conn.cli->fd, sockaddr,
+                                  sizeof(sockaddr));
+               if (strequal(sockaddr, (char *)data->data)) {
+                       close(domain->conn.cli->fd);
+                       domain->conn.cli->fd = -1;
+               }
+       }
+}

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 931ec6787a72c24e8b803d1f4420abbf413412cc..a6cc64a7b5ed4626b14c5656b4ab22a446321f2e 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1295,6 +1295,10 @@ static bool fork_domain_child(struct winbindd_child *child)
                           MSG_DUMP_EVENT_LIST, child_msg_dump_event_list);
        messaging_register(winbind_messaging_context(), NULL,
                           MSG_DEBUG, debug_message);
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_WINBIND_IP_DROPPED,
+                          winbind_msg_ip_dropped);
+
 
        primary_domain = find_our_domain();
 
@@ -1486,3 +1490,21 @@ static bool fork_domain_child(struct winbindd_child *child)
                TALLOC_FREE(frame);
        }
 }
+
+void winbind_msg_ip_dropped_parent(struct messaging_context *msg_ctx,
+                                  void *private_data,
+                                  uint32_t msg_type,
+                                  struct server_id server_id,
+                                  DATA_BLOB *data)
+{
+       struct winbindd_child *child;
+
+       winbind_msg_ip_dropped(msg_ctx, private_data, msg_type,
+                              server_id, data);
+
+
+       for (child = winbindd_children; child != NULL; child = child->next) {
+               messaging_send_buf(msg_ctx, pid_to_procid(child->pid),
+                                  msg_type, data->data, data->length);
+       }
+}

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index e5b453d5184da184703459112c8855eee4f03e84..f3c7f0c9b1e3c3c353feb7f4d7bed639696ccf24 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -307,6 +307,16 @@ void winbind_msg_dump_domain_list(struct messaging_context *msg_ctx,
                                  uint32_t msg_type,
                                  struct server_id server_id,
                                  DATA_BLOB *data);
+void winbind_msg_ip_dropped(struct messaging_context *msg_ctx,
+                           void *private_data,
+                           uint32_t msg_type,
+                           struct server_id server_id,
+                           DATA_BLOB *data);
+void winbind_msg_ip_dropped_parent(struct messaging_context *msg_ctx,
+                                  void *private_data,
+                                  uint32_t msg_type,
+                                  struct server_id server_id,
+                                  DATA_BLOB *data);
 bool winbindd_reinit_after_fork(const char *logfilename);
 struct winbindd_domain *wb_child_domain(void);