From e5cee3bbb9a9bccb4015a0297ceadb2cef2bf1e5 Mon Sep 17 00:00:00 2001 From: Anders Pitman Date: Wed, 5 Jan 2022 22:42:11 -0700 Subject: [PATCH] Warning instead of fail if no public IP --- boringproxy.go | 20 ++++++++++---------- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/boringproxy.go b/boringproxy.go index 0dc04eb..e2c5648 100644 --- a/boringproxy.go +++ b/boringproxy.go @@ -67,17 +67,17 @@ func Listen() { ip, err := namedropClient.GetPublicIp() if err != nil { - log.Fatal(err) - } + fmt.Printf("WARNING: Failed to determine public IP: %s\n", err.Error()) + } else { + err = namedrop.CheckPublicAddress(ip, *httpPort) + if err != nil { + fmt.Printf("WARNING: Failed to access port %d from the internet\n", *httpPort) + } - err = namedrop.CheckPublicAddress(ip, *httpPort) - if err != nil { - fmt.Printf("WARNING: Failed to access port %d from the internet\n", *httpPort) - } - - err = namedrop.CheckPublicAddress(ip, *httpsPort) - if err != nil { - fmt.Printf("WARNING: Failed to access port %d from the internet\n", *httpsPort) + err = namedrop.CheckPublicAddress(ip, *httpsPort) + if err != nil { + fmt.Printf("WARNING: Failed to access port %d from the internet\n", *httpsPort) + } } autoCerts := true diff --git a/go.mod b/go.mod index 228c4e9..ae7d764 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 - github.com/takingnames/namedrop-go v0.4.0 + github.com/takingnames/namedrop-go v0.6.0 ) require ( diff --git a/go.sum b/go.sum index 84f1d3c..bf02f8a 100644 --- a/go.sum +++ b/go.sum @@ -142,6 +142,8 @@ github.com/takingnames/namedrop-go v0.3.0 h1:qblZaAFQzkxOJvqVbqH3Oqevfd8mSkgF4k9 github.com/takingnames/namedrop-go v0.3.0/go.mod h1:E3nx6fxAMfestthd1O3VhbaPesLaiYSGkWXRD1nIc88= github.com/takingnames/namedrop-go v0.4.0 h1:dtCANCL+pQ/oBftGN5+gIeHglk5Yo/3Qokp5Uw90UHk= github.com/takingnames/namedrop-go v0.4.0/go.mod h1:E3nx6fxAMfestthd1O3VhbaPesLaiYSGkWXRD1nIc88= +github.com/takingnames/namedrop-go v0.6.0 h1:1iIHjSww47fwalBFfs3Caovkqzz5UMqwDFzisy6iPag= +github.com/takingnames/namedrop-go v0.6.0/go.mod h1:E3nx6fxAMfestthd1O3VhbaPesLaiYSGkWXRD1nIc88= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=