From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29071 invoked by alias); 26 May 2009 10:34:57 -0000 Received: (qmail 29049 invoked by alias); 26 May 2009 10:34:56 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_73,SPF_HELO_PASS X-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_73,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: RHEL5 - cman: Allow use of broadcast communications To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 28daa9be2045dc307701144631d118e46ed685d3 X-Git-Newrev: 958bac9a2e8938fb743b89d268c765cb020b30f0 From: Christine Caulfield Message-Id: <20090526103410.B2494120373@lists.fedorahosted.org> Date: Tue, 26 May 2009 10:34:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00403.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=958bac9a2e8938fb743b89d268c765cb020b30f0 Commit: 958bac9a2e8938fb743b89d268c765cb020b30f0 Parent: 28daa9be2045dc307701144631d118e46ed685d3 Author: Christine Caulfield AuthorDate: Tue May 26 11:32:13 2009 +0100 Committer: Christine Caulfield CommitterDate: Tue May 26 11:32:13 2009 +0100 cman: Allow use of broadcast communications The latest version of openais allows broadcast to be configured as an option. This makes it available from cman with the option bz# 492808 Signed-off-by: Christine Caulfield --- cman/daemon/ais.c | 15 +++++++++++---- cman/daemon/ais.h | 2 +- cman/daemon/cmanccs.c | 11 ++++++++++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/cman/daemon/ais.c b/cman/daemon/ais.c index 97f7034..817ce42 100644 --- a/cman/daemon/ais.c +++ b/cman/daemon/ais.c @@ -292,7 +292,7 @@ int cman_exit_fn(void *conn_info) /* END Plugin-specific code */ -int ais_add_ifaddr(char *mcast, char *ifaddr, int portnum) +int ais_add_ifaddr(char *mcast, char *ifaddr, int portnum, int broadcast) { struct totem_ip_address localhost; unsigned int totem_object_handle; @@ -319,13 +319,20 @@ int ais_add_ifaddr(char *mcast, char *ifaddr, int portnum) global_objdb->object_key_create(interface_object_handle, "bindnetaddr", strlen("bindnetaddr"), ifaddr, strlen(ifaddr)+1); - global_objdb->object_key_create(interface_object_handle, "mcastaddr", strlen("mcastaddr"), - mcast, strlen(mcast)+1); - sprintf(tmp, "%d", portnum); global_objdb->object_key_create(interface_object_handle, "mcastport", strlen("mcastport"), tmp, strlen(tmp)+1); + if (broadcast) { + global_objdb->object_key_create(interface_object_handle, "broadcast", strlen("broadcast"), + "yes", strlen("yes")+1); + mcast = "255.255.255.255"; + } + else { + global_objdb->object_key_create(interface_object_handle, "mcastaddr", strlen("mcastaddr"), + mcast, strlen(mcast)+1); + } + /* Save a local copy */ ret = totemip_parse(&mcast_addr[num_interfaces], mcast, 0); if (!ret) diff --git a/cman/daemon/ais.h b/cman/daemon/ais.h index eb1c3cf..db3bbd6 100644 --- a/cman/daemon/ais.h +++ b/cman/daemon/ais.h @@ -14,7 +14,7 @@ #include -extern int ais_add_ifaddr(char *mcast, char *ifaddr, int portnum); +extern int ais_add_ifaddr(char *mcast, char *ifaddr, int portnum, int broadcast); extern int comms_send_message(void *buf, int len, unsigned char toport, unsigned char fromport, int nodeid, diff --git a/cman/daemon/cmanccs.c b/cman/daemon/cmanccs.c index d8995e1..941cece 100644 --- a/cman/daemon/cmanccs.c +++ b/cman/daemon/cmanccs.c @@ -46,6 +46,7 @@ #define PORT_PATH "/cluster/cman/@port" #define KEY_PATH "/cluster/cman/@keyfile" #define MAXQUEUED_PATH "/cluster/cman/@max_queued" +#define BROADCAST_PATH "/cluster/cman/@broadcast" #define NODEI_NAME_PATH "/cluster/clusternodes/clusternode[%d]/@name" #define NODE_NAME_PATH_BYNAME "/cluster/clusternodes/clusternode[@name=\"%s\"]/@name" @@ -68,6 +69,7 @@ static int num_nodenames; int two_node; char *key_filename; static char *mcast_name; +static int use_broadcast = 0; static unsigned char votes; static unsigned int expected_votes; static unsigned short cluster_id; @@ -237,7 +239,7 @@ static int join(void) * Setup the interface/multicast addresses */ for (i = 0; i