diff options
author | Volker Lendecke <vl@samba.org> | 2014-05-29 14:51:37 +0200 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2014-05-31 01:59:17 +0200 |
commit | 331296df94a7f9b8921e1c57b3a5e23284ca0314 (patch) | |
tree | b4e318747504d30f995e2b6b82a112d2fdf839d0 /source3 | |
parent | 839a45a471e9571c7755e3b68f9fb3e2cebd5920 (diff) | |
download | samba-331296df94a7f9b8921e1c57b3a5e23284ca0314.tar.gz |
messaging3: The backend send_fn doesn't need a messaging_context
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
-rw-r--r-- | source3/include/messages.h | 2 | ||||
-rw-r--r-- | source3/lib/messages.c | 6 | ||||
-rw-r--r-- | source3/lib/messages_ctdbd.c | 4 | ||||
-rw-r--r-- | source3/lib/messages_dgm.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/source3/include/messages.h b/source3/include/messages.h index 18362f9d88c..9a63cd64b1a 100644 --- a/source3/include/messages.h +++ b/source3/include/messages.h @@ -87,7 +87,7 @@ struct messaging_context { }; struct messaging_backend { - NTSTATUS (*send_fn)(struct messaging_context *msg_ctx, + NTSTATUS (*send_fn)(struct server_id src, struct server_id pid, int msg_type, const struct iovec *iov, int iovlen, struct messaging_backend *backend); diff --git a/source3/lib/messages.c b/source3/lib/messages.c index 6e2e7ca9e2c..9e77009d025 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -380,7 +380,7 @@ NTSTATUS messaging_send_iov(struct messaging_context *msg_ctx, } if (!procid_is_local(&server)) { - return msg_ctx->remote->send_fn(msg_ctx, server, + return msg_ctx->remote->send_fn(msg_ctx->id, server, msg_type, iov, iovlen, msg_ctx->remote); } @@ -407,8 +407,8 @@ NTSTATUS messaging_send_iov(struct messaging_context *msg_ctx, return NT_STATUS_OK; } - return msg_ctx->local->send_fn(msg_ctx, server, msg_type, iov, iovlen, - msg_ctx->local); + return msg_ctx->local->send_fn(msg_ctx->id, server, msg_type, + iov, iovlen, msg_ctx->local); } static struct messaging_rec *messaging_rec_dup(TALLOC_CTX *mem_ctx, diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c index 34b3e2a0ff8..3b7fa053228 100644 --- a/source3/lib/messages_ctdbd.c +++ b/source3/lib/messages_ctdbd.c @@ -88,7 +88,7 @@ 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 struct iovec *iov, int iovlen, struct messaging_backend *backend) @@ -109,7 +109,7 @@ static NTSTATUS messaging_ctdb_send(struct messaging_context *msg_ctx, msg.msg_version = MESSAGE_VERSION; msg.msg_type = msg_type; msg.dest = pid; - msg.src = msg_ctx->id; + msg.src = src; msg.buf = data_blob_const(buf, talloc_get_size(buf)); status = ctdbd_messaging_send(ctx->conn, pid.vnn, pid.pid, &msg); diff --git a/source3/lib/messages_dgm.c b/source3/lib/messages_dgm.c index 6912035b945..2f2647e37f8 100644 --- a/source3/lib/messages_dgm.c +++ b/source3/lib/messages_dgm.c @@ -44,7 +44,7 @@ struct messaging_dgm_hdr { struct server_id src; }; -static NTSTATUS messaging_dgm_send(struct messaging_context *msg_ctx, +static NTSTATUS messaging_dgm_send(struct server_id src, struct server_id pid, int msg_type, const struct iovec *iov, int iovlen, struct messaging_backend *backend); @@ -286,7 +286,7 @@ static int messaging_dgm_context_destructor(struct messaging_dgm_context *c) return 0; } -static NTSTATUS messaging_dgm_send(struct messaging_context *msg_ctx, +static NTSTATUS messaging_dgm_send(struct server_id src, struct server_id pid, int msg_type, const struct iovec *iov, int iovlen, struct messaging_backend *backend) @@ -312,7 +312,7 @@ static NTSTATUS messaging_dgm_send(struct messaging_context *msg_ctx, hdr.msg_version = MESSAGE_VERSION; hdr.msg_type = msg_type & MSG_TYPE_MASK; hdr.dst = pid; - hdr.src = msg_ctx->id; + hdr.src = src; DEBUG(10, ("%s: Sending message 0x%x to %s\n", __func__, (unsigned)hdr.msg_type, |