From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25531 invoked by alias); 23 Jun 2009 07:43:34 -0000 Received: (qmail 25524 invoked by alias); 23 Jun 2009 07:43:34 -0000 X-SWARE-Spam-Status: No, hits=-1.0 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_63,J_CHICKENPOX_65,J_CHICKENPOX_66,SPF_HELO_PASS X-Spam-Status: No, hits=-1.0 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_63,J_CHICKENPOX_65,J_CHICKENPOX_66,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: STABLE3 - cman: Fix some compile-time warning 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: 26ec8a8072a5bc9b4f74ed1075460fc9bd27cbd2 X-Git-Newrev: 8a1df5b0bc701fca57996e766ea54c26f48874ea From: Christine Caulfield Message-Id: <20090623074305.5480F12037D@lists.fedorahosted.org> Date: Tue, 23 Jun 2009 07:43: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/msg00710.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8a1df5b0bc701fca57996e766ea54c26f48874ea Commit: 8a1df5b0bc701fca57996e766ea54c26f48874ea Parent: 26ec8a8072a5bc9b4f74ed1075460fc9bd27cbd2 Author: Christine Caulfield AuthorDate: Tue Jun 23 08:42:25 2009 +0100 Committer: Christine Caulfield CommitterDate: Tue Jun 23 08:42:25 2009 +0100 cman: Fix some compile-time warning Actually one of those warnings was a bug that would prevent cross-endian clusters working. Signed-off-by: Christine Caulfield --- cman/daemon/ais.c | 2 ++ cman/daemon/commands.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cman/daemon/ais.c b/cman/daemon/ais.c index 3b0a2db..ffea8c2 100644 --- a/cman/daemon/ais.c +++ b/cman/daemon/ais.c @@ -258,6 +258,8 @@ static void cman_deliver_fn(unsigned int nodeid, const void *msg, unsigned int m header.srcid = swab32(original_header->srcid); header.tgtid = swab32(original_header->tgtid); header.flags = swab32(original_header->flags); + header.srcport = original_header->srcport; + header.tgtport = original_header->tgtport; } else { memcpy(&header, original_header, sizeof(header)); diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c index b343bcb..2eb8101 100644 --- a/cman/daemon/commands.c +++ b/cman/daemon/commands.c @@ -581,7 +581,7 @@ static int do_cmd_get_extrainfo(char *cmdbuf, char **retbuf, int retsize, int *r objdb_get_string(corosync, object_handle, "mcastaddr", &mcast); /* If this fails, it must be using broadcast*/ if (!mcast) - mcast = "255.255.255.255"; + mcast = (char*)"255.255.255.255"; memset(ptr, 0, sizeof(struct sockaddr_storage)); saddr4 = (struct sockaddr_in *)ptr;