[network] [PATCH 1/3] Add missing logdir to Makefile.

[network] [PATCH 1/3] Add missing logdir to Makefile.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 930 bytes --]

The logdir has not been created during the "make install" process
and therefore not been shipped yet.

This directory is used to store various databases which contains
data about the zones and routes. They can easily accessed by
the upcomming WUI to display or compute those information.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 3c94486..cdb9d39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,8 @@ hooks_zonesdir   = $(hooksdir)/zones
 
 triggersdir      = $(networkdir)/triggers
 
+logdir           = $(localestatedir)/log/network
+
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
@@ -230,7 +232,8 @@ EXTRA_DIST += \
 	src/ppp/ip-updown.in
 
 INSTALL_DIRS += \
-	$(pppdir)
+	$(pppdir) \
+	$(logdir)
 
 ppp-install-hook:
 	ln -svf ip-updown $(DESTDIR)$(pppdir)/ip-pre-up
-- 
2.9.3

[network] [PATCH 2/3] ipv4-static: Remove routing information from databases when shutting down a zone.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 766 bytes --]

Otherwise the script will try to use this route again and crash because the address space
is not longer available.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 src/hooks/configs/ipv4-static | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4-static
index 72b748c..cb00252 100644
--- a/src/hooks/configs/ipv4-static
+++ b/src/hooks/configs/ipv4-static
@@ -147,7 +147,10 @@ hook_down() {
 		error "Zone '${zone}' doesn't exist."
 		exit ${EXIT_ERROR}
 	fi
-	
+
+	# Remove routing information from database.
+	db_delete "${zone}/ipv4"
+
 	zone_config_settings_read "${zone}" "${config}"
 
 	ip_address_del ${zone} ${ADDRESS}/${PREFIX}
-- 
2.9.3

[network] [PATCH 3/3] Only call radvd_update if a zone contains an IPv6.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 843 bytes --]

On systems which lacks any IPv6 configured zone, radvd would be
started with an empty configuration file and crashes which will
brick the system startup and results in a frozen system.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 src/functions/functions.routing | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/functions/functions.routing b/src/functions/functions.routing
index c7aac09..4824f34 100644
--- a/src/functions/functions.routing
+++ b/src/functions/functions.routing
@@ -81,7 +81,9 @@ routing_default_update() {
 		routes=$(echo ${routes})
 
 		# Reload radvd configuration
-		[[ "${proto}" = "ipv6" ]] && radvd_update
+		if [[ "${proto}" = "ipv6" ]] && db_exists "${zone}/ipv6"; then
+			radvd_update
+		fi
 
 		# Remove all default routes.
 		if [ -z "${routes}" ]; then
-- 
2.9.3

Re: [network] [PATCH 3/3] Only call radvd_update if a zone contains an IPv6.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 1113 bytes --]

Please ignore this patch,

it fixes the descibed issue on IPv4 only systems but there is another
issue with IPv6 as well which requires more and deeper work to get this
solved in a right way.

Thanks in advance,

-Stefan
> On systems which lacks any IPv6 configured zone, radvd would be
> started with an empty configuration file and crashes which will
> brick the system startup and results in a frozen system.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>  src/functions/functions.routing | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/functions/functions.routing
> b/src/functions/functions.routing
> index c7aac09..4824f34 100644
> --- a/src/functions/functions.routing
> +++ b/src/functions/functions.routing
> @@ -81,7 +81,9 @@ routing_default_update() {
>  		routes=$(echo ${routes})
>  
>  		# Reload radvd configuration
> -		[[ "${proto}" = "ipv6" ]] && radvd_update
> +		if [[ "${proto}" = "ipv6" ]] && db_exists
> "${zone}/ipv6"; then
> +			radvd_update
> +		fi
>  
>  		# Remove all default routes.
>  		if [ -z "${routes}" ]; then

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]