From 83d2550b2d1c6351202d199bc9023e1f979f07ff Mon Sep 17 00:00:00 2001 From: Ryan Huber Date: Sat, 23 Nov 2019 21:46:45 +0000 Subject: [PATCH] add an error (non fatal) when a lighthouse host has no static entry --- lighthouse.go | 12 ++++++++++++ main.go | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/lighthouse.go b/lighthouse.go index 5e19d65..26e346c 100644 --- a/lighthouse.go +++ b/lighthouse.go @@ -53,6 +53,18 @@ func NewLightHouse(amLighthouse bool, myIp uint32, ips []string, interval int, n return &h } +func (lh *LightHouse) ValidateLHStaticEntries() (bool, error) { + for lhIP, _ := range lh.lighthouses { + for ip, _ := range lh.staticList { + if lhIP == ip { + continue + } + return false, fmt.Errorf("Lighthouse %s does not have a static_host_map entry", IntIp(lhIP)) + } + } + return true, nil +} + func (lh *LightHouse) Query(ip uint32, f EncWriter) ([]udpAddr, error) { if !lh.IsLighthouseIP(ip) { lh.QueryServer(ip, f) diff --git a/main.go b/main.go index ab23331..a261e9b 100644 --- a/main.go +++ b/main.go @@ -236,6 +236,11 @@ func Main(configPath string, configTest bool, buildVersion string) { } } + _, err = lightHouse.ValidateLHStaticEntries() + if err != nil { + l.Error(err) + } + handshakeManager := NewHandshakeManager(tunCidr, preferredRanges, hostMap, lightHouse, udpServer) //TODO: These will be reused for psk