No OneTemporary
Actions

Size

48 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/config/daemons/ccsd/cnx_mgr.c b/config/daemons/ccsd/cnx_mgr.c
	index 0dfa1cdf4..fddd834ac 100644
	--- a/config/daemons/ccsd/cnx_mgr.c
	+++ b/config/daemons/ccsd/cnx_mgr.c
	@@ -1,1393 +1,1399 @@
	#include <stdio.h>
	#include <errno.h>
	#include <string.h>
	#include <sys/types.h>
	#include <sys/socket.h>
	#include <sys/stat.h>
	#include <fcntl.h>
	#include <pthread.h>
	#include <signal.h>
	#include <unistd.h>
	#include <netinet/in.h>
	#include <arpa/inet.h>
	#include <netdb.h>
	#include <time.h>
	#include <limits.h>
	#include <libxml/parser.h>
	#include <libxml/tree.h>
	#include <libxml/xpath.h>
	#include <libxml/xpathInternals.h>
	#include <corosync/engine/logsys.h>

	#include "comm_headers.h"
	#include "debug.h"
	#include "misc.h"
	#include "globals.h"

	/* Default descriptor expiration time, in seconds */
	#ifndef DEFAULT_EXPIRE
	#define DEFAULT_EXPIRE 30
	#endif

	/* Maximum open connection count */
	#ifndef MAX_OPEN_CONNECTIONS
	#define MAX_OPEN_CONNECTIONS 30
	#endif

	/* Conversion from descriptor to ocs index */
	#ifdef dindex
	#undef dindex
	#endif
	#define dindex(x) ((x) % MAX_OPEN_CONNECTIONS)

	static inline void _cleanup_descriptor(int desc);

	extern int no_manager_opt;

	typedef struct open_connection_s {
	char *oc_cwp;
	char *oc_query;
	open_doc_t *oc_odoc;
	xmlXPathContextPtr oc_ctx;
	int oc_index;
	int oc_desc;
	time_t oc_expire;
	} open_connection_t;

	/* ATTENTION: need to lock on this if we start forking the daemon **
	** Also would need to create a shared memory area for open cnx's */
	static open_connection_t **ocs = NULL;
	static int _descbase = 0;

	static int _update_config(char *location){
	int error = 0;
	int v1=0, v2=0;
	open_doc_t *tmp_odoc = NULL;
	xmlDocPtr tmp_doc = NULL;

	CCSENTER("_update_config");

	tmp_doc = xmlParseFile(location);
	if(!tmp_doc){
	log_printf(LOG_ERR, "Unable to parse %s\n", location);
	error = -EINVAL;
	goto fail;
	} else if((v2 = get_doc_version(tmp_doc)) < 0){
	log_printf(LOG_ERR, "Unable to get config_version from %s.\n", location);
	error = v2;
	goto fail;
	} else if(master_doc && master_doc->od_doc){
	v1 = get_doc_version(master_doc->od_doc);
	if(v1 >= v2){
	log_printf(LOG_ERR, "%s on-disk version is <= to in-memory version.\n", location);
	log_printf(LOG_ERR, " On-disk version : %d\n", v2);
	log_printf(LOG_ERR, " In-memory version : %d\n", v1);
	error = -EPERM;
	goto fail;
	}
	} else {
	v1 = 0;
	}

	if(!(tmp_odoc = malloc(sizeof(open_doc_t)))){
	error = -ENOMEM;
	goto fail;
	}
	memset(tmp_odoc, 0, sizeof(open_doc_t));

	tmp_odoc->od_doc = tmp_doc;

	log_printf(LOG_DEBUG, "There are %d references open on version %d of the config file.\n",
	(master_doc)?master_doc->od_refs:0, v1);
	if(master_doc && !master_doc->od_refs){
	log_printf(LOG_DEBUG, "Freeing version %d\n", v1);
	xmlFreeDoc(master_doc->od_doc);
	free(master_doc);
	master_doc = tmp_odoc;
	} else {
	master_doc = tmp_odoc;
	}

	log_printf(LOG_INFO, "Update of "DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE " complete (version %d -> %d).\n", v1, v2);
	fail:
	if(tmp_odoc != master_doc){
	free(tmp_odoc);
	}
	if(tmp_doc != master_doc->od_doc){
	xmlFreeDoc(tmp_doc);
	}


	CCSEXIT("_update_config");
	return error;
	}


	static int update_config(void){
	int error = 0;
	CCSENTER("update_config");

	/* If update_required is set, it means that there is still a pending **
	** update. We need to pull this one in before doing anything else. */
	if(update_required){
	error = _update_config(DEFAULT_CONFIG_DIR "/." DEFAULT_CONFIG_FILE);
	update_required = 0;
	if(error){
	log_printf(LOG_ERR, "Previous update could not be completed.\n");
	goto fail;
	}
	}

	fail:
	CCSEXIT("update_config");
	return error;
	}

	/**
	* broadcast_for_doc
	*
	* Returns: 0 on success, < 0 on error
	*/
	static int broadcast_for_doc(char *cluster_name, int blocking){
	int opt;
	int error = 0;
	int retry = 5;
	int sfd = -1;
	int trueint;
	int v1, v2;
	int write_to_disk = 0;
	char *tmp_name = NULL;
	struct sockaddr_storage addr, recv_addr;
	struct sockaddr_in addr4 = (struct sockaddr_in )&addr;
	struct sockaddr_in6 addr6 = (struct sockaddr_in6 )&addr;
	unsigned int len = sizeof(struct sockaddr_storage);
	int addr_size = 0;
	comm_header_t *ch = NULL;
	char *bdoc = NULL;
	fd_set rset;
	struct timeval tv;
	xmlDocPtr tmp_doc = NULL;

	CCSENTER("broadcast_for_doc");

	try_again:
	if(!master_doc){
	log_printf(LOG_ERR, "No master_doc!!!\n");
	exit(EXIT_FAILURE);
	}

	if(quorate && !cluster_name){
	log_printf(LOG_ERR, "Node is part of quorate cluster, but the cluster name is unknown.\n");
	log_printf(LOG_ERR, " Unable to validate remote config files. Refusing connection.\n");
	error = -ECONNREFUSED;
	goto fail;
	}

	ch = malloc(sizeof(comm_header_t));
	if(!ch){
	error = -ENOMEM;
	goto fail;
	}
	memset(ch, 0, sizeof(comm_header_t));

	if(IPv6 && (sfd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP)) <0){
	log_printf(LOG_ERR, "Unable to create IPv6 socket");
	error = -errno;
	goto fail;
	}

	if(!IPv6 && ((sfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)){
	log_printf(LOG_ERR, "Unable to create socket for broadcast");
	error = -errno;
	goto fail;
	}

	memset(&addr, 0, sizeof(struct sockaddr_storage));

	trueint = 1;
	if(IPv6){
	struct ipv6_mreq mreq;

	addr6->sin6_family = AF_INET6;
	addr6->sin6_port = htons(backend_port);

	if(!multicast_address \|\| !strcmp(multicast_address, "default")){
	log_printf(LOG_DEBUG, "Trying IPv6 multicast (default).\n");
	if(inet_pton(AF_INET6, "ff02::3:1", &(addr6->sin6_addr)) <= 0){
	log_printf(LOG_ERR, "Unable to convert multicast address");
	error = -errno;
	goto fail;
	}
	} else {
	log_printf(LOG_DEBUG, "Trying IPv6 multicast (%s).\n", multicast_address);
	if(inet_pton(AF_INET6, multicast_address, &(addr6->sin6_addr)) <= 0){
	log_printf(LOG_ERR, "Unable to convert multicast address");
	error = -errno;
	goto fail;
	}
	}

	memcpy(&mreq.ipv6mr_multiaddr, &(addr6->sin6_addr), sizeof(struct in6_addr));
	mreq.ipv6mr_interface = 0;
	opt = 0;

	if(setsockopt(sfd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
	&opt, sizeof(opt)) < 0){
	log_printf(LOG_ERR, "Unable to %s loopback.\n", opt?"SET":"UNSET");
	error = -errno;
	goto fail;
	}
	} else {
	addr4->sin_family = AF_INET;
	addr4->sin_port = htons(backend_port);
	if(!multicast_address){
	log_printf(LOG_DEBUG, "Trying IPv4 broadcast.\n");

	addr4->sin_addr.s_addr = INADDR_BROADCAST;
	if((error = setsockopt(sfd, SOL_SOCKET, SO_BROADCAST, &trueint, sizeof(int)))){
	log_printf(LOG_ERR, "Unable to set socket options");
	error = -errno;
	goto fail;
	} else {
	log_printf(LOG_DEBUG, " Broadcast enabled.\n");
	}
	} else {
	if(!strcmp(multicast_address, "default")){
	log_printf(LOG_DEBUG, "Trying IPv4 multicast (default).\n");
	if(inet_pton(AF_INET, "224.0.2.5", &(addr4->sin_addr)) <= 0){
	log_printf(LOG_ERR, "Unable to convert multicast address");
	error = -errno;
	goto fail;
	}
	} else {
	log_printf(LOG_DEBUG, "Trying IPv4 multicast (%s).\n", multicast_address);
	if(inet_pton(AF_INET, multicast_address, &(addr4->sin_addr)) <= 0){
	log_printf(LOG_ERR, "Unable to convert multicast address");
	error = -errno;
	goto fail;
	}
	}
	opt = 0;
	setsockopt(sfd, IPPROTO_IP, IP_MULTICAST_LOOP, &opt, sizeof(opt));
	if(setsockopt(sfd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0){
	log_printf(LOG_ERR, "Unable to set multicast threshold.\n");
	}
	}
	}
	addr_size = IPv6? sizeof(struct sockaddr_in6):sizeof(struct sockaddr_in);

	FD_ZERO(&rset);

	do {
	ch->comm_type = COMM_BROADCAST;

	log_printf(LOG_DEBUG, "Sending broadcast.\n");
	swab_header(ch);

	if(sendto(sfd, (char *)ch, sizeof(comm_header_t), 0,
	(struct sockaddr *)&addr, addr_size) < 0){
	log_printf(LOG_ERR, "Unable to perform sendto");
	if(retry > 0){
	retry--;
	close(sfd);
	free(ch);
	sleep(2);
	goto try_again;
	} else {
	error = -errno;
	goto fail;
	}
	}

	srandom(getpid());
	FD_SET(sfd, &rset);
	tv.tv_sec = 0;

	tv.tv_usec = 250000 + (random()%500000);
	#if defined(__sparc__)
	log_printf(LOG_DEBUG, "Select waiting %d usec\n", tv.tv_usec);
	#else
	log_printf(LOG_DEBUG, "Select waiting %ld usec\n", tv.tv_usec);
	#endif
	while((error = select(sfd+1, &rset, NULL,NULL, &tv))){
	log_printf(LOG_DEBUG, "Select returns %d\n", error);
	if(error < 0){
	log_printf(LOG_ERR, "Select failed");
	error = -errno;
	goto fail;
	}
	if(error){
	log_printf(LOG_DEBUG, "Checking broadcast response.\n");
	error = 0;
	recvfrom(sfd, (char *)ch, sizeof(comm_header_t), MSG_PEEK,
	(struct sockaddr )&recv_addr, (socklen_t )&len);
	swab_header(ch);
	if(!ch->comm_payload_size \|\| ch->comm_error){
	/* clean out this reply by not using MSG_PEEK */
	recvfrom(sfd, (char *)ch, sizeof(comm_header_t), 0,
	(struct sockaddr )&recv_addr, (socklen_t )&len);
	error = -ENODATA;
	FD_SET(sfd, &rset);
	goto reset_timer;
	}
	bdoc = malloc(ch->comm_payload_size + sizeof(comm_header_t));
	if(!bdoc){
	error = -ENOMEM;
	goto fail;
	}
	memset(bdoc, 0, ch->comm_payload_size + sizeof(comm_header_t));
	/* ATTENTION -- potential for incomplete package */
	recvfrom(sfd, bdoc, ch->comm_payload_size + sizeof(comm_header_t),
	0, (struct sockaddr *)&recv_addr, &len);
	tmp_doc = xmlParseMemory(bdoc+sizeof(comm_header_t),
	ch->comm_payload_size);
	if(!tmp_doc){
	log_printf(LOG_ERR, "Unable to parse remote configuration.\n");
	free(bdoc); bdoc = NULL;
	goto reset_timer;
	}

	tmp_name = get_cluster_name(tmp_doc);
	log_printf(LOG_DEBUG, " Given cluster name = %s\n", cluster_name);
	log_printf(LOG_DEBUG, " Remote cluster name= %s\n", tmp_name);
	if(!tmp_name){
	log_printf(LOG_ERR, "Unable to find cluster name in remote configuration.\n");
	free(bdoc); bdoc = NULL;
	xmlFreeDoc(tmp_doc); tmp_doc = NULL;
	goto reset_timer;
	} else if(cluster_name && strcmp(cluster_name, tmp_name)){
	log_printf(LOG_DEBUG, "Remote and local configuration have different cluster names.\n");
	log_printf(LOG_DEBUG, "Skipping...\n");
	free(tmp_name); tmp_name = NULL;
	free(bdoc); bdoc = NULL;
	xmlFreeDoc(tmp_doc); tmp_doc = NULL;
	goto reset_timer;
	}
	free(tmp_name); tmp_name = NULL;
	if(!master_doc->od_doc){
	if((v2 = get_doc_version(tmp_doc)) >= 0){
	log_printf(LOG_INFO, "Remote configuration copy (version = %d) found.\n", v2);
	master_doc->od_doc = tmp_doc;
	tmp_doc = NULL;
	write_to_disk = 1;
	}
	} else {
	if(((v1 = get_doc_version(master_doc->od_doc)) >= 0) &&
	((v2 = get_doc_version(tmp_doc)) >= 0)){
	if(ch->comm_flags & COMM_BROADCAST_FROM_QUORATE){
	log_printf(LOG_INFO, "Remote configuration copy is from quorate node.\n");
	log_printf(LOG_INFO, " Local version # : %d\n", v1);
	log_printf(LOG_INFO, " Remote version #: %d\n", v2);
	if(v1 != v2){
	log_printf(LOG_INFO, "Switching to remote copy.\n");
	}
	if(master_doc->od_refs){
	open_doc_t *tmp_odoc;
	if(!(tmp_odoc = malloc(sizeof(open_doc_t)))){
	error = -ENOMEM;
	goto fail;
	}
	memset(tmp_odoc, 0, sizeof(open_doc_t));
	tmp_odoc->od_doc = tmp_doc;
	master_doc = tmp_odoc;
	} else {
	xmlFreeDoc(master_doc->od_doc);
	master_doc->od_doc = tmp_doc;
	}
	tmp_doc = NULL;
	write_to_disk = 1;
	goto out;
	} else if(v2 > v1){
	log_printf(LOG_INFO, "Remote configuration copy is newer than local copy.\n");
	log_printf(LOG_INFO, " Local version # : %d\n", v1);
	log_printf(LOG_INFO, " Remote version #: %d\n", v2);
	if(master_doc->od_refs){
	open_doc_t *tmp_odoc;
	if(!(tmp_odoc = malloc(sizeof(open_doc_t)))){
	error = -ENOMEM;
	goto fail;
	}
	memset(tmp_odoc, 0, sizeof(open_doc_t));
	tmp_odoc->od_doc = tmp_doc;
	master_doc = tmp_odoc;
	} else {
	xmlFreeDoc(master_doc->od_doc);
	master_doc->od_doc = tmp_doc;
	}
	tmp_doc = NULL;
	write_to_disk = 1;
	}
	} else {
	xmlFreeDoc(tmp_doc);
	tmp_doc = NULL;
	}
	}
	free(bdoc); bdoc = NULL;
	}
	FD_SET(sfd, &rset);
	/* select will alter the timeout */
	reset_timer:
	tv.tv_sec = 0;
	tv.tv_usec = 250000 + (random()%500000);
	#if defined(__sparc__)
	log_printf(LOG_DEBUG, "Select waiting %d usec\n", tv.tv_usec);
	#else
	log_printf(LOG_DEBUG, "Select waiting %ld usec\n", tv.tv_usec);
	#endif
	}
	} while(blocking && !master_doc);
	out:
	if(error){
	goto fail;
	}

	if(write_to_disk){
	struct stat stat_buf;
	mode_t old_mode;
	FILE *f;
	/* We did not have a copy available or we found a newer one, so write it out */

	/* ATTENTION -- its bad if we fail here, because we have an in-memory version **
	** but it has not been written to disk....................................... */
	if(stat(DEFAULT_CONFIG_DIR, &stat_buf)){
	if(mkdir(DEFAULT_CONFIG_DIR, S_IRWXU \| S_IRWXG)){
	log_printf(LOG_ERR, "Unable to create directory " DEFAULT_CONFIG_DIR);
	error = -errno;
	goto fail;
	}
	} else if(!S_ISDIR(stat_buf.st_mode)){
	log_printf(LOG_ERR, DEFAULT_CONFIG_DIR " is not a directory.\n");
	error = -ENOTDIR;
	goto fail;
	}

	old_mode = umask(026);
	f = fopen(DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE, "w");
	umask(old_mode);
	if(!f){
	log_printf(LOG_ERR, "Unable to open " DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE);
	error = -errno;
	goto fail;
	}
	if(xmlDocDump(f, master_doc->od_doc) < 0){
	error = -EIO;
	fclose(f);
	goto fail;
	}
	fclose(f);
	}

	fail:
	if(ch) free(ch);
	if(bdoc) free(bdoc);
	if(tmp_doc) xmlFreeDoc(tmp_doc);
	if(sfd >= 0) close(sfd);
	CCSEXIT("broadcast_for_doc");
	return error;
	}

	/**
	* process_connect: process a connect request
	* @afd: accepted socket connection
	* @cluster_name: optional cluster name
	*
	* Returns: 0 on success, < 0 on error
	*/
	static int process_connect(comm_header_t ch, char cluster_name){
	int i=0, error = 0;
	int bcast_needed = 0;
	char *tmp_name = NULL;
	time_t now;

	CCSENTER("process_connect");

	ch->comm_payload_size = 0;

	log_printf(LOG_DEBUG, "Given cluster name is = %s\n", cluster_name);

	if(!ocs){
	/* this will never be freed - unless exit */
	ocs = malloc(sizeof(open_connection_t )MAX_OPEN_CONNECTIONS);
	if(!ocs){
	error = -ENOMEM;
	goto fail;
	}
	memset(ocs, 0, sizeof(open_connection_t )MAX_OPEN_CONNECTIONS);
	}

	if(!quorate && !(ch->comm_flags & COMM_CONNECT_FORCE)){
	log_printf(LOG_INFO, "Cluster is not quorate. Refusing connection.\n");
	error = -ECONNREFUSED;
	goto fail;
	}

	if(!master_doc){
	/* ATTENTION -- signal could come at any time. It may be better to **
	** malloc to different var, then copy to master_doc when done */
	master_doc = malloc(sizeof(open_doc_t));
	if(!master_doc){
	error = -ENOMEM;
	goto fail;
	}
	memset(master_doc, 0, sizeof(open_doc_t));
	}

	if(!master_doc->od_doc){
	master_doc->od_doc = xmlParseFile(DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE);
	if(!master_doc->od_doc){
	log_printf(LOG_INFO, "Unable to parse " DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE "\n");
	log_printf(LOG_INFO, "Searching cluster for valid copy.\n");
	} else if((error = get_doc_version(master_doc->od_doc)) < 0){
	log_printf(LOG_ERR, "Unable to get config_version from " DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE ".\n");
	log_printf(LOG_ERR, "Discarding data and searching for valid copy.\n");
	xmlFreeDoc(master_doc->od_doc);
	master_doc->od_doc = NULL;
	} else if(!(tmp_name = get_cluster_name(master_doc->od_doc))){
	log_printf(LOG_ERR, "Unable to get cluster name from " DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE ".\n");
	log_printf(LOG_ERR, "Discarding data and searching for valid copy.\n");
	xmlFreeDoc(master_doc->od_doc);
	master_doc->od_doc = NULL;
	} else if(cluster_name && strcmp(cluster_name, tmp_name)){
	log_printf(LOG_ERR, "Given cluster name does not match local " DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE ".\n");
	log_printf(LOG_ERR, "Discarding data and searching for matching copy.\n");
	xmlFreeDoc(master_doc->od_doc);
	master_doc->od_doc = NULL;
	free(tmp_name); tmp_name = NULL;
	} else if(set_ccs_logging(master_doc->od_doc) < 0){
	log_printf(LOG_ERR, "Unable to set logging parameters.\n");
	} else { /* Either the names match, or a name wasn't specified. */
	log_printf(LOG_INFO, DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE " (cluster name = %s, version = %d) found.\n",
	tmp_name, error);
	/* We must check with the others to make sure this is valid. */
	}
	if (!no_manager_opt)
	bcast_needed = 1;
	error = 0;
	} else {
	tmp_name = get_cluster_name(master_doc->od_doc);

	/* ATTENTION -- if not quorate, consider swapping out in-memory config **
	** for the config of the name specified............................... */

	if(cluster_name && strcmp(cluster_name, tmp_name)){
	log_printf(LOG_ERR, "Request for configuration with cluster name, %s\n", cluster_name);
	log_printf(LOG_ERR, " However, a configuration with cluster name, %s, is already loaded.\n",
	tmp_name);
	error = -EINVAL;
	goto fail;
	}
	if(!quorate){
	bcast_needed = 1;
	}
	}

	if(cluster_name && !tmp_name){
	tmp_name = strdup(cluster_name);
	if(!tmp_name){
	error = -ENOMEM;
	goto fail;
	}
	}

	log_printf(LOG_DEBUG, "Blocking is %s.\n",
	(ch->comm_flags & COMM_CONNECT_BLOCKING)? "SET": "UNSET");
	log_printf(LOG_DEBUG, "Flags = 0x%x\n", ch->comm_flags);

	/* Need to broadcast regardless (unless quorate) to check version # */
	if(bcast_needed){
	log_printf(LOG_DEBUG, "Broadcast is neccessary.\n");
	}
	if(bcast_needed &&
	(error = broadcast_for_doc(tmp_name, ch->comm_flags & COMM_CONNECT_BLOCKING)) &&
	!master_doc->od_doc){
	log_printf(LOG_ERR, "Broadcast for config file failed: %s\n", strerror(-error));
	goto fail;
	}
	error = 0;

	if(!master_doc \|\| !master_doc->od_doc){
	log_printf(LOG_ERR, "The appropriate config file could not be loaded.\n");
	error = -ENODATA;
	goto fail;
	}

	if(update_required){
	log_printf(LOG_DEBUG, "Update is required.\n");
	if((error = update_config())){
	log_printf(LOG_ERR, "Failed to update config file, required by cluster.\n");
	/* ATTENTION -- remove all open_doc_t's ? */
	goto fail;
	}
	}

	/* Locate the connection descriptor */
	now = time(NULL);
	for(i=0; i < MAX_OPEN_CONNECTIONS; i++){
	if (!ocs[i])
	continue;
	if (now >= ocs[i]->oc_expire) {
	log_printf(LOG_DEBUG, "Recycling connection descriptor %d: Expired\n",
	ocs[i]->oc_desc );
	_cleanup_descriptor(i);
	}
	}

	for(i=0; i < MAX_OPEN_CONNECTIONS; i++){
	if(!ocs[i])
	break;
	}

	if(i >= MAX_OPEN_CONNECTIONS){
	error = -EAGAIN;
	goto fail;
	}

	ocs[i] = (open_connection_t *)malloc(sizeof(open_connection_t));
	if(!ocs[i]){
	error = -ENOMEM;
	goto fail;
	}

	memset(ocs[i], 0, sizeof(open_connection_t));

	master_doc->od_refs++;
	ocs[i]->oc_odoc = master_doc;
	ocs[i]->oc_ctx = xmlXPathNewContext(ocs[i]->oc_odoc->od_doc);
	ocs[i]->oc_expire = now + DEFAULT_EXPIRE;

	/* using error as a temp var */
	error = i + _descbase++ * MAX_OPEN_CONNECTIONS;
	if (error > INT_MAX \|\| error < 0) {
	error = i;
	_descbase = 0;
	}
	ocs[i]->oc_desc = error;

	/* reset error */
	error = 0;

	if(!ocs[i]->oc_ctx){
	ocs[i]->oc_odoc->od_refs--;
	free(ocs[i]);
	log_printf(LOG_ERR, "Error: unable to create new XPath context.\n");
	error = -EIO; /* ATTENTION -- what should this be? */
	goto fail;
	}

	/* return desc to requestor */

	fail:
	if(master_doc && master_doc->od_doc == NULL){
	free(master_doc);
	master_doc = NULL;
	}
	if(tmp_name){
	free(tmp_name);
	}
	if(error){
	ch->comm_error = error;
	} else {
	ch->comm_desc = ocs[i]->oc_desc;
	}
	CCSEXIT("process_connect");
	return error;
	}


	static inline void
	_cleanup_descriptor(int desc)
	{
	open_doc_t *tmp_odoc;

	if(ocs[desc]->oc_ctx){
	xmlXPathFreeContext(ocs[desc]->oc_ctx);
	}
	if(ocs[desc]->oc_cwp){
	free(ocs[desc]->oc_cwp);
	}
	if(ocs[desc]->oc_query){
	free(ocs[desc]->oc_query);
	}
	tmp_odoc = ocs[desc]->oc_odoc;
	if(tmp_odoc->od_refs < 1){
	log_printf(LOG_ERR, "Number of references on an open doc should never be < 1.\n");
	log_printf(LOG_ERR, "This is a fatal error. Exiting...\n");
	exit(EXIT_FAILURE);
	}
	if(tmp_odoc != master_doc && tmp_odoc->od_refs == 1){
	log_printf(LOG_DEBUG, "No more references on version %d of config file, freeing...\n",
	get_doc_version(tmp_odoc->od_doc));
	xmlFreeDoc(tmp_odoc->od_doc);
	free(tmp_odoc);
	} else {
	tmp_odoc->od_refs--;
	}

	free(ocs[desc]);
	ocs[desc] = NULL;
	}


	/**
	* process_disconnect: close an open session
	* @afd: accepted socket connection
	* @desc: descriptor describing the open connection
	*
	* This fuction frees all memory associated with an open session.
	*
	* Returns: 0 on success, < 0 on error
	*/
	static int process_disconnect(comm_header_t *ch){
	int desc = dindex(ch->comm_desc);
	int error=0;
	CCSENTER("process_disconnect");

	ch->comm_payload_size = 0;

	if(desc < 0){
	log_printf(LOG_ERR, "Invalid descriptor specified (%d).\n", desc);
	log_printf(LOG_ERR, "Someone may be attempting something evil.\n");
	error = -EBADR;
	goto fail;
	}

	if(!ocs \|\| !ocs[desc] \|\| (ocs[desc]->oc_desc != ch->comm_desc)){
	/* send failure to requestor ? */
	log_printf(LOG_ERR, "Attempt to close an unopened CCS descriptor (%d).\n",
	ch->comm_desc);

	error = -EBADR;
	goto fail;
	} else {
	_cleanup_descriptor(desc);
	}

	fail:
	if(error){
	ch->comm_error = error;
	} else {
	ch->comm_desc = -1;
	}
	CCSEXIT("process_disconnect");
	return error;
	}

	/*
	* _process_get
	* @ch
	* @payload
	*
	* This function runs the xml query. If the query is different from the
	* previous query, it will always fill the payload with the first match.
	* If the current query and the previous query are the same, it fills the
	* payload with next match. If the last of all possible matches was
	* returned by the previous query and the current query is the same,
	* the payload will be filled with the 1st match and 1 will be returned
	* as the result of the function.
	*
	* Returns: -EXXX on error, 1 if restarting list, 0 otherwise
	*/
	static int _process_get(comm_header_t ch, char *payload){
	int error = 0, desc = dindex(ch->comm_desc);
	xmlXPathObjectPtr obj = NULL;
	char *query = NULL;

	CCSENTER("_process_get");
	if(!ch->comm_payload_size){
	log_printf(LOG_ERR, "process_get: payload size is zero.\n");
	error = -EINVAL;
	goto fail;
	}

	if(ch->comm_desc < 0){
	log_printf(LOG_ERR, "Invalid descriptor specified (%d).\n", ch->comm_desc);
	log_printf(LOG_ERR, "Someone may be attempting something evil.\n");
	error = -EBADR;
	goto fail;
	}

	if(!ocs \|\| !ocs[desc] \|\| (ocs[desc]->oc_desc != ch->comm_desc)){
	log_printf(LOG_ERR, "process_get: Invalid connection descriptor received.\n");
	error = -EBADR;
	goto fail;
	}

	if(ocs[desc]->oc_query && !strcmp(*payload,ocs[desc]->oc_query)){
	ocs[desc]->oc_index++;
	log_printf(LOG_DEBUG, "Index = %d\n",ocs[desc]->oc_index);
	log_printf(LOG_DEBUG, " Query = %s\n", *payload);
	} else {
	log_printf(LOG_DEBUG, "Index reset (new query).\n");
	log_printf(LOG_DEBUG, " Query = %s\n", *payload);
	ocs[desc]->oc_index = 0;
	if(ocs[desc]->oc_query){
	free(ocs[desc]->oc_query);
	}
	ocs[desc]->oc_query = (char )strdup(payload);
	}

	/* ATTENTION -- should path expansion go before index inc ? */
	if(((ch->comm_payload_size > 1) &&
	((*payload)[0] == '/')) \|\|
	!ocs[desc]->oc_cwp){
	log_printf(LOG_DEBUG, "Query involves absolute path or cwp is not set.\n");
	query = (char )strdup(payload);
	if(!query){
	error = -ENOMEM;
	goto fail;
	}
	} else {
	/* +2 because of NULL and '/' character */
	log_printf(LOG_DEBUG, "Query involves relative path.\n");
	query = malloc(strlen(*payload)+strlen(ocs[desc]->oc_cwp)+2);
	if(!query){
	error = -ENOMEM;
	goto fail;
	}
	sprintf(query, "%s/%s", ocs[desc]->oc_cwp, *payload);
	}

	/* Bump expiration time */
	ocs[desc]->oc_expire = time(NULL) + DEFAULT_EXPIRE;

	obj = xmlXPathEvalExpression((xmlChar *)query, ocs[desc]->oc_ctx);
	if(obj){
	log_printf(LOG_DEBUG, "Obj type = %d (%s)\n", obj->type, (obj->type == 1)?"XPATH_NODESET":"");
	log_printf(LOG_DEBUG, "Number of matches: %d\n", (obj->nodesetval)?obj->nodesetval->nodeNr:0);
	if(obj->nodesetval && (obj->nodesetval->nodeNr > 0) ){
	xmlNodePtr node;
	int size=0;
	- int nnv=0; /* name 'n' value */
	+ int nnv=0, child=0; /* name 'n' value */

	if(ocs[desc]->oc_index >= obj->nodesetval->nodeNr){
	ocs[desc]->oc_index = 0;
	error = 1;
	log_printf(LOG_DEBUG, "Index reset to zero (end of list).\n");
	}

	node = obj->nodesetval->nodeTab[ocs[desc]->oc_index];

	log_printf(LOG_DEBUG, "Node (%s) type = %d (%s)\n", node->name, node->type,
	(node->type == 1)? "XML_ELEMENT_NODE":
	(node->type == 2)? "XML_ATTRIBUTE_NODE":"");

	if(!node) {
	log_printf(LOG_DEBUG, "No content found.\n");
	error = -ENODATA;
	goto fail;
	}

	if(((node->type == XML_ATTRIBUTE_NODE) && strstr(query, "@*")) \|\|
	((node->type == XML_ELEMENT_NODE) && strstr(query, "child::*"))){
	/* add on the trailing NULL and the '=' separator for a list of attrs
	or an element node + CDATA*/
	- if (node->children && node->children->content)
	+ if (node->children && node->children->content) {
	size = strlen((char *)node->children->content) +
	strlen((char *)node->name)+2;
	- else
	+ child = 1;
	+ } else
	size = strlen((char *)node->name)+2;
	nnv= 1;
	} else {
	if (node->children && node->children->content) {
	size = strlen((char *)node->children->content)+1;
	} else {
	error = -ENODATA;
	goto fail;
	}
	}

	if(size <= ch->comm_payload_size){ /* do we already have enough space? */
	log_printf(LOG_DEBUG, "No extra space needed.\n");
	if(nnv){
	- sprintf(*payload, "%s=%s", node->name, node->children ?
	- (char *)node->children->content:"");
	+ if(child)
	+ sprintf(payload, "%s=%s", node->name, (char )node->children->content);
	+ else
	+ sprintf(*payload, "%s=", node->name);
	} else {
	sprintf(*payload, "%s", node->children ? node->children->content :
	node->name);
	}

	} else {
	log_printf(LOG_DEBUG, "Extra space needed.\n");
	free(*payload);
	payload = (char )malloc(size);
	if(!*payload){
	error = -ENOMEM;
	goto fail;
	}
	+ memset(*payload,0,size);
	if(nnv){
	- sprintf(*payload, "%s=%s", node->name, node->children ?
	- (char *)node->children->content:"");
	+ if(child)
	+ sprintf(payload, "%s=%s", node->name, (char )node->children->content);
	+ else
	+ sprintf(*payload, "%s=", node->name);
	} else {
	sprintf(*payload, "%s", node->children ? node->children->content :
	node->name);
	}
	}
	log_printf(LOG_DEBUG, "Query results:: %s\n", *payload);
	ch->comm_payload_size = size;
	} else {
	log_printf(LOG_DEBUG, "No nodes found.\n");
	ch->comm_payload_size = 0;
	error = -ENODATA;
	goto fail;
	}
	} else {
	log_printf(LOG_ERR, "Error: unable to evaluate xpath query \"%s\"\n", *payload);
	error = -EINVAL;
	goto fail;
	}

	fail:
	if(obj){
	xmlXPathFreeObject(obj);
	}
	if(error < 0){
	ch->comm_error = error;
	ch->comm_payload_size = 0;
	}
	if(query) { free(query); }
	CCSEXIT("_process_get");
	return error;
	}

	static int process_get(comm_header_t ch, char *payload){
	int error;
	CCSENTER("process_get");

	error = _process_get(ch, payload);

	CCSEXIT("process_get");
	return (error < 0)? error: 0;
	}

	static int process_get_list(comm_header_t ch, char *payload){
	int error;
	CCSENTER("process_get_list");

	error = _process_get(ch, payload);
	if(error){
	ch->comm_payload_size = 0;
	if(ocs && ocs[dindex(ch->comm_desc)])
	ocs[dindex(ch->comm_desc)]->oc_index = -1;
	}

	CCSEXIT("process_get_list");
	return (error < 0)? error: 0;
	}

	static int process_set(comm_header_t ch, char payload){
	int error = 0;
	int desc = dindex(ch->comm_desc);

	CCSENTER("process_set");
	if(!ch->comm_payload_size){
	log_printf(LOG_ERR, "process_set: payload size is zero.\n");
	error = -EINVAL;
	goto fail;
	}

	if(ch->comm_desc < 0){
	log_printf(LOG_ERR, "Invalid descriptor specified (%d).\n", ch->comm_desc);
	log_printf(LOG_ERR, "Someone may be attempting something evil.\n");
	error = -EBADR;
	goto fail;
	}

	if(!ocs \|\| !ocs[desc] \|\| (ocs[desc]->oc_desc != ch->comm_desc)){
	log_printf(LOG_ERR, "process_set: Invalid connection descriptor received.\n");
	error = -EBADR;
	goto fail;
	}

	error = -ENOSYS;

	fail:
	free(payload);
	ch->comm_payload_size = 0;
	if(error){
	ch->comm_error = error;
	}
	CCSEXIT("process_set");
	return error;
	}


	static int process_get_state(comm_header_t ch, char *payload){
	int error = 0, desc = dindex(ch->comm_desc);
	char *load = NULL;

	CCSENTER("process_get_state");
	if(ch->comm_payload_size){
	log_printf(LOG_ERR, "process_get_state: payload size is nonzero.\n");
	error = -EINVAL;
	goto fail;
	}

	if(ch->comm_desc < 0){
	log_printf(LOG_ERR, "Invalid descriptor specified (%d).\n", ch->comm_desc);
	log_printf(LOG_ERR, "Someone may be attempting something evil.\n");
	error = -EBADR;
	goto fail;
	}

	if(!ocs \|\| !ocs[desc] \|\| (ocs[desc]->oc_desc != ch->comm_desc)){
	log_printf(LOG_ERR, "process_get_state: Invalid connection descriptor received.\n");
	error = -EBADR;
	goto fail;
	}

	if(ocs[desc]->oc_cwp && ocs[desc]->oc_query){
	int size = strlen(ocs[desc]->oc_cwp) +
	strlen(ocs[desc]->oc_query) + 2;
	log_printf(LOG_DEBUG, "Both cwp and query are set.\n");
	load = malloc(size);
	if(!load){
	error = -ENOMEM;
	goto fail;
	}
	strcpy(load, ocs[desc]->oc_cwp);
	strcpy(load+strlen(ocs[desc]->oc_cwp)+1, ocs[desc]->oc_query);
	ch->comm_payload_size = size;
	} else if(ocs[desc]->oc_cwp){
	log_printf(LOG_DEBUG, "Only cwp is set.\n");
	load = (char *)strdup(ocs[desc]->oc_cwp);
	if(!load){
	error = -ENOMEM;
	goto fail;
	}
	ch->comm_payload_size = strlen(load)+1;
	} else if(ocs[desc]->oc_query){
	int size = strlen(ocs[desc]->oc_query) + 2;
	log_printf(LOG_DEBUG, "Only query is set.\n");
	load = malloc(size);
	if(!load){
	error = -ENOMEM;
	goto fail;
	}
	memset(load, 0, size);
	strcpy(load+1, ocs[desc]->oc_query);
	ch->comm_payload_size = size;
	}

	ocs[desc]->oc_expire = time(NULL) + DEFAULT_EXPIRE;
	*payload = load;

	fail:
	if(error){
	if(load) { free(load); }
	ch->comm_error = error;
	ch->comm_payload_size = 0;
	}
	CCSEXIT("process_get_state");
	return error;
	}


	static int process_set_state(comm_header_t ch, char payload){
	int error = 0, desc = dindex(ch->comm_desc);

	CCSENTER("process_set_state");
	if(!ch->comm_payload_size){
	log_printf(LOG_ERR, "process_set_state: payload size is zero.\n");
	error = -EINVAL;
	goto fail;
	}

	if(ch->comm_desc < 0){
	log_printf(LOG_ERR, "Invalid descriptor specified (%d).\n", ch->comm_desc);
	log_printf(LOG_ERR, "Someone may be attempting something evil.\n");
	error = -EBADR;
	goto fail;
	}

	if(!ocs \|\| !ocs[desc] \|\| (ocs[desc]->oc_desc != ch->comm_desc)){
	log_printf(LOG_ERR, "process_set_state: Invalid connection descriptor received.\n");
	error = -EBADR;
	goto fail;
	}

	if(ocs[desc]->oc_cwp){
	free(ocs[desc]->oc_cwp);
	ocs[desc]->oc_cwp = NULL;
	}

	if((ch->comm_flags & COMM_SET_STATE_RESET_QUERY) && ocs[desc]->oc_query){
	free(ocs[desc]->oc_query);
	ocs[desc]->oc_query = NULL;
	}

	ocs[desc]->oc_expire = time(NULL) + DEFAULT_EXPIRE;
	ocs[desc]->oc_cwp = (char *)strdup(payload);

	fail:
	ch->comm_payload_size = 0;
	if(error){
	ch->comm_error = error;
	}

	CCSEXIT("process_set_state");
	return error;
	}


	/**
	* process_request
	* @afd
	*
	* This function operates as a switch, passing the request to the
	* appropriate function.
	*
	* Returns: 0 on success, < 0 on error
	*/
	int process_request(int afd){
	int error=0;
	comm_header_t ch = NULL, tmp_ch;
	char *payload = NULL;

	CCSENTER("process_request");

	if(!(ch = (comm_header_t *)malloc(sizeof(comm_header_t)))){
	error = -ENOMEM;
	goto fail;
	}

	error = read(afd, ch, sizeof(comm_header_t));
	if(error < 0){
	log_printf(LOG_ERR, "Unable to read comm_header_t");
	goto fail;
	} else if(error < sizeof(comm_header_t)){
	log_printf(LOG_ERR, "Unable to read complete comm_header_t.\n");
	error = -EBADE;
	goto fail;
	}

	if(ch->comm_payload_size){
	if(!(payload = (char *)malloc(ch->comm_payload_size))){
	error = -ENOMEM;
	goto fail;
	}
	error = read(afd, payload, ch->comm_payload_size);
	if(error < 0){
	log_printf(LOG_ERR, "Unable to read payload");
	goto fail;
	} else if(error < ch->comm_payload_size){
	log_printf(LOG_ERR, "Unable to read complete payload.\n");
	error = -EBADE;
	goto fail;
	}
	}

	switch(ch->comm_type){
	case COMM_CONNECT:
	if((error = process_connect(ch, payload)) < 0){
	log_printf(LOG_ERR, "Error while processing connect: %s\n", strerror(-error));
	goto fail;
	}
	break;
	case COMM_DISCONNECT:
	if((error = process_disconnect(ch)) < 0){
	log_printf(LOG_ERR, "Error while processing disconnect: %s\n", strerror(-error));
	goto fail;
	}
	break;
	case COMM_GET:
	if((error = process_get(ch, &payload)) < 0){
	if(error != -ENODATA){
	log_printf(LOG_ERR, "Error while processing get: %s\n", strerror(-error));
	}
	goto fail;
	}
	break;
	case COMM_GET_LIST:
	if((error = process_get_list(ch, &payload)) < 0){
	if(error != -ENODATA){
	log_printf(LOG_ERR, "Error while processing get: %s\n", strerror(-error));
	}
	goto fail;
	}
	break;
	case COMM_SET:
	if((error = process_set(ch, payload)) < 0){
	log_printf(LOG_ERR, "Error while processing set: %s\n", strerror(-error));
	goto fail;
	}
	break;
	case COMM_GET_STATE:
	if((error = process_get_state(ch, &payload)) < 0){
	log_printf(LOG_ERR, "Error while processing get_state: %s\n", strerror(-error));
	goto fail;
	}
	break;
	case COMM_SET_STATE:
	if((error = process_set_state(ch, payload)) < 0){
	log_printf(LOG_ERR, "Error while processing set_state: %s\n", strerror(-error));
	goto fail;
	}
	break;
	default:
	log_printf(LOG_ERR, "Unknown connection request received.\n");
	error = -EINVAL;
	ch->comm_error = error;
	ch->comm_payload_size = 0;
	}

	if(ch->comm_payload_size){
	log_printf(LOG_DEBUG, "Reallocating transfer buffer.\n");
	tmp_ch = (comm_header_t *)
	realloc(ch,sizeof(comm_header_t)+ch->comm_payload_size);

	if(tmp_ch) { ch = tmp_ch; } else {
	log_printf(LOG_ERR, "Not enough memory to complete request.\n");
	error = -ENOMEM;
	goto fail;
	}
	memcpy((char *)ch+sizeof(comm_header_t), payload, ch->comm_payload_size);
	}

	fail:
	error = write(afd, ch, sizeof(comm_header_t)+ch->comm_payload_size);
	if(error < 0){
	if (errno == EINTR)
	goto fail;
	if (errno == EPIPE) {
	error = 0;
	} else {
	log_printf(LOG_ERR, "Unable to write package back to sender");
	}
	} else if(error < (sizeof(comm_header_t)+ch->comm_payload_size)){
	log_printf(LOG_ERR, "Unable to write complete package.\n");
	error = -EBADE;
	goto fail;
	} else {
	error = 0;
	}

	if(ch){ free(ch); }
	if(payload){ free(payload); }

	CCSEXIT("process_request");
	return error;
	}


	/**
	* process_broadcast
	* @sfd: the UDP socket
	*
	* Returns: 0 on success, < 0 on failure
	*/
	int process_broadcast(int sfd){
	int error = 0;
	comm_header_t *ch = NULL;
	xmlChar *payload = NULL;
	char *buffer = NULL;
	struct sockaddr_storage addr;
	unsigned int len = sizeof(struct sockaddr_storage); /* value/result for recvfrom */
	int sendlen;
	int discard = 0;

	CCSENTER("process_broadcast");

	ch = malloc(sizeof(comm_header_t));
	if(!ch){
	error = -ENOMEM;
	goto fail;
	}
	memset(ch, 0, sizeof(comm_header_t));
	memset(&addr, 0, sizeof(struct sockaddr_storage)); /* just to make sure */

	log_printf(LOG_DEBUG, "Waiting to receive broadcast request.\n");
	if(recvfrom(sfd, ch, sizeof(comm_header_t), 0, (struct sockaddr *)&addr, &len) < 0){
	log_printf(LOG_ERR, "Unable to perform recvfrom");
	error = -errno;
	goto fail;
	}
	swab_header(ch);

	if(ch->comm_type != COMM_BROADCAST){
	/* Either someone is pinging this port, or there is an older version **
	of ccs trying to get bcast response. Either way, we should not
	** respond to them.................................................. */
	log_printf(LOG_DEBUG, "Received invalid request on broadcast port. %x\n",ch->comm_type);
	error = -EINVAL;
	goto fail;
	}

	/* need to ignore my own broadcasts */

	if(ch->comm_payload_size){
	/* cluster name was sent, need to read it */
	}

	if(!master_doc){
	discard = 1;
	log_printf(LOG_DEBUG, "master_doc not loaded. Attempting to load it.\n");
	if(!(master_doc = malloc(sizeof(open_doc_t)))){
	error = -ENOMEM;
	goto fail;
	}
	memset(master_doc, 0, sizeof(open_doc_t));
	master_doc->od_doc = xmlParseFile(DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE);
	if(!master_doc->od_doc){
	free(master_doc);
	master_doc = NULL;
	log_printf(LOG_ERR, "Unable to parse " DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE ".\n");
	error = -ENODATA;
	goto fail;
	}
	log_printf(LOG_DEBUG, "master_doc found and loaded.\n");
	} else if(update_required){
	log_printf(LOG_DEBUG, "Update is required.\n");
	if((error = update_config())){
	log_printf(LOG_ERR, "Failed to update config file, required by cluster.\n");
	/* ATTENTION -- remove all open_doc_t's ? */
	goto fail;
	}
	}

	/* allocates space for the payload */
	xmlDocDumpFormatMemory(master_doc->od_doc,
	&payload,
	&(ch->comm_payload_size),
	0);
	if(!ch->comm_payload_size){
	error = -ENOMEM;
	log_printf(LOG_ERR, "Document dump to memory failed.\n");
	goto fail;
	}

	buffer = malloc(ch->comm_payload_size + sizeof(comm_header_t));
	if(!buffer){
	error = -ENOMEM;
	goto fail;
	}

	if(quorate){
	ch->comm_flags \|= COMM_BROADCAST_FROM_QUORATE;
	}

	swab_header(ch);
	memcpy(buffer, ch, sizeof(comm_header_t));
	swab_header(ch); /* Swab back to dip into ch for payload_size */
	memcpy(buffer+sizeof(comm_header_t), payload, ch->comm_payload_size);

	log_printf(LOG_DEBUG, "Sending configuration (version %d)...\n", get_doc_version(master_doc->od_doc));
	sendlen = ch->comm_payload_size + sizeof(comm_header_t);
	if(sendto(sfd, buffer, sendlen, 0,
	(struct sockaddr *)&addr, (socklen_t)len) < 0){
	log_printf(LOG_ERR, "Sendto failed");
	error = -errno;
	}

	fail:
	if(buffer) free(buffer);
	if(payload) free(payload);
	if(ch) free(ch);
	if(discard){
	if(master_doc && master_doc->od_doc)
	xmlFreeDoc(master_doc->od_doc);
	if(master_doc) free(master_doc);
	master_doc = NULL;
	}
	CCSEXIT("process_broadcast");
	return error;
	}
	diff --git a/config/plugins/xml/config.c b/config/plugins/xml/config.c
	index 8771007cb..9d597720b 100644
	--- a/config/plugins/xml/config.c
	+++ b/config/plugins/xml/config.c
	@@ -1,306 +1,312 @@
	#include <string.h>
	#include <limits.h>
	#include <syslog.h>
	#include <arpa/inet.h>

	#include <libxml/parser.h>
	#include <libxml/tree.h>
	#include <libxml/xpath.h>
	#include <libxml/xpathInternals.h>

	#include <corosync/lcr/lcr_comp.h>
	#include <corosync/engine/objdb.h>
	#include <corosync/engine/config.h>

	#include "logging.h"

	static int xml_readconfig(struct objdb_iface_ver0 objdb, char *error_string);
	static int init_config(struct objdb_iface_ver0 objdb, char configfile, char *error_string);
	static char error_reason[1024];
	static int xmllistindex = 0;
	static char previous_query[PATH_MAX];

	#define DEFAULT_CONFIG DEFAULT_CONFIG_DIR "/" DEFAULT_CONFIG_FILE

	/*
	* Exports the interface for the service
	*/

	static struct config_iface_ver0 xmlconfig_iface_ver0 = {
	.config_readconfig = xml_readconfig
	};

	static struct lcr_iface ifaces_ver0[2] = {
	{
	.name = "xmlconfig",
	.version = 0,
	.versions_replace = 0,
	.versions_replace_count = 0,
	.dependencies = 0,
	.dependency_count = 0,
	.constructor = NULL,
	.destructor = NULL,
	.interfaces = NULL,
	}
	};

	static struct lcr_comp xml_comp_ver0 = {
	.iface_count = 1,
	.ifaces = ifaces_ver0,
	};

	__attribute__ ((constructor)) static void xml_comp_register(void) {
	lcr_interfaces_set(&ifaces_ver0[0], &xmlconfig_iface_ver0);
	lcr_component_register(&xml_comp_ver0);
	};

	static char do_xml_query(xmlXPathContextPtr ctx, char query, int list) {
	xmlXPathObjectPtr obj = NULL;
	xmlNodePtr node = NULL;
	char *rtn = NULL;
	- int size = 0, nnv = 0;
	+ int size = 0, nnv = 0, child = 0;

	if (list && !strcmp(query, previous_query))
	xmllistindex++;
	else {
	memset(previous_query, 0, PATH_MAX);
	xmllistindex = 0;
	}

	obj = xmlXPathEvalExpression((xmlChar *)query, ctx);
	if (obj && obj->nodesetval && (obj->nodesetval->nodeNr > 0)) {
	if (xmllistindex >= obj->nodesetval->nodeNr) {
	memset(previous_query, 0, PATH_MAX);
	xmllistindex = 0;
	goto fail;
	}

	node = obj->nodesetval->nodeTab[xmllistindex];
	if (!node)
	goto fail;

	if (((node->type == XML_ATTRIBUTE_NODE) && strstr(query, "@*")) \|\|
	((node->type == XML_ELEMENT_NODE) && strstr(query, "child::*"))) {
	- if (node->children && node->children->content)
	+ if (node->children && node->children->content) {
	size = strlen((char *)node->children->content) +
	strlen((char *)node->name)+2;
	- else
	+ child = 1;
	+ } else
	size = strlen((char *)node->name)+2;

	nnv = 1;
	} else {
	if (node->children && node->children->content)
	size = strlen((char *)node->children->content)+1;
	else
	goto fail;
	}

	rtn = malloc(size);
	if (!rtn)
	goto fail;

	- if (nnv)
	- sprintf(rtn, "%s=%s", node->name, node->children ? (char *)node->children->content:"");
	- else
	+ memset(rtn, 0, size);
	+
	+ if (nnv) {
	+ if (child)
	+ sprintf(rtn, "%s=%s", node->name, (char *)node->children->content);
	+ else
	+ sprintf(rtn, "%s=", node->name);
	+ } else
	sprintf(rtn, "%s", node->children ? node->children->content : node->name);

	if(list)
	strncpy(previous_query, query, PATH_MAX-1);
	}

	fail:
	if (obj)
	xmlXPathFreeObject(obj);

	return rtn;
	}

	static int should_alloc(xmlXPathContextPtr ctx, char *key)
	{
	int keyerror = 1, childerr = 1;
	char path[256];
	char *str = NULL;

	sprintf(path, "%s/@*", key);
	str = do_xml_query(ctx, path, 1);
	if (str) {
	keyerror = 0;
	free(str);
	str = NULL;
	}

	sprintf(path, "%s/child::*", key);
	str = do_xml_query(ctx, path, 1);
	if(str) {
	childerr = 0;
	free(str);
	str = NULL;
	}

	if (childerr && keyerror)
	return 0;

	return 1;
	}

	static int read_config_for(xmlXPathContextPtr ctx, struct objdb_iface_ver0 *objdb, unsigned int parent,
	char object, char key, int always_create)
	{
	char *str;
	unsigned int object_handle = 0;
	char path[256];
	int gotcount = 0;
	char *subkeys[52];
	int subkeycount = 0;
	int i;

	if (should_alloc(ctx, key) \|\| always_create) {
	objdb->object_create(parent, &object_handle, object, strlen(object));
	}

	memset(previous_query, 0, PATH_MAX);
	sprintf(path, "%s/@*", key);
	/* Get the keys */
	for (;;)
	{
	char *equal;

	str = do_xml_query(ctx, path, 1);
	if (!str)
	break;

	equal = strchr(str, '=');
	if (equal)
	{
	*equal = 0;
	objdb->object_key_create(object_handle, str, strlen(str),
	equal+1, strlen(equal+1)+1);
	gotcount++;
	}
	free(str);
	}

	/* Now look for sub-objects.
	CCS can't cope with recursive queries so we have to store the result of
	the subkey search */
	memset(previous_query, 0, PATH_MAX);
	memset(subkeys, 0, sizeof(subkeys));
	sprintf(path, "%s/child::*", key);
	for (;;)
	{
	char *equal;

	str = do_xml_query(ctx, path, 1);
	if (!str)
	break;

	/* CCS returns duplicate values for the numbered entries we use below.
	eg. if there are 4 <clusternode/> entries it will return
	clusternode=
	clusternode=
	clusternode=
	clusternode=
	which is not helpful to us cos we retrieve them as
	clusternode[1]
	clusternode[2]
	clusternode[3]
	clusternode[4]
	so we just store unique keys.
	*/
	equal = strchr(str, '=');
	if (equal)
	*equal = 0;

	if (subkeycount > 0 && strcmp(str, subkeys[subkeycount-1]) == 0)
	{
	free(str);
	break;
	}
	subkeys[subkeycount++] = str;
	}

	for (i=0; i<subkeycount; i++)
	{
	int count = 0;
	str = subkeys[i];
	gotcount++;

	for (;;)
	{
	char subpath[1024];

	/* Found a subkey, iterate through it's sub sections */
	sprintf(subpath, "%s/%s[%d]", key, str, ++count);
	if (!read_config_for(ctx, objdb, object_handle, str, subpath, 0))
	break;
	}
	free(str);
	}
	return gotcount;
	}

	static int xml_readconfig(struct objdb_iface_ver0 objdb, char *error_string)
	{
	int ret = 0;
	char *configfile = DEFAULT_CONFIG;

	/* We need to set this up to internal defaults too early */
	openlog("corosync", LOG_CONS\|LOG_PID, SYSLOGFACILITY);

	if(getenv("COROSYNC_CLUSTER_CONFIG_FILE"))
	configfile = getenv("COROSYNC_CLUSTER_CONFIG_FILE");

	/* Read low-level totem/aisexec etc config from cluster.conf */
	if ( !(ret = init_config(objdb, configfile, error_reason)) )
	sprintf (error_reason, "Successfully read config from %s\n", configfile);
	else
	sprintf (error_reason, "Unable to read config from %s\n", configfile);

	*error_string = error_reason;

	return ret;
	}


	static int init_config(struct objdb_iface_ver0 objdb, char configfile, char *error_string)
	{
	int err = 0;
	xmlDocPtr doc = NULL;
	xmlXPathContextPtr ctx = NULL;

	/* openfile */

	doc = xmlParseFile(configfile);
	if (!doc) {
	err = -1;
	goto fail;
	}

	ctx = xmlXPathNewContext(doc);
	if (!ctx) {
	err = -1;
	goto fail;
	}

	/* load it in objdb */

	/* These first few are just versions of openais.conf */
	read_config_for(ctx, objdb, OBJECT_PARENT_HANDLE, "totem", "/cluster/totem", 1);
	read_config_for(ctx, objdb, OBJECT_PARENT_HANDLE, "logging", "/cluster/logging", 1);
	read_config_for(ctx, objdb, OBJECT_PARENT_HANDLE, "event", "/cluster/event", 1);
	read_config_for(ctx, objdb, OBJECT_PARENT_HANDLE, "aisexec", "/cluster/aisexec", 1);
	read_config_for(ctx, objdb, OBJECT_PARENT_HANDLE, "amf", "/cluster/amf", 1);

	/* This is stuff specific to us, eg quorum device timeout */
	read_config_for(ctx, objdb, OBJECT_PARENT_HANDLE, "cluster", "/cluster", 1);

	fail:

	if (ctx)
	xmlXPathFreeContext(ctx);

	if (doc)
	xmlFreeDoc(doc);

	return err;
	}

File Metadata

Mime Type: text/x-diff
Expires: Sat, Nov 23, 11:06 AM (1 d, 18 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1018626
Default Alt Text: (48 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions