From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29968 invoked by alias); 29 Jan 2009 12:05:36 -0000 Received: (qmail 29962 invoked by alias); 29 Jan 2009 12:05:36 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: cluster: master - cman: allow getnameinfo() to fail. To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7f61677ad6cf43bca6ec13ed41aa765cac280205 X-Git-Newrev: 4ec60b52bca8f5d44ad35b8ad3754fc6e2463d3c From: Christine Caulfield Message-Id: <20090129120510.967A9120569@lists.fedorahosted.org> Date: Thu, 29 Jan 2009 12:05: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/msg00313.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4ec60b52bca8f5d44ad35b8ad3754fc6e2463d3c Commit: 4ec60b52bca8f5d44ad35b8ad3754fc6e2463d3c Parent: 7f61677ad6cf43bca6ec13ed41aa765cac280205 Author: Christine Caulfield AuthorDate: Thu Jan 29 12:04:46 2009 +0000 Committer: Christine Caulfield CommitterDate: Thu Jan 29 12:04:46 2009 +0000 cman: allow getnameinfo() to fail. Signed-off-by: Christine Caulfield --- cman/services/cman/lib/libcman.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cman/services/cman/lib/libcman.c b/cman/services/cman/lib/libcman.c index beb1091..22c51f8 100644 --- a/cman/services/cman/lib/libcman.c +++ b/cman/services/cman/lib/libcman.c @@ -1015,6 +1015,7 @@ int cman_get_nodes(cman_handle_t handle, int maxnodes, int *retnodes, cman_node_ int max_addrs = 4; corosync_cfg_node_address_t addrs[max_addrs]; int num_addrs; + char *name = NULL; int error; if (!cman_inst->cfg_handle) { @@ -1029,11 +1030,13 @@ int cman_get_nodes(cman_handle_t handle, int maxnodes, int *retnodes, cman_node_ nodes[i].cn_member = 1; error = corosync_cfg_get_node_addrs(cman_inst->cfg_handle, nodes[i].cn_nodeid, max_addrs, &num_addrs, addrs); - if (error) { - sprintf(nodes[i].cn_name, "Node-%x", nodes[i].cn_nodeid); + if (!error) + name = node_name(&addrs[0]); + if (name) { + sprintf(nodes[i].cn_name, "%s", name); } else { - sprintf(nodes[i].cn_name, "%s", node_name(&addrs[0])); + sprintf(nodes[i].cn_name, "Node-%x", nodes[i].cn_nodeid); } } }