diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
index 116b024e8..21d77a7d2 100755
--- a/heartbeat/IPaddr2
+++ b/heartbeat/IPaddr2
@@ -1,1063 +1,1063 @@
 #!/bin/sh
 #
 #	$Id: IPaddr2.in,v 1.24 2006/08/09 13:01:54 lars Exp $
 #
 #       OCF Resource Agent compliant IPaddr2 script.
 #
 # 	Based on work by Tuomo Soini, ported to the OCF RA API by Lars
 # 	Marowsky-Brée. Implements Cluster Alias IP functionality too.
 #
 #	Cluster Alias IP cleanup, fixes and testing by Michael Schwartzkopff
 #
 #
 # Copyright (c) 2003 Tuomo Soini
 # Copyright (c) 2004-2006 SUSE LINUX AG, Lars Marowsky-Brée
 #                    All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like.  Any license provided herein, whether implied or
 # otherwise, applies only to this software file.  Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 #
 
 
 # TODO: 
 # - There ought to be an ocf_run_cmd function which does all logging,
 #   timeout handling etc for us
 # - Make this the standard IP address agent on Linux; the other
 #   platforms simply should ignore the additional parameters OR can use
 #   the legacy heartbeat resource script...
 # - Check LVS <-> clusterip incompatibilities.
 #
 #	OCF parameters are as below
 #	OCF_RESKEY_ip
 #	OCF_RESKEY_broadcast
 #	OCF_RESKEY_nic
 #	OCF_RESKEY_cidr_netmask
 #	OCF_RESKEY_iflabel
 #	OCF_RESKEY_mac
 #	OCF_RESKEY_clusterip_hash
 #	OCF_RESKEY_arp_interval
 #	OCF_RESKEY_arp_count
 #	OCF_RESKEY_arp_bg
 #	OCF_RESKEY_arp_mac
 #
 #	OCF_RESKEY_CRM_meta_clone
 #	OCF_RESKEY_CRM_meta_clone_max
 
 
 #######################################################################
 # Initialization:
 
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 . ${OCF_FUNCTIONS_DIR}/findif.sh
 
 # Defaults
 OCF_RESKEY_lvs_support_default=false
 OCF_RESKEY_lvs_ipv6_addrlabel_default=false
 OCF_RESKEY_lvs_ipv6_addrlabel_value_default=99
 OCF_RESKEY_clusterip_hash_default="sourceip-sourceport"
 OCF_RESKEY_unique_clone_address_default=false
 OCF_RESKEY_arp_interval_default=200
 OCF_RESKEY_arp_count_default=5
 OCF_RESKEY_arp_bg_default=true
 OCF_RESKEY_arp_mac_default="ffffffffffff"
 
 : ${OCF_RESKEY_lvs_support=${OCF_RESKEY_lvs_support_default}}
 : ${OCF_RESKEY_lvs_ipv6_addrlabel=${OCF_RESKEY_lvs_ipv6_addrlabel_default}}
 : ${OCF_RESKEY_lvs_ipv6_addrlabel_value=${OCF_RESKEY_lvs_ipv6_addrlabel_value_default}}
 : ${OCF_RESKEY_clusterip_hash=${OCF_RESKEY_clusterip_hash_default}}
 : ${OCF_RESKEY_unique_clone_address=${OCF_RESKEY_unique_clone_address_default}}
 : ${OCF_RESKEY_arp_interval=${OCF_RESKEY_arp_interval_default}}
 : ${OCF_RESKEY_arp_count=${OCF_RESKEY_arp_count_default}}
 : ${OCF_RESKEY_arp_bg=${OCF_RESKEY_arp_bg_default}}
 : ${OCF_RESKEY_arp_mac=${OCF_RESKEY_arp_mac_default}}
 #######################################################################
 
 SENDARP=$HA_BIN/send_arp
 SENDUA=$HA_BIN/send_ua
 FINDIF=findif
 VLDIR=$HA_RSCTMP
 SENDARPPIDDIR=$HA_RSCTMP
 CIP_lockfile=$HA_RSCTMP/IPaddr2-CIP-${OCF_RESKEY_ip}
 
 #######################################################################
 
 meta_data() {
 	cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="IPaddr2">
 <version>1.0</version>
 
 <longdesc lang="en">
 This Linux-specific resource manages IP alias IP addresses.
 It can add an IP alias, or remove one.
 In addition, it can implement Cluster Alias IP functionality
 if invoked as a clone resource.
 
 If used as a clone, you should explicitly set clone-node-max &gt;= 2,
 and/or clone-max &lt; number of nodes. In case of node failure,
 clone instances need to be re-allocated on surviving nodes.
 Which would not be possible, if there is already an instance on those nodes,
 and clone-node-max=1 (which is the default).
 </longdesc>
 
 <shortdesc lang="en">Manages virtual IPv4 addresses (Linux specific version)</shortdesc>
 
 <parameters>
 <parameter name="ip" unique="1" required="1">
 <longdesc lang="en">
 The IPv4 address to be configured in dotted quad notation, for example
 "192.168.1.1".
 </longdesc>
 <shortdesc lang="en">IPv4 address</shortdesc>
 <content type="string" default="" />
 </parameter>
 <parameter name="nic" unique="0">
 <longdesc lang="en">
 The base network interface on which the IP address will be brought
 online. 
 If left empty, the script will try and determine this from the
 routing table.
 
 Do NOT specify an alias interface in the form eth0:1 or anything here;
 rather, specify the base interface only.
 If you want a label, see the iflabel parameter.
 
 Prerequisite:
 
 There must be at least one static IP address, which is not managed by
 the cluster, assigned to the network interface.
 If you can not assign any static IP address on the interface,
 modify this kernel parameter:
 
 sysctl -w net.ipv4.conf.all.promote_secondaries=1 # (or per device)
 </longdesc>
 <shortdesc lang="en">Network interface</shortdesc>
 <content type="string"/>
 </parameter>
 
 <parameter name="cidr_netmask">
 <longdesc lang="en">
 The netmask for the interface in CIDR format
 (e.g., 24 and not 255.255.255.0)
 
 If unspecified, the script will also try to determine this from the
 routing table.
 </longdesc>
 <shortdesc lang="en">CIDR netmask</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 <parameter name="broadcast">
 <longdesc lang="en">
 Broadcast address associated with the IP. If left empty, the script will
 determine this from the netmask.
 </longdesc>
 <shortdesc lang="en">Broadcast address</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 <parameter name="iflabel">
 <longdesc lang="en">
 You can specify an additional label for your IP address here.
 This label is appended to your interface name.
 If a label is specified in nic name, this parameter has no effect.
 </longdesc>
 <shortdesc lang="en">Interface label</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 <parameter name="lvs_support">
 <longdesc lang="en">
 Enable support for LVS Direct Routing configurations. In case a IP
 address is stopped, only move it to the loopback device to allow the
 local node to continue to service requests, but no longer advertise it
 on the network.
 
 Notes for IPv6:
 It is not necessary to enable this option on IPv6.
 Instead, enable 'lvs_ipv6_addrlabel' option for LVS-DR usage on IPv6.
 </longdesc>
 <shortdesc lang="en">Enable support for LVS DR</shortdesc>
 <content type="boolean" default="${OCF_RESKEY_lvs_support_default}"/>
 </parameter>
 
 <parameter name="lvs_ipv6_addrlabel">
 <longdesc lang="en">
 Enable adding IPv6 address label so IPv6 traffic originating from
 the address' interface does not use this address as the source.
 This is necessary for LVS-DR health checks to realservers to work. Without it,
 the most recently added IPv6 address (probably the address added by IPaddr2)
 will be used as the source address for IPv6 traffic from that interface and
 since that address exists on loopback on the realservers, the realserver
 response to pings/connections will not never leave its loopback.
 See RFC3484 for the detail of the source address selection.
 
 See also 'lvs_ipv6_addrlabel_value' parameter.
 </longdesc>
 <shortdesc lang="en">Enables adding IPv6 address label.</shortdesc>
 <content type="boolean" default="${OCF_RESKEY_lvs_ipv6_addrlabel_default}"/>
 </parameter>
 
 <parameter name="lvs_ipv6_addrlabel_value">
 <longdesc lang="en">
 Specify IPv6 address label value used when 'lvs_ipv6_addrlabel' is enabled.
 The value should be an unused label in the policy table
 which is shown by 'ip addrlabel list' command.
 You would rarely need to change this parameter.
 </longdesc>
 <shortdesc lang="en">IPv6 address label value.</shortdesc>
 <content type="integer" default="${OCF_RESKEY_lvs_ipv6_addrlabel_value_default}"/>
 </parameter>
 
 <parameter name="mac">
 <longdesc lang="en">
 Set the interface MAC address explicitly. Currently only used in case of
 the Cluster IP Alias. Leave empty to chose automatically.
 
 </longdesc>
 <shortdesc lang="en">Cluster IP MAC address</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 <parameter name="clusterip_hash">
 <longdesc lang="en">
 Specify the hashing algorithm used for the Cluster IP functionality.
 
 </longdesc>
 <shortdesc lang="en">Cluster IP hashing function</shortdesc>
 <content type="string" default="${OCF_RESKEY_clusterip_hash_default}"/>
 </parameter>
 
 <parameter name="unique_clone_address">
 <longdesc lang="en">
 If true, add the clone ID to the supplied value of ip to create
 a unique address to manage 
 </longdesc>
 <shortdesc lang="en">Create a unique address for cloned instances</shortdesc>
 <content type="boolean" default="${OCF_RESKEY_unique_clone_address_default}"/>
 </parameter>
 
 <parameter name="arp_interval">
 <longdesc lang="en">
 Specify the interval between unsolicited ARP packets in milliseconds.
 </longdesc>
 <shortdesc lang="en">ARP packet interval in ms</shortdesc>
 <content type="integer" default="${OCF_RESKEY_arp_interval_default}"/>
 </parameter>
 
 <parameter name="arp_count">
 <longdesc lang="en">
 Number of unsolicited ARP packets to send.
 </longdesc>
 <shortdesc lang="en">ARP packet count</shortdesc>
 <content type="integer" default="${OCF_RESKEY_arp_count_default}"/>
 </parameter>
 
 <parameter name="arp_bg">
 <longdesc lang="en">
 Whether or not to send the arp packets in the background.
 </longdesc>
 <shortdesc lang="en">ARP from background</shortdesc>
 <content type="string" default="${OCF_RESKEY_arp_bg_default}"/>
 </parameter>
 
 <parameter name="arp_mac">
 <longdesc lang="en">
 MAC address to send the ARP packets to.
 
 You really shouldn't be touching this.
 
 </longdesc>
 <shortdesc lang="en">ARP MAC</shortdesc>
 <content type="string" default="${OCF_RESKEY_arp_mac_default}"/>
 </parameter>
 
 <parameter name="arp_sender">
 <longdesc lang="en">
 The program to send ARP packets with on start. For infiniband
 interfaces, default is ipoibarping. If ipoibarping is not
 available, set this to send_arp.
 </longdesc>
 <shortdesc lang="en">ARP sender</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 <parameter name="flush_routes">
 <longdesc lang="en">
 Flush the routing table on stop. This is for
 applications which use the cluster IP address
 and which run on the same physical host that the
 IP address lives on. The Linux kernel may force that
 application to take a shortcut to the local loopback
 interface, instead of the interface the address
 is really bound to. Under those circumstances, an
 application may, somewhat unexpectedly, continue
 to use connections for some time even after the
 IP address is deconfigured. Set this parameter in
 order to immediately disable said shortcut when the
 IP address goes away.
 </longdesc>
 <shortdesc lang="en">Flush kernel routing table on stop</shortdesc>
 <content type="boolean" default="false"/>
 </parameter>
 
 </parameters>
 <actions>
 <action name="start"   timeout="20s" />
 <action name="stop"    timeout="20s" />
 <action name="status" depth="0"  timeout="20s" interval="10s" />
 <action name="monitor" depth="0"  timeout="20s" interval="10s" />
 <action name="meta-data"  timeout="5s" />
 <action name="validate-all"  timeout="20s" />
 </actions>
 </resource-agent>
 END
 
 	exit $OCF_SUCCESS
 }
 
 ip_init() {
 	local rc
 
 	if [ X`uname -s` != "XLinux" ]; then
 		ocf_log err "IPaddr2 only supported Linux."
 		exit $OCF_ERR_INSTALLED
 	fi
 
 	if [ X"$OCF_RESKEY_ip" = "X" ]; then
 		ocf_log err "IP address (the ip parameter) is mandatory"
 		exit $OCF_ERR_CONFIGURED
 	fi
 
 	if
           case $__OCF_ACTION in
             start|stop)		ocf_is_root;;
             *)			true;;
           esac
         then
           : YAY!
         else
 		ocf_log err "You must be root for $__OCF_ACTION operation."
 		exit $OCF_ERR_PERM
 	fi
 
 	BASEIP="$OCF_RESKEY_ip"
 	BRDCAST="$OCF_RESKEY_broadcast"
 	NIC="$OCF_RESKEY_nic"
         # Note: We had a version out there for a while which used
         # netmask instead of cidr_netmask. Don't remove this aliasing code!
         if
           [ ! -z "$OCF_RESKEY_netmask" -a -z "$OCF_RESKEY_cidr_netmask" ]
         then
 	  OCF_RESKEY_cidr_netmask=$OCF_RESKEY_netmask
 	  export OCF_RESKEY_cidr_netmask
         fi
 	NETMASK="$OCF_RESKEY_cidr_netmask"
 	IFLABEL="$OCF_RESKEY_iflabel"
 	IF_MAC="$OCF_RESKEY_mac"
 
 	IP_INC_GLOBAL=${OCF_RESKEY_CRM_meta_clone_max:-1}
 	IP_INC_NO=`expr ${OCF_RESKEY_CRM_meta_clone:-0} + 1`
 
 	if ocf_is_true ${OCF_RESKEY_lvs_support} && [ $IP_INC_GLOBAL -gt 1 ]; then
 		ocf_log err "LVS and load sharing do not go together well"
 		exit $OCF_ERR_CONFIGURED
 	fi
 
 	if ocf_is_decimal "$IP_INC_GLOBAL" && [ $IP_INC_GLOBAL -gt 0 ]; then
 		:
 	else
 		ocf_log err "Invalid OCF_RESKEY_incarnations_max_global [$IP_INC_GLOBAL], should be positive integer"
 		exit $OCF_ERR_CONFIGURED
 	fi
 
 	echo $OCF_RESKEY_ip | grep -qs ":"
 	if [ $? -ne 0 ];then
 		FAMILY=inet
 		if ocf_is_true $OCF_RESKEY_lvs_ipv6_addrlabel ;then
 			ocf_log err "IPv4 does not support lvs_ipv6_addrlabel"
 			exit $OCF_ERR_CONFIGURED
 		fi
 	else
 		FAMILY=inet6
 		if ocf_is_true $OCF_RESKEY_lvs_support ;then
 			ocf_log err "The IPv6 does not support lvs_support"
 			exit $OCF_ERR_CONFIGURED
 		fi
 		if ocf_is_true $OCF_RESKEY_lvs_ipv6_addrlabel ;then
 			if ocf_is_decimal "$OCF_RESKEY_lvs_ipv6_addrlabel_value" && [ $OCF_RESKEY_lvs_ipv6_addrlabel_value -ge 0 ]; then
 			    :
 			else
 			    ocf_log err "Invalid lvs_ipv6_addrlabel_value [$OCF_RESKEY_lvs_ipv6_addrlabel_value], should be positive integer"
 			    exit $OCF_ERR_CONFIGURED
 			fi
 		fi
 	fi
 
 	# $FINDIF takes its parameters from the environment
 	#
 	NICINFO=`$FINDIF`
 	rc=$?
 	if
 	  [ $rc -eq 0 ]
         then
 	    NICINFO=`echo "$NICINFO" | sed -e 's/netmask\ //;s/broadcast\ //'`
 	    NIC=`echo "$NICINFO" | cut -d" " -f1`
 	    NETMASK=`echo "$NICINFO" | cut -d" " -f2`
 	    BRDCAST=`echo "$NICINFO" | cut -d" " -f3`
 	else
 		# findif couldn't find the interface
 		if ocf_is_probe; then
 			ocf_log info "[$FINDIF] failed"
 			exit $OCF_NOT_RUNNING
 		elif [ "$__OCF_ACTION" = stop ]; then
 			ocf_log warn "[$FINDIF] failed"
 			exit $OCF_SUCCESS
 		else
 			ocf_log err "[$FINDIF] failed"
 			exit $rc
 		fi
 	fi
 	
 	SENDARPPIDFILE="$SENDARPPIDDIR/send_arp-$OCF_RESKEY_ip"
 
 	case $NIC in
 	    *:*)
 		IFLABEL=$NIC
 		NIC=`echo $NIC | sed 's/:.*//'`
 		;;
 	    *)
 		if [ -n "$IFLABEL" ]; then
 			IFLABEL=${NIC}:${IFLABEL}
 		fi
 		;;
 	esac
 
 	if [ "$IP_INC_GLOBAL" -gt 1 ] && ! ocf_is_true "$OCF_RESKEY_unique_clone_address"; then
 		IP_CIP="yes"
 		IP_CIP_HASH="${OCF_RESKEY_clusterip_hash}"
 		if [ -z "$IF_MAC" ]; then
 			# Choose a MAC
 			# 1. Concatenate some input together
 			# 2. This doesn't need to be a cryptographically
 			#    secure hash.
 			# 3. Drop everything after the first 6 octets (12 chars)
 			# 4. Delimit the octets with ':'
 			# 5. Make sure the first octet is odd,
 			#    so the result is a multicast MAC
 			IF_MAC=`echo $OCF_RESKEY_ip $NETMASK $BRDCAST |	\
 				md5sum |				\
 				sed -e 's#\(............\).*#\1#'	\
 				    -e 's#..#&:#g; s#:$##'		\
 				    -e 's#^\(.\)[02468aAcCeE]#\11#'`
 		fi
 		IP_CIP_FILE="/proc/net/ipt_CLUSTERIP/$OCF_RESKEY_ip"
 	fi
 }
 
 #
 #	Find out which interfaces serve the given IP address and netmask.
 #	The arguments are an IP address and a netmask.
 #	Its output are interface names devided by spaces (e.g., "eth0 eth1").
 #
 find_interface() {
 	local ipaddr="$1"
 	local netmask="$2"
 
 	#
 	# List interfaces but exclude FreeS/WAN ipsecN virtual interfaces
 	#
 	local iface="`$IP2UTIL -o -f $FAMILY addr show \
 		| grep "\ $ipaddr/$netmask" \
 		| cut -d ' ' -f2 \
 		| grep -v '^ipsec[0-9][0-9]*$'`"
 
 	echo "$iface"
 	return 0
 }
 
 #
 #        Delete an interface
 #
 delete_interface () {
 	ipaddr="$1"
 	iface="$2"
 	netmask="$3"
 
 	CMD="$IP2UTIL -f $FAMILY addr delete $ipaddr/$netmask dev $iface"
 
 	ocf_run $CMD || return $OCF_ERR_GENERIC
 
 	if ocf_is_true $OCF_RESKEY_flush_routes; then
 	    ocf_run $IP2UTIL route flush cache
 	fi
 
 	if [ "$FAMILY" = "inet6" ] && ocf_is_true $OCF_RESKEY_lvs_ipv6_addrlabel ;then
 	    delete_ipv6_addrlabel $ipaddr
 	fi
 
 	return $OCF_SUCCESS
 }
 
 #
 #        Add an interface
 #
 add_interface () {
 	local cmd msg ipaddr netmask broadcast iface label
 
 	ipaddr="$1"
 	netmask="$2"
 	broadcast="$3"
 	iface="$4"
 	label="$5"
 
 	if [ "$FAMILY" = "inet6" ] && ocf_is_true $OCF_RESKEY_lvs_ipv6_addrlabel ;then
 	    add_ipv6_addrlabel $ipaddr
 	fi
 
 	cmd="$IP2UTIL -f $FAMILY addr add $ipaddr/$netmask dev $iface"
 	msg="Adding $FAMILY address $ipaddr/$netmask to device $iface"
 	if [ "$broadcast" != "none" ]; then
 		cmd="$IP2UTIL -f $FAMILY addr add $ipaddr/$netmask brd $broadcast dev $iface"
 		msg="Adding $FAMILY address $ipaddr/$netmask with broadcast address $broadcast to device $iface"
 	fi
 
 	if [ ! -z "$label" ]; then
 		cmd="$cmd label $label"
 		msg="${msg} (with label $label)"
 	fi
 
 	ocf_log info "$msg"
 	ocf_run $cmd || return $OCF_ERR_GENERIC
 
 	msg="Bringing device $iface up"
 	cmd="$IP2UTIL link set $iface up"
 	ocf_log info "$msg"
 	ocf_run $cmd || return $OCF_ERR_GENERIC
 
 	return $OCF_SUCCESS
 }
 
 #
 #        Delete a route
 #
 delete_route () {
 	prefix="$1"
 	iface="$2"
 
 	CMD="$IP2UTIL route delete $prefix dev $iface"
 
 	ocf_log info "$CMD"
 	$CMD
 
 	return $?
 }
 
 #      On Linux systems the (hidden) loopback interface may
 #      conflict with the requested IP address. If so, this
 #      unoriginal code will remove the offending loopback address
 #      and save it in VLDIR so it can be added back in later
 #      when the IPaddr is released.
 #
 #      TODO: This is very ugly and should be controlled by an additional
 #      instance parameter. Or even: multi-state, with the IP only being
 #      "active" on the master!?
 #
 remove_conflicting_loopback() {
 	ipaddr="$1"
 	netmask="$2"
 	broadcast="$3"
 	ifname="$4"
 
 	ocf_log info "Removing conflicting loopback $ifname."
 	if
 		echo "$ipaddr $netmask $broadcast $ifname" > "$VLDIR/$ipaddr"
 	then
 		: Saved loopback information in $VLDIR/$ipaddr
 	else
 		ocf_log err "Could not save conflicting loopback $ifname." \
 		       "it will not be restored."
 	fi
 	delete_interface "$ipaddr" "$ifname" "$netmask"
 	# Forcibly remove the route (if it exists) to the loopback.
 	delete_route "$ipaddr" "$ifname"
 }
 
 #
 #	On Linux systems the (hidden) loopback interface may
 #	need to be restored if it has been taken down previously
 #	by remove_conflicting_loopback()
 #
 restore_loopback() {
 	ipaddr="$1"
 
 	if [ -s "$VLDIR/$ipaddr" ]; then
 		ifinfo=`cat "$VLDIR/$ipaddr"`
 		ocf_log info "Restoring loopback IP Address " \
 		    "$ifinfo."
 		add_interface $ifinfo
 		rm -f "$VLDIR/$ipaddr"
 	fi
 }
 
 add_ipv6_addrlabel() {
 	local cmd ipaddr value
 	ipaddr="$1"
 	value="$OCF_RESKEY_lvs_ipv6_addrlabel_value"
 
 	cmd="$IP2UTIL addrlabel add prefix $ipaddr label $value"
 	ocf_log info "Adding IPv6 address label prefix $ipaddr label $value"
 	ocf_run $cmd || ocf_log warn "$cmd failed."
 }
 
 delete_ipv6_addrlabel() {
 	local cmd ipaddr value
 	ipaddr="$1"
 	value="$OCF_RESKEY_lvs_ipv6_addrlabel_value"
 
 	cmd="$IP2UTIL addrlabel del prefix $ipaddr label $value"
 	ocf_run $cmd # an error can be ignored
 }
 
 is_infiniband() {
 	$IP2UTIL link show $NIC | grep link/infiniband >/dev/null
 }
 
 #
 # Run send_arp to note peers about new mac address
 #
 run_send_arp() {
 	ARGS="-i $OCF_RESKEY_arp_interval -r $OCF_RESKEY_arp_count -p $SENDARPPIDFILE $NIC $OCF_RESKEY_ip auto not_used not_used"
 	if [ "x$IP_CIP" = "xyes" ] ; then
 	    if [ x = "x$IF_MAC" ] ; then
 		MY_MAC=auto
 	    else
 		MY_MAC=`echo ${IF_MAC} | sed -e 's/://g'`
 	    fi
 	    ARGS="-i $OCF_RESKEY_arp_interval -r $OCF_RESKEY_arp_count -p $SENDARPPIDFILE $NIC $OCF_RESKEY_ip $MY_MAC not_used not_used"
 	fi
 	ocf_log info "$SENDARP $ARGS"
 	if ocf_is_true $OCF_RESKEY_arp_bg; then
 		($SENDARP $ARGS || ocf_log err "Could not send gratuitous arps")& >&2
 	else
 		$SENDARP $ARGS || ocf_log err "Could not send gratuitous arps"
 	fi
 }
 
 #
 # Run send_ua to note send ICMPv6 Unsolicited Neighbor Advertisements.
 #
 run_send_ua() {
 	local i
 	# Wait until the allocated IPv6 address gets ready by checking
 	# "tentative" flag is disappeared, otherwise send_ua can not
 	# send the unsolicited advertisement requests.
 	for i in 1 2 3 4 5; do
 		$IP2UTIL -o -f $FAMILY addr show dev $NIC \
 			| grep -q -e "$OCF_RESKEY_ip/$NETMASK .* tentative"
 		[ $? -ne 0 ] && break
 		if [ $i -eq 5 ]; then
 			ocf_log warn "$OCF_RESKEY_ip still has 'tentative' status. (ignored)"
 			break
 		fi
 		sleep 1
 	done
 	ARGS="-i $OCF_RESKEY_arp_interval -c $OCF_RESKEY_arp_count $OCF_RESKEY_ip $NETMASK $NIC"
 	ocf_log info "$SENDUA $ARGS"
 	$SENDUA $ARGS || ocf_log err "Could not send ICMPv6 Unsolicited Neighbor Advertisements."
 }
 
 #
 # Run ipoibarping to note peers about new Infiniband address
 #
 run_send_ib_arp() {
 	ARGS="-q -c $OCF_RESKEY_arp_count -U -I $NIC $OCF_RESKEY_ip"
 	ocf_log info "ipoibarping $ARGS"
 	if ocf_is_true $OCF_RESKEY_arp_bg; then
 		(ipoibarping $ARGS || ocf_log err "Could not send gratuitous arps")& >&2
 	else
 		ipoibarping $ARGS || ocf_log err "Could not send gratuitous arps"
 	fi
 }
 
 # Do we already serve this IP address on the given $NIC?
 #
 # returns:
 # ok = served (for CIP: + hash bucket)
 # partial = served and no hash bucket (CIP only)
 # partial2 = served and no CIP iptables rule
 # no = nothing
 #
 ip_served() {
 	if [ -z "$NIC" ]; then # no nic found or specified
 		echo "no"
 		return 0
 	fi
 
 	cur_nic="`find_interface $OCF_RESKEY_ip $NETMASK`"
 
 	if [ -z "$cur_nic" ]; then
 		echo "no"
 		return 0
 	fi
 
 	if [ -z "$IP_CIP" ]; then
 		for i in $cur_nic; do
 			# only mark as served when on the same interfaces as $NIC
 			[ "$i" = "$NIC" ] || continue
 			echo "ok"
 			return 0
 		done
 		# There used to be logic here to pretend "not served",
 		# if ${OCF_RESKEY_lvs_support} was enabled, and the IP was
 		# found active on "lo*" only.  With lvs_support on, you should
 		# have NIC != lo, so thats already filtered
 		# by the continue above.
 
 		echo "no"
 		return 0
 	fi
 
 	# Special handling for the CIP:
 	if [ ! -e $IP_CIP_FILE ]; then
 		echo "partial2"
 		return 0
 	fi
 	if egrep -q "(^|,)${IP_INC_NO}(,|$)" $IP_CIP_FILE ; then
 		echo "ok"
 		return 0
 	else
 		echo "partial"
 		return 0
 	fi
 
 	exit $OCF_ERR_GENERIC
 }
 
 #######################################################################
 
 ip_usage() {
 	cat <<END
 usage: $0 {start|stop|status|monitor|validate-all|meta-data}
 
 Expects to have a fully populated OCF RA-compliant environment set.
 END
 }
 
 ip_start() {
 	if [ -z "$NIC" ]; then # no nic found or specified
 		exit $OCF_ERR_CONFIGURED
 	fi
 
 	if [ -n "$IP_CIP" ]; then
 	    # Cluster IPs need special processing when the first bucket
 	    #  is added to the node... take a lock to make sure only one
 	    #  process executes that code
 	    ocf_take_lock $CIP_lockfile
 	    ocf_release_lock_on_exit $CIP_lockfile
 	fi
 
 	#
 	#	Do we already service this IP address on $NIC?
 	#
 	local ip_status=`ip_served`
 
 	if [ "$ip_status" = "ok" ]; then
 		exit $OCF_SUCCESS
 	fi
 	
 	if [ -n "$IP_CIP" ] && [ $ip_status = "no" ] || [ $ip_status = "partial2" ]; then
 		$MODPROBE ip_conntrack
 		$IPTABLES -I INPUT -d $OCF_RESKEY_ip -i $NIC -j CLUSTERIP \
 				--new \
 				--clustermac $IF_MAC \
 				--total-nodes $IP_INC_GLOBAL \
 				--local-node $IP_INC_NO \
 				--hashmode $IP_CIP_HASH
 		if [ $? -ne 0 ]; then
 			ocf_log err "iptables failed"
 			exit $OCF_ERR_GENERIC
 		fi
 	fi
 
 	if [ -n "$IP_CIP" ] && [ $ip_status = "partial" ]; then
 		echo "+$IP_INC_NO" >$IP_CIP_FILE
 	fi
 	
 	if [ "$ip_status" = "no" ]; then
 		if ocf_is_true ${OCF_RESKEY_lvs_support}; then
 			for i in `find_interface $OCF_RESKEY_ip 32`; do
 				case $i in
 				lo*)
 					remove_conflicting_loopback $OCF_RESKEY_ip 32 255.255.255.255 lo
 					;;
 				esac
 			done
 		fi
 		
 		add_interface $OCF_RESKEY_ip $NETMASK ${BRDCAST:-none} $NIC $IFLABEL
 		
 		if [ $? -ne 0 ]; then
 			ocf_log err "$CMD failed."
 			exit $OCF_ERR_GENERIC
 		fi
 	fi
 
 	case $NIC in
 	lo*)
 		: no need to run send_arp on loopback
 		;;
 	*)
 		if [ $FAMILY = "inet" ];then
 		    $ARP_SEND_FUN
 		else
 		    if [ -x $SENDUA ]; then
 			run_send_ua
 		    fi
 		fi
 		;;
 	esac
 	exit $OCF_SUCCESS
 }
 
 ip_stop() {
 	local ip_del_if="yes"
 	if [ -n "$IP_CIP" ]; then
 	    # Cluster IPs need special processing when the last bucket
 	    #  is removed from the node... take a lock to make sure only one
 	    #  process executes that code
 	    ocf_take_lock $CIP_lockfile
 	    ocf_release_lock_on_exit $CIP_lockfile
 	fi
 	
 	if [ -f "$SENDARPPIDFILE" ] ; then
 		kill `cat "$SENDARPPIDFILE"`
 		if [ $? -ne 0 ]; then
 			ocf_log warn "Could not kill previously running send_arp for $OCF_RESKEY_ip"
 		else
 			ocf_log info "killed previously running send_arp for $OCF_RESKEY_ip"
 			rm -f "$SENDARPPIDFILE"
 		fi
 	fi
 	local ip_status=`ip_served`
 	ocf_log info "IP status = $ip_status, IP_CIP=$IP_CIP"
 
 	if [ $ip_status = "no" ]; then
 		: Requested interface not in use
 		exit $OCF_SUCCESS
 	fi
 
 	if [ -n "$IP_CIP" ] && [ $ip_status != "partial2" ]; then
 		if [ $ip_status = "partial" ]; then
 			exit $OCF_SUCCESS
 		fi
 		echo "-$IP_INC_NO" >$IP_CIP_FILE
 		if [ "x$(cat $IP_CIP_FILE)" = "x" ]; then
 			ocf_log info $OCF_RESKEY_ip, $IP_CIP_HASH
 			i=1
 			while [ $i -le $IP_INC_GLOBAL ]; do
 				ocf_log info $i
 				$IPTABLES -D INPUT -d $OCF_RESKEY_ip -i $NIC -j CLUSTERIP \
 					--new \
 					--clustermac $IF_MAC \
 					--total-nodes $IP_INC_GLOBAL \
 					--local-node $i \
 					--hashmode $IP_CIP_HASH
 				i=`expr $i + 1`
 			done
 		else
 			ip_del_if="no"		
 		fi
 	fi
 	
 	if [ "$ip_del_if" = "yes" ]; then
 		delete_interface $OCF_RESKEY_ip $NIC $NETMASK
 		if [ $? -ne 0 ]; then
 			exit $OCF_ERR_GENERIC
 		fi
 	
 		if ocf_is_true ${OCF_RESKEY_lvs_support}; then
 			restore_loopback "$OCF_RESKEY_ip"
 		fi
 	fi
 
 	exit $OCF_SUCCESS
 }
 
 ip_monitor() {
 	# TODO: Implement more elaborate monitoring like checking for
 	# interface health maybe via a daemon like FailSafe etc...
 
 	local ip_status=`ip_served`
 	case $ip_status in
 	ok)
 		return $OCF_SUCCESS
 		;;
 	partial|no|partial2)
 		exit $OCF_NOT_RUNNING
 		;;
 	*)
 		# Errors on this interface?
 		return $OCF_ERR_GENERIC
 		;;
 	esac
 }
 
 # make sure that we have something to send ARPs with
 set_send_arp_program() {
+    ARP_SEND_FUN=run_send_arp
     if [ -n "$OCF_RESKEY_arp_sender" ]; then
 	case "$OCF_RESKEY_arp_sender" in
 	send_arp)
 	    check_binary $SENDARP
