No OneTemporary
Actions

Size

192 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/crmd/te_actions.c b/crmd/te_actions.c
	index f77314ec40..a7f4f61939 100644
	--- a/crmd/te_actions.c
	+++ b/crmd/te_actions.c
	@@ -1,528 +1,528 @@
	/*
	* Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
	*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*
	* This software is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* General Public License for more details.
	*
	* You should have received a copy of the GNU General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/

	#include <crm_internal.h>

	#include <sys/param.h>
	#include <crm/crm.h>
	#include <crm/cib.h>
	#include <crm/msg_xml.h>

	#include <crm/common/xml.h>
	#include <tengine.h>

	#include <crmd_fsa.h>
	#include <crmd_messages.h>
	#include <crm/cluster.h>

	char *te_uuid = NULL;

	void send_rsc_command(crm_action_t * action);

	static void
	te_start_action_timer(crm_graph_t * graph, crm_action_t * action)
	{
	action->timer = calloc(1, sizeof(crm_action_timer_t));
	action->timer->timeout = action->timeout;
	action->timer->reason = timeout_action;
	action->timer->action = action;
	action->timer->source_id = g_timeout_add(action->timer->timeout + graph->network_delay,
	action_timer_callback, (void *)action->timer);

	CRM_ASSERT(action->timer->source_id != 0);
	}

	static gboolean
	te_pseudo_action(crm_graph_t * graph, crm_action_t * pseudo)
	{
	crm_debug("Pseudo action %d fired and confirmed", pseudo->id);
	pseudo->confirmed = TRUE;
	update_graph(graph, pseudo);
	trigger_graph();
	return TRUE;
	}

	void
	send_stonith_update(crm_action_t * action, const char target, const char uuid)
	{
	int rc = pcmk_ok;
	crm_node_t *peer = NULL;

	/* zero out the node-status & remove all LRM status info */
	xmlNode *node_state = NULL;

	CRM_CHECK(target != NULL, return);
	CRM_CHECK(uuid != NULL, return);

	if(get_node_uuid(0, target) == NULL) {
	set_node_uuid(target, uuid);
	}

	/* Make sure the membership and join caches are accurate */
	peer = crm_get_peer(0, target);
	if(peer->uuid == NULL) {
	crm_info("Recording uuid '%s' for node '%s'", uuid, target);
	peer->uuid = strdup(uuid);
	}
	crm_update_peer_proc(__FUNCTION__, peer, crm_proc_none, NULL);
	crm_update_peer_state(__FUNCTION__, peer, CRM_NODE_LOST, 0);
	crm_update_peer_expected(__FUNCTION__, peer, CRMD_JOINSTATE_DOWN);
	erase_node_from_join(target);

	node_state = do_update_node_cib(peer, node_update_cluster\|node_update_peer\|node_update_join\|node_update_expected, NULL, __FUNCTION__);

	/* Force our known ID */
	crm_xml_add(node_state, XML_ATTR_UUID, uuid);

	rc = fsa_cib_conn->cmds->update(fsa_cib_conn, XML_CIB_TAG_STATUS, node_state,
	cib_quorum_override \| cib_scope_local \| cib_can_create);

	/* Delay processing the trigger until the update completes */
	crm_debug("Sending fencing update %d for %s", rc, target);
	add_cib_op_callback(fsa_cib_conn, rc, FALSE, strdup(target), cib_fencing_updated);

	/* Make sure it sticks */
	/* fsa_cib_conn->cmds->bump_epoch(fsa_cib_conn, cib_quorum_override\|cib_scope_local); */

	erase_status_tag(target, XML_CIB_TAG_LRM, cib_scope_local);
	erase_status_tag(target, XML_TAG_TRANSIENT_NODEATTRS, cib_scope_local);

	free_xml(node_state);
	return;
	}

	static gboolean
	te_fence_node(crm_graph_t * graph, crm_action_t * action)
	{
	int rc = 0;
	const char *id = NULL;
	const char *uuid = NULL;
	const char *target = NULL;
	const char *type = NULL;
	gboolean invalid_action = FALSE;
	enum stonith_call_options options = st_opt_none;

	id = ID(action->xml);
	target = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
	uuid = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
	type = crm_meta_value(action->params, "stonith_action");

	CRM_CHECK(id != NULL, invalid_action = TRUE);
	CRM_CHECK(uuid != NULL, invalid_action = TRUE);
	CRM_CHECK(type != NULL, invalid_action = TRUE);
	CRM_CHECK(target != NULL, invalid_action = TRUE);

	if (invalid_action) {
	crm_log_xml_warn(action->xml, "BadAction");
	return FALSE;
	}

	crm_notice("Executing %s fencing operation (%s) on %s (timeout=%d)",
	type, id, target, transition_graph->stonith_timeout);

	/* Passing NULL means block until we can connect... */
	te_connect_stonith(NULL);

	if (confirmed_nodes && g_hash_table_size(confirmed_nodes) == 1) {
	options \|= st_opt_allow_suicide;
	}

	rc = stonith_api->cmds->fence(stonith_api, options, target, type,
	- transition_graph->stonith_timeout / 1000);
	+ transition_graph->stonith_timeout / 1000, 0);

	stonith_api->cmds->register_callback(
	stonith_api, rc, transition_graph->stonith_timeout / 1000,
	st_opt_timeout_updates, generate_transition_key(transition_graph->id, action->id, 0, te_uuid),
	"tengine_stonith_callback", tengine_stonith_callback);

	return TRUE;
	}

	static int
	get_target_rc(crm_action_t * action)
	{
	const char *target_rc_s = crm_meta_value(action->params, XML_ATTR_TE_TARGET_RC);

	if (target_rc_s != NULL) {
	return crm_parse_int(target_rc_s, "0");
	}
	return 0;
	}

	static gboolean
	te_crm_command(crm_graph_t * graph, crm_action_t * action)
	{
	char *counter = NULL;
	xmlNode *cmd = NULL;
	gboolean is_local = FALSE;

	const char *id = NULL;
	const char *task = NULL;
	const char *value = NULL;
	const char *on_node = NULL;

	gboolean rc = TRUE;
	gboolean no_wait = FALSE;

	id = ID(action->xml);
	task = crm_element_value(action->xml, XML_LRM_ATTR_TASK);
	on_node = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);

	CRM_CHECK(on_node != NULL && strlen(on_node) != 0,
	crm_err( "Corrupted command (id=%s) %s: no node",
	crm_str(id), crm_str(task));
	return FALSE);

	crm_info( "Executing crm-event (%s): %s on %s%s%s",
	crm_str(id), crm_str(task), on_node,
	is_local ? " (local)" : "", no_wait ? " - no waiting" : "");

	if (safe_str_eq(on_node, fsa_our_uname)) {
	is_local = TRUE;
	}

	value = crm_meta_value(action->params, XML_ATTR_TE_NOWAIT);
	if (crm_is_true(value)) {
	no_wait = TRUE;
	}

	if (is_local && safe_str_eq(task, CRM_OP_SHUTDOWN)) {
	/* defer until everything else completes */
	crm_info( "crm-event (%s) is a local shutdown", crm_str(id));
	graph->completion_action = tg_shutdown;
	graph->abort_reason = "local shutdown";
	action->confirmed = TRUE;
	update_graph(graph, action);
	trigger_graph();
	return TRUE;

	} else if(safe_str_eq(task, CRM_OP_SHUTDOWN)) {
	crm_node_t *peer = crm_get_peer(0, on_node);
	crm_update_peer_expected(__FUNCTION__, peer, CRMD_JOINSTATE_DOWN);
	}

	cmd = create_request(task, action->xml, on_node, CRM_SYSTEM_CRMD, CRM_SYSTEM_TENGINE, NULL);

	counter =
	generate_transition_key(transition_graph->id, action->id, get_target_rc(action), te_uuid);
	crm_xml_add(cmd, XML_ATTR_TRANSITION_KEY, counter);

	rc = send_cluster_message(on_node, crm_msg_crmd, cmd, TRUE);
	free(counter);
	free_xml(cmd);

	if (rc == FALSE) {
	crm_err("Action %d failed: send", action->id);
	return FALSE;

	} else if (no_wait) {
	action->confirmed = TRUE;
	update_graph(graph, action);
	trigger_graph();

	} else {
	if (action->timeout <= 0) {
	crm_err("Action %d: %s on %s had an invalid timeout (%dms). Using %dms instead",
	action->id, task, on_node, action->timeout, graph->network_delay);
	action->timeout = graph->network_delay;
	}
	te_start_action_timer(graph, action);
	}

	return TRUE;
	}

	gboolean
	cib_action_update(crm_action_t * action, int status, int op_rc)
	{
	lrmd_event_data_t *op = NULL;
	xmlNode *state = NULL;
	xmlNode *rsc = NULL;
	xmlNode *xml_op = NULL;
	xmlNode *action_rsc = NULL;

	int rc = pcmk_ok;

	const char *name = NULL;
	const char *value = NULL;
	const char *rsc_id = NULL;
	const char *task = crm_element_value(action->xml, XML_LRM_ATTR_TASK);
	const char *target = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
	const char *task_uuid = crm_element_value(action->xml, XML_LRM_ATTR_TASK_KEY);
	const char *target_uuid = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);

	int call_options = cib_quorum_override \| cib_scope_local;
	int target_rc = get_target_rc(action);

	if (status == PCMK_LRM_OP_PENDING) {
	crm_debug("%s %d: Recording pending operation %s on %s",
	crm_element_name(action->xml), action->id, task_uuid, target);
	} else {
	crm_warn("%s %d: %s on %s timed out",
	crm_element_name(action->xml), action->id, task_uuid, target);
	}

	action_rsc = find_xml_node(action->xml, XML_CIB_TAG_RESOURCE, TRUE);
	if (action_rsc == NULL) {
	return FALSE;
	}

	rsc_id = ID(action_rsc);
	CRM_CHECK(rsc_id != NULL, crm_log_xml_err(action->xml, "Bad:action");
	return FALSE);

	/*
	update the CIB

	<node_state id="hadev">
	<lrm>
	<lrm_resources>
	<lrm_resource id="rsc2" last_op="start" op_code="0" target="hadev"/>
	*/

	state = create_xml_node(NULL, XML_CIB_TAG_STATE);

	crm_xml_add(state, XML_ATTR_UUID, target_uuid);
	crm_xml_add(state, XML_ATTR_UNAME, target);

	rsc = create_xml_node(state, XML_CIB_TAG_LRM);
	crm_xml_add(rsc, XML_ATTR_ID, target_uuid);

	rsc = create_xml_node(rsc, XML_LRM_TAG_RESOURCES);
	rsc = create_xml_node(rsc, XML_LRM_TAG_RESOURCE);
	crm_xml_add(rsc, XML_ATTR_ID, rsc_id);

	name = XML_ATTR_TYPE;
	value = crm_element_value(action_rsc, name);
	crm_xml_add(rsc, name, value);
	name = XML_AGENT_ATTR_CLASS;
	value = crm_element_value(action_rsc, name);
	crm_xml_add(rsc, name, value);
	name = XML_AGENT_ATTR_PROVIDER;
	value = crm_element_value(action_rsc, name);
	crm_xml_add(rsc, name, value);

	op = convert_graph_action(NULL, action, status, op_rc);
	op->call_id = -1;
	op->user_data = generate_transition_key(transition_graph->id, action->id, target_rc, te_uuid);

	xml_op = create_operation_update(rsc, op, CRM_FEATURE_SET, target_rc, __FUNCTION__, LOG_INFO);
	lrmd_free_event(op);

	crm_trace("Updating CIB with \"%s\" (%s): %s %s on %s",
	status < 0 ? "new action" : XML_ATTR_TIMEOUT,
	crm_element_name(action->xml), crm_str(task), rsc_id, target);
	crm_log_xml_trace(xml_op, "Op");

	rc = fsa_cib_conn->cmds->update(fsa_cib_conn, XML_CIB_TAG_STATUS, state, call_options);

	crm_trace("Updating CIB with %s action %d: %s on %s (call_id=%d)",
	services_lrm_status_str(status), action->id, task_uuid, target, rc);

	add_cib_op_callback(fsa_cib_conn, rc, FALSE, NULL, cib_action_updated);
	free_xml(state);

	action->sent_update = TRUE;

	if (rc < pcmk_ok) {
	return FALSE;
	}

	return TRUE;
	}

	static gboolean
	te_rsc_command(crm_graph_t * graph, crm_action_t * action)
	{
	/* never overwrite stop actions in the CIB with
	* anything other than completed results
	*
	* Writing pending stops makes it look like the
	* resource is running again
	*/
	xmlNode *cmd = NULL;
	xmlNode *rsc_op = NULL;

	gboolean rc = TRUE;
	gboolean no_wait = FALSE;
	gboolean is_local = FALSE;

	char *counter = NULL;
	const char *task = NULL;
	const char *value = NULL;
	const char *on_node = NULL;
	const char *task_uuid = NULL;

	CRM_ASSERT(action != NULL);
	CRM_ASSERT(action->xml != NULL);

	action->executed = FALSE;
	on_node = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);

	CRM_CHECK(on_node != NULL && strlen(on_node) != 0,
	crm_err( "Corrupted command(id=%s) %s: no node",
	ID(action->xml), crm_str(task));
	return FALSE);

	rsc_op = action->xml;
	task = crm_element_value(rsc_op, XML_LRM_ATTR_TASK);
	task_uuid = crm_element_value(action->xml, XML_LRM_ATTR_TASK_KEY);
	on_node = crm_element_value(rsc_op, XML_LRM_ATTR_TARGET);
	counter =
	generate_transition_key(transition_graph->id, action->id, get_target_rc(action), te_uuid);
	crm_xml_add(rsc_op, XML_ATTR_TRANSITION_KEY, counter);

	if (safe_str_eq(on_node, fsa_our_uname)) {
	is_local = TRUE;
	}

	value = crm_meta_value(action->params, XML_ATTR_TE_NOWAIT);
	if (crm_is_true(value)) {
	no_wait = TRUE;
	}

	crm_info("Initiating action %d: %s %s on %s%s%s",
	action->id, task, task_uuid, on_node,
	is_local ? " (local)" : "", no_wait ? " - no waiting" : "");

	cmd = create_request(CRM_OP_INVOKE_LRM, rsc_op, on_node,
	CRM_SYSTEM_LRMD, CRM_SYSTEM_TENGINE, NULL);

	if (is_local) {
	/* shortcut local resource commands */
	ha_msg_input_t data = {
	.msg = cmd,
	.xml = rsc_op,
	};

	fsa_data_t msg = {
	.id = 0,
	.data = &data,
	.data_type = fsa_dt_ha_msg,
	.fsa_input = I_NULL,
	.fsa_cause = C_FSA_INTERNAL,
	.actions = A_LRM_INVOKE,
	.origin = __FUNCTION__,
	};

	do_lrm_invoke(A_LRM_INVOKE, C_FSA_INTERNAL, fsa_state, I_NULL, &msg);

	} else {
	rc = send_cluster_message(on_node, crm_msg_lrmd, cmd, TRUE);
	}

	free(counter);
	free_xml(cmd);

	action->executed = TRUE;
	if (rc == FALSE) {
	crm_err("Action %d failed: send", action->id);
	return FALSE;

	} else if (no_wait) {
	action->confirmed = TRUE;
	update_graph(transition_graph, action);
	trigger_graph();

	} else {
	if (action->timeout <= 0) {
	crm_err("Action %d: %s %s on %s had an invalid timeout (%dms). Using %dms instead",
	action->id, task, task_uuid, on_node, action->timeout, graph->network_delay);
	action->timeout = graph->network_delay;
	}
	te_start_action_timer(graph, action);
	}

	value = crm_meta_value(action->params, XML_OP_ATTR_PENDING);
	if (crm_is_true(value)) {
	/* write a "pending" entry to the CIB, inhibit notification */
	crm_info("Recording pending op %s in the CIB", task_uuid);
	cib_action_update(action, PCMK_LRM_OP_PENDING, PCMK_EXECRA_STATUS_UNKNOWN);
	}

	return TRUE;
	}

	crm_graph_functions_t te_graph_fns = {
	te_pseudo_action,
	te_rsc_command,
	te_crm_command,
	te_fence_node
	};

	void
	notify_crmd(crm_graph_t * graph)
	{
	const char *type = "unknown";
	enum crmd_fsa_input event = I_NULL;

	crm_debug("Processing transition completion in state %s", fsa_state2string(fsa_state));

	CRM_CHECK(graph->complete, graph->complete = TRUE);

	switch (graph->completion_action) {
	case tg_stop:
	type = "stop";
	/* fall through */
	case tg_done:
	type = "done";
	if (fsa_state == S_TRANSITION_ENGINE) {
	event = I_TE_SUCCESS;
	}
	break;

	case tg_restart:
	type = "restart";
	if (fsa_state == S_TRANSITION_ENGINE) {
	if (transition_timer->period_ms > 0) {
	crm_timer_stop(transition_timer);
	crm_timer_start(transition_timer);
	} else if(too_many_st_failures() == FALSE) {
	event = I_PE_CALC;
	}

	} else if (fsa_state == S_POLICY_ENGINE) {
	register_fsa_action(A_PE_INVOKE);
	}
	break;

	case tg_shutdown:
	type = "shutdown";
	if (is_set(fsa_input_register, R_SHUTDOWN)) {
	event = I_STOP;

	} else {
	crm_err("We didn't ask to be shut down, yet our" " PE is telling us too.");
	event = I_TERMINATE;
	}
	}

	crm_debug( "Transition %d status: %s - %s",
	graph->id, type, crm_str(graph->abort_reason));

	graph->abort_reason = NULL;
	graph->completion_action = tg_done;
	clear_bit(fsa_input_register, R_IN_TRANSITION);

	if (event != I_NULL) {
	register_fsa_input(C_FSA_INTERNAL, event, NULL);

	} else if (fsa_source) {
	mainloop_set_trigger(fsa_source);
	}
	}
	diff --git a/fencing/admin.c b/fencing/admin.c
	index 355465d363..60ddaebcaf 100644
	--- a/fencing/admin.c
	+++ b/fencing/admin.c
	@@ -1,505 +1,517 @@
	/*
	* Copyright (C) 2009 Andrew Beekhof <andrew@beekhof.net>
	*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*
	* This software is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* General Public License for more details.
	*
	* You should have received a copy of the GNU General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/

	#include <crm_internal.h>

	#include <sys/param.h>
	#include <stdio.h>
	#include <sys/types.h>
	#include <sys/stat.h>
	#include <unistd.h>
	#include <sys/utsname.h>

	#include <stdlib.h>
	#include <errno.h>
	#include <fcntl.h>

	#include <crm/crm.h>
	#include <crm/msg_xml.h>
	#include <crm/common/ipc.h>
	#include <crm/cluster/internal.h>
	#include <crm/common/mainloop.h>

	#include <crm/stonith-ng.h>
	#include <crm/cib.h>
	#include <crm/pengine/status.h>

	#include <crm/common/xml.h>


	/* INDENT-OFF */
	static struct crm_option long_options[] = {
	{"help", 0, 0, '?', "\tThis text"},
	{"version", 0, 0, '$', "\tVersion information" },
	{"verbose", 0, 0, 'V', "\tIncrease debug output"},
	{"quiet", 0, 0, 'q', "\tPrint only essential output"},

	{"-spacer-", 0, 0, '-', "Commands:"},
	{"list", 1, 0, 'l', "List devices that can terminate the specified host"},
	{"list-registered", 0, 0, 'L', "List all registered devices"},
	{"list-installed", 0, 0, 'I', "List all installed devices"},

	{"-spacer-", 0, 0, '-', ""},
	{"metadata", 0, 0, 'M', "Check the device's metadata"},
	{"query", 1, 0, 'Q', "Check the device's status"},
	{"fence", 1, 0, 'F', "Fence the named host"},
	{"unfence", 1, 0, 'U', "Unfence the named host"},
	{"reboot", 1, 0, 'B', "Reboot the named host"},
	{"confirm", 1, 0, 'C', "Confirm the named host is now safely down"},
	{"history", 1, 0, 'H', "Retrieve last fencing operation"},

	{"-spacer-", 0, 0, '-', ""},
	{"register", 1, 0, 'R', "Register the named stonith device. Requires: --agent, optional: --option"},
	{"deregister", 1, 0, 'D', "De-register the named stonith device"},

	{"register-level", 1, 0, 'r', "Register a stonith level for the named host. Requires: --index, one or more --device entries"},
	{"deregister-level", 1, 0, 'd', "De-register a stonith level for the named host. Requires: --index"},

	{"-spacer-", 0, 0, '-', ""},
	{"-spacer-", 0, 0, '-', "Options and modifiers:"},
	{"agent", 1, 0, 'a', "The agent (eg. fence_xvm) to instantiate when calling with --register"},
	{"env-option", 1, 0, 'e'},
	{"option", 1, 0, 'o'},

	{"device", 1, 0, 'v', "A device to associate with a given host and stonith level"},
	{"index", 1, 0, 'i', "The stonith level (1-9)"},

	{"timeout", 1, 0, 't', "Operation timeout in seconds"},
	+ {"tolerance", 1, 0, 0, "(Advanced) Do nothing if an equivalent --fence request succeeded less than N seconds earlier" },

	{"list-all", 0, 0, 'L', "legacy alias for --list-registered"},

	{0, 0, 0, 0}
	};
	/* INDENT-ON */

	int st_opts = st_opt_sync_call\|st_opt_allow_suicide;

	GMainLoop *mainloop = NULL;
	struct {
	stonith_t *st;
	const char *target;
	const char *action;
	int timeout;
	+ int tolerance;
	int rc;
	} async_fence_data;

	static int
	try_mainloop_connect(void)
	{
	stonith_t *st = async_fence_data.st;
	int tries = 10;
	int i = 0;
	int rc = 0;

	for (i = 0; i < tries; i++) {
	rc = st->cmds->connect(st, crm_system_name, NULL);

	if (!rc) {
	crm_debug("stonith client connection established");
	return 0;
	} else {
	crm_debug("stonith client connection failed");
	}
	sleep(1);
	}

	crm_err("Couldn not connect to stonithd. \n");
	return -1;
	}

	static void
	notify_callback(stonith_t st, stonith_event_t e)
	{
	if (e->result != pcmk_ok) {
	return;
	}

	if (safe_str_eq(async_fence_data.target, e->target) &&
	safe_str_eq(async_fence_data.action, e->action)) {

	async_fence_data.rc = e->result;
	g_main_loop_quit(mainloop);
	}
	}

	static void
	fence_callback(stonith_t * stonith, stonith_callback_data_t *data)
	{
	async_fence_data.rc = data->rc;

	g_main_loop_quit(mainloop);
	}

	static gboolean
	async_fence_helper(gpointer user_data)
	{
	stonith_t *st = async_fence_data.st;
	int call_id = 0;

	if (try_mainloop_connect()) {
	g_main_loop_quit(mainloop);
	return TRUE;
	}

	st->cmds->register_notification(st, T_STONITH_NOTIFY_FENCE, notify_callback);

	call_id = st->cmds->fence(st,
	st_opt_allow_suicide,
	async_fence_data.target,
	async_fence_data.action,
	- async_fence_data.timeout);
	+ async_fence_data.timeout,
	+ async_fence_data.tolerance
	+ );

	if (call_id < 0) {
	g_main_loop_quit(mainloop);
	return TRUE;
	}

	st->cmds->register_callback(
	st,
	call_id,
	async_fence_data.timeout,
	st_opt_timeout_updates,
	NULL,
	"callback",
	fence_callback);

	return TRUE;
	}

	static int
	-mainloop_fencing(stonith_t st, const char target, const char *action, int timeout)
	+mainloop_fencing(stonith_t st, const char target, const char *action, int timeout, int tolerance)
	{
	crm_trigger_t *trig;

	async_fence_data.st = st;
	async_fence_data.target = target;
	async_fence_data.action = action;
	async_fence_data.timeout = timeout;
	+ async_fence_data.tolerance = tolerance;
	async_fence_data.rc = -1;

	trig = mainloop_add_trigger(G_PRIORITY_HIGH, async_fence_helper, NULL);
	mainloop_set_trigger(trig);

	mainloop = g_main_new(FALSE);
	g_main_run(mainloop);

	return async_fence_data.rc;
	}

	int
	main(int argc, char ** argv)
	{
	int flag;
	int rc = 0;
	int quiet = 0;
	int verbose = 0;
	int argerr = 0;
	int timeout = 120;
	int option_index = 0;
	int fence_level = 0;
	int no_connect = 0;
	+ int tolerance = 0;

	char name[512];
	char value[512];
	const char *agent = NULL;
	const char *device = NULL;
	const char *target = NULL;
	+ const char *longname = NULL;

	char action = 0;
	stonith_t *st = NULL;
	stonith_key_value_t *params = NULL;
	stonith_key_value_t *devices = NULL;
	stonith_key_value_t *dIter = NULL;

	crm_log_cli_init("stonith_admin");
	crm_set_options(NULL, "mode [options]", long_options,
	"Provides access to the stonith-ng API.\n"
	"\nAllows the administrator to add/remove/list devices, check device and host status and fence hosts\n");

	while (1) {
	- flag = crm_get_option(argc, argv, &option_index);
	+ flag = crm_get_option_long(argc, argv, &option_index, &longname);
	if (flag == -1)
	break;

	switch(flag) {
	case 'V':
	verbose = 1;
	crm_bump_log_level(argc, argv);
	break;
	case '$':
	case '?':
	crm_help(flag, EX_OK);
	break;
	case 'I':
	no_connect = 1;
	/* fall through */
	case 'L':
	action = flag;
	break;
	case 'q':
	quiet = 1;
	break;
	case 'Q':
	case 'R':
	case 'D':
	action = flag;
	device = optarg;
	break;
	case 'a':
	agent = optarg;
	break;
	case 'l':
	target = optarg;
	action = 'L';
	break;
	case 'M':
	no_connect = 1;
	action = flag;
	break;
	case 't':
	timeout = crm_atoi(optarg, NULL);
	break;
	case 'B':
	case 'F':
	case 'U':
	/* using mainloop here */
	no_connect = 1;
	/* fall through */
	case 'C':
	/* Always log the input arguments */
	crm_log_args(argc, argv);
	target = optarg;
	action = flag;
	break;
	case 'H':
	case 'r':
	case 'd':
	target = optarg;
	action = flag;
	break;
	case 'i':
	fence_level = crm_atoi(optarg, NULL);
	break;
	case 'v':
	devices = stonith_key_value_add(devices, NULL, optarg);
	break;
	case 'o':
	crm_info("Scanning: -o %s", optarg);
	rc = sscanf(optarg, "%[^=]=%[^=]", name, value);
	if(rc != 2) {
	crm_err("Invalid option: -o %s", optarg);
	++argerr;
	} else {
	crm_info("Got: '%s'='%s'", name, value);
	params = stonith_key_value_add(params, name, value);
	}
	break;
	case 'e':
	- {
	- char *key = crm_concat("OCF_RESKEY", optarg, '_');
	- const char *env = getenv(key);
	+ {
	+ char *key = crm_concat("OCF_RESKEY", optarg, '_');
	+ const char *env = getenv(key);

	- if(env == NULL) {
	- crm_err("Invalid option: -e %s", optarg);
	- ++argerr;
	- } else {
	- crm_info("Got: '%s'='%s'", optarg, env);
	- params = stonith_key_value_add( params, optarg, env);
	+ if(env == NULL) {
	+ crm_err("Invalid option: -e %s", optarg);
	+ ++argerr;
	+ } else {
	+ crm_info("Got: '%s'='%s'", optarg, env);
	+ params = stonith_key_value_add( params, optarg, env);
	+ }
	}
	- }
	- break;
	+ break;
	+ case 0:
	+ if(safe_str_eq("tolerance", longname)) {
	+ tolerance = crm_get_msec(optarg) / 1000; /* Send in seconds */
	+ }
	+ break;
	default:
	++argerr;
	break;
	}
	}

	if (optind > argc) {
	++argerr;
	}

	if (argerr) {
	crm_help('?', EX_USAGE);
	}

	crm_debug("Create");
	st = stonith_api_new();

	if(!no_connect) {
	rc = st->cmds->connect(st, crm_system_name, NULL);
	crm_debug("Connect: %d", rc);

	if(rc < 0) {
	goto done;
	}
	}

	switch(action) {
	case 'I':
	rc = st->cmds->list_agents(st, st_opt_sync_call, NULL, &devices, timeout);
	for(dIter = devices; dIter; dIter = dIter->next ) {
	fprintf( stdout, " %s\n", dIter->value );
	}
	if(rc == 0) {
	fprintf(stderr, "No devices found\n");

	} else if(rc > 0) {
	fprintf(stderr, "%d devices found\n", rc);
	rc = 0;
	}
	stonith_key_value_freeall(devices, 1, 1);
	break;
	case 'L':
	rc = st->cmds->query(st, st_opts, target, &devices, timeout);
	for(dIter = devices; dIter; dIter = dIter->next ) {
	fprintf( stdout, " %s\n", dIter->value );
	}
	if(rc == 0) {
	fprintf(stderr, "No devices found\n");
	} else if(rc > 0) {
	fprintf(stderr, "%d devices found\n", rc);
	rc = 0;
	}
	stonith_key_value_freeall(devices, 1, 1);
	break;
	case 'Q':
	rc = st->cmds->monitor(st, st_opts, device, timeout);
	if(rc < 0) {
	rc = st->cmds->list(st, st_opts, device, NULL, timeout);
	}
	break;
	case 'R':
	rc = st->cmds->register_device(st, st_opts, device, "stonith-ng",
	agent, params);
	break;
	case 'D':
	rc = st->cmds->remove_device(st, st_opts, device);
	break;
	case 'r':
	rc = st->cmds->register_level(st, st_opts, target, fence_level, devices);
	break;
	case 'd':
	rc = st->cmds->remove_level(st, st_opts, target, fence_level);
	break;
	case 'M':
	if (agent == NULL) {
	printf("Please specify an agent to query using -a,--agent [value]\n");
	return -1;
	} else {
	char *buffer = NULL;
	rc = st->cmds->metadata(st, st_opt_sync_call, agent, NULL, &buffer, timeout);
	if(rc == pcmk_ok) {
	printf("%s\n", buffer);
	}
	free(buffer);
	}
	break;
	case 'C':
	rc = st->cmds->confirm(st, st_opts, target);
	break;
	case 'B':
	- rc = mainloop_fencing(st, target, "reboot", timeout);
	+ rc = mainloop_fencing(st, target, "reboot", timeout, tolerance);
	break;
	case 'F':
	- rc = mainloop_fencing(st, target, "off", timeout);
	+ rc = mainloop_fencing(st, target, "off", timeout, tolerance);
	break;
	case 'U':
	- rc = mainloop_fencing(st, target, "on", timeout);
	+ rc = mainloop_fencing(st, target, "on", timeout, tolerance);
	break;
	case 'H':
	{
	stonith_history_t history, hp, *latest = NULL;
	rc = st->cmds->history(st, st_opts, target, &history, timeout);
	for(hp = history; hp; hp = hp->next) {
	char *action_s = NULL;
	time_t complete = hp->completed;

	if(hp->state == st_done) {
	latest = hp;
	}

	if(quiet \|\| !verbose) {
	continue;
	} else if(hp->action == NULL) {
	action_s = strdup("unknown");
	} else if(hp->action[0] != 'r') {
	action_s = crm_concat("turn", hp->action, ' ');
	} else {
	action_s = strdup(hp->action);
	}

	if(hp->state == st_failed) {
	printf("%s failed to %s node %s on behalf of %s at %s\n",
	hp->delegate?hp->delegate:"We", action_s, hp->target, hp->origin,
	ctime(&complete));

	} else if(hp->state == st_done && hp->delegate) {
	printf("%s was able to %s node %s on behalf of %s at %s\n",
	hp->delegate, action_s, hp->target, hp->origin, ctime(&complete));

	} else if(hp->state == st_done) {
	printf("We were able to %s node %s on behalf of %s at %s\n",
	action_s, hp->target, hp->origin, ctime(&complete));
	} else {
	printf("%s wishes to %s node %s - %d %d\n",
	hp->origin, action_s, hp->target, hp->state, hp->completed);
	}

	free(action_s);
	}

	if(latest) {
	if(quiet) {
	printf("%d\n", latest->completed);
	} else {
	char *action_s = NULL;
	time_t complete = latest->completed;
	if(latest->action == NULL) {
	action_s = strdup("unknown");
	} else if(latest->action[0] != 'r') {
	action_s = crm_concat("turn", latest->action, ' ');
	} else {
	action_s = strdup(latest->action);
	}

	printf("%s was able to %s node %s on behalf of %s at %s\n",
	latest->delegate?latest->delegate:"We", action_s, latest->target,
	latest->origin, ctime(&complete));

	free(action_s);
	}
	}
	break;
	} /* closing bracket for -H case */
	} /* closing bracket for switch case */

	done:
	crm_info("Command returned: %s (%d)", pcmk_strerror(rc), rc);
	if(rc < 0) {
	printf("Command failed: %s\n", pcmk_strerror(rc));
	}

	stonith_key_value_freeall(params, 1, 1);
	st->cmds->disconnect(st);
	crm_debug("Disconnect: %d", rc);

	crm_debug("Destroy");
	stonith_api_delete(st);

	return rc;
	}
	diff --git a/fencing/commands.c b/fencing/commands.c
	index b16e96e8b9..175a6466c9 100644
	--- a/fencing/commands.c
	+++ b/fencing/commands.c
	@@ -1,1476 +1,1509 @@
	/*
	* Copyright (C) 2009 Andrew Beekhof <andrew@beekhof.net>
	*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*
	* This software is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* General Public License for more details.
	*
	* You should have received a copy of the GNU General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/

	#include <crm_internal.h>

	#include <sys/param.h>
	#include <stdio.h>
	#include <sys/types.h>
	#include <sys/wait.h>
	#include <sys/stat.h>
	#include <unistd.h>
	#include <sys/utsname.h>

	#include <stdlib.h>
	#include <errno.h>
	#include <fcntl.h>
	#include <ctype.h>

	#include <crm/crm.h>
	#include <crm/msg_xml.h>
	#include <crm/common/ipc.h>
	#include <crm/cluster/internal.h>
	#include <crm/common/mainloop.h>

	#include <crm/stonith-ng.h>
	#include <crm/fencing/internal.h>
	#include <crm/common/xml.h>

	#include <internal.h>

	GHashTable *device_list = NULL;
	GHashTable *topology = NULL;
	GList *cmd_list = NULL;

	-static int active_children = 0;
	+extern GHashTable *remote_op_list;

	+static int active_children = 0;
	static gboolean stonith_device_dispatch(gpointer user_data);
	static void st_child_done(GPid pid, int rc, const char *output, gpointer user_data);

	typedef struct async_command_s {

	int id;
	int pid;
	int fd_stdout;
	int options;
	int default_timeout;
	int timeout;

	char *op;
	char *origin;
	char *client;
	char *client_name;
	char *remote;

	char *victim;
	char *action;
	char *device;
	char *mode;

	GListPtr device_list;
	GListPtr device_next;

	void (done)(GPid pid, int rc, const char output, gpointer user_data);
	guint timer_sigterm;
	guint timer_sigkill;
	/*! If the operation timed out, this is the last signal
	* we sent to the process to get it to terminate */
	int last_timeout_signo;
	} async_command_t;

	static xmlNode *
	stonith_construct_async_reply(async_command_t cmd, const char output, xmlNode *data, int rc);

	static int
	get_action_timeout(stonith_device_t device, const char action, int default_timeout)
	{
	char buffer[512] = { 0, };
	char *value = NULL;

	CRM_CHECK(action != NULL, return default_timeout);

	if (!device->params) {
	return default_timeout;
	}

	snprintf(buffer, sizeof(buffer) - 1, "pcmk_%s_timeout", action);
	value = g_hash_table_lookup(device->params, buffer);

	if (!value) {
	return default_timeout;
	}

	return atoi(value);
	}

	static void free_async_command(async_command_t *cmd)
	{
	if (!cmd) {
	return;
	}
	cmd_list = g_list_remove(cmd_list, cmd);

	g_list_free(cmd->device_list);
	free(cmd->device);
	free(cmd->action);
	free(cmd->victim);
	free(cmd->remote);
	free(cmd->client);
	free(cmd->client_name);
	free(cmd->origin);
	free(cmd->op);
	free(cmd);
	}

	static async_command_t create_async_command(xmlNode msg)
	{
	async_command_t *cmd = NULL;
	xmlNode *op = get_xpath_object("//@"F_STONITH_ACTION, msg, LOG_ERR);
	const char *action = crm_element_value(op, F_STONITH_ACTION);

	CRM_CHECK(action != NULL, crm_log_xml_warn(msg, "NoAction"); return NULL);

	crm_log_xml_trace(msg, "Command");
	cmd = calloc(1, sizeof(async_command_t));
	crm_element_value_int(msg, F_STONITH_CALLID, &(cmd->id));
	crm_element_value_int(msg, F_STONITH_CALLOPTS, &(cmd->options));
	crm_element_value_int(msg, F_STONITH_TIMEOUT, &(cmd->default_timeout));
	cmd->timeout = cmd->default_timeout;

	cmd->origin = crm_element_value_copy(msg, F_ORIG);
	cmd->remote = crm_element_value_copy(msg, F_STONITH_REMOTE);
	cmd->client = crm_element_value_copy(msg, F_STONITH_CLIENTID);
	cmd->client_name = crm_element_value_copy(msg, F_STONITH_CLIENTNAME);
	cmd->op = crm_element_value_copy(msg, F_STONITH_OPERATION);
	cmd->action = strdup(action);
	cmd->victim = crm_element_value_copy(op, F_STONITH_TARGET);
	cmd->mode = crm_element_value_copy(op, F_STONITH_MODE);
	cmd->device = crm_element_value_copy(op, F_STONITH_DEVICE);

	CRM_CHECK(cmd->op != NULL, crm_log_xml_warn(msg, "NoOp"); free_async_command(cmd); return NULL);
	CRM_CHECK(cmd->client != NULL, crm_log_xml_warn(msg, "NoClient"));

	cmd_list = g_list_append(cmd_list, cmd);
	return cmd;
	}

	static int stonith_manual_ack(xmlNode msg, remote_fencing_op_t op)
	{
	async_command_t *cmd = create_async_command(msg);
	xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, msg, LOG_ERR);

	if(cmd == NULL) {
	return -EINVAL;
	}

	cmd->device = strdup("manual_ack");
	cmd->remote = strdup(op->id);

	crm_notice("Injecting manual confirmation that %s is safely off/down",
	crm_element_value(dev, F_STONITH_TARGET));

	st_child_done(0, 0, NULL, cmd);
	return pcmk_ok;
	}

	static gboolean stonith_device_execute(stonith_device_t *device)
	{
	int rc = 0;
	int exec_rc = 0;
	async_command_t *cmd = NULL;
	stonith_action_t *action = NULL;
	CRM_CHECK(device != NULL, return FALSE);

	if(device->active_pid) {
	crm_trace("%s is still active with pid %u", device->id, device->active_pid);
	return TRUE;
	}

	if(device->pending_ops) {
	GList *first = device->pending_ops;
	device->pending_ops = g_list_remove_link(device->pending_ops, first);
	cmd = first->data;
	g_list_free_1(first);
	}

	if(cmd == NULL) {
	crm_trace("Nothing further to do for %s", device->id);
	return TRUE;
	}

	action = stonith_action_create(device->agent,
	cmd->action,
	cmd->victim,
	cmd->timeout,
	device->params,
	device->aliases);

	exec_rc = stonith_action_execute_async(action, (void *) cmd, st_child_done);

	if(exec_rc > 0) {
	crm_debug("Operation %s%s%s on %s now running with pid=%d, timeout=%dms",
	cmd->action, cmd->victim?" for node ":"", cmd->victim?cmd->victim:"",
	device->id, exec_rc, cmd->timeout);
	device->active_pid = exec_rc;

	} else {
	crm_warn("Operation %s%s%s on %s failed (%d/%d)",
	cmd->action, cmd->victim?" for node ":"", cmd->victim?cmd->victim:"",
	device->id, exec_rc, rc);
	st_child_done(0, rc<0?rc:exec_rc, NULL, cmd);
	}
	return TRUE;
	}

	static gboolean stonith_device_dispatch(gpointer user_data)
	{
	return stonith_device_execute(user_data);
	}

	static void schedule_stonith_command(async_command_t cmd, stonith_device_t device)
	{
	CRM_CHECK(cmd != NULL, return);
	CRM_CHECK(device != NULL, return);

	if (cmd->device) {
	free(cmd->device);
	}

	cmd->device = strdup(device->id);
	cmd->timeout = get_action_timeout(device, cmd->action, cmd->default_timeout);

	crm_debug("Scheduling %s on %s for %s (timeout=%dms)", cmd->action, device->id,
	cmd->remote?cmd->remote:cmd->client, cmd->timeout);
	device->pending_ops = g_list_append(device->pending_ops, cmd);
	mainloop_set_trigger(device->work);
	}

	void free_device(gpointer data)
	{
	GListPtr gIter = NULL;
	stonith_device_t *device = data;

	g_hash_table_destroy(device->params);
	g_hash_table_destroy(device->aliases);

	for(gIter = device->pending_ops; gIter != NULL; gIter = gIter->next) {
	async_command_t *cmd = gIter->data;

	crm_warn("Removal of device '%s' purged operation %s", device->id, cmd->action);
	st_child_done(0, -ENODEV, NULL, cmd);
	free_async_command(cmd);
	}
	g_list_free(device->pending_ops);

	g_list_free_full(device->targets, free);
	free(device->namespace);
	free(device->agent);
	free(device->id);
	free(device);
	}

	static GHashTable build_port_aliases(const char hostmap, GListPtr *targets)
	{
	char *name = NULL;
	int last = 0, lpc = 0, max = 0, added = 0;
	GHashTable *aliases = g_hash_table_new_full(crm_str_hash, g_str_equal, g_hash_destroy_str, g_hash_destroy_str);

	if(hostmap == NULL) {
	return aliases;
	}

	max = strlen(hostmap);
	for(; lpc <= max; lpc++) {
	switch(hostmap[lpc]) {
	/* Assignment chars */
	case '=':
	case ':':
	if(lpc > last) {
	free(name);
	name = calloc(1, 1 + lpc - last);
	memcpy(name, hostmap + last, lpc - last);
	}
	last = lpc + 1;
	break;

	/* Delimeter chars */
	/* case ',': Potentially used to specify multiple ports */
	case 0:
	case ';':
	case ' ':
	case '\t':
	if(name) {
	char *value = NULL;
	value = calloc(1, 1 + lpc - last);
	memcpy(value, hostmap + last, lpc - last);

	crm_debug("Adding alias '%s'='%s'", name, value);
	g_hash_table_replace(aliases, name, value);
	if(targets) {
	targets = g_list_append(targets, strdup(value));
	}
	value=NULL;
	name=NULL;
	added++;

	} else if(lpc > last) {
	crm_debug("Parse error at offset %d near '%s'", lpc-last, hostmap+last);
	}

	last = lpc + 1;
	break;
	}

	if(hostmap[lpc] == 0) {
	break;
	}
	}

	if(added == 0) {
	crm_info("No host mappings detected in '%s'", hostmap);
	}

	free(name);
	return aliases;
	}

	static void parse_host_line(const char line, GListPtr output)
	{
	int lpc = 0;
	int max = 0;
	int last = 0;

	if(line) {
	max = strlen(line);
	} else {
	return;
	}

	/* Check for any complaints about additional parameters that the device doesn't understand */
	if(strstr(line, "invalid") \|\| strstr(line, "variable")) {
	crm_debug("Skipping: %s", line);
	return;
	}

	crm_trace("Processing: %s", line);
	/* Skip initial whitespace */
	for(lpc = 0; lpc <= max && isspace(line[lpc]); lpc++) {
	last = lpc+1;
	}

	/* Now the actual content */
	for(lpc = 0; lpc <= max; lpc++) {
	gboolean a_space = isspace(line[lpc]);
	if(a_space && lpc < max && isspace(line[lpc+1])) {
	/* fast-forward to the end of the spaces */

	} else if(a_space \|\| line[lpc] == ',' \|\| line[lpc] == 0) {
	int rc = 1;
	char *entry = NULL;

	if(lpc != last) {
	entry = calloc(1, 1 + lpc - last);
	rc = sscanf(line+last, "%[a-zA-Z0-9_-.]", entry);
	}

	if(entry == NULL) {
	/* Skip */
	} else if(rc != 1) {
	crm_warn("Could not parse (%d %d): %s", last, lpc, line+last);
	} else if(safe_str_neq(entry, "on") && safe_str_neq(entry, "off")) {
	crm_trace("Adding '%s'", entry);
	output = g_list_append(output, entry);
	entry = NULL;
	}

	free(entry);
	last = lpc + 1;
	}
	}
	}

	static GListPtr parse_host_list(const char *hosts)
	{
	int lpc = 0;
	int max = 0;
	int last = 0;
	GListPtr output = NULL;

	if(hosts == NULL) {
	return output;
	}

	max = strlen(hosts);
	for(lpc = 0; lpc <= max; lpc++) {
	if(hosts[lpc] == '\n' \|\| hosts[lpc] == 0) {
	char *line = NULL;

	line = calloc(1, 2 + lpc - last);
	snprintf(line, 1 + lpc - last, "%s", hosts+last);
	parse_host_line(line, &output);
	free(line);

	last = lpc + 1;
	}
	}

	return output;
	}

	static stonith_device_t build_device_from_xml(xmlNode msg)
	{
	xmlNode *dev = get_xpath_object("//"F_STONITH_DEVICE, msg, LOG_ERR);
	stonith_device_t *device = NULL;

	device = calloc(1, sizeof(stonith_device_t));
	device->id = crm_element_value_copy(dev, XML_ATTR_ID);
	device->agent = crm_element_value_copy(dev, "agent");
	device->namespace = crm_element_value_copy(dev, "namespace");
	device->params = xml2list(dev);
	device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device);
	/* TODO: Hook up priority */

	return device;
	}

	static const char *
	target_list_type(stonith_device_t *dev)
	{
	const char *check_type = NULL;

	check_type = g_hash_table_lookup(dev->params, STONITH_ATTR_HOSTCHECK);

	if(check_type == NULL) {

	if(g_hash_table_lookup(dev->params, STONITH_ATTR_HOSTLIST)) {
	check_type = "static-list";
	} else if(g_hash_table_lookup(dev->params, STONITH_ATTR_HOSTMAP)) {
	check_type = "static-list";
	} else {
	check_type = "dynamic-list";
	}
	}

	return check_type;
	}

	static void
	update_dynamic_list(stonith_device_t *dev)
	{
	time_t now = time(NULL);

	/* Host/alias must be in the list output to be eligable to be fenced
	*
	* Will cause problems if down'd nodes aren't listed or (for virtual nodes)
	* if the guest is still listed despite being moved to another machine
	*/

	if(dev->targets_age < 0) {
	crm_trace("Port list queries disabled for %s", dev->id);

	} else if(dev->targets == NULL \|\| dev->targets_age + 60 < now) {
	stonith_action_t *action = NULL;
	char *output = NULL;
	int rc = pcmk_ok;
	int exec_rc = pcmk_ok;

	if(dev->active_pid != 0) {
	crm_notice("Port list query can not execute because device is busy, using cache: %s",
	dev->targets ? "YES" : "NO");
	return;
	}

	action = stonith_action_create(dev->agent, "list", NULL, 5, dev->params, NULL);
	exec_rc = stonith_action_execute(action, &rc, &output);

	if(rc != 0 && dev->active_pid == 0) {
	/* This device probably only supports a single
	* connection, which appears to already be in use,
	* likely involved in a montior or (less likely)
	* metadata operation.
	*
	* Avoid disabling port list queries in the hope that
	* the op would succeed next time
	*/
	crm_info("Couldn't query ports for %s. Call failed with rc=%d and active_pid=%d: %s",
	dev->agent, rc, dev->active_pid, output);

	} else if(exec_rc < 0 \|\| rc != 0) {
	crm_notice("Disabling port list queries for %s (%d/%d): %s",
	dev->id, exec_rc, rc, output);
	dev->targets_age = -1;

	/* Fall back to status */
	g_hash_table_replace(dev->params, strdup(STONITH_ATTR_HOSTCHECK), strdup("status"));

	g_list_free_full(dev->targets, free);
	dev->targets = NULL;
	} else {
	crm_info("Refreshing port list for %s", dev->id);
	g_list_free_full(dev->targets, free);
	dev->targets = parse_host_list(output);
	dev->targets_age = now;
	}

	free(output);
	}
	}

	int stonith_device_register(xmlNode msg, const char *desc)
	{
	const char *value = NULL;
	stonith_device_t *device = build_device_from_xml(msg);

	value = g_hash_table_lookup(device->params, STONITH_ATTR_HOSTLIST);
	if(value) {
	device->targets = parse_host_list(value);
	}

	value = g_hash_table_lookup(device->params, STONITH_ATTR_HOSTMAP);
	device->aliases = build_port_aliases(value, &(device->targets));

	value = target_list_type(device);
	if (safe_str_eq(value, "dynamic-list")) {
	/* set the dynamic list during the register to guarantee we have
	* targets cached */
	update_dynamic_list(device);
	}

	g_hash_table_replace(device_list, device->id, device);

	crm_notice("Added '%s' to the device list (%d active devices)", device->id, g_hash_table_size(device_list));
	if(desc) {
	*desc = device->id;
	}
	return pcmk_ok;
	}

	static int stonith_device_remove(xmlNode msg, const char *desc)
	{
	xmlNode *dev = get_xpath_object("//"F_STONITH_DEVICE, msg, LOG_ERR);
	const char *id = crm_element_value(dev, XML_ATTR_ID);
	if(g_hash_table_remove(device_list, id)) {
	crm_info("Removed '%s' from the device list (%d active devices)",
	id, g_hash_table_size(device_list));
	} else {
	crm_info("Device '%s' not found (%d active devices)",
	id, g_hash_table_size(device_list));
	}
	if(desc) {
	*desc = id;
	}
	return pcmk_ok;
	}

	static int count_active_levels(stonith_topology_t *tp)
	{
	int lpc = 0;
	int count = 0;
	for(lpc = 0; lpc < ST_LEVEL_MAX; lpc++) {
	if(tp->levels[lpc] != NULL) {
	count++;
	}
	}
	return count;
	}

	void free_topology_entry(gpointer data)
	{
	stonith_topology_t *tp = data;

	int lpc = 0;
	for(lpc = 0; lpc < ST_LEVEL_MAX; lpc++) {
	if(tp->levels[lpc] != NULL) {
	g_list_free_full(tp->levels[lpc], free);
	}
	}
	free(tp->node);
	free(tp);
	}

	int stonith_level_register(xmlNode msg, char *desc)
	{
	int id = 0;
	int rc = pcmk_ok;
	xmlNode *child = NULL;

	xmlNode *level = get_xpath_object("//"F_STONITH_LEVEL, msg, LOG_ERR);
	const char *node = crm_element_value(level, F_STONITH_TARGET);
	stonith_topology_t *tp = g_hash_table_lookup(topology, node);

	crm_element_value_int(level, XML_ATTR_ID, &id);
	if(desc) {
	*desc = g_strdup_printf("%s[%d]", node, id);
	}
	if(id <= 0 \|\| id >= ST_LEVEL_MAX) {
	return -EINVAL;
	}

	if(tp == NULL) {
	tp = calloc(1, sizeof(stonith_topology_t));
	tp->node = strdup(node);
	g_hash_table_replace(topology, tp->node, tp);
	crm_trace("Added %s to the topology (%d active entries)", node, g_hash_table_size(topology));
	}

	if(tp->levels[id] != NULL) {
	crm_info("Adding to the existing %s[%d] topology entry (%d active entries)", node, id, count_active_levels(tp));
	}

	for (child = __xml_first_child(level); child != NULL; child = __xml_next(child)) {
	const char *device = ID(child);
	crm_trace("Adding device '%s' for %s (%d)", device, node, id);
	tp->levels[id] = g_list_append(tp->levels[id], strdup(device));
	}

	crm_info("Node %s has %d active fencing levels", node, count_active_levels(tp));
	return rc;
	}

	int stonith_level_remove(xmlNode msg, char *desc)
	{
	int id = 0;
	xmlNode *level = get_xpath_object("//"F_STONITH_LEVEL, msg, LOG_ERR);
	const char *node = crm_element_value(level, F_STONITH_TARGET);
	stonith_topology_t *tp = g_hash_table_lookup(topology, node);

	if(desc) {
	*desc = g_strdup_printf("%s[%d]", node, id);
	}
	crm_element_value_int(level, XML_ATTR_ID, &id);

	if(tp == NULL) {
	crm_info("Node %s not found (%d active entries)",
	node, g_hash_table_size(topology));
	return pcmk_ok;

	} else if(id < 0 \|\| id >= ST_LEVEL_MAX) {
	return -EINVAL;
	}

	if(id == 0 && g_hash_table_remove(topology, node)) {
	crm_info("Removed all %s related entries from the topology (%d active entries)",
	node, g_hash_table_size(topology));

	} else if(id > 0 && tp->levels[id] != NULL) {
	g_list_free_full(tp->levels[id], free);
	tp->levels[id] = NULL;

	crm_info("Removed entry '%d' from %s's topology (%d active entries remaining)",
	id, node, count_active_levels(tp));
	}
	return pcmk_ok;
	}

	static gboolean string_in_list(GListPtr list, const char *item)
	{
	int lpc = 0;
	int max = g_list_length(list);
	for(lpc = 0; lpc < max; lpc ++) {
	const char *value = g_list_nth_data(list, lpc);
	if(safe_str_eq(item, value)) {
	return TRUE;
	}
	}
	return FALSE;
	}

	static int stonith_device_action(xmlNode msg, char *output)
	{
	int rc = pcmk_ok;
	xmlNode *dev = get_xpath_object("//"F_STONITH_DEVICE, msg, LOG_ERR);
	const char *id = crm_element_value(dev, F_STONITH_DEVICE);

	async_command_t *cmd = NULL;
	stonith_device_t *device = NULL;

	if(id) {
	crm_trace("Looking for '%s'", id);
	device = g_hash_table_lookup(device_list, id);
	}

	if(device) {
	cmd = create_async_command(msg);
	if(cmd == NULL) {
	free_device(device);
	return -EPROTO;
	}

	schedule_stonith_command(cmd, device);
	rc = -EINPROGRESS;

	} else {
	crm_info("Device %s not found", id?id:"<none>");
	rc = -ENODEV;
	}
	return rc;
	}

	static gboolean can_fence_host_with_device(stonith_device_t dev, const char host)
	{
	gboolean can = FALSE;
	const char *alias = host;
	const char *check_type = NULL;

	if(dev == NULL) {
	return FALSE;

	} else if(host == NULL) {
	return TRUE;
	}

	if(g_hash_table_lookup(dev->aliases, host)) {
	alias = g_hash_table_lookup(dev->aliases, host);
	}

	check_type = target_list_type(dev);

	if(safe_str_eq(check_type, "none")) {
	can = TRUE;

	} else if(safe_str_eq(check_type, "static-list")) {

	/* Presence in the hostmap is sufficient
	* Only use if all hosts on which the device can be active can always fence all listed hosts
	*/

	if(string_in_list(dev->targets, host)) {
	can = TRUE;
	} else if(g_hash_table_lookup(dev->params, STONITH_ATTR_HOSTMAP)
	&& g_hash_table_lookup(dev->aliases, host)) {
	can = TRUE;
	}

	} else if(safe_str_eq(check_type, "dynamic-list")) {
	update_dynamic_list(dev);

	if(string_in_list(dev->targets, alias)) {
	can = TRUE;
	}

	} else if(safe_str_eq(check_type, "status")) {
	int rc = 0;
	int exec_rc = 0;
	stonith_action_t *action = NULL;
	/* Run the status operation for the device/target combination
	* Will cause problems if the device doesn't return 2 for down'd nodes or
	* (for virtual nodes) if the device doesn't return 1 for guests that
	* have been moved to another host
	*/

	action = stonith_action_create(dev->agent, "status", host, 5, dev->params, dev->aliases);
	exec_rc = stonith_action_execute(action, &rc, NULL);

	if(exec_rc != 0) {
	crm_err("Could not invoke %s: rc=%d", dev->id, exec_rc);

	} else if(rc == 1 /* unkown */) {
	crm_trace("Host %s is not known by %s", host, dev->id);

	} else if(rc == 0 /* active / \|\| rc == 2 / inactive */) {
	can = TRUE;

	} else {
	crm_notice("Unkown result when testing if %s can fence %s: rc=%d", dev->id, host, rc);
	}

	} else {
	crm_err("Unknown check type: %s", check_type);
	}

	if(safe_str_eq(host, alias)) {
	crm_info("%s can%s fence %s: %s", dev->id, can?"":" not", host, check_type);
	} else {
	crm_info("%s can%s fence %s (aka. '%s'): %s", dev->id, can?"":" not", host, alias, check_type);
	}
	return can;
	}


	struct device_search_s
	{
	const char *host;
	GListPtr capable;
	};

	static void search_devices(
	gpointer key, gpointer value, gpointer user_data)
	{
	stonith_device_t *dev = value;
	struct device_search_s *search = user_data;
	if(can_fence_host_with_device(dev, search->host)) {
	search->capable = g_list_append(search->capable, value);
	}
	}

	static int stonith_query(xmlNode msg, xmlNode *list)
	{
	struct device_search_s search;
	int available_devices = 0;
	const char *action = NULL;
	xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, msg, LOG_DEBUG_3);

	search.host = NULL;
	search.capable = NULL;

	if(dev) {
	const char *device = crm_element_value(dev, F_STONITH_DEVICE);
	search.host = crm_element_value(dev, F_STONITH_TARGET);
	if(device && safe_str_eq(device, "manual_ack")) {
	/* No query necessary */
	if(list) {
	*list = NULL;
	}
	return pcmk_ok;
	}

	action = crm_element_value(dev, F_STONITH_ACTION);
	}

	crm_log_xml_debug(msg, "Query");

	g_hash_table_foreach(device_list, search_devices, &search);
	available_devices = g_list_length(search.capable);
	if(search.host) {
	crm_debug("Found %d matching devices for '%s'",
	available_devices, search.host);
	} else {
	crm_debug("%d devices installed", available_devices);
	}

	/* Pack the results into data */
	if(list) {
	GListPtr lpc = NULL;
	*list = create_xml_node(NULL, __FUNCTION__);
	crm_xml_add(*list, F_STONITH_TARGET, search.host);
	crm_xml_add_int(*list, "st-available-devices", available_devices);
	for(lpc = search.capable; lpc != NULL; lpc = lpc->next) {
	stonith_device_t device = (stonith_device_t)lpc->data;
	int action_specific_timeout = get_action_timeout(device, action, 0);

	dev = create_xml_node(*list, F_STONITH_DEVICE);
	crm_xml_add(dev, XML_ATTR_ID, device->id);
	crm_xml_add(dev, "namespace", device->namespace);
	crm_xml_add(dev, "agent", device->agent);
	if (action_specific_timeout) {
	crm_xml_add_int(dev, F_STONITH_ACTION_TIMEOUT, action_specific_timeout);
	}
	if(search.host == NULL) {
	xmlNode *attrs = create_xml_node(dev, XML_TAG_ATTRS);
	g_hash_table_foreach(device->params, hash2field, attrs);
	}
	}
	}

	g_list_free(search.capable);

	return available_devices;
	}

	static void log_operation(async_command_t cmd, int rc, int pid, const char next, const char *output)
	{
	if(rc == 0) {
	next = NULL;
	}

	if(cmd->victim != NULL) {
	do_crm_log(rc==0?LOG_NOTICE:LOG_ERR,
	"Operation '%s' [%d] (call %d from %s) for host '%s' with device '%s' returned: %d (%s)%s%s",
	cmd->action, pid, cmd->id, cmd->client, cmd->victim, cmd->device, rc, pcmk_strerror(rc),
	next?". Trying: ":"", next?next:"");
	} else {
	do_crm_log_unlikely(rc==0?LOG_DEBUG:LOG_NOTICE,
	"Operation '%s' [%d] for device '%s' returned: %d (%s)%s%s",
	cmd->action, pid, cmd->device, rc, pcmk_strerror(rc), next?". Trying: ":"", next?next:"");
	}

	if(output) {
	/* Logging the whole string confuses syslog when the string is xml */
	char *local_copy = strdup(output);
	int lpc = 0, last = 0, more = strlen(local_copy);
	for(lpc = 0; lpc < more; lpc++) {
	if(local_copy[lpc] == '\n' \|\| local_copy[lpc] == 0) {
	local_copy[lpc] = 0;
	do_crm_log(rc==0?LOG_INFO:LOG_WARNING, "%s: %s",
	cmd->device, local_copy+last);
	last = lpc+1;
	}
	}
	crm_debug("%s: %s (total %d bytes)", cmd->device, local_copy+last, more);
	free(local_copy);
	}
	}

	static void
	stonith_send_async_reply(async_command_t cmd, const char output, int rc, GPid pid)
	{
	xmlNode *reply = NULL;
	gboolean bcast = TRUE;

	reply = stonith_construct_async_reply(cmd, output, NULL, rc);

	if(safe_str_eq(cmd->action, "metadata")) {
	/* Too verbose to log */
	bcast = FALSE;
	output = NULL;
	crm_trace("Directed reply: %s op", cmd->action);

	} else if(crm_str_eq(cmd->action, "monitor", TRUE) \|\|
	crm_str_eq(cmd->action, "list", TRUE) \|\|
	crm_str_eq(cmd->action, "status", TRUE)) {
	crm_trace("Directed reply: %s op", cmd->action);
	bcast = FALSE;

	} else if(safe_str_eq(cmd->mode, "slave")) {
	crm_trace("Directed reply: Complex op with %s", cmd->device);
	bcast = FALSE;
	}

	log_operation(cmd, rc, pid, NULL, output);
	crm_log_xml_trace(reply, "Reply");

	if(bcast && !stand_alone) {
	/* Send reply as T_STONITH_NOTIFY so everyone does notifications
	* Potentially limit to unsucessful operations to the originator?
	*/
	crm_trace("Broadcast reply");
	crm_xml_add(reply, F_STONITH_OPERATION, T_STONITH_NOTIFY);
	send_cluster_message(NULL, crm_msg_stonith_ng, reply, FALSE);

	} else if(cmd->origin) {
	crm_trace("Directed reply to %s", cmd->origin);
	send_cluster_message(cmd->origin, crm_msg_stonith_ng, reply, FALSE);

	} else {
	crm_trace("Directed local %ssync reply to %s", (cmd->options & st_opt_sync_call)?"":"a-", cmd->client);
	do_local_reply(reply, cmd->client, cmd->options & st_opt_sync_call, FALSE);
	}

	if(stand_alone) {
	/* Do notification with a clean data object */
	xmlNode *notify_data = create_xml_node(NULL, T_STONITH_NOTIFY_FENCE);
	crm_xml_add_int(notify_data, F_STONITH_RC, rc);
	crm_xml_add(notify_data, F_STONITH_TARGET, cmd->victim);
	crm_xml_add(notify_data, F_STONITH_OPERATION, cmd->op);
	crm_xml_add(notify_data, F_STONITH_DELEGATE, cmd->device);
	crm_xml_add(notify_data, F_STONITH_REMOTE, cmd->remote);
	crm_xml_add(notify_data, F_STONITH_ORIGIN, cmd->client);

	do_stonith_notify(0, T_STONITH_NOTIFY_FENCE, rc, notify_data, NULL);
	}

	free_xml(reply);
	}


	static void cancel_stonith_command(async_command_t *cmd)
	{
	stonith_device_t *device;

	CRM_CHECK(cmd != NULL, return);

	if (!cmd->device) {
	return;
	}

	device = g_hash_table_lookup(device_list, cmd->device);

	if (device) {
	crm_trace("Cancel scheduled %s on %s", cmd->action, device->id);
	device->pending_ops = g_list_remove(device->pending_ops, cmd);
	}
	}

	#define READ_MAX 500
	static void st_child_done(GPid pid, int rc, const char *output, gpointer user_data)
	{
	stonith_device_t *device = NULL;
	async_command_t *cmd = user_data;

	GListPtr gIter = NULL;
	GListPtr gIterNext = NULL;

	CRM_CHECK(cmd != NULL, return);

	active_children--;

	/* The device is ready to do something else now */
	device = g_hash_table_lookup(device_list, cmd->device);
	if(device) {
	device->active_pid = 0;
	mainloop_set_trigger(device->work);
	}

	crm_trace("Operation on %s completed with rc=%d (%d remaining)",
	cmd->device, rc, g_list_length(cmd->device_next));

	if(rc != 0 && cmd->device_next) {
	stonith_device_t *dev = cmd->device_next->data;

	log_operation(cmd, rc, pid, dev->id, output);

	cmd->device_next = cmd->device_next->next;
	schedule_stonith_command(cmd, dev);
	/* Prevent cmd from being freed */
	cmd = NULL;
	goto done;
	}

	if(rc > 0) {
	rc = -pcmk_err_generic;
	}

	stonith_send_async_reply(cmd, output, rc, pid);

	if(rc != 0) {
	goto done;
	}

	/* Check to see if any operations are scheduled to do the exact
	* same thing that just completed. If so, rather than
	* performing the same fencing operation twice, return the result
	* of this operation for all pending commands it matches. */
	for (gIter = cmd_list; gIter != NULL; gIter = gIterNext) {
	async_command_t *cmd_other = gIter->data;
	gIterNext = gIter->next;

	if(cmd == cmd_other) {
	continue;
	}

	/* A pending scheduled command matches the command that just finished if.
	* 1. The client connections are different.
	* 2. The node victim is the same.
	* 3. The fencing action is the same.
	* 4. The device scheduled to execute the action is the same.
	*/
	if(safe_str_eq(cmd->client, cmd_other->client) \|\|
	safe_str_neq(cmd->victim, cmd_other->victim) \|\|
	safe_str_neq(cmd->action, cmd_other->action) \|\|
	safe_str_neq(cmd->device, cmd_other->device)) {

	continue;
	}

	crm_notice("Merging stonith action %s for node %s originating from client %s with identical stonith request from client %s",
	cmd_other->action,
	cmd_other->victim,
	cmd_other->client,
	cmd->client);

	cmd_list = g_list_remove_link(cmd_list, gIter);

	stonith_send_async_reply(cmd_other, output, rc, pid);
	cancel_stonith_command(cmd_other);

	free_async_command(cmd_other);
	g_list_free_1(gIter);
	}

	done:
	free_async_command(cmd);
	}

	static gint sort_device_priority(gconstpointer a, gconstpointer b)
	{
	const stonith_device_t *dev_a = a;
	const stonith_device_t *dev_b = a;
	if(dev_a->priority > dev_b->priority) {
	return -1;
	} else if(dev_a->priority < dev_b->priority) {
	return 1;
	}
	return 0;
	}

	static int stonith_fence(xmlNode *msg)
	{
	int options = 0;
	const char *device_id = NULL;
	stonith_device_t *device = NULL;
	async_command_t *cmd = create_async_command(msg);
	xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, msg, LOG_ERR);

	if(cmd == NULL) {
	return -EPROTO;
	}

	device_id = crm_element_value(dev, F_STONITH_DEVICE);
	if(device_id) {
	device = g_hash_table_lookup(device_list, device_id);
	if(device == NULL) {
	crm_err("Requested device '%s' is not available", device_id);
	}

	} else {
	struct device_search_s search;

	search.capable = NULL;
	search.host = crm_element_value(dev, F_STONITH_TARGET);

	crm_element_value_int(msg, F_STONITH_CALLOPTS, &options);
	if(options & st_opt_cs_nodeid) {
	int nodeid = crm_atoi(search.host, NULL);
	crm_node_t *node = crm_get_peer(nodeid, NULL);
	if(node) {
	search.host = node->uname;
	}
	}

	g_hash_table_foreach(device_list, search_devices, &search);
	crm_info("Found %d matching devices for '%s'", g_list_length(search.capable), search.host);

	if(g_list_length(search.capable) > 0) {
	/* Order based on priority */
	search.capable = g_list_sort(search.capable, sort_device_priority);

	device = search.capable->data;

	if(g_list_length(search.capable) > 1) {
	cmd->device_list = search.capable;
	cmd->device_next = cmd->device_list->next;
	} else {
	g_list_free(search.capable);
	}
	}
	}

	if(device) {
	schedule_stonith_command(cmd, device);
	return -EINPROGRESS;
	}

	free_async_command(cmd);
	return -EHOSTUNREACH;
	}

	xmlNode stonith_construct_reply(xmlNode request, char output, xmlNode data, int rc)
	{
	int lpc = 0;
	xmlNode *reply = NULL;

	const char *name = NULL;
	const char *value = NULL;
	const char *names[] = {
	F_STONITH_OPERATION,
	F_STONITH_CALLID,
	F_STONITH_CLIENTID,
	F_STONITH_CLIENTNAME,
	F_STONITH_REMOTE,
	F_STONITH_CALLOPTS
	};

	crm_trace("Creating a basic reply");
	reply = create_xml_node(NULL, T_STONITH_REPLY);

	crm_xml_add(reply, "st_origin", __FUNCTION__);
	crm_xml_add(reply, F_TYPE, T_STONITH_NG);
	crm_xml_add(reply, "st_output", output);
	crm_xml_add_int(reply, F_STONITH_RC, rc);

	CRM_CHECK(request != NULL, crm_warn("Can't create a sane reply"); return reply);
	for(lpc = 0; lpc < DIMOF(names); lpc++) {
	name = names[lpc];
	value = crm_element_value(request, name);
	crm_xml_add(reply, name, value);
	}

	if(data != NULL) {
	crm_trace("Attaching reply output");
	add_message_xml(reply, F_STONITH_CALLDATA, data);
	}
	return reply;
	}

	static xmlNode *
	stonith_construct_async_reply(async_command_t cmd, const char output, xmlNode *data, int rc)
	{
	xmlNode *reply = NULL;

	crm_trace("Creating a basic reply");
	reply = create_xml_node(NULL, T_STONITH_REPLY);

	crm_xml_add(reply, "st_origin", __FUNCTION__);
	crm_xml_add(reply, F_TYPE, T_STONITH_NG);

	crm_xml_add(reply, F_STONITH_OPERATION, cmd->op);
	crm_xml_add(reply, F_STONITH_DEVICE, cmd->device);
	crm_xml_add(reply, F_STONITH_REMOTE, cmd->remote);
	crm_xml_add(reply, F_STONITH_CLIENTID, cmd->client);
	crm_xml_add(reply, F_STONITH_CLIENTNAME, cmd->client_name);
	crm_xml_add(reply, F_STONITH_TARGET, cmd->victim);
	crm_xml_add(reply, F_STONITH_ACTION, cmd->op);
	crm_xml_add(reply, F_STONITH_ORIGIN, cmd->origin);
	crm_xml_add_int(reply, F_STONITH_CALLID, cmd->id);
	crm_xml_add_int(reply, F_STONITH_CALLOPTS, cmd->options);


	crm_xml_add_int(reply, F_STONITH_RC, rc);

	crm_xml_add(reply, "st_output", output);

	if(data != NULL) {
	crm_info("Attaching reply output");
	add_message_xml(reply, F_STONITH_CALLDATA, data);
	}
	return reply;
	}

	void
	stonith_command(stonith_client_t client, uint32_t id, uint32_t flags, xmlNode request, const char *remote)
	{
	int call_options = 0;
	int rc = -EOPNOTSUPP;

	gboolean is_reply = FALSE;
	gboolean always_reply = FALSE;

	xmlNode *reply = NULL;
	xmlNode *data = NULL;

	char *output = NULL;
	const char *op = crm_element_value(request, F_STONITH_OPERATION);
	const char *client_id = crm_element_value(request, F_STONITH_CLIENTID);

	crm_element_value_int(request, F_STONITH_CALLOPTS, &call_options);
	if(get_xpath_object("//"T_STONITH_REPLY, request, LOG_DEBUG_3)) {
	is_reply = TRUE;
	}

	crm_debug("Processing %s%s from %s (%16x)", op, is_reply?" reply":"",
	client?client->name:remote, call_options);

	if(is_set(call_options, st_opt_sync_call)) {
	CRM_ASSERT(client == NULL \|\| client->request_id == id);
	}

	if(crm_str_eq(op, CRM_OP_REGISTER, TRUE)) {
	xmlNode *reply = create_xml_node(NULL, "reply");

	CRM_ASSERT(client);
	crm_xml_add(reply, F_STONITH_OPERATION, CRM_OP_REGISTER);
	crm_xml_add(reply, F_STONITH_CLIENTID, client->id);
	crm_ipcs_send(client->channel, id, reply, FALSE);
	client->request_id = 0;
	free_xml(reply);
	return;

	} else if(crm_str_eq(op, STONITH_OP_EXEC, TRUE)) {
	rc = stonith_device_action(request, &output);

	} else if (crm_str_eq(op, STONITH_OP_TIMEOUT_UPDATE, TRUE)) {
	const char *call_id = crm_element_value(request, F_STONITH_CALLID);
	const char *client_id = crm_element_value(request, F_STONITH_CLIENTID);
	int op_timeout = 0;

	crm_element_value_int(request, F_STONITH_TIMEOUT, &op_timeout);
	do_stonith_async_timeout_update(client_id, call_id, op_timeout);
	return;
	} else if(is_reply && crm_str_eq(op, STONITH_OP_QUERY, TRUE)) {
	process_remote_stonith_query(request);
	return;

	} else if(crm_str_eq(op, STONITH_OP_QUERY, TRUE)) {
	create_remote_stonith_op(client_id, request, TRUE); /* Record it for the future notification */
	rc = stonith_query(request, &data);
	always_reply = TRUE;
	if(!data) {
	return;
	}

	} else if(is_reply && crm_str_eq(op, T_STONITH_NOTIFY, TRUE)) {
	process_remote_stonith_exec(request);
	return;

	} else if(is_reply && crm_str_eq(op, STONITH_OP_FENCE, TRUE)) {
	/* Reply to a complex fencing op */
	process_remote_stonith_exec(request);
	return;

	} else if(crm_str_eq(op, T_STONITH_NOTIFY, TRUE)) {
	const char *flag_name = NULL;

	CRM_ASSERT(client);
	flag_name = crm_element_value(request, F_STONITH_NOTIFY_ACTIVATE);
	if(flag_name) {
	crm_debug("Setting %s callbacks for %s (%s): ON",
	flag_name, client->name, client->id);
	client->flags \|= get_stonith_flag(flag_name);
	}

	flag_name = crm_element_value(request, F_STONITH_NOTIFY_DEACTIVATE);
	if(flag_name) {
	crm_debug("Setting %s callbacks for %s (%s): off",
	flag_name, client->name, client->id);
	client->flags \|= get_stonith_flag(flag_name);
	}

	if(flags & crm_ipc_client_response) {
	crm_ipcs_send_ack(client->channel, id, "ack", __FUNCTION__, __LINE__);
	client->request_id = 0;
	}
	return;

	/* } else if(is_reply && crm_str_eq(op, STONITH_OP_FENCE, TRUE)) { */
	/* process_remote_stonith_exec(request); */
	/* return; */

	} else if(is_reply == FALSE && crm_str_eq(op, STONITH_OP_RELAY, TRUE)) {
	if(initiate_remote_stonith_op(NULL, request, FALSE) != NULL) {
	rc = -EINPROGRESS;
	}

	} else if(is_reply == FALSE && crm_str_eq(op, STONITH_OP_FENCE, TRUE)) {

	if(remote \|\| stand_alone) {
	rc = stonith_fence(request);

	} else if(call_options & st_opt_manual_ack) {
	remote_fencing_op_t *rop = initiate_remote_stonith_op(client, request, TRUE);
	rc = stonith_manual_ack(request, rop);

	} else {
	const char *alternate_host = NULL;
	xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, request, LOG_TRACE);
	const char *target = crm_element_value(dev, F_STONITH_TARGET);
	const char *action = crm_element_value(dev, F_STONITH_ACTION);
	const char *device = crm_element_value(dev, F_STONITH_DEVICE);

	if(client) {
	+ int tolerance = 0;
	+
	+ crm_element_value_int(dev, F_STONITH_TOLERANCE, &tolerance);
	crm_notice("Client %s.%d[%s] wants to fence (%s) '%s' with device '%s'",
	client->name, client->pid, client->id, action, target, device?device:"(any)");
	+
	+ crm_trace("tolerance=%d, remote_op_list=%p", tolerance, remote_op_list);
	+ if(tolerance > 0 && remote_op_list) {
	+ GHashTableIter iter;
	+ time_t now = time(NULL);
	+ remote_fencing_op_t *op = NULL;
	+
	+ g_hash_table_iter_init(&iter, remote_op_list);
	+ while(g_hash_table_iter_next(&iter, NULL, (void**)&op)) {
	+ if (target == NULL \|\| action == NULL) {
	+ continue;
	+ } else if(strcmp(op->target, target) != 0) {
	+ continue;
	+ } else if(op->state != st_done) {
	+ continue;
	+ } else if(strcmp(op->action, action) != 0) {
	+ continue;
	+ } else if((op->completed + tolerance) < now) {
	+ continue;
	+ }
	+
	+ crm_notice("Target %s was fenced (%s) less than %ds ago by %s on behalf of %s",
	+ target, action, tolerance, op->delegate, op->originator);
	+ rc = 0;
	+ goto done;
	+ }
	+ }
	+
	} else {
	crm_notice("Peer %s wants to fence (%s) '%s' with device '%s'",
	remote, action, target, device?device:"(any)");
	}

	if(g_hash_table_lookup(topology, target) && safe_str_eq(target, stonith_our_uname)) {
	GHashTableIter gIter;
	crm_node_t *entry = NULL;
	int membership = crm_proc_plugin \| crm_proc_heartbeat \| crm_proc_cpg;

	g_hash_table_iter_init(&gIter, crm_peer_cache);
	while (g_hash_table_iter_next(&gIter, NULL, (void **)&entry)) {
	crm_trace("Checking for %s.%d != %s",
	entry->uname, entry->id, target);
	if(entry->uname
	&& (entry->processes & membership)
	&& safe_str_neq(entry->uname, target)) {
	alternate_host = entry->uname;
	break;
	}
	}
	if(alternate_host == NULL) {
	crm_err("No alternate host available to handle complex self fencing request");
	g_hash_table_iter_init(&gIter, crm_peer_cache);
	while (g_hash_table_iter_next(&gIter, NULL, (void **)&entry)) {
	crm_notice("Peer[%d] %s", entry->id, entry->uname);
	}
	}
	}

	if(alternate_host) {
	crm_notice("Forwarding complex self fencing request to peer %s", alternate_host);
	crm_xml_add(request, F_STONITH_OPERATION, STONITH_OP_RELAY);
	crm_xml_add(request, F_STONITH_CLIENTID, client->id);
	send_cluster_message(alternate_host, crm_msg_stonith_ng, request, FALSE);
	rc = -EINPROGRESS;

	} else if(initiate_remote_stonith_op(client, request, FALSE) != NULL) {
	rc = -EINPROGRESS;
	}
	}

	} else if (crm_str_eq(op, STONITH_OP_FENCE_HISTORY, TRUE)) {
	rc = stonith_fence_history(request, &data);
	always_reply = TRUE;

	} else if(crm_str_eq(op, CRM_OP_REGISTER, TRUE)) {
	return;

	} else if(crm_str_eq(op, STONITH_OP_DEVICE_ADD, TRUE)) {
	const char *id = NULL;
	xmlNode *notify_data = create_xml_node(NULL, op);
	rc = stonith_device_register(request, &id);

	crm_xml_add(notify_data, F_STONITH_DEVICE, id);
	crm_xml_add_int(notify_data, F_STONITH_ACTIVE, g_hash_table_size(device_list));

	do_stonith_notify(call_options, op, rc, notify_data, NULL);
	free_xml(notify_data);

	} else if(crm_str_eq(op, STONITH_OP_DEVICE_DEL, TRUE)) {
	const char *id = NULL;
	xmlNode *notify_data = create_xml_node(NULL, op);
	rc = stonith_device_remove(request, &id);

	crm_xml_add(notify_data, F_STONITH_DEVICE, id);
	crm_xml_add_int(notify_data, F_STONITH_ACTIVE, g_hash_table_size(device_list));

	do_stonith_notify(call_options, op, rc, notify_data, NULL);
	free_xml(notify_data);

	} else if(crm_str_eq(op, STONITH_OP_LEVEL_ADD, TRUE)) {
	char *id = NULL;
	xmlNode *notify_data = create_xml_node(NULL, op);
	rc = stonith_level_register(request, &id);

	crm_xml_add(notify_data, F_STONITH_DEVICE, id);
	crm_xml_add_int(notify_data, F_STONITH_ACTIVE, g_hash_table_size(topology));

	do_stonith_notify(call_options, op, rc, notify_data, NULL);
	free_xml(notify_data);

	} else if(crm_str_eq(op, STONITH_OP_LEVEL_DEL, TRUE)) {
	char *id = NULL;
	xmlNode *notify_data = create_xml_node(NULL, op);
	rc = stonith_level_remove(request, &id);

	crm_xml_add(notify_data, F_STONITH_DEVICE, id);
	crm_xml_add_int(notify_data, F_STONITH_ACTIVE, g_hash_table_size(topology));

	do_stonith_notify(call_options, op, rc, notify_data, NULL);
	free_xml(notify_data);

	} else if(crm_str_eq(op, STONITH_OP_CONFIRM, TRUE)) {
	async_command_t *cmd = create_async_command(request);
	xmlNode *reply = stonith_construct_async_reply(cmd, NULL, NULL, 0);

	crm_xml_add(reply, F_STONITH_OPERATION, T_STONITH_NOTIFY);
	crm_notice("Broadcasting manual fencing confirmation for node %s", cmd->victim);
	send_cluster_message(NULL, crm_msg_stonith_ng, reply, FALSE);

	free_async_command(cmd);
	free_xml(reply);

	} else {
	crm_err("Unknown %s%s from %s", op, is_reply?" reply":"",
	client?client->name:remote);
	crm_log_xml_warn(request, "UnknownOp");
	}

	+ done:
	do_crm_log_unlikely(rc>0?LOG_DEBUG:LOG_INFO,"Processed %s%s from %s: %s (%d)", op, is_reply?" reply":"",
	client?client->name:remote, rc>0?"":pcmk_strerror(rc), rc);

	if(is_reply \|\| rc == -EINPROGRESS) {
	/* Nothing (yet) */

	} else if(remote) {
	reply = stonith_construct_reply(request, output, data, rc);
	send_cluster_message(remote, crm_msg_stonith_ng, reply, FALSE);
	free_xml(reply);

	} else if(rc <= pcmk_ok \|\| always_reply) {
	reply = stonith_construct_reply(request, output, data, rc);
	do_local_reply(reply, client_id, call_options & st_opt_sync_call, remote!=NULL);
	free_xml(reply);
	}

	free(output);
	free_xml(data);
	}
	diff --git a/fencing/fence_pcmk b/fencing/fence_pcmk
	index 4f37ea5b64..b485e474f7 100755
	--- a/fencing/fence_pcmk
	+++ b/fencing/fence_pcmk
	@@ -1,182 +1,182 @@
	#!/usr/bin/perl

	use Getopt::Long;

	my $ME = $0;

	END {
	defined fileno STDOUT or return;
	close STDOUT and return;
	warn "$ME: failed to close standard output: $!\n";
	$? \|\|= 1;
	}

	# Get the program name from $0 and strip directory names
	$_=$0;
	s/.*\///;
	my $pname = $_;

	$opt_o = 'reset'; # Default fence action
	$opt_t = '300'; # Default fence timeout (seconds)
	$extra_args = '-E';

	sub usage
	{
	print "Helper that presents a RHCS-style interface for Linux-HA stonith plugins\n\n";
	print "Should never need to use invoked by the user directly\n\n";
	print "\n";
	print "Usage: $pname [options]\n";
	print "\n";
	print "Options:\n";
	print " -h usage\n";
	print " -n <name> nodename\n";
	print " -o <string> Action: on \| off \| reset (default) \| stat \| hostlist\n";
	print " -q quiet mode\n";
	print " -V version\n";

	exit 0;
	}

	sub fail
	{
	($msg) = @_;
	print $msg."\n" unless defined $opt_q;
	$t->close if defined $t;
	exit 1;
	}

	sub fail_usage
	{
	($msg)=@_;
	print STDERR $msg."\n" if $msg;
	print STDERR "Please use '-h' for usage.\n";
	exit 1;
	}

	sub version
	{
	print "1.0.0\n";

	exit 0;
	}

	sub get_options_stdin
	{
	my $opt;
	my $line = 0;
	while( defined($in = <>) )
	{
	$_ = $in;
	chomp;

	# strip leading and trailing whitespace
	s/^\s*//;
	s/\s*$//;

	# skip comments
	next if /^#/;

	$line+=1;
	$opt=$_;
	next unless $opt;

	($name,$val)=split /\s=\s/, $opt;

	if ( $name eq "" )
	{
	print STDERR "parse error: illegal name in option $line\n";
	exit 2;
	}

	# DO NOTHING -- this field is used by fenced
	elsif ($name eq "agent" ) {}

	elsif ($name eq "timeout" )
	{
	$opt_t = $val;
	}
	elsif ($name eq "option" \|\| $name eq "action" )
	{
	$opt_o = $val;
	}
	elsif ($name eq "port" )
	{
	$opt_n = $val;
	}
	else
	{
	$ENV{$name} = $val;
	}

	}
	}

	######################################################################33
	# MAIN

	if (@ARGV > 0) {
	GetOptions("n=s"=>\$opt_n,
	"o=s"=>\$opt_o,
	"t=s"=>\$opt_t,
	"q" =>\$opt_q,
	"V" =>\$opt_V,
	"version" =>\$opt_V,
	"help" =>\$opt_h,
	"h" =>\$opt_h) \|\| fail_usage;
	foreach (@ARGV) {
	print "$_\n";
	}
	# getopts("ht:n:o:s:qV") \|\| fail_usage ;

	usage if defined $opt_h;
	version if defined $opt_V;

	fail_usage "Unknown parameter." if (@ARGV > 0);

	} else {
	get_options_stdin();
	}

	$opt_o=lc($opt_o);
	fail "failed: unrecognised action: $opt_o"
	unless $opt_o =~ /^(on\|off\|reset\|reboot\|stat\|status\|monitor\|list\|hostlist\|poweroff\|poweron)$/;

	sub term_handler {
	local $SIG{TERM} = 'IGNORE';
	kill(TERM,-getpgrp($$));
	}

	setpgrp($$,0);
	$agent_pid=$$;

	if ( $pid=fork() == 0 )
	{
	$cmd="--help $opt_o";
	if ( $opt_o eq "monitor" \|\| $opt_o eq "stat" \|\| $opt_o eq "status" \|\| $opt_o eq "list" ) {
	$cmd="--list";
	$cmd="--list-registered" unless defined $opt_n;
	} else {
	fail "failed: no plug number" unless defined $opt_n;
	if ( $opt_o eq "reboot" \|\| $opt_o eq "reset" ) {
	$cmd="--reboot";
	} elsif ( $opt_o eq "on" \|\| $opt_o eq "poweron" ) {
	$cmd="--unfence";
	} elsif ( $opt_o eq "off" \|\| $opt_o eq "poweroff" ) {
	$cmd="--fence";
	}
	system "logger -p daemon.notice \"fence_pcmk[$agent_pid]: Requesting Pacemaker fence $opt_n ($opt_o)\"";
	}
	- exec "stonith_admin $cmd $opt_n" or die "failed to exec \"stonith_admin $cmd $opt_n\"\n";
	+ exec "stonith_admin $cmd $opt_n --tolerance 5s" or die "failed to exec \"stonith_admin $cmd $opt_n\"\n";
	}

	$SIG{TERM} = \&term_handler;
	wait;
	$status=$?/256;

	print (($status == 0 ? "success":"failed") . ": $opt_n $status\n")
	unless defined $opt_q;

	if ( $status != 0 ) {
	system "logger -p daemon.notice \"fence_pcmk[$agent_pid]: Call to fence $opt_n ($opt_o) failed with rc=$status\"";
	}
	exit ($status == 0 ? 0 : 1 );
	diff --git a/fencing/test.c b/fencing/test.c
	index b33bf14078..2e8b9cfcc0 100644
	--- a/fencing/test.c
	+++ b/fencing/test.c
	@@ -1,643 +1,643 @@
	/*
	* Copyright (C) 2009 Andrew Beekhof <andrew@beekhof.net>
	*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*
	* This software is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* General Public License for more details.
	*
	* You should have received a copy of the GNU General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/

	#include <crm_internal.h>

	#include <sys/param.h>
	#include <stdio.h>
	#include <sys/time.h>
	#include <sys/types.h>
	#include <sys/stat.h>
	#include <unistd.h>
	#include <sys/utsname.h>

	#include <stdlib.h>
	#include <errno.h>
	#include <fcntl.h>

	#include <crm/crm.h>
	#include <crm/msg_xml.h>
	#include <crm/common/ipc.h>
	#include <crm/cluster/internal.h>

	#include <crm/stonith-ng.h>
	#include <crm/fencing/internal.h>
	#include <crm/common/xml.h>

	#include <crm/common/mainloop.h>

	GMainLoop *mainloop = NULL;
	crm_trigger_t *trig = NULL;
	int mainloop_iter = 0;
	int callback_rc = 0;
	typedef void (*mainloop_test_iteration_cb)(int check_event);
	#define MAINLOOP_DEFAULT_TIMEOUT 2

	#define mainloop_test_done(pass) \
	if (pass) { \
	crm_info("SUCCESS - %s", __PRETTY_FUNCTION__); \
	mainloop_iter++; \
	mainloop_set_trigger(trig); \
	} else { \
	crm_info("FAILURE = %s async_callback %d", __PRETTY_FUNCTION__, callback_rc); \
	exit(-1); \
	} \
	callback_rc = 0; \


	/* INDENT-OFF */
	enum test_modes {
	/* class dev test using a very specific environment */
	test_standard = 0,
	/* watch notifications only */
	test_passive,
	/* sanity test stonith client api using fence_true and fence_false */
	test_api_sanity,
	/* sanity test mainloop code with async respones. */
	test_api_mainloop,
	};

	static struct crm_option long_options[] = {
	{"verbose", 0, 0, 'V'},
	{"version", 0, 0, '$'},
	{"help", 0, 0, '?'},
	{"passive", 0, 0, 'p'},
	{"api_test", 0, 0, 't'},
	{"mainloop_api_test", 0, 0, 'm'},

	{0, 0, 0, 0}
	};
	/* INDENT-ON */

	stonith_t *st = NULL;
	struct pollfd pollfd;
	int st_opts = st_opt_sync_call;
	int expected_notifications = 0;
	int verbose = 0;

	static void dispatch_helper(int timeout)
	{
	int rc;
	crm_debug("Looking for notification");
	pollfd.events = POLLIN;
	while(true) {
	rc = poll( &pollfd, 1, timeout); /* wait 10 minutes, -1 forever */
	if (rc > 0 ) {
	if (!stonith_dispatch(st)) {
	break;
	}
	} else {
	break;
	}
	}
	}

	static void st_callback(stonith_t st, stonith_event_t e)
	{
	if(st->state == stonith_disconnected) {
	exit(1);
	}

	crm_notice("Operation %s requested by %s %s for peer %s. %s reported: %s (ref=%s)",
	e->operation, e->origin, e->result == pcmk_ok?"completed":"failed",
	e->target, e->executioner ? e->executioner : "<none>",
	pcmk_strerror(e->result), e->id);

	if (expected_notifications) {
	expected_notifications--;
	}
	}

	static void
	st_global_callback(stonith_t * stonith, stonith_callback_data_t *data)
	{
	crm_notice("Call id %d completed with rc %d", data->call_id, data->rc);
	}

	static void
	passive_test(void)
	{
	int rc = 0;
	rc = st->cmds->connect(st, crm_system_name, &pollfd.fd);
	crm_debug("Connect: %d", rc);

	st->cmds->register_notification(st, T_STONITH_NOTIFY_DISCONNECT, st_callback);
	st->cmds->register_notification(st, T_STONITH_NOTIFY_FENCE, st_callback);
	st->cmds->register_notification(st, STONITH_OP_DEVICE_ADD, st_callback);
	st->cmds->register_notification(st, STONITH_OP_DEVICE_DEL, st_callback);
	st->cmds->register_callback(st, 0, 120, st_opt_timeout_updates, NULL, "st_global_callback", st_global_callback);

	dispatch_helper(600 * 1000);
	}

	#define single_test(cmd, str, num_notifications, expected_rc) \
	{ \
	int rc = 0; \
	rc = cmd; \
	expected_notifications = 0; \
	if (num_notifications) { \
	expected_notifications = num_notifications; \
	dispatch_helper(500); \
	} \
	if (rc != expected_rc) { \
	crm_info("FAILURE - expected rc %d != %d(%s) for cmd - %s\n", expected_rc, rc, pcmk_strerror(rc), str); \
	exit(-1); \
	} else if (expected_notifications) { \
	crm_info("FAILURE - expected %d notifications, got only %d for cmd - %s\n", \
	num_notifications, num_notifications - expected_notifications, str); \
	exit(-1); \
	} else { \
	if (verbose) { \
	crm_info("SUCCESS - %s: %d", str, rc); \
	} else { \
	crm_debug("SUCCESS - %s: %d", str, rc); \
	} \
	} \
	}\

	static void
	run_fence_failure_test(void)
	{
	stonith_key_value_t *params = NULL;

	params = stonith_key_value_add(params, "pcmk_host_map", "false_1_node1=1,2 false_1_node2=3,4");

	single_test(st->cmds->register_device(st, st_opts, "test-id1", "stonith-ng", "fence_false", params),
	"Register device1 for failure test", 1, 0);

	- single_test(st->cmds->fence(st, st_opts, "false_1_node2", "off", 3),
	+ single_test(st->cmds->fence(st, st_opts, "false_1_node2", "off", 3, 0),
	"Fence failure results off", 1, -62);

	- single_test(st->cmds->fence(st, st_opts, "false_1_node2", "reboot", 3),
	+ single_test(st->cmds->fence(st, st_opts, "false_1_node2", "reboot", 3, 0),
	"Fence failure results reboot", 1, -62);

	single_test(st->cmds->remove_device(st, st_opts, "test-id1"),
	"Remove device1 for failure test", 1, 0);

	stonith_key_value_freeall(params, 1, 1);
	}

	static void
	run_fence_failure_rollover_test(void)
	{
	stonith_key_value_t *params = NULL;

	params = stonith_key_value_add(params, "pcmk_host_map", "false_1_node1=1,2 false_1_node2=3,4");

	single_test(st->cmds->register_device(st, st_opts, "test-id1", "stonith-ng", "fence_false", params),
	"Register device1 for rollover test", 1, 0);

	single_test(st->cmds->register_device(st, st_opts, "test-id2", "stonith-ng", "fence_true", params),
	"Register device2 for rollover test", 1, 0);

	- single_test(st->cmds->fence(st, st_opts, "false_1_node2", "off", 3),
	+ single_test(st->cmds->fence(st, st_opts, "false_1_node2", "off", 3, 0),
	"Fence rollover results off", 1, 0);

	- single_test(st->cmds->fence(st, st_opts, "false_1_node2", "on", 3),
	+ single_test(st->cmds->fence(st, st_opts, "false_1_node2", "on", 3, 0),
	"Fence rollover results on", 1, 0);

	single_test(st->cmds->remove_device(st, st_opts, "test-id1"),
	"Remove device1 for rollover tests", 1, 0);

	single_test(st->cmds->remove_device(st, st_opts, "test-id2"),
	"Remove device2 for rollover tests", 1, 0);

	stonith_key_value_freeall(params, 1, 1);
	}

	static void
	run_standard_test(void)
	{
	stonith_key_value_t *params = NULL;

	params = stonith_key_value_add(params, "pcmk_host_map", "false_1_node1=1,2 false_1_node2=3,4");

	single_test(st->cmds->register_device(st, st_opts, "test-id", "stonith-ng", "fence_true", params),
	"Register", 1, 0);

	single_test(st->cmds->list(st, st_opts, "test-id", NULL, 1),
	"list", 1, 0);

	single_test(st->cmds->monitor(st, st_opts, "test-id", 1),
	"Monitor", 1, 0);

	single_test(st->cmds->status(st, st_opts, "test-id", "false_1_node2", 1),
	"Status false_1_node2", 1, 0);

	single_test(st->cmds->status(st, st_opts, "test-id", "false_1_node1", 1),
	"Status false_1_node1", 1, 0);

	- single_test(st->cmds->fence(st, st_opts, "unknown-host", "off", 1),
	+ single_test(st->cmds->fence(st, st_opts, "unknown-host", "off", 1, 0),
	"Fence unknown-host (expected failure)", 0, -113);

	- single_test(st->cmds->fence(st, st_opts, "false_1_node1", "off", 1),
	+ single_test(st->cmds->fence(st, st_opts, "false_1_node1", "off", 1, 0),
	"Fence false_1_node1", 1, 0);

	- single_test(st->cmds->fence(st, st_opts, "false_1_node1", "on", 1),
	+ single_test(st->cmds->fence(st, st_opts, "false_1_node1", "on", 1, 0),
	"Unfence false_1_node1", 1, 0);

	single_test(st->cmds->remove_device(st, st_opts, "test-id"),
	"Remove test-id", 1, 0);

	stonith_key_value_freeall(params, 1, 1);
	}

	static void
	sanity_tests(void)
	{
	int rc = 0;
	rc = st->cmds->connect(st, crm_system_name, &pollfd.fd);
	crm_debug("Connect: %d", rc);

	st->cmds->register_notification(st, T_STONITH_NOTIFY_DISCONNECT, st_callback);
	st->cmds->register_notification(st, T_STONITH_NOTIFY_FENCE, st_callback);
	st->cmds->register_notification(st, STONITH_OP_DEVICE_ADD, st_callback);
	st->cmds->register_notification(st, STONITH_OP_DEVICE_DEL, st_callback);
	st->cmds->register_callback(st, 0, 120, st_opt_timeout_updates, NULL, "st_global_callback", st_global_callback);

	crm_info("Starting API Sanity Tests");
	run_standard_test();
	run_fence_failure_test();
	run_fence_failure_rollover_test();
	crm_info("Sanity Tests Passed");
	}

	static void
	standard_dev_test(void)
	{
	int rc = 0;
	char *tmp = NULL;
	stonith_key_value_t *params = NULL;

	rc = st->cmds->connect(st, crm_system_name, &pollfd.fd);
	crm_debug("Connect: %d", rc);

	params = stonith_key_value_add(params, "pcmk_host_map", "some-host=pcmk-7 true_1_node1=3,4");

	rc = st->cmds->register_device(st, st_opts, "test-id", "stonith-ng", "fence_xvm", params);
	crm_debug("Register: %d", rc);

	rc = st->cmds->list(st, st_opts, "test-id", &tmp, 10);
	crm_debug("List: %d output: %s\n", rc, tmp ? tmp : "<none>");

	rc = st->cmds->monitor(st, st_opts, "test-id", 10);
	crm_debug("Monitor: %d", rc);

	rc = st->cmds->status(st, st_opts, "test-id", "false_1_node2", 10);
	crm_debug("Status false_1_node2: %d", rc);

	rc = st->cmds->status(st, st_opts, "test-id", "false_1_node1", 10);
	crm_debug("Status false_1_node1: %d", rc);

	- rc = st->cmds->fence(st, st_opts, "unknown-host", "off", 60);
	+ rc = st->cmds->fence(st, st_opts, "unknown-host", "off", 60, 0);
	crm_debug("Fence unknown-host: %d", rc);

	rc = st->cmds->status(st, st_opts, "test-id", "false_1_node1", 10);
	crm_debug("Status false_1_node1: %d", rc);

	- rc = st->cmds->fence(st, st_opts, "false_1_node1", "off", 60);
	+ rc = st->cmds->fence(st, st_opts, "false_1_node1", "off", 60, 0);
	crm_debug("Fence false_1_node1: %d", rc);

	rc = st->cmds->status(st, st_opts, "test-id", "false_1_node1", 10);
	crm_debug("Status false_1_node1: %d", rc);

	- rc = st->cmds->fence(st, st_opts, "false_1_node1", "on", 10);
	+ rc = st->cmds->fence(st, st_opts, "false_1_node1", "on", 10, 0);
	crm_debug("Unfence false_1_node1: %d", rc);

	rc = st->cmds->status(st, st_opts, "test-id", "false_1_node1", 10);
	crm_debug("Status false_1_node1: %d", rc);

	- rc = st->cmds->fence(st, st_opts, "some-host", "off", 10);
	+ rc = st->cmds->fence(st, st_opts, "some-host", "off", 10, 0);
	crm_debug("Fence alias: %d", rc);

	rc = st->cmds->status(st, st_opts, "test-id", "some-host", 10);
	crm_debug("Status alias: %d", rc);

	- rc = st->cmds->fence(st, st_opts, "false_1_node1", "on", 10);
	+ rc = st->cmds->fence(st, st_opts, "false_1_node1", "on", 10, 0);
	crm_debug("Unfence false_1_node1: %d", rc);

	rc = st->cmds->remove_device(st, st_opts, "test-id");
	crm_debug("Remove test-id: %d", rc);

	stonith_key_value_freeall(params, 1, 1);
	}

	static void
	iterate_mainloop_tests(gboolean event_ready);

	static void
	mainloop_callback(stonith_t * stonith, stonith_callback_data_t *data)
	{
	callback_rc = data->rc;
	iterate_mainloop_tests(TRUE);
	}

	static int
	register_callback_helper(int callid)
	{
	return st->cmds->register_callback(
	st,
	callid,
	MAINLOOP_DEFAULT_TIMEOUT,
	st_opt_timeout_updates,
	NULL,
	"callback",
	mainloop_callback);
	}

	static void
	test_async_fence_pass(int check_event)
	{
	int rc = 0;

	if (check_event) {
	if (callback_rc != 0) {
	mainloop_test_done(FALSE);
	} else {
	mainloop_test_done(TRUE);
	}
	return;
	}

	- rc = st->cmds->fence(st, 0, "true_1_node1", "off", MAINLOOP_DEFAULT_TIMEOUT);
	+ rc = st->cmds->fence(st, 0, "true_1_node1", "off", MAINLOOP_DEFAULT_TIMEOUT, 0);
	if (rc < 0) {
	crm_err("fence failed with rc %d", rc);
	mainloop_test_done(FALSE);
	}
	register_callback_helper(rc);
	/* wait for event */
	}

	#define CUSTOM_TIMEOUT_ADDITION 10
	static void
	test_async_fence_custom_timeout(int check_event)
	{
	int rc = 0;
	static time_t begin = 0;

	if (check_event) {
	uint32_t diff = (time(NULL) - begin);

	if (callback_rc != -ETIME) {
	mainloop_test_done(FALSE);
	} else if (diff < CUSTOM_TIMEOUT_ADDITION + MAINLOOP_DEFAULT_TIMEOUT) {
	crm_err("Custom timeout test failed, callback expiration should be updated to %d, actual timeout was %d",
	CUSTOM_TIMEOUT_ADDITION + MAINLOOP_DEFAULT_TIMEOUT, diff);
	mainloop_test_done(FALSE);
	} else {
	mainloop_test_done(TRUE);
	}
	return;
	}
	begin = time(NULL);

	- rc = st->cmds->fence(st, 0, "custom_timeout_node1", "off", MAINLOOP_DEFAULT_TIMEOUT);
	+ rc = st->cmds->fence(st, 0, "custom_timeout_node1", "off", MAINLOOP_DEFAULT_TIMEOUT, 0);
	if (rc < 0) {
	crm_err("fence failed with rc %d", rc);
	mainloop_test_done(FALSE);
	}
	register_callback_helper(rc);
	/* wait for event */
	}

	static void
	test_async_fence_timeout(int check_event)
	{
	int rc = 0;

	if (check_event) {
	if (callback_rc != -ETIME) {
	mainloop_test_done(FALSE);
	} else {
	mainloop_test_done(TRUE);
	}
	return;
	}

	- rc = st->cmds->fence(st, 0, "false_1_node2", "off", MAINLOOP_DEFAULT_TIMEOUT);
	+ rc = st->cmds->fence(st, 0, "false_1_node2", "off", MAINLOOP_DEFAULT_TIMEOUT, 0);
	if (rc < 0) {
	crm_err("fence failed with rc %d", rc);
	mainloop_test_done(FALSE);
	}
	register_callback_helper(rc);
	/* wait for event */
	}

	static void
	test_async_monitor(int check_event)
	{
	int rc = 0;

	if (check_event) {
	if (callback_rc) {
	mainloop_test_done(FALSE);
	} else {
	mainloop_test_done(TRUE);
	}
	return;
	}

	rc = st->cmds->monitor(st, 0, "false_1", MAINLOOP_DEFAULT_TIMEOUT);
	if (rc < 0) {
	crm_err("monitor failed with rc %d", rc);
	mainloop_test_done(FALSE);
	}

	register_callback_helper(rc);
	/* wait for event */
	}

	static void
	test_register_async_devices(int check_event)
	{
	char buf[16] = { 0, };
	stonith_key_value_t *params = NULL;

	params = stonith_key_value_add(params, "pcmk_host_map", "false_1_node1=1,2");
	st->cmds->register_device(st, st_opts, "false_1", "stonith-ng", "fence_false", params);
	stonith_key_value_freeall(params, 1, 1);

	params = NULL;
	params = stonith_key_value_add(params, "pcmk_host_map", "true_1_node1=1,2");
	st->cmds->register_device(st, st_opts, "true_1", "stonith-ng", "fence_true", params);
	stonith_key_value_freeall(params, 1, 1);

	params = NULL;
	params = stonith_key_value_add(params, "pcmk_host_map", "custom_timeout_node1=1,2");
	snprintf(buf, sizeof(buf) -1, "%d", MAINLOOP_DEFAULT_TIMEOUT + CUSTOM_TIMEOUT_ADDITION);
	params = stonith_key_value_add(params, "pcmk_off_timeout", buf);
	st->cmds->register_device(st, st_opts, "false_custom_timeout", "stonith-ng", "fence_false", params);
	stonith_key_value_freeall(params, 1, 1);

	mainloop_test_done(TRUE);
	}

	static void
	try_mainloop_connect(int check_event)
	{
	int tries = 10;
	int i = 0;
	int rc = 0;

	for (i = 0; i < tries; i++) {
	rc = st->cmds->connect(st, crm_system_name, NULL);

	if (!rc) {
	crm_info("stonith client connection established");
	mainloop_test_done(TRUE);
	return;
	} else {
	crm_info("stonith client connection failed");
	}
	sleep(1);
	}

	crm_err("API CONNECTION FAILURE\n");
	mainloop_test_done(FALSE);
	}

	static void
	iterate_mainloop_tests(gboolean event_ready)
	{
	static mainloop_test_iteration_cb callbacks[] = {
	try_mainloop_connect,
	test_register_async_devices,
	test_async_monitor,
	test_async_fence_pass,
	test_async_fence_timeout,
	test_async_fence_custom_timeout,
	};

	if (mainloop_iter == (sizeof(callbacks) / sizeof(mainloop_test_iteration_cb))) {
	/* all tests ran, everything passed */
	crm_info("ALL MAINLOOP TESTS PASSED!");
	exit(0);
	}

	callbacks[mainloop_iter](event_ready);
	}

	static gboolean
	trigger_iterate_mainloop_tests(gpointer user_data)
	{
	iterate_mainloop_tests(FALSE);
	return TRUE;
	}

	static void
	test_shutdown(int nsig)
	{
	int rc = 0;
	if (st) {
	rc = st->cmds->disconnect(st);
	crm_info("Disconnect: %d", rc);

	crm_debug("Destroy");
	stonith_api_delete(st);
	}

	if (rc) {
	exit(-1);
	}
	}

	static void
	mainloop_tests(void)
	{
	trig = mainloop_add_trigger(G_PRIORITY_HIGH, trigger_iterate_mainloop_tests, NULL);
	mainloop_set_trigger(trig);
	mainloop_add_signal(SIGTERM, test_shutdown);

	crm_info("Starting");
	mainloop = g_main_new(FALSE);
	g_main_run(mainloop);
	}

	int
	main(int argc, char ** argv)
	{
	int argerr = 0;
	int flag;
	int option_index = 0;

	enum test_modes mode = test_standard;

	crm_set_options(NULL, "mode [options]", long_options,
	"Provides a summary of cluster's current state."
	"\n\nOutputs varying levels of detail in a number of different formats.\n");

	while (1) {
	flag = crm_get_option(argc, argv, &option_index);
	if (flag == -1) {
	break;
	}

	switch(flag) {
	case 'V':
	verbose = 1;
	break;
	case '$':
	case '?':
	crm_help(flag, EX_OK);
	break;
	case 'p':
	mode = test_passive;
	break;
	case 't':
	mode = test_api_sanity;
	break;
	case 'm':
	mode = test_api_mainloop;
	break;
	default:
	++argerr;
	break;
	}
	}

	crm_log_init("stonith-test", LOG_INFO, TRUE, verbose ? TRUE : FALSE, argc, argv, FALSE);

	if (optind > argc) {
	++argerr;
	}

	if (argerr) {
	crm_help('?', EX_USAGE);
	}

	crm_debug("Create");
	st = stonith_api_new();

	switch (mode) {
	case test_standard:
	standard_dev_test();
	break;
	case test_passive:
	passive_test();
	break;
	case test_api_sanity:
	sanity_tests();
	break;
	case test_api_mainloop:
	mainloop_tests();
	break;
	}

	test_shutdown(0);
	return 0;
	}
	diff --git a/include/crm/fencing/internal.h b/include/crm/fencing/internal.h
	index eb21e66806..cb8abff031 100644
	--- a/include/crm/fencing/internal.h
	+++ b/include/crm/fencing/internal.h
	@@ -1,121 +1,122 @@
	/*
	* Copyright (C) 2011 Andrew Beekhof <andrew@beekhof.net>
	*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*
	* This software is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* General Public License for more details.
	*
	* You should have received a copy of the GNU General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/
	#ifndef STONITH_NG_INTERNAL__H
	# define STONITH_NG_INTERNAL__H

	# include <crm/common/ipc.h>
	# include <crm/common/xml.h>

	struct stonith_action_s;
	typedef struct stonith_action_s stonith_action_t;

	stonith_action_t *
	stonith_action_create(const char *agent,
	const char *_action,
	const char *victim,
	int timeout,
	GHashTable * device_args,
	GHashTable * port_map);

	GPid
	stonith_action_execute_async(stonith_action_t *action,
	void *userdata,
	void (done)(GPid pid, int rc, const char output, gpointer user_data));

	int
	stonith_action_execute(stonith_action_t *action,
	int *agent_result,
	char **output);

	gboolean is_redhat_agent(const char *agent);

	xmlNode create_level_registration_xml(const char node, int level,
	stonith_key_value_t * device_list);

	xmlNode create_device_registration_xml(const char id, const char namespace, const char agent,
	stonith_key_value_t * params);

	#define ST_LEVEL_MAX 10

	#define F_STONITH_CLIENTID "st_clientid"
	#define F_STONITH_CALLOPTS "st_callopt"
	#define F_STONITH_CALLID "st_callid"
	#define F_STONITH_CALLDATA "st_calldata"
	#define F_STONITH_OPERATION "st_op"
	#define F_STONITH_TARGET "st_target"
	#define F_STONITH_REMOTE "st_remote_op"
	#define F_STONITH_RC "st_rc"
	/! Timeout period per a device execution /
	#define F_STONITH_TIMEOUT "st_timeout"
	+#define F_STONITH_TOLERANCE "st_tolerance"
	/! Action specific timeout period returned in query of fencing devices. /
	#define F_STONITH_ACTION_TIMEOUT "st_action_timeout"
	#define F_STONITH_CALLBACK_TOKEN "st_async_id"
	#define F_STONITH_CLIENTNAME "st_clientname"
	#define F_STONITH_CLIENTNODE "st_clientnode"
	#define F_STONITH_NOTIFY_TYPE "st_notify_type"
	#define F_STONITH_NOTIFY_ACTIVATE "st_notify_activate"
	#define F_STONITH_NOTIFY_DEACTIVATE "st_notify_deactivate"
	#define F_STONITH_DELEGATE "st_delegate"
	/*! The node initiating the stonith operation. If an operation
	* is relayed, this is the last node the operation lands on. When
	* in standalone mode, origin is the client's id that originated the
	* operation. */
	#define F_STONITH_ORIGIN "st_origin"
	#define F_STONITH_HISTORY_LIST "st_history"
	#define F_STONITH_DATE "st_date"
	#define F_STONITH_STATE "st_state"
	#define F_STONITH_LEVEL "st_level"
	#define F_STONITH_ACTIVE "st_active"

	#define F_STONITH_DEVICE "st_device_id"
	#define F_STONITH_ACTION "st_device_action"
	#define F_STONITH_MODE "st_mode"

	#define T_STONITH_NG "stonith-ng"
	#define T_STONITH_REPLY "st-reply"
	/*! For async operations, an event from the server containing
	* the total amount of time the server is allowing for the operation
	* to take place is returned to the client. */
	#define T_STONITH_TIMEOUT_VALUE "st-async-timeout-value"
	#define T_STONITH_NOTIFY "st_notify"

	#define STONITH_ATTR_ARGMAP "pcmk_arg_map"
	#define STONITH_ATTR_HOSTARG "pcmk_host_argument"
	#define STONITH_ATTR_HOSTMAP "pcmk_host_map"
	#define STONITH_ATTR_HOSTLIST "pcmk_host_list"
	#define STONITH_ATTR_HOSTCHECK "pcmk_host_check"

	#define STONITH_ATTR_ACTION_OP "action"

	#define STONITH_OP_EXEC "st_execute"
	#define STONITH_OP_TIMEOUT_UPDATE "st_timeout_update"
	#define STONITH_OP_QUERY "st_query"
	#define STONITH_OP_FENCE "st_fence"
	#define STONITH_OP_RELAY "st_relay"
	#define STONITH_OP_CONFIRM "st_confirm"
	#define STONITH_OP_DEVICE_ADD "st_device_register"
	#define STONITH_OP_DEVICE_DEL "st_device_remove"
	#define STONITH_OP_DEVICE_METADATA "st_device_metadata"
	#define STONITH_OP_FENCE_HISTORY "st_fence_history"
	#define STONITH_OP_LEVEL_ADD "st_level_add"
	#define STONITH_OP_LEVEL_DEL "st_level_remove"

	#define stonith_channel "st_command"
	#define stonith_channel_callback "st_callback"

	#endif
	diff --git a/include/crm/stonith-ng.h b/include/crm/stonith-ng.h
	index fa20e16a50..5c175bb292 100644
	--- a/include/crm/stonith-ng.h
	+++ b/include/crm/stonith-ng.h
	@@ -1,425 +1,425 @@
	/*
	* Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
	*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*
	* This software is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* General Public License for more details.
	*
	* You should have received a copy of the GNU General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/
	#ifndef STONITH_NG__H
	# define STONITH_NG__H

	# include <dlfcn.h>
	# include <stdbool.h>

	/* TO-DO: Work out how to drop this requirement */
	# include <libxml/tree.h>

	#define T_STONITH_NOTIFY_DISCONNECT "st_notify_disconnect"
	#define T_STONITH_NOTIFY_FENCE "st_notify_fence"

	/* INDENT-OFF */
	enum stonith_state {
	stonith_connected_command,
	stonith_connected_query,
	stonith_disconnected,
	};

	enum stonith_call_options {
	st_opt_none = 0x00000000,
	st_opt_verbose = 0x00000001,
	st_opt_allow_suicide = 0x00000002,

	st_opt_manual_ack = 0x00000008,
	st_opt_discard_reply = 0x00000010,
	st_opt_all_replies = 0x00000020,
	st_opt_topology = 0x00000040,
	st_opt_scope_local = 0x00000100,
	st_opt_cs_nodeid = 0x00000200,
	st_opt_sync_call = 0x00001000,
	/*! Allow the timeout period for a callback to be adjusted
	* based on the time the server reports the operation will take. */
	st_opt_timeout_updates = 0x00002000,
	/! Only report back if operation is a success in callback /
	st_opt_report_only_success = 0x00004000,
	};

	#define stonith_default_options = stonith_none

	enum op_state
	{
	st_query,
	st_exec,
	st_done,
	st_failed,
	};

	typedef struct stonith_key_value_s {
	char *key;
	char *value;
	struct stonith_key_value_s *next;
	} stonith_key_value_t;

	typedef struct stonith_history_s {
	char *target;
	char *action;
	char *origin;
	char *delegate;
	int completed;
	int state;

	struct stonith_history_s *next;
	} stonith_history_t;

	typedef struct stonith_s stonith_t;

	typedef struct stonith_event_s
	{
	char *id;
	char *type;
	char *message;
	char *operation;

	int result;
	char *origin;
	char *target;
	char *action;
	char *executioner;

	char *device;

	/! The name of the client that initiated the action. /
	char *client_origin;

	} stonith_event_t;

	typedef struct stonith_callback_data_s
	{
	int rc;
	int call_id;
	void *userdata;
	} stonith_callback_data_t;

	typedef struct stonith_api_operations_s
	{
	/*!
	* \brief Destroy the stonith api structure.
	*/
	int (free) (stonith_t st);

	/*!
	* \brief Connect to the local stonith daemon.
	*
	* \retval 0, success
	* \retval negative error code on failure
	*/
	int (connect) (stonith_t st, const char name, int stonith_fd);

	/*!
	* \brief Disconnect from the local stonith daemon.
	*
	* \retval 0, success
	* \retval negative error code on failure
	*/
	int (disconnect)(stonith_t st);

	/*!
	* \brief Remove a registered stonith device with the local stonith daemon.
	*
	* \note Synchronous, guaranteed to occur in daemon before function returns.
	*
	* \retval 0, success
	* \retval negative error code on failure
	*/
	int (*remove_device)(
	stonith_t st, int options, const char name);

	/*!
	* \brief Register a stonith device with the local stonith daemon.
	*
	* \note Synchronous, guaranteed to occur in daemon before function returns.
	*
	* \retval 0, success
	* \retval negative error code on failure
	*/
	int (*register_device)(
	stonith_t st, int options, const char id,
	const char namespace, const char agent, stonith_key_value_t *params);

	/*!
	* \brief Remove a fencing level for a specific node.
	*
	* \note This feature is not available when stonith is in standalone mode.
	*
	* \retval 0, success
	* \retval negative error code on failure
	*/
	int (*remove_level)(
	stonith_t st, int options, const char node, int level);

	/*!
	* \brief Register a fencing level containing the fencing devices to be used
	* at that level for a specific node.
	*
	* \note This feature is not available when stonith is in standalone mode.
	*
	* \retval 0, success
	* \retval negative error code on failure
	*/
	int (*register_level)(
	stonith_t st, int options, const char node, int level, stonith_key_value_t *device_list);

	/*!
	* \brief Get the metadata documentation for a resource.
	*
	* \note Value is returned in output. Output must be freed when set.
	*
	* \retval 0 success
	* \retval negative error code on failure
	*/
	int (metadata)(stonith_t st, int options,
	const char device, const char namespace, char **output, int timeout);

	/*!
	* \brief Retrieve a list of installed stonith agents
	*
	* \note if namespace is not provided, all known agents will be returned
	* \note list must be freed using stonith_key_value_freeall()
	* \note call_options parameter is not used, it is reserved for future use.
	*
	* \retval num items in list on success
	* \retval negative error code on failure
	*/
	int (list_agents)(stonith_t stonith, int call_options, const char *namespace,
	stonith_key_value_t **devices, int timeout);

	/*!
	* \brief Retrieve string listing hosts and port assignments from a local stonith device.
	*
	* \retval 0 on success
	* \retval negative error code on failure
	*/
	int (list)(stonith_t st, int options, const char id, char *list_output, int timeout);

	/*!
	* \brief Check to see if a local stonith device is reachable
	*
	* \retval 0 on success
	* \retval negative error code on failure
	*/
	int (monitor)(stonith_t st, int options, const char *id, int timeout);

	/*!
	* \brief Check to see if a local stonith device's port is reachable
	*
	* \retval 0 on success
	* \retval negative error code on failure
	*/
	int (status)(stonith_t st, int options, const char id, const char port, int timeout);

	/*!
	* \brief Retrieve a list of registered stonith devices.
	*
	* \note If node is provided, only devices that can fence the node id
	* will be returned.
	*
	* \retval num items in list on success
	* \retval negative error code on failure
	*/
	int (query)(stonith_t st, int options, const char *node,
	stonith_key_value_t **devices, int timeout);

	/*!
	* \brief Issue a fencing action against a node.
	*
	* \note Possible actions are, 'on', 'off', and 'reboot'.
	*
	* \param st, stonith connection
	* \param options, call options
	* \param node, The target node to fence
	* \param action, The fencing action to take
	* \param timeout, The default per device timeout to use with each device
	* capable of fencing the target.
	*
	* \retval 0 success
	* \retval negative error code on failure.
	*/
	int (fence)(stonith_t st, int options, const char node, const char action,
	- int timeout);
	+ int timeout, int tolerance);

	/*!
	* \brief Manually confirm that a node is down.
	*
	* \retval 0 success
	* \retval negative error code on failure.
	*/
	int (confirm)(stonith_t st, int options, const char *node);

	/*!
	* \brief Retrieve a list of fencing operations that have occurred for a specific node.
	*
	* \note History is not available in standalone mode.
	*
	* \retval 0 success
	* \retval negative error code on failure.
	*/
	int (history)(stonith_t st, int options, const char node, stonith_history_t *output, int timeout);

	int (*register_notification)(
	stonith_t st, const char event,
	void (notify)(stonith_t st, stonith_event_t *e));
	int (remove_notification)(stonith_t st, const char *event);

	/*!
	* \brief Register a callback to receive the result of an async call id
	*
	* \param call_id, The call id to register the callback for.
	* \param timeout, The default timeout period to wait until this callback expires
	* \param options, Option flags, st_opt_timeout_updates and st_opt_report_only_success are the
	* only valid options for this function.
	* \param userdate, A pointer that will be handed back in the callback.
	* \param callback_name, Unique name given to callback
	* \param callback, The callback function
	*
	* \retval 0 success
	* \retval negative error code on failure.
	*/
	int (register_callback)(stonith_t st,
	int call_id,
	int timeout,
	int options,
	void *userdata,
	const char *callback_name,
	void (callback)(stonith_t st, stonith_callback_data_t *data));

	/*!
	* \brief Remove a registered callback for a given call id.
	*/
	int (remove_callback)(stonith_t st, int call_id, bool all_callbacks);

	} stonith_api_operations_t;

	struct stonith_s
	{
	enum stonith_state state;

	int call_id;
	int call_timeout;
	void *private;

	stonith_api_operations_t *cmds;
	};
	/* INDENT-ON */

	/* Core functions */
	stonith_t *stonith_api_new(void);
	void stonith_api_delete(stonith_t * st);

	void stonith_dump_pending_callbacks(stonith_t * st);

	const char get_stonith_provider(const char agent, const char *provider);

	bool stonith_dispatch(stonith_t * st);

	stonith_key_value_t stonith_key_value_add(stonith_key_value_t kvp, const char *key,
	const char *value);
	void stonith_key_value_freeall(stonith_key_value_t * kvp, int keys, int values);

	/* Basic helpers that allows nodes to be fenced and the history to be
	* queried without mainloop or the caller understanding the full API
	*
	* At least one of nodeid and uname are required
	*/
	int stonith_api_kick(int nodeid, const char *uname, int timeout, bool off);
	time_t stonith_api_time(int nodeid, const char *uname, bool in_progress);

	/*
	* Helpers for using the above functions without install-time dependancies
	*
	* Usage:
	* #include <crm/stonith-ng.h>
	*
	* To turn a node off by corosync nodeid:
	* stonith_api_kick_helper(nodeid, 120, 1);
	*
	* To check the last fence date/time (also by nodeid):
	* last = stonith_api_time_helper(nodeid, 0);
	*
	* To check if fencing is in progress:
	* if(stonith_api_time_helper(nodeid, 1) > 0) { ... }
	*
	* eg.

	#include <stdio.h>
	#include <time.h>
	#include <crm/stonith-ng.h>
	int
	main(int argc, char ** argv)
	{
	int rc = 0;
	int nodeid = 102;

	rc = stonith_api_time_helper(nodeid, 0);
	printf("%d last fenced at %s\n", nodeid, ctime(rc));

	rc = stonith_api_kick_helper(nodeid, 120, 1);
	printf("%d fence result: %d\n", nodeid, rc);

	rc = stonith_api_time_helper(nodeid, 0);
	printf("%d last fenced at %s\n", nodeid, ctime(rc));

	return 0;
	}

	*/

	# define STONITH_LIBRARY "libstonithd.so.2"

	static inline int
	stonith_api_kick_helper(int nodeid, int timeout, bool off)
	{
	static void *st_library = NULL;
	static int (st_kick_fn) (int nodeid, const char uname, int timeout, bool off) = NULL;

	if (st_library == NULL) {
	st_library = dlopen(STONITH_LIBRARY, RTLD_LAZY);
	}
	if (st_library && st_kick_fn == NULL) {
	st_kick_fn = dlsym(st_library, "stonith_api_kick");
	}
	if (st_kick_fn == NULL) {
	return -ELIBACC;
	}

	return (*st_kick_fn) (nodeid, NULL, timeout, off);
	}

	static inline time_t
	stonith_api_time_helper(int nodeid, bool in_progress)
	{
	static void *st_library = NULL;
	static time_t(st_time_fn) (int nodeid, const char uname, bool in_progress) = NULL;

	if (st_library == NULL) {
	st_library = dlopen(STONITH_LIBRARY, RTLD_LAZY);
	}
	if (st_library && st_time_fn == NULL) {
	st_time_fn = dlsym(st_library, "stonith_api_time");
	}
	if (st_time_fn == NULL) {
	return 0;
	}

	return (*st_time_fn) (nodeid, NULL, in_progress);
	}

	#endif
	diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
	index 0b7125556a..1a3cab2a9a 100644
	--- a/lib/fencing/st_client.c
	+++ b/lib/fencing/st_client.c
	@@ -1,2268 +1,2269 @@
	/*
	* Copyright (c) 2004 Andrew Beekhof <andrew@beekhof.net>
	*
	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.
	*
	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.
	*
	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*
	*/
	#include <crm_internal.h>
	#include <unistd.h>
	#include <stdlib.h>
	#include <stdio.h>
	#include <stdarg.h>
	#include <string.h>
	#include <ctype.h>

	#include <sys/stat.h>
	#include <sys/types.h>
	#include <sys/wait.h>

	#include <glib.h>
	#include <dirent.h>
	#include <libgen.h> /* Add it for compiling on OSX */

	#include <crm/crm.h>
	#include <crm/stonith-ng.h>
	#include <crm/fencing/internal.h>
	#include <crm/msg_xml.h>
	#include <crm/common/xml.h>

	#ifdef HAVE_STONITH_STONITH_H
	# include <stonith/stonith.h>
	# define LHA_STONITH_LIBRARY "libstonith.so.1"
	static void *lha_agents_lib = NULL;
	#endif

	#include <crm/common/mainloop.h>


	CRM_TRACE_INIT_DATA(stonith);

	struct stonith_action_s {
	char *agent;
	char *action;
	char *victim;
	char *args;
	int timeout;
	int async;
	void *userdata;
	void (done_cb)(GPid pid, gint status, const char output, gpointer user_data);

	/* async track data */
	int fd_stdout;
	int last_timeout_signo;
	guint timer_sigterm;
	guint timer_sigkill;

	/* output data */
	GPid pid;
	int rc;
	char *output;
	};

	typedef struct stonith_private_s {
	char *token;
	crm_ipc_t *ipc;
	mainloop_io_t *source;
	GHashTable *stonith_op_callback_table;
	GList *notify_list;

	void (op_callback) (stonith_t st, stonith_callback_data_t *data);

	} stonith_private_t;

	typedef struct stonith_notify_client_s {
	const char *event;
	const char obj_id; / implement one day */
	const char obj_type; / implement one day */
	void (notify) (stonith_t st, stonith_event_t *e);

	} stonith_notify_client_t;

	typedef struct stonith_callback_client_s {
	void (callback) (stonith_t st, stonith_callback_data_t *data);
	const char *id;
	void *user_data;
	gboolean only_success;
	gboolean allow_timeout_updates;
	struct timer_rec_s *timer;

	} stonith_callback_client_t;

	struct notify_blob_s {
	stonith_t *stonith;
	xmlNode *xml;
	};

	struct timer_rec_s {
	int call_id;
	int timeout;
	guint ref;
	stonith_t *stonith;
	};

	typedef int (stonith_op_t) (const char , int, const char , xmlNode ,
	xmlNode , xmlNode , xmlNode , xmlNode );

	static const char META_TEMPLATE[] =
	"<?xml version=\"1.0\"?>\n"
	"<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n"
	"<resource-agent name=\"%s\">\n"
	" <version>1.0</version>\n"
	" <longdesc lang=\"en\">\n"
	"%s\n"
	" </longdesc>\n"
	" <shortdesc lang=\"en\">%s</shortdesc>\n"
	"%s\n"
	" <actions>\n"
	" <action name=\"start\" timeout=\"20\" />\n"
	" <action name=\"stop\" timeout=\"15\" />\n"
	" <action name=\"status\" timeout=\"20\" />\n"
	" <action name=\"monitor\" timeout=\"20\" interval=\"3600\"/>\n"
	" <action name=\"meta-data\" timeout=\"15\" />\n"
	" </actions>\n"
	" <special tag=\"heartbeat\">\n"
	" <version>2.0</version>\n" " </special>\n" "</resource-agent>\n";

	bool stonith_dispatch(stonith_t * st);
	int stonith_dispatch_internal(const char *buffer, ssize_t length, gpointer userdata);
	void stonith_perform_callback(stonith_t * stonith, xmlNode * msg, int call_id, int rc);
	xmlNode stonith_create_op(int call_id, const char token, const char op, xmlNode data,
	int call_options);
	int stonith_send_command(stonith_t * stonith, const char op, xmlNode data,
	xmlNode ** output_data, int call_options, int timeout);

	static void stonith_connection_destroy(gpointer user_data);
	static void stonith_send_notification(gpointer data, gpointer user_data);

	static void
	stonith_connection_destroy(gpointer user_data)
	{
	stonith_t *stonith = user_data;
	stonith_private_t *native = NULL;
	struct notify_blob_s blob;

	crm_trace("Sending destroyed notification");
	blob.stonith = stonith;
	blob.xml = create_xml_node(NULL, "notify");

	native = stonith->private;
	native->ipc = NULL;
	native->source = NULL;

	stonith->state = stonith_disconnected;
	crm_xml_add(blob.xml, F_TYPE, T_STONITH_NOTIFY);
	crm_xml_add(blob.xml, F_SUBTYPE, T_STONITH_NOTIFY_DISCONNECT);

	g_list_foreach(native->notify_list, stonith_send_notification, &blob);
	free_xml(blob.xml);
	}

	xmlNode *
	create_device_registration_xml(const char id, const char namespace, const char *agent,
	stonith_key_value_t * params)
	{
	xmlNode *data = create_xml_node(NULL, F_STONITH_DEVICE);
	xmlNode *args = create_xml_node(data, XML_TAG_ATTRS);

	crm_xml_add(data, XML_ATTR_ID, id);
	crm_xml_add(data, "origin", __FUNCTION__);
	crm_xml_add(data, "agent", agent);
	crm_xml_add(data, "namespace", namespace);

	for (; params; params = params->next) {
	hash2field((gpointer) params->key, (gpointer) params->value, args);
	}

	return data;
	}

	static int
	stonith_api_register_device(stonith_t * st, int call_options,
	const char id, const char namespace, const char *agent,
	stonith_key_value_t * params)
	{
	int rc = 0;
	xmlNode *data = NULL;

	#if HAVE_STONITH_STONITH_H
	namespace = get_stonith_provider(agent, namespace);
	if (safe_str_eq(namespace, "heartbeat")) {
	stonith_key_value_add(params, "plugin", agent);
	agent = "fence_legacy";
	}
	#endif

	data = create_device_registration_xml(id, namespace, agent, params);

	rc = stonith_send_command(st, STONITH_OP_DEVICE_ADD, data, NULL, call_options, 0);
	free_xml(data);

	return rc;
	}

	static int
	stonith_api_remove_device(stonith_t * st, int call_options, const char *name)
	{
	int rc = 0;
	xmlNode *data = NULL;

	data = create_xml_node(NULL, F_STONITH_DEVICE);
	crm_xml_add(data, "origin", __FUNCTION__);
	crm_xml_add(data, XML_ATTR_ID, name);
	rc = stonith_send_command(st, STONITH_OP_DEVICE_DEL, data, NULL, call_options, 0);
	free_xml(data);

	return rc;
	}

	static int
	stonith_api_remove_level(stonith_t * st, int options, const char *node, int level)
	{
	int rc = 0;
	xmlNode *data = NULL;

	data = create_xml_node(NULL, F_STONITH_LEVEL);
	crm_xml_add(data, "origin", __FUNCTION__);
	crm_xml_add(data, F_STONITH_TARGET, node);
	crm_xml_add_int(data, XML_ATTR_ID, level);
	rc = stonith_send_command(st, STONITH_OP_LEVEL_DEL, data, NULL, options, 0);
	free_xml(data);

	return rc;
	}

	xmlNode *
	create_level_registration_xml(const char node, int level, stonith_key_value_t device_list)
	{
	xmlNode *data = create_xml_node(NULL, F_STONITH_LEVEL);

	crm_xml_add_int(data, XML_ATTR_ID, level);
	crm_xml_add(data, F_STONITH_TARGET, node);
	crm_xml_add(data, "origin", __FUNCTION__);

	for (; device_list; device_list = device_list->next) {
	xmlNode *dev = create_xml_node(data, F_STONITH_DEVICE);

	crm_xml_add(dev, XML_ATTR_ID, device_list->value);
	}

	return data;
	}

	static int
	stonith_api_register_level(stonith_t * st, int options, const char *node, int level,
	stonith_key_value_t * device_list)
	{
	int rc = 0;
	xmlNode *data = create_level_registration_xml(node, level, device_list);

	rc = stonith_send_command(st, STONITH_OP_LEVEL_ADD, data, NULL, options, 0);
	free_xml(data);

	return rc;
	}

	static void
	append_arg(gpointer key, gpointer value, gpointer user_data)
	{
	int len = 3; /* =, \n, \0 */
	int last = 0;
	char **args = user_data;

	CRM_CHECK(key != NULL, return);
	CRM_CHECK(value != NULL, return);

	if (strstr(key, "pcmk_")) {
	return;
	} else if (strstr(key, CRM_META)) {
	return;
	} else if (safe_str_eq(key, "crm_feature_set")) {
	return;
	}

	len += strlen(key);
	len += strlen(value);
	if (*args != NULL) {
	last = strlen(*args);
	}

	args = realloc(args, last + len);
	crm_trace("Appending: %s=%s", (char )key, (char )value);
	sprintf((args) + last, "%s=%s\n", (char )key, (char *)value);
	}

	static void
	append_const_arg(const char key, const char value, char **arg_list)
	{
	char *glib_sucks_key = strdup(key);
	char *glib_sucks_value = strdup(value);

	append_arg(glib_sucks_key, glib_sucks_value, arg_list);

	free(glib_sucks_value);
	free(glib_sucks_key);
	}

	static void
	append_host_specific_args(const char victim, const char map, GHashTable * params, char **arg_list)
	{
	char *name = NULL;
	int last = 0, lpc = 0, max = 0;

	if (map == NULL) {
	/* The best default there is for now... */
	crm_debug("Using default arg map: port=uname");
	append_const_arg("port", victim, arg_list);
	return;
	}

	max = strlen(map);
	crm_debug("Processing arg map: %s", map);
	for (; lpc < max + 1; lpc++) {
	if (isalpha(map[lpc])) {
	/* keep going */

	} else if (map[lpc] == '=' \|\| map[lpc] == ':') {
	free(name);
	name = calloc(1, 1 + lpc - last);
	memcpy(name, map + last, lpc - last);
	crm_debug("Got name: %s", name);
	last = lpc + 1;

	} else if (map[lpc] == 0 \|\| map[lpc] == ',' \|\| isspace(map[lpc])) {
	char *param = NULL;
	const char *value = NULL;

	param = calloc(1, 1 + lpc - last);
	memcpy(param, map + last, lpc - last);
	last = lpc + 1;

	crm_debug("Got key: %s", param);
	if (name == NULL) {
	crm_err("Misparsed '%s', found '%s' without a name", map, param);
	free(param);
	continue;
	}

	if (safe_str_eq(param, "uname")) {
	value = victim;
	} else {
	char *key = crm_meta_name(param);

	value = g_hash_table_lookup(params, key);
	free(key);
	}

	if (value) {
	crm_debug("Setting '%s'='%s' (%s) for %s", name, value, param, victim);
	append_const_arg(name, value, arg_list);

	} else {
	crm_err("No node attribute '%s' for '%s'", name, victim);
	}

	free(name);
	name = NULL;
	free(param);
	if (map[lpc] == 0) {
	break;
	}

	} else if (isspace(map[lpc])) {
	last = lpc;
	}
	}
	free(name);
	}

	static char *
	make_args(const char action, const char victim, GHashTable * device_args, GHashTable * port_map)
	{
	char buffer[512];
	char *arg_list = NULL;
	const char *value = NULL;

	CRM_CHECK(action != NULL, return NULL);

	if (device_args) {
	g_hash_table_foreach(device_args, append_arg, &arg_list);
	}

	buffer[511] = 0;
	snprintf(buffer, 511, "pcmk_%s_action", action);
	if (device_args) {
	value = g_hash_table_lookup(device_args, buffer);
	}

	if (value == NULL && device_args) {
	/* Legacy support for early 1.1 releases - Remove for 1.4 */
	snprintf(buffer, 511, "pcmk_%s_cmd", action);
	value = g_hash_table_lookup(device_args, buffer);
	}

	if (value == NULL && device_args && safe_str_eq(action, "off")) {
	/* Legacy support for late 1.1 releases - Remove for 1.4 */
	value = g_hash_table_lookup(device_args, "pcmk_poweroff_action");
	}

	if (value) {
	crm_info("Substituting action '%s' for requested operation '%s'", value, action);
	action = value;
	}

	append_const_arg(STONITH_ATTR_ACTION_OP, action, &arg_list);
	if (victim && device_args) {
	const char *alias = victim;
	const char *param = g_hash_table_lookup(device_args, STONITH_ATTR_HOSTARG);

	if (port_map && g_hash_table_lookup(port_map, victim)) {
	alias = g_hash_table_lookup(port_map, victim);
	}

	/* Always supply the node's name too:
	* https://fedorahosted.org/cluster/wiki/FenceAgentAPI
	*/
	append_const_arg("nodename", victim, &arg_list);

	/* Check if we need to supply the victim in any other form */
	if (param == NULL) {
	const char *map = g_hash_table_lookup(device_args, STONITH_ATTR_ARGMAP);

	if (map == NULL) {
	param = "port";
	value = g_hash_table_lookup(device_args, param);

	} else {
	/* Legacy handling */
	append_host_specific_args(alias, map, device_args, &arg_list);
	value = map; /* Nothing more to do */
	}

	} else if (safe_str_eq(param, "none")) {
	value = param; /* Nothing more to do */

	} else {
	value = g_hash_table_lookup(device_args, param);
	}

	/* Don't overwrite explictly set values for $param */
	if (value == NULL \|\| safe_str_eq(value, "dynamic")) {
	crm_debug("Performing %s action for node '%s' as '%s=%s'", action, victim, param,
	alias);
	append_const_arg(param, alias, &arg_list);
	}
	}

	crm_trace("Calculated: %s", arg_list);
	return arg_list;
	}

	static gboolean
	st_child_term(gpointer data)
	{
	int rc = 0;
	stonith_action_t *track = data;
	crm_info("Child %d timed out, sending SIGTERM", track->pid);
	track->timer_sigterm = 0;
	track->last_timeout_signo = SIGTERM;
	rc = kill(track->pid, SIGTERM);
	if(rc < 0) {
	crm_perror(LOG_ERR, "Couldn't send SIGTERM to %d", track->pid);
	}
	return FALSE;
	}

	static gboolean
	st_child_kill(gpointer data)
	{
	int rc = 0;
	stonith_action_t *track = data;
	crm_info("Child %d timed out, sending SIGKILL", track->pid);
	track->timer_sigkill = 0;
	track->last_timeout_signo = SIGKILL;
	rc = kill(track->pid, SIGKILL);
	if(rc < 0) {
	crm_perror(LOG_ERR, "Couldn't send SIGKILL to %d", track->pid);
	}
	return FALSE;
	}

	static void
	stonith_action_destroy(stonith_action_t *action)
	{

	if (action->timer_sigterm > 0) {
	g_source_remove(action->timer_sigterm);
	}
	if (action->timer_sigkill > 0) {
	g_source_remove(action->timer_sigkill);
	}

	if (action->fd_stdout) {
	close(action->fd_stdout);
	}
	free(action->agent);
	free(action->args);
	free(action->output);
	free(action->action);
	free(action->victim);
	free(action);
	}

	stonith_action_t *
	stonith_action_create(const char *agent,
	const char *_action,
	const char *victim,
	int timeout,
	GHashTable * device_args,
	GHashTable * port_map)
	{
	stonith_action_t *action;

	action = calloc(1, sizeof(stonith_action_t));
	crm_info("Initiating action %s for agent %s (target=%s)", _action, agent, victim);
	action->args = make_args(_action, victim, device_args, port_map);
	action->agent = strdup(agent);
	action->action = strdup(_action);
	if (victim) {
	action->victim = strdup(victim);
	}
	action->timeout = timeout;

	return action;
	}

	#define READ_MAX 500
	static char*
	read_output(int fd)
	{
	char buffer[READ_MAX];
	char *output = NULL;
	int len = 0;
	int more = 0;

	if (!fd) {
	return NULL;
	}

	do {
	errno = 0;
	memset(&buffer, 0, READ_MAX);
	more = read(fd, buffer, READ_MAX-1);

	if (more > 0) {
	crm_trace("Got %d more bytes: %s", more, buffer);
	output = realloc(output, len + more + 1);
	sprintf(output+len, "%s", buffer);
	len += more;
	}

	} while (more == (READ_MAX-1) \|\| (more < 0 && errno == EINTR));

	return output;
	}

	static void
	stonith_action_async_done(GPid pid, gint status, gpointer user_data)
	{
	int rc = -pcmk_err_generic;
	stonith_action_t *action = user_data;

	if (action->timer_sigterm > 0) {
	g_source_remove(action->timer_sigterm);
	}
	if (action->timer_sigkill > 0) {
	g_source_remove(action->timer_sigkill);
	}

	if(action->last_timeout_signo) {
	rc = -ETIME;
	crm_notice("Child process %d performing action '%s' timed out with signal %d",
	pid, action->action, action->last_timeout_signo);
	} else if(WIFSIGNALED(status)) {
	int signo = WTERMSIG(status);
	rc = -ECONNABORTED;
	crm_notice("Child process %d performing action '%s' timed out with signal %d",
	pid, action->action, signo);
	} else if(WIFEXITED(status)) {
	rc = WEXITSTATUS(status);
	crm_debug("Child process %d performing action '%s' exited with rc %d",
	pid, action->action, rc);
	}

	action->rc = rc;
	action->output = read_output(action->fd_stdout);

	if (action->done_cb) {
	action->done_cb(pid, action->rc, action->output, action->userdata);
	}

	stonith_action_destroy(action);
	}

	static int
	internal_stonith_action_execute(stonith_action_t *action)
	{
	int pid, status, len, rc = -EPROTO;
	int ret;
	int total = 0;
	int p_read_fd, p_write_fd; /* parent read/write file descriptors */
	int c_read_fd, c_write_fd; /* child read/write file descriptors */
	int fd1[2];
	int fd2[2];

	c_read_fd = c_write_fd = p_read_fd = p_write_fd = -1;

	if (action->args == NULL \|\| action->agent == NULL)
	goto fail;
	len = strlen(action->args);

	if (pipe(fd1))
	goto fail;
	p_read_fd = fd1[0];
	c_write_fd = fd1[1];

	if (pipe(fd2))
	goto fail;
	c_read_fd = fd2[0];
	p_write_fd = fd2[1];

	crm_debug("forking");
	pid = fork();
	if (pid < 0) {
	rc = -ECHILD;
	goto fail;
	}

	if (!pid) {
	/* child */

	close(1);
	/* coverity[leaked_handle] False positive */
	if (dup(c_write_fd) < 0)
	goto fail;
	close(2);
	/* coverity[leaked_handle] False positive */
	if (dup(c_write_fd) < 0)
	goto fail;
	close(0);
	/* coverity[leaked_handle] False positive */
	if (dup(c_read_fd) < 0)
	goto fail;

	/* keep c_write_fd open so parent can report all errors. */
	close(c_read_fd);
	close(p_read_fd);
	close(p_write_fd);

	execlp(action->agent, action->agent, NULL);
	exit(EXIT_FAILURE);
	}

	/* parent */
	action->pid = pid;
	ret = fcntl(p_read_fd, F_SETFL, fcntl(p_read_fd, F_GETFL, 0) \| O_NONBLOCK);
	if(ret < 0) {
	crm_perror(LOG_NOTICE, "Could not change the output of %s to be non-blocking", action->agent);
	}

	do {
	crm_debug("sending args");
	ret = write(p_write_fd, action->args + total, len - total);
	if (ret > 0) {
	total += ret;
	}

	} while (errno == EINTR && total < len);

	if (total != len) {
	crm_perror(LOG_ERR, "Sent %d not %d bytes", total, len);
	if (ret >= 0) {
	rc = -EREMOTEIO;
	}
	goto fail;
	}

	close(p_write_fd);

	/* async */
	if (action->async) {
	action->fd_stdout = p_read_fd;
	g_child_watch_add(pid, stonith_action_async_done, action);
	crm_trace("Op: %s on %s, pid: %d, timeout: %ds", action->action, action->agent, pid, action->timeout);
	action->last_timeout_signo = 0;
	if (action->timeout) {
	action->timer_sigterm = g_timeout_add(1000*action->timeout, st_child_term, action);
	action->timer_sigkill = g_timeout_add(1000*(action->timeout+5), st_child_kill, action);
	} else {
	crm_err("No timeout set for stonith operation %s with device %s",
	action->action, action->agent);
	}

	close(c_write_fd);
	close(c_read_fd);
	return 0;

	} else {
	/* sync */
	int timeout = action->timeout + 1;
	pid_t p = 0;

	while (action->timeout < 0 \|\| timeout > 0) {
	p = waitpid(pid, &status, WNOHANG);
	if (p > 0) {
	break;
	}
	sleep(1);
	timeout--;
	};

	if (timeout == 0) {
	int killrc = kill(pid, 9 /SIGKILL/);

	if (killrc && errno != ESRCH) {
	crm_err("kill(%d, KILL) failed: %d", pid, errno);
	}
	}

	if (p <= 0) {
	crm_perror(LOG_ERR, "waitpid(%d)", pid);

	} else if (p != pid) {
	crm_err("Waited for %d, got %d", pid, p);
	}

	action->output = read_output(p_read_fd);

	action->rc = rc = -ECONNABORTED;
	if (timeout == 0) {
	action->rc = -ETIME;
	} else if (WIFEXITED(status)) {
	crm_debug("result = %d", WEXITSTATUS(status));
	action->rc = -WEXITSTATUS(status);
	rc = 0;

	} else if (WIFSIGNALED(status)) {
	crm_err("call %s for %s exited due to signal %d", action->action, action->agent, WTERMSIG(status));

	} else {
	crm_err("call %s for %s exited abnormally. stopped=%d, continued=%d",
	action->action, action->agent, WIFSTOPPED(status), WIFCONTINUED(status));
	}
	}

	fail:

	if (p_read_fd >= 0) {
	close(p_read_fd);
	}
	if (p_write_fd >= 0) {
	close(p_write_fd);
	}

	if (c_read_fd >= 0) {
	close(c_read_fd);
	}
	if (c_write_fd >= 0) {
	close(c_write_fd);
	}

	return rc;
	}

	GPid
	stonith_action_execute_async(stonith_action_t *action,
	void *userdata,
	void (done)(GPid pid, int rc, const char output, gpointer user_data))
	{
	int rc = 0;

	if (!action) {
	return -1;
	}

	action->userdata = userdata;
	action->done_cb = done;
	action->async = 1;

	rc = internal_stonith_action_execute(action);

	return rc ? rc : action->pid;
	}

	int
	stonith_action_execute(stonith_action_t *action,
	int *agent_result,
	char **output)
	{
	int rc = 0;

	if (!action) {
	return -1;
	}

	rc = internal_stonith_action_execute(action);
	if (rc) {
	/* error */
	return rc;
	}

	if (agent_result) {
	*agent_result = action->rc;
	}
	if (output) {
	*output = action->output;
	action->output = NULL; /* handed it off, do not free */
	}

	stonith_action_destroy(action);
	return rc;
	}

	static int
	stonith_api_device_list(stonith_t * stonith, int call_options, const char *namespace,
	stonith_key_value_t ** devices, int timeout)
	{
	int count = 0;

	if (devices == NULL) {
	crm_err("Parameter error: stonith_api_device_list");
	return -EFAULT;
	}

	/* Include Heartbeat agents */
	if (namespace == NULL \|\| safe_str_eq("heartbeat", namespace)) {
	#if HAVE_STONITH_STONITH_H
	static gboolean need_init = TRUE;

	char **entry = NULL;
	char **type_list = NULL;
	static char *(type_list_fn) (void) = NULL;
	static void (type_free_fn) (char *) = NULL;

	if(need_init) {
	need_init = FALSE;
	type_list_fn = find_library_function(&lha_agents_lib, LHA_STONITH_LIBRARY, "stonith_types", FALSE);
	type_free_fn = find_library_function(&lha_agents_lib, LHA_STONITH_LIBRARY, "stonith_free_hostlist", FALSE);
	}

	if(type_list_fn) {
	type_list = (*type_list_fn)();
	}

	for (entry = type_list; entry != NULL && *entry; ++entry) {
	crm_trace("Added: %s", *entry);
	devices = stonith_key_value_add(devices, NULL, *entry);
	count++;
	}
	if (type_list && type_free_fn) {
	(*type_free_fn)(type_list);
	}
	#else
	if(namespace != NULL) {
	return -EINVAL; /* Heartbeat agents not supported */
	}
	#endif
	}

	/* Include Red Hat agents, basically: ls -1 @sbin_dir@/fence_* */
	if (namespace == NULL \|\| safe_str_eq("redhat", namespace)) {
	struct dirent **namelist;
	int file_num = scandir(RH_STONITH_DIR, &namelist, 0, alphasort);

	if (file_num > 0) {
	struct stat prop;
	char buffer[FILENAME_MAX + 1];

	while (file_num--) {
	if ('.' == namelist[file_num]->d_name[0]) {
	free(namelist[file_num]);
	continue;

	} else if (0 != strncmp(RH_STONITH_PREFIX,
	namelist[file_num]->d_name, strlen(RH_STONITH_PREFIX))) {
	free(namelist[file_num]);
	continue;
	}

	snprintf(buffer, FILENAME_MAX, "%s/%s", RH_STONITH_DIR, namelist[file_num]->d_name);
	if (stat(buffer, &prop) == 0 && S_ISREG(prop.st_mode)) {
	devices = stonith_key_value_add(devices, NULL, namelist[file_num]->d_name);
	count++;
	}

	free(namelist[file_num]);
	}
	free(namelist);
	}
	}

	return count;
	}

	static int
	stonith_api_device_metadata(stonith_t * stonith, int call_options, const char *agent,
	const char namespace, char *output, int timeout)
	{
	int rc = 0;
	char *buffer = NULL;
	const char *provider = get_stonith_provider(agent, namespace);

	crm_trace("looking up %s/%s metadata", agent, provider);

	/* By having this in a library, we can access it from stonith_admin
	* when neither lrmd or stonith-ng are running
	* Important for the crm shell's validations...
	*/

	if (safe_str_eq(provider, "redhat")) {
	stonith_action_t *action = stonith_action_create(agent, "metadata", NULL, 5, NULL, NULL);
	int exec_rc = stonith_action_execute(action, &rc, &buffer);

	if (exec_rc < 0 \|\| rc != 0 \|\| buffer == NULL) {
	crm_debug("Query failed: %d %d: %s", exec_rc, rc, crm_str(buffer));
	free(buffer); /* Just in case */
	return -EINVAL;

	} else {

	xmlNode *xml = string2xml(buffer);
	xmlNode *actions = NULL;
	xmlXPathObject *xpathObj = NULL;

	xpathObj = xpath_search(xml, "//actions");
	if (xpathObj && xpathObj->nodesetval->nodeNr > 0) {
	actions = getXpathResult(xpathObj, 0);
	}

	/* Now fudge the metadata so that the start/stop actions appear */
	xpathObj = xpath_search(xml, "//action[@name='stop']");
	if (xpathObj == NULL \|\| xpathObj->nodesetval->nodeNr <= 0) {
	xmlNode *tmp = NULL;

	tmp = create_xml_node(actions, "action");
	crm_xml_add(tmp, "name", "stop");
	crm_xml_add(tmp, "timeout", "20s");

	tmp = create_xml_node(actions, "action");
	crm_xml_add(tmp, "name", "start");
	crm_xml_add(tmp, "timeout", "20s");
	}

	/* Now fudge the metadata so that the port isn't required in the configuration */
	xpathObj = xpath_search(xml, "//parameter[@name='port']");
	if (xpathObj && xpathObj->nodesetval->nodeNr > 0) {
	/* We'll fill this in */
	xmlNode *tmp = getXpathResult(xpathObj, 0);

	crm_xml_add(tmp, "required", "0");
	}

	free(buffer);
	buffer = dump_xml_formatted(xml);
	free_xml(xml);
	}

	} else {
	#if !HAVE_STONITH_STONITH_H
	return -EINVAL; /* Heartbeat agents not supported */
	#else
	int bufferlen = 0;
	static const char *no_parameter_info = "<!-- no value -->";

	Stonith *stonith_obj = NULL;

	static gboolean need_init = TRUE;
	static Stonith (st_new_fn) (const char *) = NULL;
	static const char (st_info_fn) (Stonith *, int) = NULL;
	static void (st_del_fn) (Stonith ) = NULL;

	if(need_init) {
	need_init = FALSE;
	st_new_fn = find_library_function(&lha_agents_lib, LHA_STONITH_LIBRARY, "stonith_new", FALSE);
	st_del_fn = find_library_function(&lha_agents_lib, LHA_STONITH_LIBRARY, "stonith_delete", FALSE);
	st_info_fn = find_library_function(&lha_agents_lib, LHA_STONITH_LIBRARY, "stonith_get_info", FALSE);
	}

	if (lha_agents_lib && st_new_fn && st_del_fn && st_info_fn) {
	char *xml_meta_longdesc = NULL;
	char *xml_meta_shortdesc = NULL;

	char *meta_param = NULL;
	char *meta_longdesc = NULL;
	char *meta_shortdesc = NULL;

	stonith_obj = (*st_new_fn) (agent);
	if(stonith_obj) {
	meta_longdesc = strdup((*st_info_fn)(stonith_obj, ST_DEVICEDESCR));
	if (meta_longdesc == NULL) {
	crm_warn("no long description in %s's metadata.", agent);
	meta_longdesc = strdup(no_parameter_info);
	}

	meta_shortdesc = strdup((*st_info_fn)(stonith_obj, ST_DEVICEID));
	if (meta_shortdesc == NULL) {
	crm_warn("no short description in %s's metadata.", agent);
	meta_shortdesc = strdup(no_parameter_info);
	}

	meta_param = strdup((*st_info_fn)(stonith_obj, ST_CONF_XML));
	if (meta_param == NULL) {
	crm_warn("no list of parameters in %s's metadata.", agent);
	meta_param = strdup(no_parameter_info);
	}
	(*st_del_fn)(stonith_obj);
	} else {
	return -EINVAL; /* Heartbeat agents not supported */
	}

	xml_meta_longdesc =
	(char )xmlEncodeEntitiesReentrant(NULL, (const unsigned char )meta_longdesc);
	xml_meta_shortdesc =
	(char )xmlEncodeEntitiesReentrant(NULL, (const unsigned char )meta_shortdesc);

	bufferlen = strlen(META_TEMPLATE) + strlen(agent)
	+ strlen(xml_meta_longdesc) + strlen(xml_meta_shortdesc)
	+ strlen(meta_param) + 1;

	buffer = calloc(1, bufferlen);
	snprintf(buffer, bufferlen - 1, META_TEMPLATE,
	agent, xml_meta_longdesc, xml_meta_shortdesc, meta_param);

	xmlFree(xml_meta_longdesc);
	xmlFree(xml_meta_shortdesc);

	free(meta_shortdesc);
	free(meta_longdesc);
	free(meta_param);
	}
	#endif
	}

	if (output) {
	*output = buffer;

	} else {
	free(buffer);
	}

	return rc;
	}

	static int
	stonith_api_query(stonith_t * stonith, int call_options, const char *target,
	stonith_key_value_t ** devices, int timeout)
	{
	int rc = 0, lpc = 0, max = 0;

	xmlNode *data = NULL;
	xmlNode *output = NULL;
	xmlXPathObjectPtr xpathObj = NULL;

	CRM_CHECK(devices != NULL, return -EINVAL);

	data = create_xml_node(NULL, F_STONITH_DEVICE);
	crm_xml_add(data, "origin", __FUNCTION__);
	crm_xml_add(data, F_STONITH_TARGET, target);
	rc = stonith_send_command(stonith, STONITH_OP_QUERY, data, &output, call_options, timeout);

	if (rc < 0) {
	return rc;
	}

	xpathObj = xpath_search(output, "//@agent");
	if (xpathObj) {
	max = xpathObj->nodesetval->nodeNr;

	for (lpc = 0; lpc < max; lpc++) {
	xmlNode *match = getXpathResult(xpathObj, lpc);

	CRM_CHECK(match != NULL, continue);

	crm_info("%s[%d] = %s", "//@agent", lpc, xmlGetNodePath(match));
	devices = stonith_key_value_add(devices, NULL, crm_element_value(match, XML_ATTR_ID));
	}
	}

	free_xml(output);
	free_xml(data);
	return max;
	}

	static int
	stonith_api_call(stonith_t * stonith,
	int call_options,
	const char *id,
	const char *action,
	const char *victim,
	int timeout,
	xmlNode **output)
	{
	int rc = 0;
	xmlNode *data = NULL;

	data = create_xml_node(NULL, F_STONITH_DEVICE);
	crm_xml_add(data, "origin", __FUNCTION__);
	crm_xml_add(data, F_STONITH_DEVICE, id);
	crm_xml_add(data, F_STONITH_ACTION, action);
	crm_xml_add(data, F_STONITH_TARGET, victim);

	rc = stonith_send_command(stonith, STONITH_OP_EXEC, data, output, call_options, timeout);
	free_xml(data);

	return rc;
	}

	static int
	stonith_api_list(stonith_t * stonith, int call_options, const char id, char *list_info, int timeout)
	{
	int rc;
	xmlNode *output = NULL;

	rc = stonith_api_call(stonith, call_options, id, "list", NULL, timeout, &output);

	if (output && list_info) {
	const char *list_str;

	list_str = crm_element_value(output, "st_output");

	if (list_str) {
	*list_info = strdup(list_str);
	}
	}

	if (output) {
	free_xml(output);
	}

	return rc;
	}

	static int
	stonith_api_monitor(stonith_t * stonith, int call_options, const char *id, int timeout)
	{
	return stonith_api_call(stonith, call_options, id, "monitor", NULL, timeout, NULL);
	}

	static int
	stonith_api_status(stonith_t * stonith, int call_options, const char id, const char port, int timeout)
	{
	return stonith_api_call(stonith, call_options, id, "status", port, timeout, NULL);
	}

	static int
	stonith_api_fence(stonith_t * stonith, int call_options, const char node, const char action,
	- int timeout)
	+ int timeout, int tolerance)
	{
	int rc = 0;
	xmlNode *data = NULL;

	data = create_xml_node(NULL, __FUNCTION__);
	crm_xml_add(data, F_STONITH_TARGET, node);
	crm_xml_add(data, F_STONITH_ACTION, action);
	crm_xml_add_int(data, F_STONITH_TIMEOUT, timeout);
	+ crm_xml_add_int(data, F_STONITH_TOLERANCE, tolerance);

	rc = stonith_send_command(stonith, STONITH_OP_FENCE, data, NULL, call_options, timeout);
	free_xml(data);

	return rc;
	}

	static int
	stonith_api_confirm(stonith_t * stonith, int call_options, const char *target)
	{
	- return stonith_api_fence(stonith, call_options \| st_opt_manual_ack, target, "off", 0);
	+ return stonith_api_fence(stonith, call_options \| st_opt_manual_ack, target, "off", 0, 0);
	}

	static int
	stonith_api_history(stonith_t * stonith, int call_options, const char *node,
	stonith_history_t ** history, int timeout)
	{
	int rc = 0;
	xmlNode *data = NULL;
	xmlNode *output = NULL;
	stonith_history_t *last = NULL;

	*history = NULL;

	if (node) {
	data = create_xml_node(NULL, __FUNCTION__);
	crm_xml_add(data, F_STONITH_TARGET, node);
	}

	rc = stonith_send_command(stonith, STONITH_OP_FENCE_HISTORY, data, &output,
	call_options \| st_opt_sync_call, timeout);
	free_xml(data);

	if (rc == 0) {
	xmlNode *op = NULL;
	xmlNode *reply = get_xpath_object("//" F_STONITH_HISTORY_LIST, output, LOG_ERR);

	for (op = __xml_first_child(reply); op != NULL; op = __xml_next(op)) {
	stonith_history_t *kvp;

	kvp = calloc(1, sizeof(stonith_history_t));
	kvp->target = crm_element_value_copy(op, F_STONITH_TARGET);
	kvp->action = crm_element_value_copy(op, F_STONITH_ACTION);
	kvp->origin = crm_element_value_copy(op, F_STONITH_ORIGIN);
	kvp->delegate = crm_element_value_copy(op, F_STONITH_DELEGATE);
	crm_element_value_int(op, F_STONITH_DATE, &kvp->completed);
	crm_element_value_int(op, F_STONITH_STATE, &kvp->state);

	if (last) {
	last->next = kvp;
	} else {
	*history = kvp;
	}
	last = kvp;
	}
	}
	return rc;
	}

	gboolean
	is_redhat_agent(const char *agent)
	{
	int rc = 0;
	struct stat prop;
	char buffer[FILENAME_MAX + 1];

	snprintf(buffer, FILENAME_MAX, "%s/%s", RH_STONITH_DIR, agent);
	rc = stat(buffer, &prop);
	if (rc >= 0 && S_ISREG(prop.st_mode)) {
	return TRUE;
	}
	return FALSE;
	}

	const char *
	get_stonith_provider(const char agent, const char provider)
	{
	/* This function sucks */
	if (is_redhat_agent(agent)) {
	return "redhat";

	#if HAVE_STONITH_STONITH_H
	} else {
	Stonith *stonith_obj = NULL;

	static gboolean need_init = TRUE;
	static Stonith (st_new_fn) (const char *) = NULL;
	static void (st_del_fn) (Stonith ) = NULL;

	if(need_init) {
	need_init = FALSE;
	st_new_fn = find_library_function(&lha_agents_lib, LHA_STONITH_LIBRARY, "stonith_new", FALSE);
	st_del_fn = find_library_function(&lha_agents_lib, LHA_STONITH_LIBRARY, "stonith_delete", FALSE);
	}

	if (lha_agents_lib && st_new_fn && st_del_fn) {
	stonith_obj = (*st_new_fn) (agent);
	if(stonith_obj) {
	(*st_del_fn)(stonith_obj);
	return "heartbeat";
	}
	}
	#endif
	}

	crm_err("No such device: %s", agent);
	return NULL;
	}

	static gint
	stonithlib_GCompareFunc(gconstpointer a, gconstpointer b)
	{
	int rc = 0;
	const stonith_notify_client_t *a_client = a;
	const stonith_notify_client_t *b_client = b;

	CRM_CHECK(a_client->event != NULL && b_client->event != NULL, return 0);
	rc = strcmp(a_client->event, b_client->event);
	if (rc == 0) {
	if (a_client->notify == NULL \|\| b_client->notify == NULL) {
	return 0;

	} else if (a_client->notify == b_client->notify) {
	return 0;

	} else if (((long)a_client->notify) < ((long)b_client->notify)) {
	crm_err("callbacks for %s are not equal: %p vs. %p",
	a_client->event, a_client->notify, b_client->notify);
	return -1;
	}
	crm_err("callbacks for %s are not equal: %p vs. %p",
	a_client->event, a_client->notify, b_client->notify);
	return 1;
	}
	return rc;
	}

	xmlNode *
	stonith_create_op(int call_id, const char token, const char op, xmlNode * data, int call_options)
	{
	xmlNode *op_msg = create_xml_node(NULL, "stonith_command");

	CRM_CHECK(op_msg != NULL, return NULL);
	CRM_CHECK(token != NULL, return NULL);

	crm_xml_add(op_msg, F_XML_TAGNAME, "stonith_command");

	crm_xml_add(op_msg, F_TYPE, T_STONITH_NG);
	crm_xml_add(op_msg, F_STONITH_CALLBACK_TOKEN, token);
	crm_xml_add(op_msg, F_STONITH_OPERATION, op);
	crm_xml_add_int(op_msg, F_STONITH_CALLID, call_id);
	crm_trace("Sending call options: %.8lx, %d", (long)call_options, call_options);
	crm_xml_add_int(op_msg, F_STONITH_CALLOPTS, call_options);

	if (data != NULL) {
	add_message_xml(op_msg, F_STONITH_CALLDATA, data);
	}

	return op_msg;
	}

	static void
	stonith_destroy_op_callback(gpointer data)
	{
	stonith_callback_client_t *blob = data;

	if (blob->timer && blob->timer->ref > 0) {
	g_source_remove(blob->timer->ref);
	}
	free(blob->timer);
	free(blob);
	}

	static int
	stonith_api_signoff(stonith_t * stonith)
	{
	stonith_private_t *native = stonith->private;

	crm_debug("Signing out of the STONITH Service");

	if (native->source != NULL) {
	/* Attached to mainloop */
	mainloop_del_ipc_client(native->source);
	native->source = NULL;
	native->ipc = NULL;

	} else if(native->ipc) {
	/* Not attached to mainloop */
	crm_ipc_t *ipc = native->ipc;
	native->ipc = NULL;
	crm_ipc_close(ipc);
	crm_ipc_destroy(ipc);
	}

	stonith->state = stonith_disconnected;
	return pcmk_ok;
	}

	static int
	stonith_api_signon(stonith_t * stonith, const char name, int stonith_fd)
	{
	int rc = pcmk_ok;
	stonith_private_t *native = stonith->private;
	static struct ipc_client_callbacks st_callbacks =
	{
	.dispatch = stonith_dispatch_internal,
	.destroy = stonith_connection_destroy
	};

	crm_trace("Connecting command channel");

	stonith->state = stonith_connected_command;
	if(stonith_fd) {
	/* No mainloop */
	native->ipc = crm_ipc_new("stonith-ng", 0);

	if(native->ipc && crm_ipc_connect(native->ipc)) {
	*stonith_fd = crm_ipc_get_fd(native->ipc);

	} else if(native->ipc) {
	rc = -ENOTCONN;
	}

	} else {
	/* With mainloop */
	native->source = mainloop_add_ipc_client("stonith-ng", G_PRIORITY_MEDIUM, 0, stonith, &st_callbacks);
	native->ipc = mainloop_get_ipc_client(native->source);
	}

	if (native->ipc == NULL) {
	crm_debug("Could not connect to the Stonith API");
	rc = -ENOTCONN;
	}

	if (rc == pcmk_ok) {
	xmlNode *reply = NULL;
	xmlNode *hello = create_xml_node(NULL, "stonith_command");

	crm_xml_add(hello, F_TYPE, T_STONITH_NG);
	crm_xml_add(hello, F_STONITH_OPERATION, CRM_OP_REGISTER);
	crm_xml_add(hello, F_STONITH_CLIENTNAME, name);
	rc = crm_ipc_send(native->ipc, hello, crm_ipc_client_response, -1, &reply);

	if(rc < 0) {
	crm_perror(LOG_DEBUG, "Couldn't complete registration with the fencing API: %d", rc);
	rc = -ECOMM;

	} else if(reply == NULL) {
	crm_err("Did not receive registration reply");
	rc = -EPROTO;

	} else {
	const char *msg_type = crm_element_value(reply, F_STONITH_OPERATION);
	const char *tmp_ticket = crm_element_value(reply, F_STONITH_CLIENTID);

	if (safe_str_neq(msg_type, CRM_OP_REGISTER)) {
	crm_err("Invalid registration message: %s", msg_type);
	crm_log_xml_err(reply, "Bad reply");
	rc = -EPROTO;

	} else if (tmp_ticket == NULL) {
	crm_err("No registration token provided");
	crm_log_xml_err(reply, "Bad reply");
	rc = -EPROTO;

	} else {
	crm_trace("Obtained registration token: %s", tmp_ticket);
	native->token = strdup(tmp_ticket);
	rc = pcmk_ok;
	}
	}

	free_xml(reply);
	free_xml(hello);
	}

	if (rc == pcmk_ok) {
	#if HAVE_MSGFROMIPC_TIMEOUT
	stonith->call_timeout = MAX_IPC_DELAY;
	#endif
	crm_debug("Connection to STONITH successful");
	return pcmk_ok;
	}

	crm_debug("Connection to STONITH failed: %s", pcmk_strerror(rc));
	stonith->cmds->disconnect(stonith);
	return rc;
	}

	static int
	stonith_set_notification(stonith_t * stonith, const char *callback, int enabled)
	{
	xmlNode *notify_msg = create_xml_node(NULL, __FUNCTION__);
	stonith_private_t *native = stonith->private;

	if (stonith->state != stonith_disconnected) {
	int rc;

	crm_xml_add(notify_msg, F_STONITH_OPERATION, T_STONITH_NOTIFY);
	if (enabled) {
	crm_xml_add(notify_msg, F_STONITH_NOTIFY_ACTIVATE, callback);
	} else {
	crm_xml_add(notify_msg, F_STONITH_NOTIFY_DEACTIVATE, callback);
	}
	rc = crm_ipc_send(native->ipc, notify_msg, crm_ipc_client_response, -1, NULL);
	if(rc < 0) {
	crm_perror(LOG_DEBUG, "Couldn't register for fencing notifications: %d", rc);
	rc = -ECOMM;
	}
	}

	free_xml(notify_msg);
	return pcmk_ok;
	}

	static int
	stonith_api_add_notification(stonith_t * stonith, const char *event,
	void (callback) (stonith_t stonith, stonith_event_t *e))
	{
	GList *list_item = NULL;
	stonith_notify_client_t *new_client = NULL;
	stonith_private_t *private = NULL;

	private = stonith->private;
	crm_trace("Adding callback for %s events (%d)", event, g_list_length(private->notify_list));

	new_client = calloc(1, sizeof(stonith_notify_client_t));
	new_client->event = event;
	new_client->notify = callback;

	list_item = g_list_find_custom(private->notify_list, new_client, stonithlib_GCompareFunc);

	if (list_item != NULL) {
	crm_warn("Callback already present");
	free(new_client);
	return -ENOTUNIQ;

	} else {
	private->notify_list = g_list_append(private->notify_list, new_client);

	stonith_set_notification(stonith, event, 1);

	crm_trace("Callback added (%d)", g_list_length(private->notify_list));
	}
	return pcmk_ok;
	}

	static int
	stonith_api_del_notification(stonith_t * stonith, const char *event)
	{
	GList *list_item = NULL;
	stonith_notify_client_t *new_client = NULL;
	stonith_private_t *private = NULL;

	crm_debug("Removing callback for %s events", event);

	private = stonith->private;
	new_client = calloc(1, sizeof(stonith_notify_client_t));
	new_client->event = event;
	new_client->notify = NULL;

	list_item = g_list_find_custom(private->notify_list, new_client, stonithlib_GCompareFunc);

	stonith_set_notification(stonith, event, 0);

	if (list_item != NULL) {
	stonith_notify_client_t *list_client = list_item->data;

	private->notify_list = g_list_remove(private->notify_list, list_client);
	free(list_client);

	crm_trace("Removed callback");

	} else {
	crm_trace("Callback not present");
	}
	free(new_client);
	return pcmk_ok;
	}

	static gboolean
	stonith_async_timeout_handler(gpointer data)
	{
	struct timer_rec_s *timer = data;

	crm_err("Async call %d timed out after %dms", timer->call_id, timer->timeout);
	stonith_perform_callback(timer->stonith, NULL, timer->call_id, -ETIME);

	/* Always return TRUE, never remove the handler
	* We do that in stonith_del_callback()
	*/
	return TRUE;
	}

	static void
	set_callback_timeout(stonith_callback_client_t callback, stonith_t stonith, int call_id, int timeout)
	{
	struct timer_rec_s *async_timer = callback->timer;

	if (timeout <= 0) {
	return;
	}

	if (!async_timer) {
	async_timer = calloc(1, sizeof(struct timer_rec_s));
	callback->timer = async_timer;
	}

	async_timer->stonith = stonith;
	async_timer->call_id = call_id;
	/* Allow a fair bit of grace to allow the server to tell us of a timeout
	* This is only a fallback
	*/
	async_timer->timeout = (timeout + 60) * 1000;
	if (async_timer->ref) {
	g_source_remove(async_timer->ref);
	}
	async_timer->ref = g_timeout_add(async_timer->timeout, stonith_async_timeout_handler, async_timer);
	}

	static void
	update_callback_timeout(int call_id, int timeout, stonith_t *st)
	{
	stonith_callback_client_t *callback = NULL;
	stonith_private_t *private = st->private;
	callback = g_hash_table_lookup(private->stonith_op_callback_table, GINT_TO_POINTER(call_id));
	if (!callback \|\| !callback->allow_timeout_updates) {
	return;
	}

	set_callback_timeout(callback, st, call_id, timeout);
	}

	static void
	invoke_callback(stonith_t st, int call_id, int rc, void userdata,
	void (callback) (stonith_t st, stonith_callback_data_t *data))
	{
	stonith_callback_data_t data = { 0, };

	data.call_id = call_id;
	data.rc = rc;
	data.userdata = userdata;

	callback(st, &data);
	}

	static int
	stonith_api_add_callback(stonith_t * stonith, int call_id, int timeout, int options,
	void user_data, const char callback_name,
	void (callback) (stonith_t st, stonith_callback_data_t *data))
	{
	stonith_callback_client_t *blob = NULL;
	stonith_private_t *private = NULL;

	CRM_CHECK(stonith != NULL, return -EINVAL);
	CRM_CHECK(stonith->private != NULL, return -EINVAL);
	private = stonith->private;

	if (call_id == 0) {
	private->op_callback = callback;

	} else if (call_id < 0) {
	if (!(options & st_opt_report_only_success)) {
	crm_trace("Call failed, calling %s: %s",
	callback_name, pcmk_strerror(call_id));
	invoke_callback(stonith, call_id, call_id, user_data, callback);
	} else {
	crm_warn("STONITH call failed: %s", pcmk_strerror(call_id));
	}
	return FALSE;
	}

	blob = calloc(1, sizeof(stonith_callback_client_t));
	blob->id = callback_name;
	blob->only_success = (options & st_opt_report_only_success) ? TRUE : FALSE;
	blob->user_data = user_data;
	blob->callback = callback;
	blob->allow_timeout_updates = (options & st_opt_timeout_updates) ? TRUE : FALSE;

	if (timeout > 0) {
	set_callback_timeout(blob, stonith, call_id, timeout);
	}

	g_hash_table_insert(private->stonith_op_callback_table, GINT_TO_POINTER(call_id), blob);
	crm_trace("Added callback to %s for call %d", callback_name, call_id);

	return TRUE;
	}

	static int
	stonith_api_del_callback(stonith_t * stonith, int call_id, bool all_callbacks)
	{
	stonith_private_t *private = stonith->private;

	if (all_callbacks) {
	private->op_callback = NULL;
	g_hash_table_destroy(private->stonith_op_callback_table);
	private->stonith_op_callback_table = g_hash_table_new_full(g_direct_hash, g_direct_equal,
	NULL,
	stonith_destroy_op_callback);

	} else if (call_id == 0) {
	private->op_callback = NULL;

	} else {
	g_hash_table_remove(private->stonith_op_callback_table, GINT_TO_POINTER(call_id));
	}
	return pcmk_ok;
	}

	static void
	stonith_dump_pending_op(gpointer key, gpointer value, gpointer user_data)
	{
	int call = GPOINTER_TO_INT(key);
	stonith_callback_client_t *blob = value;

	crm_debug("Call %d (%s): pending", call, crm_str(blob->id));
	}

	void
	stonith_dump_pending_callbacks(stonith_t * stonith)
	{
	stonith_private_t *private = stonith->private;

	if (private->stonith_op_callback_table == NULL) {
	return;
	}
	return g_hash_table_foreach(private->stonith_op_callback_table, stonith_dump_pending_op, NULL);
	}

	void
	stonith_perform_callback(stonith_t * stonith, xmlNode * msg, int call_id, int rc)
	{
	stonith_private_t *private = NULL;
	stonith_callback_client_t *blob = NULL;
	stonith_callback_client_t local_blob;

	CRM_CHECK(stonith != NULL, return);
	CRM_CHECK(stonith->private != NULL, return);

	private = stonith->private;

	local_blob.id = NULL;
	local_blob.callback = NULL;
	local_blob.user_data = NULL;
	local_blob.only_success = FALSE;

	if (msg != NULL) {
	crm_element_value_int(msg, F_STONITH_RC, &rc);
	crm_element_value_int(msg, F_STONITH_CALLID, &call_id);
	}

	CRM_CHECK(call_id > 0, crm_log_xml_err(msg, "Bad result"));

	blob = g_hash_table_lookup(private->stonith_op_callback_table, GINT_TO_POINTER(call_id));

	if (blob != NULL) {
	local_blob = *blob;
	blob = NULL;

	stonith_api_del_callback(stonith, call_id, FALSE);

	} else {
	crm_trace("No callback found for call %d", call_id);
	local_blob.callback = NULL;
	}

	if (local_blob.callback != NULL && (rc == pcmk_ok \|\| local_blob.only_success == FALSE)) {
	crm_trace("Invoking callback %s for call %d", crm_str(local_blob.id), call_id);
	invoke_callback(stonith, call_id, rc, local_blob.user_data, local_blob.callback);

	} else if (private->op_callback == NULL && rc != pcmk_ok) {
	crm_warn("STONITH command failed: %s", pcmk_strerror(rc));
	crm_log_xml_debug(msg, "Failed STONITH Update");
	}

	if (private->op_callback != NULL) {
	crm_trace("Invoking global callback for call %d", call_id);
	invoke_callback(stonith, call_id, rc, NULL, private->op_callback);
	}
	crm_trace("OP callback activated.");
	}

	/*
	<notify t="st_notify" subt="st_device_register" st_op="st_device_register" st_rc="0" >
	<st_calldata >
	<stonith_command t="stonith-ng" st_async_id="088fb640-431a-48b9-b2fc-c4ff78d0a2d9" st_op="st_device_register" st_callid="2" st_callopt="4096" st_timeout="0" st_clientid="088fb640-431a-48b9-b2fc-c4ff78d0a2d9" st_clientname="stonith-test" >
	<st_calldata >
	<st_device_id id="test-id" origin="create_device_registration_xml" agent="fence_virsh" namespace="stonith-ng" >
	<attributes ipaddr="localhost" pcmk-portmal="some-host=pcmk-1 pcmk-3=3,4" login="root" identity_file="/root/.ssh/id_dsa" />
	</st_device_id>
	</st_calldata>
	</stonith_command>
	</st_calldata>
	</notify>

	<notify t="st_notify" subt="st_notify_fence" st_op="st_notify_fence" st_rc="0" >
	<st_calldata >
	<st_notify_fence st_rc="0" st_target="some-host" st_op="st_fence" st_delegate="test-id" st_origin="61dd7759-e229-4be7-b1f8-ef49dd14d9f0" />
	</st_calldata>
	</notify>
	*/
	static stonith_event_t *
	xml_to_event(xmlNode *msg)
	{
	stonith_event_t *event = calloc(1, sizeof(stonith_event_t));
	const char *ntype = crm_element_value(msg, F_SUBTYPE);
	char *data_addr = g_strdup_printf("//%s", ntype);
	xmlNode *data = get_xpath_object(data_addr, msg, LOG_DEBUG);

	crm_log_xml_trace(msg, "stonith_notify");

	crm_element_value_int(msg, F_STONITH_RC, &(event->result));

	if(safe_str_eq(ntype, T_STONITH_NOTIFY_FENCE)) {
	event->operation = crm_element_value_copy(msg, F_STONITH_OPERATION);

	if(data) {
	event->origin = crm_element_value_copy(data, F_STONITH_ORIGIN);
	event->action = crm_element_value_copy(data, F_STONITH_ACTION);
	event->target = crm_element_value_copy(data, F_STONITH_TARGET);
	event->executioner = crm_element_value_copy(data, F_STONITH_DELEGATE);
	event->id = crm_element_value_copy(data, F_STONITH_REMOTE);
	event->client_origin = crm_element_value_copy(data, F_STONITH_CLIENTNAME);
	} else {
	crm_err("No data for %s event", ntype);
	crm_log_xml_notice(msg, "BadEvent");
	}
	}

	g_free(data_addr);
	return event;
	}

	static void
	event_free(stonith_event_t *event)
	{
	free(event->id);
	free(event->type);
	free(event->message);
	free(event->operation);
	free(event->origin);
	free(event->action);
	free(event->target);
	free(event->executioner);
	free(event->device);
	free(event->client_origin);
	free(event);
	}

	static void
	stonith_send_notification(gpointer data, gpointer user_data)
	{
	struct notify_blob_s *blob = user_data;
	stonith_notify_client_t *entry = data;
	stonith_event_t *st_event = NULL;
	const char *event = NULL;

	if (blob->xml == NULL) {
	crm_warn("Skipping callback - NULL message");
	return;
	}

	event = crm_element_value(blob->xml, F_SUBTYPE);

	if (entry == NULL) {
	crm_warn("Skipping callback - NULL callback client");
	return;

	} else if (entry->notify == NULL) {
	crm_warn("Skipping callback - NULL callback");
	return;

	} else if (safe_str_neq(entry->event, event)) {
	crm_trace("Skipping callback - event mismatch %p/%s vs. %s", entry, entry->event, event);
	return;
	}

	st_event = xml_to_event(blob->xml);

	crm_trace("Invoking callback for %p/%s event...", entry, event);
	entry->notify(blob->stonith, st_event);
	crm_trace("Callback invoked...");

	event_free(st_event);
	}

	int
	stonith_send_command(stonith_t * stonith, const char op, xmlNode data, xmlNode ** output_data,
	int call_options, int timeout)
	{
	int rc = 0;
	int reply_id = -1;
	enum crm_ipc_flags ipc_flags = crm_ipc_client_none;


	xmlNode *op_msg = NULL;
	xmlNode *op_reply = NULL;

	stonith_private_t *native = stonith->private;

	if (stonith->state == stonith_disconnected) {
	return -ENOTCONN;
	}

	if (output_data != NULL) {
	*output_data = NULL;
	}

	if (op == NULL) {
	crm_err("No operation specified");
	return -EINVAL;
	}

	if (call_options & st_opt_sync_call) {
	ipc_flags \|= crm_ipc_client_response;
	}

	stonith->call_id++;
	/* prevent call_id from being negative (or zero) and conflicting
	* with the stonith_errors enum
	* use 2 because we use it as (stonith->call_id - 1) below
	*/
	if (stonith->call_id < 1) {
	stonith->call_id = 1;
	}

	CRM_CHECK(native->token != NULL,;);
	op_msg = stonith_create_op(stonith->call_id, native->token, op, data, call_options);
	if (op_msg == NULL) {
	return -EINVAL;
	}

	crm_xml_add_int(op_msg, F_STONITH_TIMEOUT, timeout);
	crm_trace("Sending %s message to STONITH service, Timeout: %ds", op, timeout);

	rc = crm_ipc_send(native->ipc, op_msg, ipc_flags, 1000*(timeout + 60), &op_reply);
	free_xml(op_msg);

	if(rc < 0) {
	crm_perror(LOG_ERR, "Couldn't perform %s operation (timeout=%ds): %d", op, timeout, rc);
	rc = -ECOMM;
	goto done;
	}

	crm_log_xml_trace(op_reply, "Reply");

	if (!(call_options & st_opt_sync_call)) {
	crm_trace("Async call %d, returning", stonith->call_id);
	CRM_CHECK(stonith->call_id != 0, return -EPROTO);
	free_xml(op_reply);

	return stonith->call_id;
	}

	rc = pcmk_ok;
	crm_element_value_int(op_reply, F_STONITH_CALLID, &reply_id);

	if (reply_id == stonith->call_id) {
	crm_trace("Syncronous reply %d received", reply_id);

	if (crm_element_value_int(op_reply, F_STONITH_RC, &rc) != 0) {
	rc = -ENOMSG;
	}

	if ((call_options & st_opt_discard_reply) \|\| output_data == NULL) {
	crm_trace("Discarding reply");

	} else {
	*output_data = op_reply;
	op_reply = NULL; /* Prevent subsequent free */
	}

	} else if (reply_id <= 0) {
	crm_err("Recieved bad reply: No id set");
	crm_log_xml_err(op_reply, "Bad reply");
	free_xml(op_reply);
	rc = -ENOMSG;

	} else {
	crm_err("Recieved bad reply: %d (wanted %d)", reply_id, stonith->call_id);
	crm_log_xml_err(op_reply, "Old reply");
	free_xml(op_reply);
	rc = -ENOMSG;
	}

	done:
	if (crm_ipc_connected(native->ipc) == FALSE) {
	crm_err("STONITH disconnected");
	stonith->state = stonith_disconnected;
	}

	free_xml(op_reply);
	return rc;
	}

	/* Not used with mainloop */
	bool
	stonith_dispatch(stonith_t * st)
	{
	gboolean stay_connected = TRUE;
	stonith_private_t *private = NULL;

	CRM_ASSERT(st != NULL);
	private = st->private;

	while(crm_ipc_ready(private->ipc)) {

	if(crm_ipc_read(private->ipc) > 0) {
	const char *msg = crm_ipc_buffer(private->ipc);
	stonith_dispatch_internal(msg, strlen(msg), st);
	}

	if(crm_ipc_connected(private->ipc) == FALSE) {
	crm_err("Connection closed");
	stay_connected = FALSE;
	}
	}

	return stay_connected;
	}

	int
	stonith_dispatch_internal(const char *buffer, ssize_t length, gpointer userdata)
	{
	const char *type = NULL;
	struct notify_blob_s blob;

	stonith_t * st = userdata;
	stonith_private_t *private = NULL;

	CRM_ASSERT(st != NULL);
	private = st->private;

	blob.stonith = st;
	blob.xml = string2xml(buffer);
	if (blob.xml == NULL) {
	crm_warn("Received a NULL msg from STONITH service: %s.", buffer);
	return 0;
	}

	/* do callbacks */
	type = crm_element_value(blob.xml, F_TYPE);
	crm_trace("Activating %s callbacks...", type);

	if (safe_str_eq(type, T_STONITH_NG)) {
	stonith_perform_callback(st, blob.xml, 0, 0);

	} else if (safe_str_eq(type, T_STONITH_NOTIFY)) {
	g_list_foreach(private->notify_list, stonith_send_notification, &blob);
	} else if (safe_str_eq(type, T_STONITH_TIMEOUT_VALUE)) {
	int call_id = 0;
	int timeout = 0;

	crm_element_value_int(blob.xml, F_STONITH_TIMEOUT, &timeout);
	crm_element_value_int(blob.xml, F_STONITH_CALLID, &call_id);

	update_callback_timeout(call_id, timeout, st);
	} else {
	crm_err("Unknown message type: %s", type);
	crm_log_xml_warn(blob.xml, "BadReply");
	}

	free_xml(blob.xml);
	return 1;
	}

	static int
	stonith_api_free(stonith_t * stonith)
	{
	int rc = pcmk_ok;

	if (stonith->state != stonith_disconnected) {
	rc = stonith->cmds->disconnect(stonith);
	}

	if (stonith->state == stonith_disconnected) {
	stonith_private_t *private = stonith->private;

	g_hash_table_destroy(private->stonith_op_callback_table);
	free(private->token);
	free(stonith->private);
	free(stonith->cmds);
	free(stonith);
	}

	return rc;
	}

	void
	stonith_api_delete(stonith_t * stonith)
	{
	stonith_private_t *private = stonith->private;
	GList *list = private->notify_list;

	while (list != NULL) {
	stonith_notify_client_t *client = g_list_nth_data(list, 0);

	list = g_list_remove(list, client);
	free(client);
	}

	stonith->cmds->free(stonith);
	stonith = NULL;
	}

	stonith_t *
	stonith_api_new(void)
	{
	stonith_t *new_stonith = NULL;
	stonith_private_t *private = NULL;

	new_stonith = calloc(1, sizeof(stonith_t));
	private = calloc(1, sizeof(stonith_private_t));
	new_stonith->private = private;

	private->stonith_op_callback_table = g_hash_table_new_full(g_direct_hash, g_direct_equal,
	NULL, stonith_destroy_op_callback);
	private->notify_list = NULL;

	new_stonith->call_id = 1;
	new_stonith->state = stonith_disconnected;

	new_stonith->cmds = calloc(1, sizeof(stonith_api_operations_t));

	/* INDENT-OFF */
	new_stonith->cmds->free = stonith_api_free;
	new_stonith->cmds->connect = stonith_api_signon;
	new_stonith->cmds->disconnect = stonith_api_signoff;

	new_stonith->cmds->list = stonith_api_list;
	new_stonith->cmds->monitor = stonith_api_monitor;
	new_stonith->cmds->status = stonith_api_status;
	new_stonith->cmds->fence = stonith_api_fence;
	new_stonith->cmds->confirm = stonith_api_confirm;
	new_stonith->cmds->history = stonith_api_history;

	new_stonith->cmds->list_agents = stonith_api_device_list;
	new_stonith->cmds->metadata = stonith_api_device_metadata;

	new_stonith->cmds->query = stonith_api_query;
	new_stonith->cmds->remove_device = stonith_api_remove_device;
	new_stonith->cmds->register_device = stonith_api_register_device;

	new_stonith->cmds->remove_level = stonith_api_remove_level;
	new_stonith->cmds->register_level = stonith_api_register_level;

	new_stonith->cmds->remove_callback = stonith_api_del_callback;
	new_stonith->cmds->register_callback = stonith_api_add_callback;
	new_stonith->cmds->remove_notification = stonith_api_del_notification;
	new_stonith->cmds->register_notification = stonith_api_add_notification;
	/* INDENT-ON */

	return new_stonith;
	}

	stonith_key_value_t *
	stonith_key_value_add(stonith_key_value_t * head, const char key, const char value)
	{
	stonith_key_value_t p, end;

	p = calloc(1, sizeof(stonith_key_value_t));
	if (key) {
	p->key = strdup(key);
	}
	if (value) {
	p->value = strdup(value);
	}

	end = head;
	while (end && end->next) {
	end = end->next;
	}

	if (end) {
	end->next = p;
	} else {
	head = p;
	}

	return head;
	}

	void
	stonith_key_value_freeall(stonith_key_value_t * head, int keys, int values)
	{
	stonith_key_value_t *p;

	while (head) {
	p = head->next;
	if (keys) {
	free(head->key);
	}
	if (values) {
	free(head->value);
	}
	free(head);
	head = p;
	}
	}

	int
	stonith_api_kick(int nodeid, const char *uname, int timeout, bool off)
	{
	char *name = NULL;
	const char *action = "reboot";

	int rc = -EPROTO;
	stonith_t *st = NULL;
	enum stonith_call_options opts = st_opt_sync_call \| st_opt_allow_suicide;

	st = stonith_api_new();
	if (st) {
	rc = st->cmds->connect(st, "stonith-api", NULL);
	}

	if (uname != NULL) {
	name = strdup(uname);

	} else if (nodeid > 0) {
	opts \|= st_opt_cs_nodeid;
	name = crm_itoa(nodeid);
	}

	if (off) {
	action = "off";
	}

	if (rc == pcmk_ok) {
	- rc = st->cmds->fence(st, opts, name, action, timeout);
	+ rc = st->cmds->fence(st, opts, name, action, timeout, 0);
	}

	if (st) {
	st->cmds->disconnect(st);
	stonith_api_delete(st);
	}

	free(name);
	return rc;
	}

	time_t
	stonith_api_time(int nodeid, const char *uname, bool in_progress)
	{
	int rc = 0;
	char *name = NULL;

	time_t when = 0;
	time_t progress = 0;
	stonith_t *st = NULL;
	stonith_history_t history, hp = NULL;
	enum stonith_call_options opts = st_opt_sync_call;

	st = stonith_api_new();
	if (st) {
	rc = st->cmds->connect(st, "stonith-api", NULL);
	}

	if (uname != NULL) {
	name = strdup(uname);

	} else if (nodeid > 0) {
	opts \|= st_opt_cs_nodeid;
	name = crm_itoa(nodeid);
	}

	if (st && rc == pcmk_ok) {
	st->cmds->history(st, st_opt_sync_call \| st_opt_cs_nodeid, name, &history, 120);

	for (hp = history; hp; hp = hp->next) {
	if (in_progress) {
	if (hp->state != st_done && hp->state != st_failed) {
	progress = time(NULL);
	}

	} else if (hp->state == st_done) {
	when = hp->completed;
	}
	}
	}

	if (progress) {
	when = progress;
	}

	if (st) {
	st->cmds->disconnect(st);
	stonith_api_delete(st);
	}

	free(name);
	return when;
	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jul 8, 6:31 PM (7 h, 10 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1989034
Default Alt Text: (192 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions