[Cluster-devel] cluster/ccs ccs_tool/update.c daemon/cluster_mgr.c

[Cluster-devel] cluster/ccs ccs_tool/update.c daemon/cluster_mgr.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2007-10-26 20:26:47

Modified files:
	ccs/ccs_tool   : update.c 
	ccs/daemon     : cluster_mgr.c 

Log message:
	Fix bugzilla #298831 / #298861 - apps using magmamsg don't connect from correct source IP on multi-homed hosts

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/update.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.2.4&r2=1.1.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cluster_mgr.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.10.2.8&r2=1.10.2.9

--- cluster/ccs/ccs_tool/update.c	2006/01/12 18:11:26	1.1.2.4
+++ cluster/ccs/ccs_tool/update.c	2007/10/26 20:26:47	1.1.2.5
@@ -80,6 +80,7 @@
 }
 
 int update(char *location){
+  uint64_t nid;
   int error = 0;
   int i, fd;
   int cluster_fd = -1;
@@ -190,6 +191,8 @@
   
   membership = clu_member_list(NULL);
   msg_update(membership);
+  clu_local_nodeid(NULL, &nid);
+  msg_set_nodeid(nid);
   memb_resolve_list(membership, NULL);
 
 
--- cluster/ccs/daemon/cluster_mgr.c	2006/02/16 20:12:26	1.10.2.8
+++ cluster/ccs/daemon/cluster_mgr.c	2007/10/26 20:26:47	1.10.2.9
@@ -306,6 +306,7 @@
 
 
 static void cluster_communicator(void){
+  uint64_t nid;
   int cluster_fd = -1;
   int listen_fds[2], listeners;
   int warn_user = 0;
@@ -371,6 +372,8 @@
 
   membership = clu_member_list(NULL);
   msg_update(membership);
+  clu_local_nodeid(NULL, &nid);
+  msg_set_nodeid(nid);
   memb_resolve_list(membership, NULL);
 
   while(1) {