Implement review suggestions

Fix local. resolving in Firefox

netenv/environment_linux.go

@@ -45,14 +45,14 @@ func Gateways() []net.IP {
 	}()
 	// logic
 
-	newGateways := make([]net.IP, 0)
+	gateways = make([]net.IP, 0)
 	var decoded []byte
 
 	// open file
 	route, err := os.Open("/proc/net/route")
 	if err != nil {
 		log.Warningf("environment: could not read /proc/net/route: %s", err)
-		return newGateways
+		return gateways
 	}
 	defer route.Close()
 
@@ -77,7 +77,7 @@ func Gateways() []net.IP {
 				continue
 			}
 			gate := net.IPv4(decoded[3], decoded[2], decoded[1], decoded[0])
-			newGateways = append(newGateways, gate)
+			gateways = append(gateways, gate)
 		}
 	}
 
@@ -85,7 +85,7 @@ func Gateways() []net.IP {
 	v6route, err := os.Open("/proc/net/ipv6_route")
 	if err != nil {
 		log.Warningf("environment: could not read /proc/net/ipv6_route: %s", err)
-		return newGateways
+		return gateways
 	}
 	defer v6route.Close()
 
@@ -110,11 +110,11 @@ func Gateways() []net.IP {
 				continue
 			}
 			gate := net.IP(decoded)
-			newGateways = append(newGateways, gate)
+			gateways = append(gateways, gate)
 		}
 	}
 
-	return newGateways
+	return gateways
 }
 
 // Nameservers returns the currently active nameservers.

netenv/online-status.go

@@ -2,7 +2,6 @@ package netenv
 
 import (
 	"context"
-	"errors"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -111,30 +110,13 @@ var (
 	captivePortalLock sync.Mutex
 )
 
+// CaptivePortal holds information about a detected captive portal.
 type CaptivePortal struct {
 	URL    string
 	Domain string
 	IP     net.IP
 }
 
-// IPasRR returns the captive portal IP as a DNS resource record.
-func (p *CaptivePortal) IPasRR() (rr dns.RR, err error) {
-	switch {
-	case p.IP == nil:
-		return nil, errors.New("no portal IP present")
-	case p.Domain == "":
-		return nil, errors.New("no portal domain present")
-	case p.IP.To4() != nil:
-		rr, err = dns.NewRR(p.Domain + " 17 IN A " + p.IP.String())
-	default:
-		rr, err = dns.NewRR(p.Domain + " 17 IN AAAA " + p.IP.String())
-	}
-	if err != nil {
-		return nil, err
-	}
-	return rr, nil
-}
-
 func init() {
 	var onlineStatusValue int32
 	onlineStatus = &onlineStatusValue