From f67d4ec93fbf2923a2120a5c134cd8096d4e41fd Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@google.com>
Date: Sun, 6 Jan 2019 15:12:22 +0100
Subject: [PATCH] radvd: load extra prefixes from /perm/radvd/prefixes.json

---
 cmd/radvd/radvd.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/cmd/radvd/radvd.go b/cmd/radvd/radvd.go
index 616e2b3..165640f 100644
--- a/cmd/radvd/radvd.go
+++ b/cmd/radvd/radvd.go
@@ -20,6 +20,7 @@ import (
 	"flag"
 	"io/ioutil"
 	"log"
+	"net"
 	"os"
 	"os/signal"
 	"syscall"
@@ -42,7 +43,15 @@ func logic() error {
 		if err := json.Unmarshal(b, &cfg); err != nil {
 			return err
 		}
-		srv.SetPrefixes(cfg.Prefixes)
+
+		var additional []net.IPNet
+		if b, err := ioutil.ReadFile("/perm/radvd/prefixes.json"); err == nil {
+			if err := json.Unmarshal(b, &additional); err != nil {
+				return err
+			}
+		}
+
+		srv.SetPrefixes(append(cfg.Prefixes, additional...))
 		return nil
 	}
 	if err := readConfig(); err != nil {