svn commit: samba r16984 - in branches/tmp/vl-messaging/source/lib: .

[vlendec at samba.org]

Author: vlendec
Date: 2006-07-12 15:26:46 +0000 (Wed, 12 Jul 2006)
New Revision: 16984

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16984

Log:
We need to put the final destination into the message transferred via the
stream socket. Otherwise the dispatcher on a different cluster node tries to
send the message to itself instead of the intended target.

Volker

Modified:
   branches/tmp/vl-messaging/source/lib/messages_stream.c


Changeset:
Modified: branches/tmp/vl-messaging/source/lib/messages_stream.c
===================================================================
--- branches/tmp/vl-messaging/source/lib/messages_stream.c	2006-07-12 14:45:36 UTC (rev 16983)
+++ branches/tmp/vl-messaging/source/lib/messages_stream.c	2006-07-12 15:26:46 UTC (rev 16984)
@@ -317,6 +317,7 @@
 
 static BOOL message_send_pid_stream_internal(struct messaging_client *client,
 					     struct process_id from,
+					     struct process_id to,
 					     int msg_type,
 					     const void *buf, size_t len,
 					     BOOL duplicates_allowed,
@@ -342,7 +343,7 @@
 	li->msg->msg_version = MESSAGE_VERSION;
 	li->msg->msg_type = msg_type;
 	li->msg->src = from;
-	li->msg->dest = client->pid;
+	li->msg->dest = to;
 	if (len > 0) {
 		memcpy(buffer + sizeof(struct message_rec), buf, len);
 	}
@@ -694,7 +695,7 @@
 		}
 	}
 
-	return message_send_pid_stream_internal(client, from, msg_type,
+	return message_send_pid_stream_internal(client, from, to, msg_type,
 						buf, len,
 						duplicates_allowed, timeout);
 }