sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-30 06:50:24 +03:00
Code

messaging3: Add messaging_send_iov_from

Browse Source 
In the notifyd code it will be very helpful to fake source server_ids

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2014-11-12 16:42:59 +01:00 committed by Jeremy Allison
parent d9a8453bbf
commit 28f750643b
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source3/include/messages.h
View File

@ -123,6 +123,11 @@ NTSTATUS messaging_send(struct messaging_context *msg_ctx,
NTSTATUS messaging_send_buf(struct messaging_context *msg_ctx,
struct server_id server, uint32_t msg_type,
const uint8_t *buf, size_t len);
NTSTATUS 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);
NTSTATUS messaging_send_iov(struct messaging_context *msg_ctx,
struct server_id server, uint32_t msg_type,
const struct iovec *iov, int iovlen,

30
source3/lib/messages.c
View File

@ -489,16 +489,17 @@ 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,
const int *fds, size_t num_fds)
NTSTATUS 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;
struct iovec iov2[iovlen+1];
if (server_id_is_disconnected(&server)) {
if (server_id_is_disconnected(&dst)) {
return NT_STATUS_INVALID_PARAMETER_MIX;
}
@ -506,12 +507,12 @@ NTSTATUS messaging_send_iov(struct messaging_context *msg_ctx,
return NT_STATUS_INVALID_PARAMETER_MIX;
}
if (!procid_is_local(&server)) {
if (!procid_is_local(&dst)) {
if (num_fds > 0) {
return NT_STATUS_NOT_SUPPORTED;
}
ret = msg_ctx->remote->send_fn(msg_ctx->id, server,
ret = msg_ctx->remote->send_fn(src, dst,
msg_type, iov, iovlen,
NULL, 0,
msg_ctx->remote);
@ -524,14 +525,14 @@ NTSTATUS messaging_send_iov(struct messaging_context *msg_ctx,
ZERO_STRUCT(hdr);
hdr = (struct messaging_hdr) {
.msg_type = msg_type,
.dst = server,
.src = msg_ctx->id
.dst = dst,
.src = src
};
iov2[0] = (struct iovec){ .iov_base = &hdr, .iov_len = sizeof(hdr) };
memcpy(&iov2[1], iov, iovlen * sizeof(*iov));
become_root();
ret = messaging_dgm_send(server.pid, iov2, iovlen+1, fds, num_fds);
ret = messaging_dgm_send(dst.pid, iov2, iovlen+1, fds, num_fds);
unbecome_root();
if (ret != 0) {
@ -540,6 +541,15 @@ NTSTATUS messaging_send_iov(struct messaging_context *msg_ctx,
return NT_STATUS_OK;
}
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)
{
return messaging_send_iov_from(msg_ctx, msg_ctx->id, dst, msg_type,
iov, iovlen, fds, num_fds);
}
static struct messaging_rec *messaging_rec_dup(TALLOC_CTX *mem_ctx,
struct messaging_rec *rec)
{