diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-03-06 11:21:41 +1100 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2012-03-22 15:30:26 +1100 |
| commit | 940efdb8e94c18226f23d6bcf76276fc3bca18bb (patch) | |
| tree | f9632433e6ff0bc2320394e7a7897cd38597ca8e | |
| parent | 95e10b20cb5d3e3de543535a274bd7bbc76750e0 (diff) | |
| download | samba-940efdb8e94c18226f23d6bcf76276fc3bca18bb.tar.gz samba-940efdb8e94c18226f23d6bcf76276fc3bca18bb.tar.xz samba-940efdb8e94c18226f23d6bcf76276fc3bca18bb.zip | |
Eventscript functions - remove functions only used by 13.per_ip_routing
The relevant functions are now in that script.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 45c3476d12bf0f52966b72d286f101fce1382cd2)
| -rwxr-xr-x | ctdb/config/functions | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/ctdb/config/functions b/ctdb/config/functions index c83e72a9bf..7d1f592da7 100755 --- a/ctdb/config/functions +++ b/ctdb/config/functions @@ -1287,70 +1287,6 @@ ctdb_standard_event_handler () esac } -ipv4_host_addr_to_net_addr() -{ - local HOST=$1 - local MASKBITS=$2 - - local HOST0=$(echo $HOST | awk -F . '{print $4}') - local HOST1=$(echo $HOST | awk -F . '{print $3}') - local HOST2=$(echo $HOST | awk -F . '{print $2}') - local HOST3=$(echo $HOST | awk -F . '{print $1}') - - local HOST_NUM=$(( $HOST0 + $HOST1 * 256 + $HOST2 * (256 ** 2) + $HOST3 * (256 ** 3) )) - - local MASK_NUM=$(( ( (2**32 - 1) * (2**(32 - $MASKBITS)) ) & (2**32 - 1) )) - - local NET_NUM=$(( $HOST_NUM & $MASK_NUM)) - - local NET0=$(( $NET_NUM & 255 )) - local NET1=$(( ($NET_NUM & (255 * 256)) / 256 )) - local NET2=$(( ($NET_NUM & (255 * 256**2)) / 256**2 )) - local NET3=$(( ($NET_NUM & (255 * 256**3)) / 256**3 )) - - echo "$NET3.$NET2.$NET1.$NET0" -} - -ipv4_maskbits_to_net_mask() -{ - local MASKBITS=$1 - - local MASK_NUM=$(( ( (2**32 - 1) * (2**(32 - $MASKBITS)) ) & (2**32 - 1) )) - - local MASK0=$(( $MASK_NUM & 255 )) - local MASK1=$(( ($MASK_NUM & (255 * 256)) / 256 )) - local MASK2=$(( ($MASK_NUM & (255 * 256**2)) / 256**2 )) - local MASK3=$(( ($MASK_NUM & (255 * 256**3)) / 256**3 )) - - echo "$MASK3.$MASK2.$MASK1.$MASK0" -} - -ipv4_is_valid_addr() -{ - local ADDR=$1 - local fail=0 - - local N=`echo $ADDR | sed -e 's/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*//'` - test -n "$N" && fail=1 - - local ADDR0=$(echo $ADDR | awk -F . '{print $4}') - local ADDR1=$(echo $ADDR | awk -F . '{print $3}') - local ADDR2=$(echo $ADDR | awk -F . '{print $2}') - local ADDR3=$(echo $ADDR | awk -F . '{print $1}') - - test "$ADDR0" -gt 255 && fail=1 - test "$ADDR1" -gt 255 && fail=1 - test "$ADDR2" -gt 255 && fail=1 - test "$ADDR3" -gt 255 && fail=1 - - test x"$fail" != x"0" && { - #echo "IPv4: '$ADDR' is not a valid address" - return 1; - } - - return 0; -} - # iptables doesn't like being re-entered, so flock-wrap it. iptables() { |