messaging3: The backend send_fn doesn't need a messaging_context

[samba.git] / source3 / lib / messages_ctdbd.c

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 0c8a2aa8e4404c9096969b53f64b78e3348fad78..3b7fa0532282f8401a891d5611579fa89ac109f3 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -2,26 +2,43 @@
    Unix SMB/CIFS implementation.
    Samba internal messaging functions
    Copyright (C) 2007 by Volker Lendecke
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "messages.h"
+#include "util_tdb.h"
+
+/*
+ * It is not possible to include ctdb.h and tdb_compat.h (included via
+ * some other include above) without warnings. This fixes those
+ * warnings.
+ */
+
+#ifdef typesafe_cb
+#undef typesafe_cb
+#endif
 
-#ifdef CLUSTER_SUPPORT
+#ifdef typesafe_cb_preargs
+#undef typesafe_cb_preargs
+#endif
+
+#ifdef typesafe_cb_postargs
+#undef typesafe_cb_postargs
+#endif
 
-#include "librpc/gen_ndr/messaging.h"
 #include "ctdb.h"
 #include "ctdb_private.h"
 #include "ctdbd_conn.h"
@@ -40,6 +57,27 @@ static int global_ctdb_connection_pid;
 
 struct ctdbd_connection *messaging_ctdbd_connection(void)
 {
+       if (!lp_clustering()) {
+               return NULL;
+       }
+
+       if (global_ctdb_connection_pid == 0 &&
+           global_ctdbd_connection == NULL) {
+               struct tevent_context *ev;
+               struct messaging_context *msg;
+
+               ev = samba_tevent_context_init(NULL);
+               if (!ev) {
+                       DEBUG(0,("samba_tevent_context_init failed\n"));
+               }
+
+               msg = messaging_init(NULL, ev);
+               if (!msg) {
+                       DEBUG(0,("messaging_init failed\n"));
+                       return NULL;
+               }
+       }
+
        if (global_ctdb_connection_pid != getpid()) {
                DEBUG(0,("messaging_ctdbd_connection():"
                         "valid for pid[%d] but it's [%d]\n",
@@ -50,23 +88,35 @@ struct ctdbd_connection *messaging_ctdbd_connection(void)
        return global_ctdbd_connection;
 }
 
-static NTSTATUS messaging_ctdb_send(struct messaging_context *msg_ctx,
+static NTSTATUS messaging_ctdb_send(struct server_id src,
                                    struct server_id pid, int msg_type,
-                                   const DATA_BLOB *data,
+                                   const struct iovec *iov, int iovlen,
                                    struct messaging_backend *backend)
 {
        struct messaging_ctdbd_context *ctx = talloc_get_type_abort(
                backend->private_data, struct messaging_ctdbd_context);
 
        struct messaging_rec msg;
+       uint8_t *buf;
+       NTSTATUS status;
+
+       buf = iov_buf(talloc_tos(), iov, iovlen);
+       if (buf == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
 
        msg.msg_version = MESSAGE_VERSION;
        msg.msg_type    = msg_type;
        msg.dest        = pid;
-       msg.src         = procid_self();
-       msg.buf         = *data;
+       msg.src         = src;
+       msg.buf         = data_blob_const(buf, talloc_get_size(buf));
 
-       return ctdbd_messaging_send(ctx->conn, pid.vnn, pid.pid, &msg);
+       status = ctdbd_messaging_send(ctx->conn, pid.vnn, pid.pid, &msg);
+
+       TALLOC_FREE(buf);
+
+       return status;
 }
 
 static int messaging_ctdbd_destructor(struct messaging_ctdbd_context *ctx)
@@ -87,12 +137,12 @@ NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
        struct messaging_ctdbd_context *ctx;
        NTSTATUS status;
 
-       if (!(result = TALLOC_P(mem_ctx, struct messaging_backend))) {
+       if (!(result = talloc(mem_ctx, struct messaging_backend))) {
                DEBUG(0, ("talloc failed\n"));
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!(ctx = TALLOC_P(result, struct messaging_ctdbd_context))) {
+       if (!(ctx = talloc(result, struct messaging_ctdbd_context))) {
                DEBUG(0, ("talloc failed\n"));
                TALLOC_FREE(result);
                return NT_STATUS_NO_MEMORY;
@@ -128,14 +178,3 @@ NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
        *presult = result;
        return NT_STATUS_OK;
 }
-
-#else
-
-NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
-                             TALLOC_CTX *mem_ctx,
-                             struct messaging_backend **presult)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-#endif