Revision a004c27e

b/common.sh
1 1
#!/bin/bash
2 2

  
3
source /etc/default/snf-network
4

  
3 5
function try {
4 6

  
5 7
  $1 &>/dev/null || true
......
23 25
function delete_neighbor_proxy {
24 26

  
25 27
  get_uplink $LINK "-6"
26
  get_eui64 $MAC $SUBNET6
27
  $SNF_NETWORK_LOG $0 "ip -6 neigh del proxy $EUI64 dev $UPLINK"
28
  ip -6 neigh del proxy $EUI64 dev $UPLINK
28
  get_eui64 $MAC $NETWORK_SUBNET6
29
  if [ -n "$EUI64" -a -n "$UPLINK" ]; then
30
    $SNF_NETWORK_LOG $0 "* ip -6 neigh del proxy $EUI64 dev $UPLINK"
31
    ip -6 neigh del proxy $EUI64 dev $UPLINK
32
  fi
29 33

  
30 34
}
31 35

  
......
84 88
  echo 1 > /proc/sys/net/ipv4/ip_nonlocal_bind
85 89
  # $SNF_NETWORK_LOG $0 "arping  -c3 -I $UPLINK -U $IP"
86 90
  # arping  -c3 -I $UPLINK -U $IP
87
  $SNF_NETWORK_LOG $0 "arpsend -U -i $IP $UPLINK"
88
  arpsend -U -i $IP $UPLINK
91
  $SNF_NETWORK_LOG $0 "arpsend -U -c 1 -i $IP $UPLINK"
92
  arpsend -U -c 1 -i $IP $UPLINK
89 93
  echo 0 > /proc/sys/net/ipv4/ip_nonlocal_bind
90 94

  
91 95
}
......
201 205

  
202 206
  local table=$1
203 207
  local version=$2
204
  UPLINK=$(ip "$version" route list table "$table" | grep "default via" | awk '{print $5}')
208
  UPLINK=$(ip $version route list table "$table" | grep "default via" | awk '{print $5}')
209
  $SNF_NETWORK_LOG $0 "* uplink for table $table is $UPLINK"
205 210

  
206 211
}
207 212

  
......
218 223
    EUI64=
219 224
  else
220 225
    EUI64=$($MAC2EUI64 $mac $prefix)
226
    $SNF_NETWORK_LOG $0 "* eui64 for $mac inside $prefix is $EUI64"
221 227
  fi
222 228

  
223 229
}
......
230 236
send_command () {
231 237

  
232 238
  local command="$1"
233
  $SNF_NETWORK_LOG $0 "$command"
239
  $SNF_NETWORK_LOG $0 "* $command"
234 240
  nsupdate -k $KEYFILE > /dev/null << EOF
235 241
  server $SERVER
236 242
  $command
b/ifup-extra
16 16
  case $tag in
17 17
    mail)
18 18
    # Here add iptalbes rule..
19
    $SNF_NETWORK_LOG $0 "Applying mail rule..."
19 20
  ;;
20 21
  esac
21 22
done
b/kvm-ifdown
46 46
  $DNS_TAG)
47 47
    if ! $ONLY_LOCAL; then
48 48
      get_rev4_info "$IP"
49
      get_eui64 "$MAC" "$SUBNET6"
49
      get_eui64 "$MAC" "$NETWORK_SUBNET6"
50 50
      get_rev6_info "$EUI64"
51 51
      $SNF_NETWORK_LOG $0 "delete dns entry for $GANETI_INSTANCE_NAME $IP $EUI64"
52 52
      update_all delete
b/kvm-ifup
52 52
  ;;
53 53
  $DNS_TAG)
54 54
    get_rev4_info "$IP"
55
    get_eui64 "$MAC" "$SUBNET6"
55
    get_eui64 "$MAC" "$NETWORK_SUBNET6"
56 56
    get_rev6_info "$EUI64"
57 57
    $SNF_NETWORK_LOG $0 "update dns for $GANETI_INSTANCE_NAME $IP $EUI64"
58 58
    update_all add
b/vif-custom
67 67
  ;;
68 68
  $DNS_TAG)
69 69
    get_rev4_info "$IP"
70
    get_eui64 "$MAC" "$SUBNET6"
70
    get_eui64 "$MAC" "$NETWORK_SUBNET6"
71 71
    get_rev6_info "$EUI64"
72 72
    $SNF_NETWORK_LOG $0 "update dns for $GANETI_INSTANCE_NAME $IP $EUI64"
73 73
    update_all add

Also available in: Unified diff