This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - fence: Make fence_xvmd bind correctly
- From: Lon Hohberger <lon at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Tue, 31 Mar 2009 15:34:35 +0000 (UTC)
- Subject: cluster: STABLE3 - fence: Make fence_xvmd bind correctly
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=907d6dadb593846efff28821ab0752b23994f1d2
Commit: 907d6dadb593846efff28821ab0752b23994f1d2
Parent: b8fc4036cf0cc45c9fd4ea3264242d07cbec00dd
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Mon Mar 30 14:27:51 2009 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Tue Mar 31 11:24:51 2009 -0400
fence: Make fence_xvmd bind correctly
If no interface is selected when using ipv4,
go back to binding to 'any' address.
Signed-off-by: Lon Hohberger <lhh@redhat.com>
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
fence/agents/xvm/mcast.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/fence/agents/xvm/mcast.c b/fence/agents/xvm/mcast.c
index 1a7265d..1effa83 100644
--- a/fence/agents/xvm/mcast.c
+++ b/fence/agents/xvm/mcast.c
@@ -35,6 +35,8 @@ ipv4_recv_sk(char *addr, int port, unsigned int ifindex)
struct ip_mreqn mreq;
struct sockaddr_in sin;
+ memset(&mreq, 0, sizeof(mreq));
+
/* Store multicast address */
if (inet_pton(PF_INET, addr,
(void *)&mreq.imr_multiaddr.s_addr) < 0) {
@@ -72,13 +74,19 @@ ipv4_recv_sk(char *addr, int port, unsigned int ifindex)
* Join multicast group
*/
/* mreq.imr_multiaddr.s_addr is set above */
- mreq.imr_ifindex = ifindex;
+ if (ifindex <= 0) {
+ dbg_printf(4,"Using 'any' address/interface\n");
+ mreq.imr_address.s_addr = htonl(INADDR_ANY);
+ } else {
+ dbg_printf(4,"Using interface index %d\n", ifindex);
+ mreq.imr_ifindex = ifindex;
+ }
dbg_printf(4, "Joining multicast group\n");
if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
&mreq, sizeof(mreq)) == -1) {
- printf("Failed to bind multicast receive socket to "
+ dbg_printf(1,"Failed to bind multicast receive socket to "
"%s: %s\n", addr, strerror(errno));
- printf("Check network configuration.\n");
+ dbg_printf(1,"Check network configuration.\n");
close(sock);
return -1;
}
@@ -106,6 +114,8 @@ ipv4_send_sk(char *send_addr, char *addr, int port, struct sockaddr *tgt,
return -1;
}
+ memset(&mreq, 0, sizeof(mreq));
+
/* Store multicast address */
mcast.sin_family = PF_INET;
mcast.sin_port = htons(port);