Exchange() now seems to skip Pack() if Data is not empty

Author: jedisct1

dnscrypt-proxy/plugin_forward.go

@@ -312,6 +312,7 @@ func (plugin *PluginForward) Eval(pluginsState *PluginsState, msg *dns.Msg) erro
 		// Create a clean copy of the message without Extra section for forwarding
 		forwardMsg := msg.Copy()
 		forwardMsg.Extra = nil
+		forwardMsg.Data = nil // Clear packed data so Exchange will re-pack without Extra
 
 		respMsg, _, err = client.Exchange(ctx, forwardMsg, pluginsState.serverProto, server)
 		if err != nil {

dnscrypt-proxy/resolve.go

@@ -51,6 +51,7 @@ func resolveQuery(server string, qName string, qType uint16, sendClientSubnet bo
 	readTimeout := transport.ReadTimeout
 	for i := 0; i < 3; i++ {
 		msg.ID = dns.ID()
+		msg.Data = nil // Clear packed data so Exchange will re-pack with new ID
 		ctx, cancel := context.WithTimeout(context.Background(), readTimeout)
 		response, rtt, err := client.Exchange(ctx, msg, "udp", server)
 		cancel()