[Astlinux-commits] SF.net SVN: astlinux:[8291] branches/1.0/package/arnofw

[<abe...@us...>]

Revision: 8291
          http://sourceforge.net/p/astlinux/code/8291
Author:   abelbeck
Date:     2017-05-09 14:07:42 +0000 (Tue, 09 May 2017)
Log Message:
-----------
arnofw, add support for EXT_IF_DHCPV6_IPV6 config variable, AIF Issue #34

Modified Paths:
--------------
    branches/1.0/package/arnofw/arnofw.wrapper

Added Paths:
-----------
    branches/1.0/package/arnofw/arnofw-0002-EXT_IF_DHCPV6_IPV6.patch

Added: branches/1.0/package/arnofw/arnofw-0002-EXT_IF_DHCPV6_IPV6.patch
===================================================================
--- branches/1.0/package/arnofw/arnofw-0002-EXT_IF_DHCPV6_IPV6.patch	                        (rev 0)
+++ branches/1.0/package/arnofw/arnofw-0002-EXT_IF_DHCPV6_IPV6.patch	2017-05-09 14:07:42 UTC (rev 8291)
@@ -0,0 +1,39 @@
+diff --git a/bin/arno-iptables-firewall b/bin/arno-iptables-firewall
+index 50b024c..1ee713f 100755
+--- a/bin/arno-iptables-firewall
++++ b/bin/arno-iptables-firewall
+@@ -2698,9 +2698,11 @@ setup_ext_input_chain()
+     echo " Enabling support for DHCP-assigned-IP (DHCP client)"
+     # Allow this host to be an DHCP client:
+     ip4tables -A EXT_INPUT_CHAIN -p udp --sport 67 --dport 68 -j ACCEPT
++  fi
++  if [ "$EXT_IF_DHCP_IP" = "1" -o "$EXT_IF_DHCPV6_IPV6" = "1" ]; then
+     if [ "$IPV6_SUPPORT" = "1" ]; then
+       # Allow this host to be an DHCPv6 client:
+-      ip6tables -A EXT_INPUT_CHAIN -p udp --sport 547 --dport 546 -j ACCEPT
++      ip6tables -A EXT_INPUT_CHAIN -s fe80::/10 -p udp --sport 547 --dport 546 -j ACCEPT
+     fi
+   fi
+ 
+diff --git a/etc/arno-iptables-firewall/firewall.conf b/etc/arno-iptables-firewall/firewall.conf
+index e3c8894..766cbdd 100644
+--- a/etc/arno-iptables-firewall/firewall.conf
++++ b/etc/arno-iptables-firewall/firewall.conf
+@@ -39,10 +39,16 @@
+ EXT_IF=""
+ 
+ # Enable if THIS machines (dynamically) obtains its IP through (IPv4) DHCP
+-# and/or (IPv6) DHCPv6 (from your ISP)
++# and possibly (IPv6) DHCPv6 (from your ISP)
+ # ------------------------------------------------------------------------------
+ EXT_IF_DHCP_IP=0
+ 
++# Enable if THIS machines (dynamically) obtains its IP through (IPv6) DHCPv6
++# and not (IPv4) DHCP. Applies only when EXT_IF_DHCP_IP is set to "0".
++# (IPv6 Only)
++# ------------------------------------------------------------------------------
++EXT_IF_DHCPV6_IPV6=0
++
+ # (EXPERT SETTING!) Here you can override your external(!) IPv4 subnet(s).
+ # Normally these are (attempted to be) autodetected, so leaving this empty
+ # should work for most scenarios. This setting is used when eg. running a DHCP

Modified: branches/1.0/package/arnofw/arnofw.wrapper
===================================================================
--- branches/1.0/package/arnofw/arnofw.wrapper	2017-05-09 00:57:44 UTC (rev 8290)
+++ branches/1.0/package/arnofw/arnofw.wrapper	2017-05-09 14:07:42 UTC (rev 8291)
@@ -222,11 +222,20 @@
   fi
 
   EXT_IF_DHCP_IP=0
-  if [ -n "$EXTIF" -a -z "$EXTIP" ] && [ "$EXTIF" != "ppp0" -o -z "$PPPOEIF" ]; then
-    EXT_IF_DHCP_IP=1
+  EXT_IF_DHCPV6_IPV6=0
+  if [ -n "$EXTIF" ] && [ "$EXTIF" != "ppp0" -o -z "$PPPOEIF" ]; then
+    if [ -z "$EXTIP" ]; then
+      EXT_IF_DHCP_IP=1
+    elif [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+      EXT_IF_DHCPV6_IPV6=1
+    fi
   fi
-  if [ -n "$EXT2IF" -a -z "$EXT2IP" ] && [ "$EXT2IF" != "ppp0" -o -z "$PPPOEIF" ]; then
-    EXT_IF_DHCP_IP=1
+  if [ -n "$EXT2IF" ] && [ "$EXT2IF" != "ppp0" -o -z "$PPPOEIF" ]; then
+    if [ -z "$EXT2IP" ]; then
+      EXT_IF_DHCP_IP=1
+    elif [ "$IPV6" = "yes" -a "$EXT2DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+      EXT_IF_DHCPV6_IPV6=1
+    fi
   fi
 
   if [ "$EXTDHCP" = "yes" -a -n "$EXTIP" -a -n "$EXTGW" -a -z "$EXT2IF" -a -z "$PPPOEIF" ]; then

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.