This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - cman: don't display the last node name if we can'tget an address
- From: Christine Caulfield <chrissie at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 4 Feb 2009 11:30:43 +0000 (UTC)
- Subject: cluster: STABLE3 - cman: don't display the last node name if we can'tget an address
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=34fe18a15b5147c4444510e0eddc80a5ce16a11e
Commit: 34fe18a15b5147c4444510e0eddc80a5ce16a11e
Parent: dc8f60c70f13374a1e1e2dcb242a357ac454f247
Author: Christine Caulfield <ccaulfie@redhat.com>
AuthorDate: Wed Feb 4 11:29:31 2009 +0000
Committer: Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Wed Feb 4 11:29:31 2009 +0000
cman: don't display the last node name if we can't get an address
cman_get_node_addrs can return success but 0 node addresses. This confused
cman_tool into displaying the same node name twice.
Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
cman/cman_tool/main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c
index b6e366d..87e52d3 100644
--- a/cman/cman_tool/main.c
+++ b/cman/cman_tool/main.c
@@ -376,7 +376,7 @@ static void print_node(commandline_t *comline, cman_handle_t h, int *format, str
* (we really don't want corosync to look up names in DNS so it invents them)
*/
if (sscanf(node->cn_name, "Node%d", &tmpid) == 1 && tmpid == node->cn_nodeid) {
- if (!cman_get_node_addrs(h, node->cn_nodeid, MAX_INTERFACES, &numaddrs, addrs)) {
+ if (!cman_get_node_addrs(h, node->cn_nodeid, MAX_INTERFACES, &numaddrs, addrs) && numaddrs) {
getnameinfo((struct sockaddr *)addrs[0].cna_address, addrs[0].cna_addrlen, node->cn_name, sizeof(node->cn_name), NULL, 0, NI_NAMEREQD);
}
}