From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31756 invoked by alias); 31 Mar 2009 15:35:36 -0000 Received: (qmail 31737 invoked by alias); 31 Mar 2009 15:35:34 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - fence: Make fence_xvmd bind correctly To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: b8fc4036cf0cc45c9fd4ea3264242d07cbec00dd X-Git-Newrev: 907d6dadb593846efff28821ab0752b23994f1d2 From: Lon Hohberger Message-Id: <20090331153435.AD3D9120197@lists.fedorahosted.org> Date: Tue, 31 Mar 2009 15:35: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-q1/txt/msg00988.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=907d6dadb593846efff28821ab0752b23994f1d2 Commit: 907d6dadb593846efff28821ab0752b23994f1d2 Parent: b8fc4036cf0cc45c9fd4ea3264242d07cbec00dd Author: Lon Hohberger AuthorDate: Mon Mar 30 14:27:51 2009 -0400 Committer: Lon Hohberger 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 Signed-off-by: Fabio M. Di Nitto --- 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);