dns: stop using deprecated ares_query

avivkeller · ruyadorno · commit bf68733e7f61 · 2024-11-27T11:03:27.000-05:00
PR-URL: #55430 Refs: #52464 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
@@ -830,62 +830,62 @@ void ChannelWrap::EnsureServers() {
 }
 
 int AnyTraits::Send(QueryWrap<AnyTraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, ns_t_any);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_ANY);
   return ARES_SUCCESS;
 }
 
 int ATraits::Send(QueryWrap<ATraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, ns_t_a);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_A);
   return ARES_SUCCESS;
 }
 
 int AaaaTraits::Send(QueryWrap<AaaaTraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, ns_t_aaaa);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_AAAA);
   return ARES_SUCCESS;
 }
 
 int CaaTraits::Send(QueryWrap<CaaTraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, T_CAA);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_CAA);
   return ARES_SUCCESS;
 }
 
 int CnameTraits::Send(QueryWrap<CnameTraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, ns_t_cname);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_CNAME);
   return ARES_SUCCESS;
 }
 
 int MxTraits::Send(QueryWrap<MxTraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, ns_t_mx);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_MX);
   return ARES_SUCCESS;
 }
 
 int NsTraits::Send(QueryWrap<NsTraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, ns_t_ns);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_NS);
   return ARES_SUCCESS;
 }
 
 int TxtTraits::Send(QueryWrap<TxtTraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, ns_t_txt);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_TXT);
   return ARES_SUCCESS;
 }
 
 int SrvTraits::Send(QueryWrap<SrvTraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, ns_t_srv);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_SRV);
   return ARES_SUCCESS;
 }
 
 int PtrTraits::Send(QueryWrap<PtrTraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, ns_t_ptr);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_PTR);
   return ARES_SUCCESS;
 }
 
 int NaptrTraits::Send(QueryWrap<NaptrTraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, ns_t_naptr);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_NAPTR);
   return ARES_SUCCESS;
 }
 
 int SoaTraits::Send(QueryWrap<SoaTraits>* wrap, const char* name) {
-  wrap->AresQuery(name, ns_c_in, ns_t_soa);
+  wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_SOA);
   return ARES_SUCCESS;
 }
 
diff --git a/src/cares_wrap.h b/src/cares_wrap.h
@@ -246,18 +246,20 @@ class QueryWrap final : public AsyncWrap {
     return Traits::Send(this, name);
   }
 
