From 9c55f1ccac1c4c068c5eae2fb73a336bb2499baa Mon Sep 17 00:00:00 2001
From: Maurice Walker <maurice@walker.earth>
Date: Fri, 15 Jul 2022 17:33:48 +0200
Subject: [PATCH] Disable IPv6 inside 4in6 and 4in4 gif tunnels

When setting up an IPv4-over-IPv6 or IPv4-over-IPv4 gif tunnel, IPv6 should be disabled inside the tunnel to prevent the automatic configuration of an IPv6 link-local address.
---
 src/etc/inc/interfaces.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index e1cb09c74..83a08ba34 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -657,6 +657,7 @@ function _interfaces_gif_configure($gif)
     if ((is_ipaddrv6($gif['tunnel-local-addr'])) || (is_ipaddrv6($gif['tunnel-remote-addr']))) {
         mwexec("/sbin/ifconfig {$gif['gifif']} inet6 " . escapeshellarg($gif['tunnel-local-addr']) . " " . escapeshellarg($gif['tunnel-remote-addr']) . " prefixlen 128");
     } else {
+        mwexec("/sbin/ifconfig {$gif['gifif']} inet6 ifdisabled");
         mwexec("/sbin/ifconfig {$gif['gifif']} " . escapeshellarg($gif['tunnel-local-addr']) . " " . escapeshellarg($gif['tunnel-remote-addr']) . " netmask " . gen_subnet_mask($gif['tunnel-remote-net']));
     }