-	    ARP_SEND_FUN=run_send_arp
 	;;
 	ipoibarping)
 	    check_binary ipoibarping
 	    ARP_SEND_FUN=run_send_ib_arp
 	;;
 	*)
 	    ocf_log err "unrecognized arp_sender value: $OCF_RESKEY_arp_sender"
 	    exit $OCF_ERR_CONFIGURED
 	;;
 	esac
     else
 	if is_infiniband; then
 	    ARP_SEND_FUN=run_send_ib_arp
 	    if ! have_binary ipoibarping; then
 	    	[ "$__OCF_ACTION" = start ] &&
 		    ocf_log warn "using send_arp for infiniband because ipoibarping is not available (set arp_sender to \"send_arp\" to suppress this message)"
 		check_binary $SENDARP
 		ARP_SEND_FUN=run_send_arp
 	    fi
 	fi
     fi
 }
 
 ip_validate() {
     check_binary $IP2UTIL
     IP_CIP=
 
     ip_init
 
     set_send_arp_program
 
     if [ -n "$IP_CIP" ]; then
 	check_binary $IPTABLES
 	check_binary $MODPROBE
     fi
 
 # $BASEIP, $NETMASK, $NIC , $IP_INC_GLOBAL, and $BRDCAST have been checked within ip_init,
 # do not bother here.
 
     if ocf_is_true "$OCF_RESKEY_unique_clone_address" &&
 	    ! ocf_is_true "$OCF_RESKEY_CRM_meta_globally_unique"; then
 	ocf_log err "unique_clone_address makes sense only with meta globally_unique set"
 	exit $OCF_ERR_CONFIGURED
     fi
 
     if ocf_is_decimal "$OCF_RESKEY_arp_interval" && [ $OCF_RESKEY_arp_interval -gt 0 ]; then
 	:
     else
 	ocf_log err "Invalid OCF_RESKEY_arp_interval [$OCF_RESKEY_arp_interval]"
 	exit $OCF_ERR_CONFIGURED
     fi
 
     if ocf_is_decimal "$OCF_RESKEY_arp_count" && [ $OCF_RESKEY_arp_count -gt 0 ]; then
 	:
     else
 	ocf_log err "Invalid OCF_RESKEY_arp_count [$OCF_RESKEY_arp_count]"
 	exit $OCF_ERR_CONFIGURED
     fi
 
     if [ -n "$IP_CIP" ]; then
 
 	local valid=1
 
 	case $IP_CIP_HASH in
 	sourceip|sourceip-sourceport|sourceip-sourceport-destport)
 		;;
 	*)
 		ocf_log err "Invalid OCF_RESKEY_clusterip_hash [$IP_CIP_HASH]"
 		exit $OCF_ERR_CONFIGURED
 		;;
 	esac
 
 	if ocf_is_true ${OCF_RESKEY_lvs_support}; then
 		ecf_log err "LVS and load sharing not advised to try"
 		exit $OCF_ERR_CONFIGURED
 	fi
 
 	case $IF_MAC in
 	[0-9a-zA-Z][13579bBdDfF][!0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][!0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][!0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][!0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][!0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z])
 		;;
 	*)
 		valid=0
 		;;
 	esac
 
 	if [ $valid -eq 0 ]; then
 	  ocf_log err "Invalid IF_MAC [$IF_MAC]"
 	  exit $OCF_ERR_CONFIGURED
 	fi
 
     fi
 }
 
 if ocf_is_true "$OCF_RESKEY_unique_clone_address"; then
     prefix=`echo $OCF_RESKEY_ip | awk -F. '{print $1"."$2"."$3}'`
     suffix=`echo $OCF_RESKEY_ip | awk -F. '{print $4}'`
     suffix=`expr ${OCF_RESKEY_CRM_meta_clone:-0} + $suffix`
     OCF_RESKEY_ip="$prefix.$suffix"
 fi
 
 case $__OCF_ACTION in
 meta-data)	meta_data
 		;;
 usage|help)	ip_usage
 		exit $OCF_SUCCESS
 		;;
 esac
 
 ip_validate
 
 case $__OCF_ACTION in
 start)		ip_start
 		;;
 stop)		ip_stop
 		;;
 status)		ip_status=`ip_served`
 		if [ $ip_status = "ok" ]; then
 			echo "running"
 			exit $OCF_SUCCESS
 		else
 			echo "stopped"
 			exit $OCF_NOT_RUNNING
 		fi
 		;;
 monitor)	ip_monitor
 		;;
 validate-all)	;;
 *)		ip_usage
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
 # vi:sw=4:ts=8: