Fix TARGET_IP to include /24 CIDR for iptables rules
The iptables rules were using 10.3.1.0 (single IP) instead of 10.3.1.0/24 (subnet), causing routing from other machines to fail.
This commit is contained in:
@@ -10,7 +10,7 @@ ACTION="${1:-start}"
|
|||||||
# Fixed configuration (we assigned these)
|
# Fixed configuration (we assigned these)
|
||||||
CONTAINER_IP="172.30.0.10"
|
CONTAINER_IP="172.30.0.10"
|
||||||
BRIDGE_NAME="br-cistech-vpn"
|
BRIDGE_NAME="br-cistech-vpn"
|
||||||
TARGET_IP="${TARGET_IP:-10.3.1.0}"
|
TARGET_IP="${TARGET_IP:-10.3.1.0/24}"
|
||||||
LAN_SUBNET="192.168.0.0/23"
|
LAN_SUBNET="192.168.0.0/23"
|
||||||
LAN_INTERFACES="eth0 eth1 wlan0"
|
LAN_INTERFACES="eth0 eth1 wlan0"
|
||||||
LOG_FILE="/var/log/cistech-routing.log"
|
LOG_FILE="/var/log/cistech-routing.log"
|
||||||
@@ -29,7 +29,6 @@ remove_routes() {
|
|||||||
|
|
||||||
# Remove any existing route to TARGET_IP
|
# Remove any existing route to TARGET_IP
|
||||||
ip route del "$TARGET_IP" 2>/dev/null || true
|
ip route del "$TARGET_IP" 2>/dev/null || true
|
||||||
ip route del "$TARGET_IP/24" 2>/dev/null || true
|
|
||||||
|
|
||||||
log "Stale routes removed"
|
log "Stale routes removed"
|
||||||
}
|
}
|
||||||
@@ -41,7 +40,7 @@ apply_routes() {
|
|||||||
log "Applying host routing rules..."
|
log "Applying host routing rules..."
|
||||||
log " Container IP: $CONTAINER_IP"
|
log " Container IP: $CONTAINER_IP"
|
||||||
log " Bridge: $BRIDGE_NAME"
|
log " Bridge: $BRIDGE_NAME"
|
||||||
log " Target IP: $TARGET_IP"
|
log " Target Network: $TARGET_IP"
|
||||||
log " LAN interface: ${lan_if:-unknown}"
|
log " LAN interface: ${lan_if:-unknown}"
|
||||||
|
|
||||||
# Enable IP forwarding
|
# Enable IP forwarding
|
||||||
@@ -49,7 +48,7 @@ apply_routes() {
|
|||||||
log "IP forwarding enabled"
|
log "IP forwarding enabled"
|
||||||
|
|
||||||
# Add route to TARGET_IP via container
|
# Add route to TARGET_IP via container
|
||||||
ip route replace "$TARGET_IP/24" via "$CONTAINER_IP" dev "$BRIDGE_NAME"
|
ip route replace "$TARGET_IP" via "$CONTAINER_IP" dev "$BRIDGE_NAME"
|
||||||
log "Route added: $TARGET_IP via $CONTAINER_IP dev $BRIDGE_NAME"
|
log "Route added: $TARGET_IP via $CONTAINER_IP dev $BRIDGE_NAME"
|
||||||
|
|
||||||
# Allow forwarding in DOCKER-USER chain for all LAN interfaces
|
# Allow forwarding in DOCKER-USER chain for all LAN interfaces
|
||||||
@@ -84,7 +83,7 @@ remove_all() {
|
|||||||
log "Removing all routing rules..."
|
log "Removing all routing rules..."
|
||||||
|
|
||||||
# Remove route
|
# Remove route
|
||||||
ip route del "$TARGET_IP/24" via "$CONTAINER_IP" dev "$BRIDGE_NAME" 2>/dev/null || true
|
ip route del "$TARGET_IP" via "$CONTAINER_IP" dev "$BRIDGE_NAME" 2>/dev/null || true
|
||||||
|
|
||||||
# Remove iptables rules for all LAN interfaces
|
# Remove iptables rules for all LAN interfaces
|
||||||
for lan_if in $LAN_INTERFACES; do
|
for lan_if in $LAN_INTERFACES; do
|
||||||
|
|||||||
Reference in New Issue
Block a user