modules/freifunk: remove firewall addon data

diff --git a/modules/freifunk/root/etc/firewall.freifunk b/modules/freifunk/root/etc/firewall.freifunk
deleted file mode 100644 (file)
index b27957b..0000000
--- a/modules/freifunk/root/etc/firewall.freifunk
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# Freifunk Firewall addons
-# $Id$
-
-
-#
-# Apply advanced settings
-#
-apply_advanced() {
-       local tcp_ecn
-       local tcp_window_scaling
-       local accept_redirects
-       local accept_source_route
-
-       config_get_bool tcp_ecn $1 tcp_ecn 1
-       config_get ip_conntrack_max $1 ip_conntrack_max
-       config_get_bool tcp_westwood $1 tcp_westwood 0
-       config_get_bool tcp_window_scaling $1 tcp_window_scaling 1
-       config_get_bool accept_redirects $1 accept_redirects 0
-       config_get_bool accept_source_route $1 accept_source_route 0
-
-       logger -t firewall.freifunk "tcp_ecn is $tcp_ecn"
-       logger -t firewall.freifunk "tcp_window_scaling is $tcp_window_scaling"
-       logger -t firewall.freifunk "accept_redirects is $accept_redirects"
-       logger -t firewall.freifunk "accept_source_route is $accept_source_route"
-
-       sysctl -w net.ipv4.tcp_ecn=$tcp_ecn >/dev/null
-       sysctl -w net.ipv4.tcp_window_scaling=$tcp_window_scaling >/dev/null
-       sysctl -w net.ipv4.tcp_westwood=$tcp_westwood >/dev/null
-       sysctl -w net.ipv4.ip_conntrack_max=$ip_conntrack_max >/dev/null
-
-       for f in /proc/sys/net/ipv4/conf/*/accept_redirects; do
-               echo $accept_redirects > $f
-       done
-
-       for f in /proc/sys/net/ipv4/conf/*/accept_source_route; do
-               echo $accept_source_route > $f
-       done
-}
-
-config_foreach apply_advanced advanced
-
-
-#
-# Apply fixes for masquerading rules
-#
-apply_nat_fix() {
-       local up
-       local ifname
-       config_get up $1 up
-       [ -n "$up" ] || return 0
-       (ACTION="ifup" INTERFACE="$1" . /etc/hotplug.d/iface/22-firewall-nat-fix )
-}
-
-uci_set_state firewall core loaded 1
-config_foreach fw_addif interface
-config_foreach apply_nat_fix interface
-
-[ -x /etc/init.d/luci_splash ] && ( sleep 3; /etc/init.d/luci_splash restart )&
-
-[ -x /etc/init.d/freifunk-p2pblock ] && /etc/init.d/freifunk-p2pblock enabled && \
-       ( sleep 3; /etc/init.d/freifunk-p2pblock restart )&

diff --git a/modules/freifunk/root/etc/hotplug.d/iface/22-firewall-nat-fix b/modules/freifunk/root/etc/hotplug.d/iface/22-firewall-nat-fix
deleted file mode 100644 (file)
index 634f432..0000000
--- a/modules/freifunk/root/etc/hotplug.d/iface/22-firewall-nat-fix
+++ /dev/null
@@ -1,61 +0,0 @@
-. /lib/firewall/uci_firewall.sh
-unset ZONE
-config_get ifname $INTERFACE ifname
-[ "$ifname" == "lo" ] && exit 0
-
-load_zones() {
-       local name
-       local network
-       config_get name $1 name
-       config_get network $1 network
-       [ -z "$network" ] && network=$name
-       for n in $network; do
-               [ "$n" = "$INTERFACE" ] && ZONE="$ZONE $name"
-       done
-}
-
-config_foreach load_zones zone
-
-[ -z "$ZONE" ] && exit 0
-
-natfix_addr_add() {
-       local network=$1
-       local iface=$2
-
-       config_get parent "$1" interface
-       [ "$network" != "$INTERFACE" -a "$parent" != "$INTERFACE" ] && return 0
-
-       config_get ipaddr "$network" ipaddr
-       [ -n "$ipaddr" ] || return 0
-       config_get netmask "$network" netmask
-       [ -n "$netmask" ] || return 0
-       eval "$(ipcalc.sh $ipaddr $netmask)"
-
-       logger -t firewall.freifunk "adding nat rule for $iface($NETWORK/$PREFIX)"
-       iptables -t nat -A "natfix_$iface" -s "$NETWORK/$PREFIX" -d "$NETWORK/$PREFIX" -j ACCEPT
-}
-
-[ ifup = "$ACTION" ] && {
-       iptables -t nat -N "natfix_$ifname"
-       natfix_addr_add "$INTERFACE" "$ifname"
-       config_foreach natfix_addr_add alias "$ifname"
-
-       for z in $ZONE; do
-               local loaded
-               config_get loaded core loaded
-               [ -n "$loaded" ] && {
-                       logger -t firewall.freifunk "applying nat rules on zone $z"
-                       iptables -t nat -I "zone_${z}_nat" 1 -o "$ifname" -j "natfix_$ifname"
-               }
-       done
-}
-
-[ ifdown = "$ACTION" ] && {
-       for z in $ZONE; do
-               local up
-               config_get up $z up
-               iptables -t nat -D "zone_${z}_nat" -o "$ifname" -j "natfix_$ifname" 2>/dev/null
-       done
-       iptables -t nat -F "natfix_$ifname" 2>/dev/null
-       iptables -t nat -X "natfix_$ifname" 2>/dev/null
-}