Commit 916e66cf authored by nanahira's avatar nanahira

fix eq

parent 44651cf7
...@@ -28,10 +28,10 @@ handle_gateway() { ...@@ -28,10 +28,10 @@ handle_gateway() {
GATEWAY_NEXT_HOP_MARK=$((GATEWAY_ID + 1100)) GATEWAY_NEXT_HOP_MARK=$((GATEWAY_ID + 1100))
GATEWAY_SELECTION_MARK=$((GATEWAY_NEXT_HOP_MARK + 50)) GATEWAY_SELECTION_MARK=$((GATEWAY_NEXT_HOP_MARK + 50))
BRIDGE_IP=$(ip -4 addr show dev "$BRIDGE_NAME" | grep 'inet ' | awk '{print $2}') BRIDGE_IP=$(ip -4 addr show dev "$BRIDGE_NAME" | grep 'inet ' | awk '{print $2}')
if [[ "$GATEWAY_ADDRESS" -eq "_use_first" ]]; then if [[ "$GATEWAY_ADDRESS" == "_use_first" ]]; then
GATEWAY_ADDRESS=$(subnetcalc "$BRIDGE_IP" -n | grep "Host Range" | awk '{print $5}') GATEWAY_ADDRESS=$(subnetcalc "$BRIDGE_IP" -n | grep "Host Range" | awk '{print $5}')
fi fi
if [[ "$GATEWAY_ADDRESS" -eq "_use_last" ]]; then if [[ "$GATEWAY_ADDRESS" == "_use_last" ]]; then
GATEWAY_ADDRESS=$(subnetcalc "$BRIDGE_IP" -n | grep "Host Range" | awk '{print $7}') GATEWAY_ADDRESS=$(subnetcalc "$BRIDGE_IP" -n | grep "Host Range" | awk '{print $7}')
fi fi
...@@ -42,7 +42,7 @@ handle_gateway() { ...@@ -42,7 +42,7 @@ handle_gateway() {
ip rule add pref 100 fwmark "$GATEWAY_NEXT_HOP_MARK" lookup "$GATEWAY_NEXT_HOP_MARK" ip rule add pref 100 fwmark "$GATEWAY_NEXT_HOP_MARK" lookup "$GATEWAY_NEXT_HOP_MARK"
ip rule add pref 400 fwmark "$GATEWAY_SELECTION_MARK" lookup "$GATEWAY_NEXT_HOP_MARK" ip rule add pref 400 fwmark "$GATEWAY_SELECTION_MARK" lookup "$GATEWAY_NEXT_HOP_MARK"
if [[ "$GATEWAY_NO_ORIGIN" -eq 0 ]]; then if [[ "$GATEWAY_NO_ORIGIN" == 0 ]]; then
eth_origin -I "$BRIDGE_NAME" "$GATEWAY_ID" "$GATEWAY_ADDRESS" "$GATEWAY_MAC" eth_origin -I "$BRIDGE_NAME" "$GATEWAY_ID" "$GATEWAY_ADDRESS" "$GATEWAY_MAC"
fi fi
} }
......
...@@ -20,16 +20,16 @@ handle_gateway() { ...@@ -20,16 +20,16 @@ handle_gateway() {
GATEWAY_NEXT_HOP_MARK=$((GATEWAY_ID + 1100)) GATEWAY_NEXT_HOP_MARK=$((GATEWAY_ID + 1100))
GATEWAY_SELECTION_MARK=$((GATEWAY_NEXT_HOP_MARK + 50)) GATEWAY_SELECTION_MARK=$((GATEWAY_NEXT_HOP_MARK + 50))
BRIDGE_IP=$(ip -4 addr show dev "$BRIDGE_NAME" | grep 'inet ' | awk '{print $2}') BRIDGE_IP=$(ip -4 addr show dev "$BRIDGE_NAME" | grep 'inet ' | awk '{print $2}')
if [[ "$GATEWAY_ADDRESS" -eq "_use_first" ]]; then if [[ "$GATEWAY_ADDRESS" == "_use_first" ]]; then
GATEWAY_ADDRESS=$(subnetcalc "$BRIDGE_IP" -n | grep "Host Range" | awk '{print $5}') GATEWAY_ADDRESS=$(subnetcalc "$BRIDGE_IP" -n | grep "Host Range" | awk '{print $5}')
fi fi
if [[ "$GATEWAY_ADDRESS" -eq "_use_last" ]]; then if [[ "$GATEWAY_ADDRESS" == "_use_last" ]]; then
GATEWAY_ADDRESS=$(subnetcalc "$BRIDGE_IP" -n | grep "Host Range" | awk '{print $7}') GATEWAY_ADDRESS=$(subnetcalc "$BRIDGE_IP" -n | grep "Host Range" | awk '{print $7}')
fi fi
ip rule del pref 100 fwmark "$GATEWAY_NEXT_HOP_MARK" lookup "$GATEWAY_NEXT_HOP_MARK" ip rule del pref 100 fwmark "$GATEWAY_NEXT_HOP_MARK" lookup "$GATEWAY_NEXT_HOP_MARK"
ip rule add pref 400 fwmark "$GATEWAY_SELECTION_MARK" lookup "$GATEWAY_NEXT_HOP_MARK" ip rule add pref 400 fwmark "$GATEWAY_SELECTION_MARK" lookup "$GATEWAY_NEXT_HOP_MARK"
if [[ "$GATEWAY_NO_ORIGIN" -eq 0 ]]; then if [[ "$GATEWAY_NO_ORIGIN" == 0 ]]; then
eth_origin -D "$BRIDGE_NAME" "$GATEWAY_ID" "$GATEWAY_ADDRESS" "$GATEWAY_MAC" eth_origin -D "$BRIDGE_NAME" "$GATEWAY_ID" "$GATEWAY_ADDRESS" "$GATEWAY_MAC"
fi fi
} }
......
...@@ -34,7 +34,7 @@ eth_origin() { ...@@ -34,7 +34,7 @@ eth_origin() {
GATEWAY_ADDRESS=$4 GATEWAY_ADDRESS=$4
GATEWAY_MAC=$5 GATEWAY_MAC=$5
MARK=$[1100 + $GATEWAY_ID] MARK=$[1100 + $GATEWAY_ID]
if [[ "$GATEWAY_MAC" -eq "unknown" ]]; then if [[ "$GATEWAY_MAC" == "unknown" ]]; then
ping "$GATEWAY_ADDRESS" -c 1 ping "$GATEWAY_ADDRESS" -c 1
NEIGH_LINE=$(ip neigh show "$GATEWAY_ADDRESS") NEIGH_LINE=$(ip neigh show "$GATEWAY_ADDRESS")
GATEWAY_MAC=$(echo $NEIGH_LINE | awk '{print $5}') GATEWAY_MAC=$(echo $NEIGH_LINE | awk '{print $5}')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment