Fix ResponseMessage nil bug

shawn1m · shawn1m · commit a0a7af506971 · 2019-01-02T22:00:53.000+08:00
diff --git a/core/inbound/server.go b/core/inbound/server.go
@@ -62,9 +62,14 @@ func (s *Server) ServeDNS(w dns.ResponseWriter, q *dns.Msg) {
 
 	cb := d.ActiveClientBundle
 
+	if cb.ResponseMessage == nil {
+		return
+	}
+
 	err := w.WriteMsg(cb.ResponseMessage)
 	if err != nil {
 		log.Warn("Write message fail:", cb.ResponseMessage)
+		return
 	}
 }
 
diff --git a/core/outbound/dispatcher.go b/core/outbound/dispatcher.go
@@ -148,8 +148,8 @@ func (d *Dispatcher) ChooseActiveClientBundle() {
 			}
 			if common.IsIPMatchList(net.ParseIP(a.(*dns.AAAA).AAAA.String()), d.IPNetworkAlternativeList, true, "alternative") {
 				d.ActiveClientBundle = d.AlternativeClientBundle
-				return
 				log.Debug("Finally use alternative DNS")
+				return
 			}
 		}
 		log.Debug("IP network match failed, finally use alternative DNS")

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,14 @@ func (s Server) ServeDNS(w dns.ResponseWriter, q dns.Msg) {`
`62`	`62`
`63`	`63`	`cb := d.ActiveClientBundle`
`64`	`64`
	`65`	`+ if cb.ResponseMessage == nil {`
	`66`	`+ return`
	`67`	`+ }`
	`68`	`+`
`65`	`69`	`err := w.WriteMsg(cb.ResponseMessage)`
`66`	`70`	`if err != nil {`
`67`	`71`	`log.Warn("Write message fail:", cb.ResponseMessage)`
	`72`	`+ return`
`68`	`73`	`}`
`69`	`74`	`}`
`70`	`75`
Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,8 @@ func (d *Dispatcher) ChooseActiveClientBundle() {`
`148`	`148`	`}`
`149`	`149`	`if common.IsIPMatchList(net.ParseIP(a.(*dns.AAAA).AAAA.String()), d.IPNetworkAlternativeList, true, "alternative") {`
`150`	`150`	`d.ActiveClientBundle = d.AlternativeClientBundle`
`151`		`- return`
`152`	`151`	`log.Debug("Finally use alternative DNS")`
	`152`	`+ return`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`	`log.Debug("IP network match failed, finally use alternative DNS")`