#include "lib/util/tevent_unix.h"
#include "lib/background.h"
#include "lib/messages_dgm.h"
+#include "lib/util/iov_buf.h"
+#include "lib/util/server_id_db.h"
+#include "lib/messages_dgm_ref.h"
+#include "lib/messages_util.h"
struct messaging_callback {
struct messaging_callback *prev, *next;
- uint32 msg_type;
+ uint32_t msg_type;
void (*fn)(struct messaging_context *msg, void *private_data,
uint32_t msg_type,
struct server_id server_id, DATA_BLOB *data);
struct tevent_req **waiters;
unsigned num_waiters;
- struct messaging_dgm_context *local;
-
+ void *msg_dgm_ref;
struct messaging_backend *remote;
-};
-struct messaging_hdr {
- int msg_type;
- struct server_id dst;
- struct server_id src;
+ struct server_id_db *names_db;
};
+static void messaging_dispatch_rec(struct messaging_context *msg_ctx,
+ struct messaging_rec *rec);
+
/****************************************************************************
A useful function for testing the message system.
****************************************************************************/
messaging_send(msg_ctx, src, MSG_PONG, data);
}
-/****************************************************************************
- Register/replace a dispatch function for a particular message type.
- JRA changed Dec 13 2006. Only one message handler now permitted per type.
- *NOTE*: Dispatch functions must be able to cope with incoming
- messages on an *odd* byte boundary.
-****************************************************************************/
-
-struct msg_all {
- struct messaging_context *msg_ctx;
- int msg_type;
- uint32 msg_flag;
- const void *buf;
- size_t len;
- int n_sent;
-};
-
-/****************************************************************************
- Send one of the messages for the broadcast.
-****************************************************************************/
-
-static int traverse_fn(struct db_record *rec, const struct server_id *id,
- uint32_t msg_flags, void *state)
-{
- struct msg_all *msg_all = (struct msg_all *)state;
- NTSTATUS status;
-
- /* Don't send if the receiver hasn't registered an interest. */
-
- if((msg_flags & msg_all->msg_flag) == 0) {
- return 0;
- }
-
- /* If the msg send fails because the pid was not found (i.e. smbd died),
- * the msg has already been deleted from the messages.tdb.*/
-
- status = messaging_send_buf(msg_all->msg_ctx, *id, msg_all->msg_type,
- (const uint8_t *)msg_all->buf, msg_all->len);
-
- if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
- struct server_id_buf idbuf;
-
- /*
- * If the pid was not found delete the entry from
- * serverid.tdb
- */
-
- DEBUG(2, ("pid %s doesn't exist\n",
- server_id_str_buf(*id, &idbuf)));
-
- dbwrap_record_delete(rec);
- }
- msg_all->n_sent++;
- return 0;
-}
-
-/**
- * Send a message to all smbd processes.
- *
- * It isn't very efficient, but should be OK for the sorts of
- * applications that use it. When we need efficient broadcast we can add
- * it.
- *
- * @param n_sent Set to the number of messages sent. This should be
- * equal to the number of processes, but be careful for races.
- *
- * @retval True for success.
- **/
-bool message_send_all(struct messaging_context *msg_ctx,
- int msg_type,
- const void *buf, size_t len,
- int *n_sent)
-{
- struct msg_all msg_all;
-
- msg_all.msg_type = msg_type;
- if (msg_type < 0x100) {
- msg_all.msg_flag = FLAG_MSG_GENERAL;
- } else if (msg_type > 0x100 && msg_type < 0x200) {
- msg_all.msg_flag = FLAG_MSG_NMBD;
- } else if (msg_type > 0x200 && msg_type < 0x300) {
- msg_all.msg_flag = FLAG_MSG_PRINT_GENERAL;
- } else if (msg_type > 0x300 && msg_type < 0x400) {
- msg_all.msg_flag = FLAG_MSG_SMBD;
- } else if (msg_type > 0x400 && msg_type < 0x600) {
- msg_all.msg_flag = FLAG_MSG_WINBIND;
- } else if (msg_type > 4000 && msg_type < 5000) {
- msg_all.msg_flag = FLAG_MSG_DBWRAP;
- } else {
- return false;
- }
-
- msg_all.buf = buf;
- msg_all.len = len;
- msg_all.n_sent = 0;
- msg_all.msg_ctx = msg_ctx;
-
- serverid_traverse(traverse_fn, &msg_all);
- if (n_sent)
- *n_sent = msg_all.n_sent;
- return true;
-}
-
static void messaging_recv_cb(const uint8_t *msg, size_t msg_len,
+ int *fds, size_t num_fds,
void *private_data)
{
struct messaging_context *msg_ctx = talloc_get_type_abort(
private_data, struct messaging_context);
- const struct messaging_hdr *hdr;
struct server_id_buf idbuf;
struct messaging_rec rec;
+ int64_t fds64[MIN(num_fds, INT8_MAX)];
+ size_t i;
- if (msg_len < sizeof(*hdr)) {
- DEBUG(1, ("message too short: %u\n", (unsigned)msg_len));
- return;
+ if (msg_len < MESSAGE_HDR_LENGTH) {
+ DBG_WARNING("message too short: %zu\n", msg_len);
+ goto close_fail;
+ }
+
+ if (num_fds > INT8_MAX) {
+ DBG_WARNING("too many fds: %zu\n", num_fds);
+ goto close_fail;
}
/*
- * messages_dgm guarantees alignment, so we can cast here
+ * "consume" the fds by copying them and setting
+ * the original variable to -1
*/
- hdr = (const struct messaging_hdr *)msg;
-
- DEBUG(10, ("%s: Received message 0x%x len %u from %s\n", __func__,
- (unsigned)hdr->msg_type, (unsigned)(msg_len - sizeof(*hdr)),
- server_id_str_buf(hdr->src, &idbuf)));
+ for (i=0; i < num_fds; i++) {
+ fds64[i] = fds[i];
+ fds[i] = -1;
+ }
rec = (struct messaging_rec) {
.msg_version = MESSAGE_VERSION,
- .msg_type = hdr->msg_type,
- .src = hdr->src,
- .dest = hdr->dst,
- .buf.data = discard_const_p(uint8, msg) + sizeof(*hdr),
- .buf.length = msg_len - sizeof(*hdr)
+ .buf.data = discard_const_p(uint8_t, msg) + MESSAGE_HDR_LENGTH,
+ .buf.length = msg_len - MESSAGE_HDR_LENGTH,
+ .num_fds = num_fds,
+ .fds = fds64,
};
+ message_hdr_get(&rec.msg_type, &rec.src, &rec.dest, msg);
+
+ DBG_DEBUG("Received message 0x%x len %zu (num_fds:%zu) from %s\n",
+ (unsigned)rec.msg_type, rec.buf.length, num_fds,
+ server_id_str_buf(rec.src, &idbuf));
+
messaging_dispatch_rec(msg_ctx, &rec);
+ return;
+
+close_fail:
+ for (i=0; i < num_fds; i++) {
+ close(fds[i]);
+ }
+}
+
+static int messaging_context_destructor(struct messaging_context *ctx)
+{
+ unsigned i;
+
+ for (i=0; i<ctx->num_new_waiters; i++) {
+ if (ctx->new_waiters[i] != NULL) {
+ tevent_req_set_cleanup_fn(ctx->new_waiters[i], NULL);
+ ctx->new_waiters[i] = NULL;
+ }
+ }
+ for (i=0; i<ctx->num_waiters; i++) {
+ if (ctx->waiters[i] != NULL) {
+ tevent_req_set_cleanup_fn(ctx->waiters[i], NULL);
+ ctx->waiters[i] = NULL;
+ }
+ }
+
+ return 0;
+}
+
+static const char *private_path(const char *name)
+{
+ return talloc_asprintf(talloc_tos(), "%s/%s", lp_private_dir(), name);
}
struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev)
{
struct messaging_context *ctx;
- NTSTATUS status;
int ret;
+ const char *lck_path;
+ const char *priv_path;
+ bool ok;
if (!(ctx = talloc_zero(mem_ctx, struct messaging_context))) {
return NULL;
}
- ctx->id = procid_self();
+ ctx->id = (struct server_id) {
+ .pid = getpid(), .vnn = NONCLUSTER_VNN
+ };
+
ctx->event_ctx = ev;
sec_init();
- ret = messaging_dgm_init(ctx, ctx->event_ctx, ctx->id,
- lp_cache_directory(), sec_initial_uid(),
- messaging_recv_cb, ctx, &ctx->local);
+ lck_path = lock_path("msg.lock");
+ if (lck_path == NULL) {
+ TALLOC_FREE(ctx);
+ return NULL;
+ }
- if (ret != 0) {
- DEBUG(2, ("messaging_dgm_init failed: %s\n", strerror(ret)));
+ ok = directory_create_or_exist_strict(lck_path, sec_initial_uid(),
+ 0755);
+ if (!ok) {
+ DEBUG(10, ("%s: Could not create lock directory: %s\n",
+ __func__, strerror(errno)));
TALLOC_FREE(ctx);
return NULL;
}
+ priv_path = private_path("msg.sock");
+ if (priv_path == NULL) {
+ TALLOC_FREE(ctx);
+ return NULL;
+ }
+
+ ok = directory_create_or_exist_strict(priv_path, sec_initial_uid(),
+ 0700);
+ if (!ok) {
+ DEBUG(10, ("%s: Could not create msg directory: %s\n",
+ __func__, strerror(errno)));
+ TALLOC_FREE(ctx);
+ return NULL;
+ }
+
+ ctx->msg_dgm_ref = messaging_dgm_ref(
+ ctx, ctx->event_ctx, &ctx->id.unique_id,
+ priv_path, lck_path, messaging_recv_cb, ctx, &ret);
+
+ if (ctx->msg_dgm_ref == NULL) {
+ DEBUG(2, ("messaging_dgm_ref failed: %s\n", strerror(ret)));
+ TALLOC_FREE(ctx);
+ return NULL;
+ }
+
+ talloc_set_destructor(ctx, messaging_context_destructor);
+
if (lp_clustering()) {
- status = messaging_ctdbd_init(ctx, ctx, &ctx->remote);
+ ret = messaging_ctdbd_init(ctx, ctx, &ctx->remote);
- if (!NT_STATUS_IS_OK(status)) {
+ if (ret != 0) {
DEBUG(2, ("messaging_ctdbd_init failed: %s\n",
- nt_errstr(status)));
+ strerror(ret)));
TALLOC_FREE(ctx);
return NULL;
}
}
ctx->id.vnn = get_my_vnn();
+ ctx->names_db = server_id_db_init(
+ ctx, ctx->id, lp_lock_directory(), 0,
+ TDB_INCOMPATIBLE_HASH|TDB_CLEAR_IF_FIRST);
+ if (ctx->names_db == NULL) {
+ DEBUG(10, ("%s: server_id_db_init failed\n", __func__));
+ TALLOC_FREE(ctx);
+ return NULL;
+ }
+
messaging_register(ctx, NULL, MSG_PING, ping_message);
/* Register some debugging related messages */
register_dmalloc_msgs(ctx);
debug_register_msgs(ctx);
+ {
+ struct server_id_buf tmp;
+ DBG_DEBUG("my id: %s\n", server_id_str_buf(ctx->id, &tmp));
+ }
+
return ctx;
}
*/
NTSTATUS messaging_reinit(struct messaging_context *msg_ctx)
{
- NTSTATUS status;
int ret;
+ char *lck_path;
- TALLOC_FREE(msg_ctx->local);
+ TALLOC_FREE(msg_ctx->msg_dgm_ref);
- msg_ctx->id = procid_self();
+ msg_ctx->id = (struct server_id) {
+ .pid = getpid(), .vnn = msg_ctx->id.vnn
+ };
- ret = messaging_dgm_init(msg_ctx, msg_ctx->event_ctx, msg_ctx->id,
- lp_cache_directory(), sec_initial_uid(),
- messaging_recv_cb, msg_ctx,
- &msg_ctx->local);
- if (ret != 0) {
- DEBUG(0, ("messaging_dgm_init failed: %s\n", strerror(errno)));
- return map_nt_error_from_unix(ret);
+ lck_path = lock_path("msg.lock");
+ if (lck_path == NULL) {
+ return NT_STATUS_NO_MEMORY;
}
- TALLOC_FREE(msg_ctx->remote);
+ msg_ctx->msg_dgm_ref = messaging_dgm_ref(
+ msg_ctx, msg_ctx->event_ctx, &msg_ctx->id.unique_id,
+ private_path("msg.sock"), lck_path,
+ messaging_recv_cb, msg_ctx, &ret);
+
+ if (msg_ctx->msg_dgm_ref == NULL) {
+ DEBUG(2, ("messaging_dgm_ref failed: %s\n", strerror(ret)));
+ return map_nt_error_from_unix(ret);
+ }
if (lp_clustering()) {
- status = messaging_ctdbd_init(msg_ctx, msg_ctx,
- &msg_ctx->remote);
+ ret = messaging_ctdbd_reinit(msg_ctx, msg_ctx,
+ msg_ctx->remote);
- if (!NT_STATUS_IS_OK(status)) {
+ if (ret != 0) {
DEBUG(1, ("messaging_ctdbd_init failed: %s\n",
- nt_errstr(status)));
- return status;
+ strerror(ret)));
+ return map_nt_error_from_unix(ret);
}
}
+ server_id_db_reinit(msg_ctx->names_db, msg_ctx->id);
+
return NT_STATUS_OK;
}
}
}
-static bool messaging_is_self_send(const struct messaging_context *msg_ctx,
- const struct server_id *dst)
-{
- return ((msg_ctx->id.vnn == dst->vnn) &&
- (msg_ctx->id.pid == dst->pid));
-}
-
/*
Send a message to a particular server
*/
struct server_id server, uint32_t msg_type,
const DATA_BLOB *data)
{
- struct iovec iov;
+ struct iovec iov = {0};
- iov.iov_base = data->data;
- iov.iov_len = data->length;
+ if (data != NULL) {
+ iov.iov_base = data->data;
+ iov.iov_len = data->length;
+ };
- return messaging_send_iov(msg_ctx, server, msg_type, &iov, 1);
+ return messaging_send_iov(msg_ctx, server, msg_type, &iov, 1, NULL, 0);
}
NTSTATUS messaging_send_buf(struct messaging_context *msg_ctx,
return messaging_send(msg_ctx, server, msg_type, &blob);
}
-NTSTATUS messaging_send_iov(struct messaging_context *msg_ctx,
- struct server_id server, uint32_t msg_type,
- const struct iovec *iov, int iovlen)
+int messaging_send_iov_from(struct messaging_context *msg_ctx,
+ struct server_id src, struct server_id dst,
+ uint32_t msg_type,
+ const struct iovec *iov, int iovlen,
+ const int *fds, size_t num_fds)
{
int ret;
- struct messaging_hdr hdr;
+ uint8_t hdr[MESSAGE_HDR_LENGTH];
struct iovec iov2[iovlen+1];
- if (server_id_is_disconnected(&server)) {
- return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (server_id_is_disconnected(&dst)) {
+ return EINVAL;
+ }
+
+ if (num_fds > INT8_MAX) {
+ return EINVAL;
}
- if (!procid_is_local(&server)) {
- ret = msg_ctx->remote->send_fn(msg_ctx->id, server,
+ if (dst.vnn != msg_ctx->id.vnn) {
+ if (num_fds > 0) {
+ return ENOSYS;
+ }
+
+ ret = msg_ctx->remote->send_fn(src, dst,
msg_type, iov, iovlen,
+ NULL, 0,
msg_ctx->remote);
- if (ret != 0) {
- return map_nt_error_from_unix(ret);
- }
- return NT_STATUS_OK;
+ return ret;
}
- if (messaging_is_self_send(msg_ctx, &server)) {
- struct messaging_rec rec;
- uint8_t *buf;
+ message_hdr_put(hdr, msg_type, src, dst);
+ iov2[0] = (struct iovec){ .iov_base = hdr, .iov_len = sizeof(hdr) };
+ memcpy(&iov2[1], iov, iovlen * sizeof(*iov));
- buf = iov_buf(talloc_tos(), iov, iovlen);
- if (buf == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
+ ret = messaging_dgm_send(dst.pid, iov2, iovlen+1, fds, num_fds);
- rec.msg_version = MESSAGE_VERSION;
- rec.msg_type = msg_type & MSG_TYPE_MASK;
- rec.dest = server;
- rec.src = msg_ctx->id;
- rec.buf = data_blob_const(buf, talloc_get_size(buf));
- messaging_dispatch_rec(msg_ctx, &rec);
- TALLOC_FREE(buf);
- return NT_STATUS_OK;
+ if (ret == EACCES) {
+ become_root();
+ ret = messaging_dgm_send(dst.pid, iov2, iovlen+1,
+ fds, num_fds);
+ unbecome_root();
}
- hdr = (struct messaging_hdr) {
- .msg_type = msg_type,
- .dst = server,
- .src = msg_ctx->id
- };
- iov2[0] = (struct iovec){ .iov_base = &hdr, .iov_len = sizeof(hdr) };
- memcpy(&iov2[1], iov, iovlen * sizeof(*iov));
+ return ret;
+}
- become_root();
- ret = messaging_dgm_send(msg_ctx->local, server.pid, iov2, iovlen+1);
- unbecome_root();
+NTSTATUS messaging_send_iov(struct messaging_context *msg_ctx,
+ struct server_id dst, uint32_t msg_type,
+ const struct iovec *iov, int iovlen,
+ const int *fds, size_t num_fds)
+{
+ int ret;
+ ret = messaging_send_iov_from(msg_ctx, msg_ctx->id, dst, msg_type,
+ iov, iovlen, fds, num_fds);
if (ret != 0) {
return map_nt_error_from_unix(ret);
}
struct messaging_rec *rec)
{
struct messaging_rec *result;
+ size_t fds_size = sizeof(int64_t) * rec->num_fds;
- result = talloc_pooled_object(mem_ctx, struct messaging_rec,
- 1, rec->buf.length);
+ result = talloc_pooled_object(mem_ctx, struct messaging_rec, 2,
+ rec->buf.length + fds_size);
if (result == NULL) {
return NULL;
}
result->buf.data = talloc_memdup(result, rec->buf.data,
rec->buf.length);
+
+ result->fds = NULL;
+ if (result->num_fds > 0) {
+ result->fds = talloc_memdup(result, rec->fds, fds_size);
+ }
+
return result;
}
tevent_req_defer_callback(req, state->ev);
state->tevent_handle = messaging_dgm_register_tevent_context(
- state, msg_ctx->local, ev);
- if (tevent_req_nomem(state, req)) {
+ state, ev);
+ if (tevent_req_nomem(state->tevent_handle, req)) {
return tevent_req_post(req, ev);
}
tevent_req_received(req);
return err;
}
- *presult = talloc_move(mem_ctx, &state->rec);
+ if (presult != NULL) {
+ *presult = talloc_move(mem_ctx, &state->rec);
+ }
return 0;
}
struct messaging_read_state *state = talloc_get_type_abort(
private_data, struct messaging_read_state);
+ if (rec->num_fds != 0) {
+ return false;
+ }
+
return rec->msg_type == state->msg_type;
}
return 0;
}
+struct messaging_handler_state {
+ struct tevent_context *ev;
+ struct messaging_context *msg_ctx;
+ uint32_t msg_type;
+ bool (*handler)(struct messaging_context *msg_ctx,
+ struct messaging_rec **rec, void *private_data);
+ void *private_data;
+};
+
+static void messaging_handler_got_msg(struct tevent_req *subreq);
+
+struct tevent_req *messaging_handler_send(
+ TALLOC_CTX *mem_ctx, struct tevent_context *ev,
+ struct messaging_context *msg_ctx, uint32_t msg_type,
+ bool (*handler)(struct messaging_context *msg_ctx,
+ struct messaging_rec **rec, void *private_data),
+ void *private_data)
+{
+ struct tevent_req *req, *subreq;
+ struct messaging_handler_state *state;
+
+ req = tevent_req_create(mem_ctx, &state,
+ struct messaging_handler_state);
+ if (req == NULL) {
+ return NULL;
+ }
+ state->ev = ev;
+ state->msg_ctx = msg_ctx;
+ state->msg_type = msg_type;
+ state->handler = handler;
+ state->private_data = private_data;
+
+ subreq = messaging_read_send(state, state->ev, state->msg_ctx,
+ state->msg_type);
+ if (tevent_req_nomem(subreq, req)) {
+ return tevent_req_post(req, ev);
+ }
+ tevent_req_set_callback(subreq, messaging_handler_got_msg, req);
+ return req;
+}
+
+static void messaging_handler_got_msg(struct tevent_req *subreq)
+{
+ struct tevent_req *req = tevent_req_callback_data(
+ subreq, struct tevent_req);
+ struct messaging_handler_state *state = tevent_req_data(
+ req, struct messaging_handler_state);
+ struct messaging_rec *rec;
+ int ret;
+ bool ok;
+
+ ret = messaging_read_recv(subreq, state, &rec);
+ TALLOC_FREE(subreq);
+ if (tevent_req_error(req, ret)) {
+ return;
+ }
+
+ subreq = messaging_read_send(state, state->ev, state->msg_ctx,
+ state->msg_type);
+ if (tevent_req_nomem(subreq, req)) {
+ return;
+ }
+ tevent_req_set_callback(subreq, messaging_handler_got_msg, req);
+
+ ok = state->handler(state->msg_ctx, &rec, state->private_data);
+ TALLOC_FREE(rec);
+ if (ok) {
+ /*
+ * Next round
+ */
+ return;
+ }
+ TALLOC_FREE(subreq);
+ tevent_req_done(req);
+}
+
+int messaging_handler_recv(struct tevent_req *req)
+{
+ return tevent_req_simple_recv_unix(req);
+}
+
static bool messaging_append_new_waiters(struct messaging_context *msg_ctx)
{
if (msg_ctx->num_new_waiters == 0) {
return true;
}
-struct messaging_defer_callback_state {
- struct messaging_context *msg_ctx;
- struct messaging_rec *rec;
- void (*fn)(struct messaging_context *msg, void *private_data,
- uint32_t msg_type, struct server_id server_id,
- DATA_BLOB *data);
- void *private_data;
-};
-
-static void messaging_defer_callback_trigger(struct tevent_context *ev,
- struct tevent_immediate *im,
- void *private_data);
-
-static void messaging_defer_callback(
- struct messaging_context *msg_ctx, struct messaging_rec *rec,
- void (*fn)(struct messaging_context *msg, void *private_data,
- uint32_t msg_type, struct server_id server_id,
- DATA_BLOB *data),
- void *private_data)
-{
- struct messaging_defer_callback_state *state;
- struct tevent_immediate *im;
-
- state = talloc(msg_ctx, struct messaging_defer_callback_state);
- if (state == NULL) {
- DEBUG(1, ("talloc failed\n"));
- return;
- }
- state->msg_ctx = msg_ctx;
- state->fn = fn;
- state->private_data = private_data;
-
- state->rec = messaging_rec_dup(state, rec);
- if (state->rec == NULL) {
- DEBUG(1, ("talloc failed\n"));
- TALLOC_FREE(state);
- return;
- }
-
- im = tevent_create_immediate(state);
- if (im == NULL) {
- DEBUG(1, ("tevent_create_immediate failed\n"));
- TALLOC_FREE(state);
- return;
- }
- tevent_schedule_immediate(im, msg_ctx->event_ctx,
- messaging_defer_callback_trigger, state);
-}
-
-static void messaging_defer_callback_trigger(struct tevent_context *ev,
- struct tevent_immediate *im,
- void *private_data)
-{
- struct messaging_defer_callback_state *state = talloc_get_type_abort(
- private_data, struct messaging_defer_callback_state);
- struct messaging_rec *rec = state->rec;
-
- state->fn(state->msg_ctx, state->private_data, rec->msg_type, rec->src,
- &rec->buf);
- TALLOC_FREE(state);
-}
-
/*
Dispatch one messaging_rec
*/
-void messaging_dispatch_rec(struct messaging_context *msg_ctx,
- struct messaging_rec *rec)
+static void messaging_dispatch_rec(struct messaging_context *msg_ctx,
+ struct messaging_rec *rec)
{
struct messaging_callback *cb, *next;
unsigned i;
+ size_t j;
for (cb = msg_ctx->callbacks; cb != NULL; cb = next) {
next = cb->next;
continue;
}
- if (messaging_is_self_send(msg_ctx, &rec->dest)) {
- /*
- * This is a self-send. We are called here from
- * messaging_send(), and we don't want to directly
- * recurse into the callback but go via a
- * tevent_loop_once
- */
- messaging_defer_callback(msg_ctx, rec, cb->fn,
- cb->private_data);
- } else {
- /*
- * This comes from a different process. we are called
- * from the event loop, so we should call back
- * directly.
- */
- cb->fn(msg_ctx, cb->private_data, rec->msg_type,
- rec->src, &rec->buf);
+ /*
+ * the old style callbacks don't support fd passing
+ */
+ for (j=0; j < rec->num_fds; j++) {
+ int fd = rec->fds[j];
+ close(fd);
}
+ rec->num_fds = 0;
+ rec->fds = NULL;
+
+ cb->fn(msg_ctx, cb->private_data, rec->msg_type,
+ rec->src, &rec->buf);
+
/*
* we continue looking for matching messages after finding
* one. This matters for subsystems like the internal notify
}
if (!messaging_append_new_waiters(msg_ctx)) {
+ for (j=0; j < rec->num_fds; j++) {
+ int fd = rec->fds[j];
+ close(fd);
+ }
+ rec->num_fds = 0;
+ rec->fds = NULL;
return;
}
req, struct messaging_filtered_read_state);
if (state->filter(rec, state->private_data)) {
messaging_filtered_read_done(req, rec);
+
+ /*
+ * Only the first one gets the fd-array
+ */
+ rec->num_fds = 0;
+ rec->fds = NULL;
}
i += 1;
}
+
+ /*
+ * If the fd-array isn't used, just close it.
+ */
+ for (j=0; j < rec->num_fds; j++) {
+ int fd = rec->fds[j];
+ close(fd);
+ }
+ rec->num_fds = 0;
+ rec->fds = NULL;
}
static int mess_parent_dgm_cleanup(void *private_data);
static int mess_parent_dgm_cleanup(void *private_data)
{
- struct messaging_context *msg_ctx = talloc_get_type_abort(
- private_data, struct messaging_context);
int ret;
- ret = messaging_dgm_wipe(msg_ctx->local);
+ ret = messaging_dgm_wipe();
DEBUG(10, ("messaging_dgm_wipe returned %s\n",
ret ? strerror(ret) : "ok"));
return lp_parm_int(-1, "messaging", "messaging dgm cleanup interval",
mess_parent_dgm_cleanup, msg);
if (req == NULL) {
DEBUG(1, ("background_job_send failed\n"));
+ return;
}
tevent_req_set_callback(req, mess_parent_dgm_cleanup_done, msg);
}
int ret;
if (pid == 0) {
- ret = messaging_dgm_wipe(msg_ctx->local);
+ ret = messaging_dgm_wipe();
} else {
- ret = messaging_dgm_cleanup(msg_ctx->local, pid);
+ ret = messaging_dgm_cleanup(pid);
}
return ret;
return msg_ctx->event_ctx;
}
+struct server_id_db *messaging_names_db(struct messaging_context *msg_ctx)
+{
+ return msg_ctx->names_db;
+}
+
/** @} **/
git.samba.org / metze / samba / wip.git / blobdiff