Testing: Re-added setting of default route; delete bridged interface's IP address

Author: Salvoxia

bin/ovpn_run

@@ -101,10 +101,17 @@ if [ $OVPN_DEVICE == "tap" ]; then
         echo "bridge $OVPN_BR_BR already exists"
     fi
 
+    # Add default route if eth is also gateway port
+    echo 'checking if default gateway needs to be added for bridge'
+    if [ $(ip route | grep -c "default via $OVPN_BR_ETH_GATEWAY dev $OVPN_BR_BR") -eq 0 ]; then
+        ip route append default via $OVPN_BR_ETH_GATEWAY dev $OVPN_BR_BR
+    fi
+
     # check if $OVPN_BR_ETH_IF is already added to bridge; add if not
     if [ $(brctl show $OVPN_BR_BR | grep -c $OVPN_BR_ETH_IF) -eq 0 ]; then
         echo "ip link set $OVPN_BR_ETH_IF master $OVPN_BR_BR"
         ip link set $OVPN_BR_ETH_IF master $OVPN_BR_BR
+        ip addr del $OVPN_BR_ETH_IP/$OVPN_BR_CIDR dev $OVPN_BR_ETH_IF
     else
         # Remember the interface was already part of the bridge at startup
         echo "if belongs to bridge" >> /tmp/initial_situation
@@ -127,12 +134,6 @@ if [ $OVPN_DEVICE == "tap" ]; then
     #    # Remember interface was already in promiscous mode
     #    echo "if is promisc" >> /tmp/initial_situation
     #fi
-
-    # Add default route if eth is also gateway port
-    #echo 'checking if default gateway needs to be added for bridge'
-    #if [ $(ip route | grep -c "default via $OVPN_BR_ETH_GATEWAY dev $OVPN_BR_BR") -eq 0 ]; then
-    #    ip route add default via $OVPN_BR_ETH_GATEWAY dev $OVPN_BR_BR
-    #fi
 
     echo 'setting up IPTABLES'
     # check if entry already exists before adding
@@ -239,16 +240,16 @@ cleanup()
             fi
         fi
 
-        #if [ -z "$(grep "if belongs to bridge" /tmp/initial_situation)" ]; then
-        #    #echo 'setting IP, subnet and broadcast address for physical device'
-        #    #OVPN_BR_CIDR=$(mask2cidr $OVPN_BR_ETH_SUBNET)
-        #    #ip addr add $OVPN_BR_ETH_IP/$OVPN_BR_CIDR brd + dev $OVPN_BR_ETH_IF
-        #
-        #    #echo 'checking if default gateway needs to be added for pyhsical device'
-        #    #if [ $(ip route | grep -c "default via $OVPN_BR_ETH_GATEWAY dev $OVPN_BR_ETH_IF") -eq 0 ]; then
-        #    #    ip route add default via $OVPN_BR_ETH_GATEWAY dev $OVPN_BR_ETH_IF
-        #    #fi
-        #fi
+        if [ -z "$(grep "if belongs to bridge" /tmp/initial_situation)" ]; then
+            #echo 'setting IP, subnet and broadcast address for physical device'
+            OVPN_BR_CIDR=$(mask2cidr $OVPN_BR_ETH_SUBNET)
+            ip addr add $OVPN_BR_ETH_IP/$OVPN_BR_CIDR brd + dev $OVPN_BR_ETH_IF
+        
+            echo 'checking if default gateway needs to be added for pyhsical device'
+            if [ $(ip route | grep -c "default via $OVPN_BR_ETH_GATEWAY dev $OVPN_BR_ETH_IF") -eq 0 ]; then
+                ip route append default via $OVPN_BR_ETH_GATEWAY dev $OVPN_BR_ETH_IF
+            fi
+        fi
 
         echo 'Removing tap device'
         if [ $(ip link show | grep -c $OVPN_DEVICE$OVPN_DEVICEN:) -eq 1 ]; then