Minor changes related to logging

[snf-network] / common.sh

diff --git a/common.sh b/common.sh
index 8210cb3..17f13bc 100755 (executable)
--- a/common.sh
+++ b/common.sh
@@ -2,7 +2,7 @@
 
 function try {
 
-  $1 &>/dev/null || true 
+  $1 &>/dev/null || true
 
 }
 
@@ -20,6 +20,14 @@ function clear_routed_setup_ipv6 {
 
 }
 
+function delete_neighbor_proxy {
+
+  get_uplink $LINK "-6"
+  get_eui64 $MAC $SUBNET6
+  $SNF_NETWORK_LOG $0 "ip -6 neigh del proxy $EUI64 dev $UPLINK"
+  ip -6 neigh del proxy $EUI64 dev $UPLINK
+
+}
 
 function clear_routed_setup_firewall {
 
@@ -68,11 +76,15 @@ function routed_setup_ipv4 {
        # Enable proxy ARP
        echo 1 > /proc/sys/net/ipv4/conf/$INTERFACE/proxy_arp
 
+}
+
+function send_garp {
+
   # Send GARP from host to upstream router
   get_uplink $TABLE
   echo 1 > /proc/sys/net/ipv4/ip_nonlocal_bind
-  hooks-log $0 "arping  -c3 -I $UPLINK -U $IP"
-  arping  -c3 -I $UPLINK -U $IP
+  $SNF_NETWORK_LOG $0 "arpsend -U -i $IP -c1 $UPLINK"
+  arpsend -U -i $IP -c1 $UPLINK
   echo 0 > /proc/sys/net/ipv4/ip_nonlocal_bind
 
 }
@@ -96,7 +108,7 @@ function routed_setup_ipv6 {
        echo 0 > /proc/sys/net/ipv6/conf/$INTERFACE/proxy_ndp
 
   # Send Unsolicited Neighbor Advertisement
-  hooks-log $0 "ndsend $EUI64 $UPLINK"
+  $SNF_NETWORK_LOG $0 "ndsend $EUI64 $UPLINK"
   ndsend $EUI64 $UPLINK
 
 }
@@ -224,7 +236,7 @@ get_eui64 () {
 send_command () {
 
   local command="$1"
-  hooks-log dnshook "$command"
+  $SNF_NETWORK_LOG $0 "$command"
   nsupdate -k $KEYFILE > /dev/null << EOF
   server $SERVER
   $command