Move ReservedIPNetworkList to common, fix some bugs

Author: shawn1m

core/common/common.go

@@ -7,13 +7,15 @@ package common
 
 import (
 	"net"
-	"time"
 	"strings"
+	"time"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/miekg/dns"
 )
 
+var ReservedIPNetworkList = getReservedIPNetworkList()
+
 func IsIPMatchList(ip net.IP, ipnl []*net.IPNet, isLog bool) bool {
 
 	for _, ip_net := range ipnl {
@@ -43,7 +45,21 @@ func IsAnswerEmpty(m *dns.Msg) bool {
 	return false
 }
 
-func HasSubDomain(s string, sub string) bool{
+func HasSubDomain(s string, sub string) bool {
+
+	return strings.HasSuffix(sub, "."+s) || s == sub
+}
 
-	return strings.HasSuffix(sub, "." + s) || s == sub
-}
+func getReservedIPNetworkList() []*net.IPNet {
+
+	ipnl := make([]*net.IPNet, 0)
+	localCIDR := []string{"127.0.0.0/8", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "100.64.0.0/10"}
+	for _, c := range localCIDR {
+		_, ip_net, err := net.ParseCIDR(c)
+		if err != nil {
+			break
+		}
+		ipnl = append(ipnl, ip_net)
+	}
+	return ipnl
+}

core/outbound/client.go

@@ -18,30 +18,27 @@ type Client struct {
 	ResponseMessage *dns.Msg
 	QuestionMessage *dns.Msg
 
-	DNSUpstream           *DNSUpstream
-	EDNSClientSubnetIP    string
-	InboundIP             string
+	DNSUpstream        *DNSUpstream
+	EDNSClientSubnetIP string
+	InboundIP          string
 
 	Hosts *hosts.Hosts
 	Cache *cache.Cache
 }
 
-var ReservedIPNetworkList = getReservedIPNetworkList()
-
 func NewClient(q *dns.Msg, u *DNSUpstream, ip string, h *hosts.Hosts, cache *cache.Cache) *Client {
 
 	c := &Client{QuestionMessage: q, DNSUpstream: u, InboundIP: ip, Hosts: h, Cache: cache}
-	if ReservedIPNetworkList == nil{
-		c.getEDNSClientSubnetIP()
-	}
+
+	c.getEDNSClientSubnetIP()
 	return c
 }
 
 func (c *Client) getEDNSClientSubnetIP() {
 
 	switch c.DNSUpstream.EDNSClientSubnet.Policy {
 	case "auto":
-		if !common.IsIPMatchList(net.ParseIP(c.InboundIP), ReservedIPNetworkList, false) {
+		if !common.IsIPMatchList(net.ParseIP(c.InboundIP), common.ReservedIPNetworkList, false) {
 			c.EDNSClientSubnetIP = c.InboundIP
 		} else {
 			c.EDNSClientSubnetIP = c.DNSUpstream.EDNSClientSubnet.ExternalIP
@@ -224,17 +221,3 @@ func (c *Client) logAnswer(indicator string) {
 		log.Debug(name + " Answer: " + a.String())
 	}
 }
-
-func getReservedIPNetworkList() []*net.IPNet {
-
-	ipnl := make([]*net.IPNet, 0)
-	localCIDR := []string{"127.0.0.0/8", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "100.64.0.0/10"}
-	for _, c := range localCIDR {
-		_, ip_net, err := net.ParseCIDR(c)
-		if err != nil {
-			break
-		}
-		ipnl = append(ipnl, ip_net)
-	}
-	return ipnl
-}

core/outbound/clientbundle.go

@@ -51,7 +51,7 @@ func (cb *ClientBundle) ExchangeFromRemote(isCache bool, isLog bool) {
 	var em *dns.Msg
 
 	for i := 0; i < len(cb.ClientList); i++ {
-		if m := <- ch; m != nil {
+		if m := <-ch; m != nil {
 			if common.IsAnswerEmpty(m) {
 				em = m
 				break
@@ -96,4 +96,4 @@ func (cb *ClientBundle) CacheResults() {
 	if cb.Cache != nil {
 		cb.Cache.InsertMessage(cache.Key(cb.QuestionMessage.Question[0], getEDNSClientSubnetIP(cb.QuestionMessage)), cb.ResponseMessage)
 	}
-}
+}

core/outbound/edns.go

@@ -53,7 +53,7 @@ func isEDNSClientSubnet(o *dns.OPT) *dns.EDNS0_SUBNET {
 	return nil
 }
 
-func getEDNSClientSubnetIP(m *dns.Msg) string{
+func getEDNSClientSubnetIP(m *dns.Msg) string {
 
 	o := m.IsEdns0()
 	if o != nil {
@@ -65,4 +65,4 @@ func getEDNSClientSubnetIP(m *dns.Msg) string{
 		}
 	}
 	return ""
-}
+}

main/main.go

@@ -7,9 +7,9 @@ package main
 
 import (
 	"flag"
-	"runtime"
-	"os"
 	"io"
+	"os"
+	"runtime"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/shawn1m/overture/core"
@@ -40,10 +40,10 @@ func main() {
 		log.SetLevel(log.InfoLevel)
 	}
 
-	logf, err := os.OpenFile(logPath, os.O_APPEND | os.O_WRONLY | os.O_CREATE, 0640)
+	logf, err := os.OpenFile(logPath, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0640)
 	if err != nil {
 		println("Logfile error: Please check your log file path")
-	}else{
+	} else {
 		log.SetOutput(io.MultiWriter(logf, os.Stdout))
 	}