Improve New func of Client and ClientBundle

Author: shawn1m

core/inbound/server.go

@@ -51,8 +51,8 @@ func (s *Server) Run() {
 func (s *Server) ServeDNS(w dns.ResponseWriter, q *dns.Msg) {
 
 	inboundIP, _, _ := net.SplitHostPort(w.RemoteAddr().String())
-	s.Dispatcher.PrimaryClientBundle = outbound.NewClientBundle(*q, s.Dispatcher.PrimaryDNS, inboundIP, s.Hosts, s.Cache)
-	s.Dispatcher.AlternativeClientBundle = outbound.NewClientBundle(*q, s.Dispatcher.AlternativeDNS, inboundIP, s.Hosts, s.Cache)
+	s.Dispatcher.PrimaryClientBundle = outbound.NewClientBundle(q, s.Dispatcher.PrimaryDNS, inboundIP, s.Hosts, s.Cache)
+	s.Dispatcher.AlternativeClientBundle = outbound.NewClientBundle(q, s.Dispatcher.AlternativeDNS, inboundIP, s.Hosts, s.Cache)
 
 	log.Debug("Question: " + q.Question[0].String())
 

core/outbound/client.go

@@ -26,9 +26,9 @@ type Client struct {
 	Cache *cache.Cache
 }
 
-func NewClient(q dns.Msg, u *DNSUpstream, ip string, h *hosts.Hosts, cache *cache.Cache) *Client {
+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}
+	c := &Client{QuestionMessage: *q, DNSUpstream: u, InboundIP: ip, Hosts: h, Cache: cache}
 
 	c.getEDNSClientSubnetIP()
 	return c

core/outbound/clientbundle.go

@@ -24,13 +24,13 @@ type ClientBundle struct {
 	Cache *cache.Cache
 }
 
-func NewClientBundle(q dns.Msg, ul []*DNSUpstream, ip string, h *hosts.Hosts, cache *cache.Cache) *ClientBundle {
+func NewClientBundle(q *dns.Msg, ul []*DNSUpstream, ip string, h *hosts.Hosts, cache *cache.Cache) *ClientBundle {
 
-	cb := &ClientBundle{QuestionMessage: q, DNSUpstreamList: ul, InboundIP: ip, Hosts: h, Cache: cache}
+	cb := &ClientBundle{QuestionMessage: *q, DNSUpstreamList: ul, InboundIP: ip, Hosts: h, Cache: cache}
 
 	for _, u := range ul {
 
-		c := NewClient(cb.QuestionMessage, u, cb.InboundIP, cb.Hosts, cb.Cache)
+		c := NewClient(&cb.QuestionMessage, u, cb.InboundIP, cb.Hosts, cb.Cache)
 		cb.ClientList = append(cb.ClientList, c)
 	}