summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-05-07 09:50:27 +0200
committerVolker Lendecke <vl@samba.org>2014-05-08 09:10:12 +0200
commit9988e625524a2f79a884d02ae02924bed9c2576d (patch)
treeb5a31e389f0f0b6f2c4db9276fcaf5a6e71df985
parentc0f6ab92f7516a0b3f0034a1ee25a45c4f088ec3 (diff)
downloadsamba-9988e625524a2f79a884d02ae02924bed9c2576d.tar.gz
samba-9988e625524a2f79a884d02ae02924bed9c2576d.tar.xz
samba-9988e625524a2f79a884d02ae02924bed9c2576d.zip
messaging3: Factor out the self-send check
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/lib/messages.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 1c62809b0d..e722b2a012 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -341,6 +341,12 @@ void messaging_deregister(struct messaging_context *ctx, uint32_t msg_type,
}
}
+static bool messaging_is_self_send(const struct messaging_context *msg_ctx,
+ const struct server_id *dst)
+{
+ return server_id_equal(&msg_ctx->id, dst);
+}
+
/*
Send a message to a particular server
*/
@@ -358,7 +364,7 @@ NTSTATUS messaging_send(struct messaging_context *msg_ctx,
msg_ctx->remote);
}
- if (server_id_equal(&msg_ctx->id, &server)) {
+ if (messaging_is_self_send(msg_ctx, &server)) {
struct messaging_rec rec;
rec.msg_version = MESSAGE_VERSION;
rec.msg_type = msg_type & MSG_TYPE_MASK;
@@ -735,7 +741,7 @@ void messaging_dispatch_rec(struct messaging_context *msg_ctx,
continue;
}
- if (server_id_equal(&msg_ctx->id, &rec->dest)) {
+ 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