-  void AresQuery(const char* name, int dnsclass, int type) {
+  void AresQuery(const char* name,
+                 ares_dns_class_t dnsclass,
+                 ares_dns_rec_type_t type) {
     channel_->EnsureServers();
     TRACE_EVENT_NESTABLE_ASYNC_BEGIN1(
       TRACING_CATEGORY_NODE2(dns, native), trace_name_, this,
       "name", TRACE_STR_COPY(name));
-    ares_query(
-        channel_->cares_channel(),
-        name,
-        dnsclass,
-        type,
-        Callback,
-        MakeCallbackPointer());
+    ares_query_dnsrec(channel_->cares_channel(),
+                      name,
+                      dnsclass,
+                      type,
+                      Callback,
+                      MakeCallbackPointer(),
+                      nullptr);
   }
 
   void ParseError(int status) {
@@ -304,19 +306,20 @@ class QueryWrap final : public AsyncWrap {
     return wrap;
   }
 
-  static void Callback(
-      void* arg,
-      int status,
-      int timeouts,
-      unsigned char* answer_buf,
-      int answer_len) {
+  static void Callback(void* arg,
+                       ares_status_t status,
+                       size_t timeouts,
+                       const ares_dns_record_t* dnsrec) {
     QueryWrap<Traits>* wrap = FromCallbackPointer(arg);
     if (wrap == nullptr) return;
 
     unsigned char* buf_copy = nullptr;
+    size_t answer_len = 0;
     if (status == ARES_SUCCESS) {
-      buf_copy = node::Malloc<unsigned char>(answer_len);
-      memcpy(buf_copy, answer_buf, answer_len);
+      // No need to explicitly call ares_free_string here,
+      // as it is a wrapper around free, which is already
+      // invoked when MallocedBuffer is destructed.
+      ares_dns_write(dnsrec, &buf_copy, &answer_len);
     }
 
     wrap->response_data_ = std::make_unique<ResponseData>();

Original file line number	Diff line number	Diff line change
`@@ -830,62 +830,62 @@ void ChannelWrap::EnsureServers() {`
`830`	`830`	`}`
`831`	`831`
`832`	`832`	`int AnyTraits::Send(QueryWrap<AnyTraits>* wrap, const char* name) {`
`833`		`- wrap->AresQuery(name, ns_c_in, ns_t_any);`
	`833`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_ANY);`
`834`	`834`	`return ARES_SUCCESS;`
`835`	`835`	`}`
`836`	`836`
`837`	`837`	`int ATraits::Send(QueryWrap<ATraits>* wrap, const char* name) {`
`838`		`- wrap->AresQuery(name, ns_c_in, ns_t_a);`
	`838`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_A);`
`839`	`839`	`return ARES_SUCCESS;`
`840`	`840`	`}`
`841`	`841`
`842`	`842`	`int AaaaTraits::Send(QueryWrap<AaaaTraits>* wrap, const char* name) {`
`843`		`- wrap->AresQuery(name, ns_c_in, ns_t_aaaa);`
	`843`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_AAAA);`
`844`	`844`	`return ARES_SUCCESS;`
`845`	`845`	`}`
`846`	`846`
`847`	`847`	`int CaaTraits::Send(QueryWrap<CaaTraits>* wrap, const char* name) {`
`848`		`- wrap->AresQuery(name, ns_c_in, T_CAA);`
	`848`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_CAA);`
`849`	`849`	`return ARES_SUCCESS;`
`850`	`850`	`}`
`851`	`851`
`852`	`852`	`int CnameTraits::Send(QueryWrap<CnameTraits>* wrap, const char* name) {`
`853`		`- wrap->AresQuery(name, ns_c_in, ns_t_cname);`
	`853`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_CNAME);`
`854`	`854`	`return ARES_SUCCESS;`
`855`	`855`	`}`
`856`	`856`
`857`	`857`	`int MxTraits::Send(QueryWrap<MxTraits>* wrap, const char* name) {`
`858`		`- wrap->AresQuery(name, ns_c_in, ns_t_mx);`
	`858`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_MX);`
`859`	`859`	`return ARES_SUCCESS;`
`860`	`860`	`}`
`861`	`861`
`862`	`862`	`int NsTraits::Send(QueryWrap<NsTraits>* wrap, const char* name) {`
`863`		`- wrap->AresQuery(name, ns_c_in, ns_t_ns);`
	`863`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_NS);`
`864`	`864`	`return ARES_SUCCESS;`
`865`	`865`	`}`
`866`	`866`
`867`	`867`	`int TxtTraits::Send(QueryWrap<TxtTraits>* wrap, const char* name) {`
`868`		`- wrap->AresQuery(name, ns_c_in, ns_t_txt);`
	`868`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_TXT);`
`869`	`869`	`return ARES_SUCCESS;`
`870`	`870`	`}`
`871`	`871`
`872`	`872`	`int SrvTraits::Send(QueryWrap<SrvTraits>* wrap, const char* name) {`
`873`		`- wrap->AresQuery(name, ns_c_in, ns_t_srv);`
	`873`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_SRV);`
`874`	`874`	`return ARES_SUCCESS;`
`875`	`875`	`}`
`876`	`876`
`877`	`877`	`int PtrTraits::Send(QueryWrap<PtrTraits>* wrap, const char* name) {`
`878`		`- wrap->AresQuery(name, ns_c_in, ns_t_ptr);`
	`878`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_PTR);`
`879`	`879`	`return ARES_SUCCESS;`
`880`	`880`	`}`
`881`	`881`
`882`	`882`	`int NaptrTraits::Send(QueryWrap<NaptrTraits>* wrap, const char* name) {`
`883`		`- wrap->AresQuery(name, ns_c_in, ns_t_naptr);`
	`883`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_NAPTR);`
`884`	`884`	`return ARES_SUCCESS;`
`885`	`885`	`}`
`886`	`886`
`887`	`887`	`int SoaTraits::Send(QueryWrap<SoaTraits>* wrap, const char* name) {`
`888`		`- wrap->AresQuery(name, ns_c_in, ns_t_soa);`
	`888`	`+ wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_SOA);`
`889`	`889`	`return ARES_SUCCESS;`
`890`	`890`	`}`
`891`	`891`