admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor changes

Browse Source 
- Remove https://ip4.ddnss.de/meineip.php
- Logs when falling back to plaintext DNS
This commit is contained in:
Quentin McGaw
2020-07-11 21:04:46 +00:00
parent b1596bc7e4
commit 2f9d1f09d3
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/dns/loop.go
View File

@@ -146,6 +146,7 @@ func (l *looper) fallbackToUnencryptedDNS() {
// Try with user provided plaintext ip address // Try with user provided plaintext ip address
targetIP := l.settings.PlaintextAddress targetIP := l.settings.PlaintextAddress
if targetIP != nil { if targetIP != nil {
l.logger.Info("falling back on plaintext DNS at address %s", targetIP)
l.conf.UseDNSInternally(targetIP) l.conf.UseDNSInternally(targetIP)
if err := l.conf.UseDNSSystemWide(targetIP); err != nil { if err := l.conf.UseDNSSystemWide(targetIP); err != nil {
l.logger.Error(err) l.logger.Error(err)
@@ -158,6 +159,7 @@ func (l *looper) fallbackToUnencryptedDNS() {
data := constants.DNSProviderMapping()[provider] data := constants.DNSProviderMapping()[provider]
for _, targetIP = range data.IPs { for _, targetIP = range data.IPs {
if targetIP.To4() != nil { if targetIP.To4() != nil {
l.logger.Info("falling back on plaintext DNS at address %s", targetIP)
l.conf.UseDNSInternally(targetIP) l.conf.UseDNSInternally(targetIP)
if err := l.conf.UseDNSSystemWide(targetIP); err != nil { if err := l.conf.UseDNSSystemWide(targetIP); err != nil {
l.logger.Error(err) l.logger.Error(err)

1
internal/publicip/publicip.go
View File

@@ -35,7 +35,6 @@ func (i *ipGetter) Get() (ip net.IP, err error) {
"https://diagnostic.opendns.com/myip", "https://diagnostic.opendns.com/myip",
"https://domains.google.com/checkip", "https://domains.google.com/checkip",
"https://ifconfig.io/ip", "https://ifconfig.io/ip",
"https://ip4.ddnss.de/meineip.php",
"https://ipinfo.io/ip", "https://ipinfo.io/ip",
} }
url := urls[i.randIntn(len(urls))] url := urls[i.randIntn(len(urls))]