Revision 6afbe696

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
28
  get_eui64 $MAC $NETWORK_SUBNET6
29

  
30
  if [ -z "$EUI64" -z -o "$UPLINK" ]; then
31
    return
32
  fi
33

  
27 34
  $SNF_NETWORK_LOG $0 "ip -6 neigh del proxy $EUI64 dev $UPLINK"
28 35
  ip -6 neigh del proxy $EUI64 dev $UPLINK
29 36

  
......
80 87

  
81 88
function send_garp {
82 89

  
83
  # Send GARP from host to upstream router
84 90
  get_uplink $TABLE
91
  if [ -z "$IP" -o -z "$UPLINK" ]; then
92
    return
93
  fi
94

  
95
  # Send GARP from host to upstream router
85 96
  echo 1 > /proc/sys/net/ipv4/ip_nonlocal_bind
86 97
  $SNF_NETWORK_LOG $0 "arpsend -U -i $IP -c1 $UPLINK"
87 98
  arpsend -U -i $IP -c1 $UPLINK
......
207 218

  
208 219
  local table=$1
209 220
  local version=$2
210
  UPLINK=$(ip "$version" route list table "$table" | grep "default via" | awk '{print $5}')
221
  UPLINK=$(ip $version route list table $table | grep "default via" | awk '{print $5}')
222
  $SNF_NETWORK_LOG $0 "* uplink for table $table is $UPLINK"
211 223

  
212 224
}
213 225

  
......
224 236
    EUI64=
225 237
  else
226 238
    EUI64=$($MAC2EUI64 $mac $prefix)
239
    $SNF_NETWORK_LOG $0 "* eui64 for $mac inside $prefix is $EUI64"
227 240
  fi
228 241

  
229 242
}
......
236 249
send_command () {
237 250

  
238 251
  local command="$1"
239
  $SNF_NETWORK_LOG $0 "$command"
252
  $SNF_NETWORK_LOG $0 "* $command"
240 253
  nsupdate -k $KEYFILE > /dev/null << EOF
241 254
  server $SERVER
242 255
  $command
b/ifup-extra
48 48
    case $tag in
49 49
      mail)
50 50
      # Here add iptalbes rule..
51
      $SNF_NETWORK_LOG $0 "Tag $tag found: Applying rule for $INTERFACE..."
51 52
      iptables -I FORWARD -i $INTERFACE -p tcp --dport 25 -j ACCEPT
52 53
      ip6tables -I FORWARD -i $INTERFACE -p tcp --dport 25 -j ACCEPT
53 54
    ;;
b/snf-network-dnshook
111 111
  eval MAC=\$$mac
112 112
  eval MODE=\$$mode
113 113
  eval LINK=\$$link
114
  eval SUBNET=\$$subnet
115
  eval SUBNET6=\$$subnet6
114
  eval NETWORK_SUBNET=\$$subnet
115
  eval NETWORK_SUBNET6=\$$subnet6
116 116
  eval TAGS=\$$tags
117 117

  
118 118
  for tag in $TAGS; do
......
120 120
    $DNS_TAG)
121 121

  
122 122
      get_rev4_info "$IP"
123
      get_eui64 "$MAC" "$SUBNET6"
123
      get_eui64 "$MAC" "$NETWORK_SUBNET6"
124 124
      get_rev6_info "$EUI64"
125 125
      $SNF_NETWORK_LOG dnshook "update dns for $GANETI_INSTANCE_NAME $IP $EUI64"
126 126
      update_dns

Also available in: Unified diff