* Added NAT rule for Freifunk DHCP

diff --git a/module/admin-core/contrib/init.d/luci_freifunk b/module/admin-core/contrib/init.d/luci_freifunk
index 663112389fdd04fe0bbcb41bc8de92db0f7f7d7e..d3c23e54d6060a948a78f2ed825d242052557173 100644 (file)
--- a/module/admin-core/contrib/init.d/luci_freifunk
+++ b/module/admin-core/contrib/init.d/luci_freifunk
@@ -10,6 +10,7 @@ start() {
        config_get wanif wan ifname
        config_get lanif lan ifname
        config_get ffif  ff  ifname
+       config_get ffdif ffdhcp  ifname
        
        config_get lanip   lan ipaddr
        config_get lanmask lan netmask
@@ -17,6 +18,9 @@ start() {
        config_get ffip    ff ipaddr
        config_get ffmask  ff netmask
        
+       config_get ffdip   ffdhcp ipaddr
+       config_get ffdmask ffdhcp netmask
+       
        [ -n "$ffif" ] || return 0
        
        
@@ -53,6 +57,13 @@ start() {
                iptables -t nat -A luci_freifunk_postrouting -s "$NETWORK/$PREFIX" -o "$wanif" -j MASQUERADE
        }
        
+       ### Freifunk DHCP to Wan
+       [ "$internet" -gt 0 -a -n "$ffdif" ] && {               
+               eval "$(ipcalc.sh $ffdip $ffdmask)"             
+               
+               iptables -t nat -A luci_freifunk_postrouting -s "$NETWORK/$PREFIX" -o "$wanif" -j MASQUERADE
+       }
+       
        ### Hook in the chains
        iptables -A forwarding_rule -j luci_freifunk_forwarding
        iptables -t nat -A postrouting_rule -j luci_freifunk_postrouting

diff --git a/module/admin-core/src/view/admin_system/reboot.htm b/module/admin-core/src/view/admin_system/reboot.htm
index b6c38b75c4b65bda7ebd3a4c33734deaa3cfe2af..e81be408c9b5581c51d0a181af88fec67bcaf593 100644 (file)
--- a/module/admin-core/src/view/admin_system/reboot.htm
+++ b/module/admin-core/src/view/admin_system/reboot.htm
@@ -6,6 +6,6 @@
 <p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:reboot_do Neustart durchführen%></a></p>
 <% else %>
 <p><%:reboot_running Bitte warten: Neustart wird durchgeführt...%></p>
-<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 45000)</script>
+<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>
 <% end %>
 <%+footer%>
\ No newline at end of file