From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6443 invoked by alias); 28 Jan 2009 16:11:10 -0000 Received: (qmail 6437 invoked by alias); 28 Jan 2009 16:11:09 -0000 X-SWARE-Spam-Status: No, hits=-1.0 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_66,KAM_MX,SPF_HELO_PASS X-Spam-Status: No, hits=-1.0 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_66,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: Remove the internal get_node_addrs function 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: 14339c5ff2c3e435f0b8ea02007f71b9970a0f01 X-Git-Newrev: f5a52a313cb97f76015dc09347e74f05d5509f0b From: Christine Caulfield Message-Id: <20090128161049.26FC812055D@lists.fedorahosted.org> Date: Wed, 28 Jan 2009 16:11: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/msg00310.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f5a52a313cb97f76015dc09347e74f05d5509f0b Commit: f5a52a313cb97f76015dc09347e74f05d5509f0b Parent: 14339c5ff2c3e435f0b8ea02007f71b9970a0f01 Author: Christine Caulfield AuthorDate: Wed Jan 28 16:10:01 2009 +0000 Committer: Christine Caulfield CommitterDate: Wed Jan 28 16:10:01 2009 +0000 cman: Remove the internal get_node_addrs function CFG has this service now. Signed-off-by: Christine Caulfield --- cman/services/cman/include/corosync/ipc_cman.h | 18 +--------- cman/services/cman/services/cman.c | 40 ------------------------ 2 files changed, 2 insertions(+), 56 deletions(-) diff --git a/cman/services/cman/include/corosync/ipc_cman.h b/cman/services/cman/include/corosync/ipc_cman.h index 5946987..40ab128 100644 --- a/cman/services/cman/include/corosync/ipc_cman.h +++ b/cman/services/cman/include/corosync/ipc_cman.h @@ -11,16 +11,14 @@ enum req_cman_types { MESSAGE_REQ_CMAN_SENDMSG = 0, MESSAGE_REQ_CMAN_IS_LISTENING, MESSAGE_REQ_CMAN_BIND, - MESSAGE_REQ_CMAN_UNBIND, - MESSAGE_REQ_CMAN_GET_NODE_ADDRS, + MESSAGE_REQ_CMAN_UNBIND }; enum res_cman_types { MESSAGE_RES_CMAN_SENDMSG = 0, MESSAGE_RES_CMAN_IS_LISTENING, MESSAGE_RES_CMAN_BIND, - MESSAGE_RES_CMAN_UNBIND, - MESSAGE_RES_CMAN_GET_NODE_ADDRS, + MESSAGE_RES_CMAN_UNBIND }; #define TOTEMIP_ADDRLEN (sizeof(struct in6_addr)) @@ -57,17 +55,5 @@ struct res_lib_cman_is_listening { unsigned int status; }; -struct req_lib_cman_get_node_addrs { - mar_req_header_t header __attribute__((aligned(8))); - unsigned int nodeid; -}; - -struct res_lib_cman_get_node_addrs { - mar_res_header_t header __attribute__((aligned(8))); - unsigned int family; - unsigned int num_addrs; - char addrs[TOTEMIP_ADDRLEN][0]; -}; - #endif diff --git a/cman/services/cman/services/cman.c b/cman/services/cman/services/cman.c index c5e081b..fe61bc7 100644 --- a/cman/services/cman/services/cman.c +++ b/cman/services/cman/services/cman.c @@ -110,7 +110,6 @@ static void message_handler_req_lib_cman_is_listening (void *conn, void *msg); static void message_handler_req_lib_cman_sendmsg (void *conn, void *msg); static void message_handler_req_lib_cman_unbind (void *conn, void *msg); static void message_handler_req_lib_cman_bind (void *conn, void *msg); -static void message_handler_req_lib_cman_get_node_addrs (void *conn, void *msg); /* * Library Handler Definition @@ -140,12 +139,6 @@ static struct corosync_lib_handler cman_lib_service[] = .response_size = sizeof (mar_res_header_t), .response_id = MESSAGE_RES_CMAN_UNBIND, .flow_control = COROSYNC_LIB_FLOW_CONTROL_NOT_REQUIRED - }, - { /* 4 */ - .lib_handler_fn = message_handler_req_lib_cman_get_node_addrs, - .response_size = sizeof (mar_res_header_t), - .response_id = MESSAGE_RES_CMAN_GET_NODE_ADDRS, - .flow_control = COROSYNC_LIB_FLOW_CONTROL_NOT_REQUIRED } }; @@ -578,36 +571,3 @@ static void message_handler_req_lib_cman_is_listening (void *conn, void *msg) res_lib_cman_is_listening.header.error = error; corosync_api->ipc_conn_send_response(conn, &res_lib_cman_is_listening, sizeof(res_lib_cman_is_listening)); } - - -static void message_handler_req_lib_cman_get_node_addrs (void *conn, void *msg) -{ - struct totem_ip_address node_ifs[MAX_INTERFACES]; - char buf[PIPE_BUF]; - char **status; - unsigned int num_interfaces = 0; - int ret = 0; - int i; - struct req_lib_cman_get_node_addrs *req_lib_cman_get_node_addrs = (struct req_lib_cman_get_node_addrs *)msg; - struct res_lib_cman_get_node_addrs *res_lib_cman_get_node_addrs = (struct res_lib_cman_get_node_addrs *)buf; - - if (req_lib_cman_get_node_addrs->nodeid == 0) - req_lib_cman_get_node_addrs->nodeid = our_node.nodeid; - - corosync_api->totem_ifaces_get(req_lib_cman_get_node_addrs->nodeid, node_ifs, &status, &num_interfaces); - - res_lib_cman_get_node_addrs->header.size = sizeof(struct res_lib_cman_get_node_addrs) + (num_interfaces * TOTEMIP_ADDRLEN); - res_lib_cman_get_node_addrs->header.id = MESSAGE_RES_CMAN_GET_NODE_ADDRS; - res_lib_cman_get_node_addrs->header.error = ret; - res_lib_cman_get_node_addrs->num_addrs = num_interfaces; - if (num_interfaces) { - res_lib_cman_get_node_addrs->family = node_ifs[0].family; - for (i = 0; iaddrs[i][0], node_ifs[i].addr, TOTEMIP_ADDRLEN); - } - } - else { - res_lib_cman_get_node_addrs->header.error = EINVAL; - } - corosync_api->ipc_conn_send_response(conn, res_lib_cman_get_node_addrs, res_lib_cman_get_node_addrs->header.size); -}