DNS: unified parameter type of nsapi_dns_query_async_cancel

michalpasztamobica · michalpasztamobica · commit 45976419b88b · 2019-10-23T11:58:15.000+03:00
diff --git a/features/netsocket/nsapi_dns.cpp b/features/netsocket/nsapi_dns.cpp
@@ -639,6 +639,8 @@ void nsapi_dns_call_in_set(call_in_callback_cb_t callback)
 void nsapi_dns_reset()
 {
     nsapi_dns_cache_reset();
+    dns_message_id = 1;
+    dns_unique_id = 1;
 }
 
 nsapi_error_t nsapi_dns_call_in(call_in_callback_cb_t cb, int delay, mbed::Callback<void()> func)
@@ -843,7 +845,7 @@ static void nsapi_dns_query_async_timeout(void)
     dns_mutex->unlock();
 }
 
-nsapi_error_t nsapi_dns_query_async_cancel(intptr_t id)
+nsapi_error_t nsapi_dns_query_async_cancel(nsapi_size_or_error_t id)
 {
     dns_mutex->lock();
 
diff --git a/features/netsocket/nsapi_dns.h b/features/netsocket/nsapi_dns.h
@@ -216,7 +216,7 @@ nsapi_size_or_error_t nsapi_dns_query_multiple(S *stack, const char *host,
   *  @param id       Unique id of the hostname translation operation
   *  @return         0 on success, negative error code on failure
   */
-nsapi_error_t nsapi_dns_query_async_cancel(nsapi_error_t id);
+nsapi_error_t nsapi_dns_query_async_cancel(nsapi_size_or_error_t id);
 
 /** Set a call in callback
  *

Original file line number	Diff line number	Diff line change
`@@ -639,6 +639,8 @@ void nsapi_dns_call_in_set(call_in_callback_cb_t callback)`
`639`	`639`	`void nsapi_dns_reset()`
`640`	`640`	`{`
`641`	`641`	`nsapi_dns_cache_reset();`
	`642`	`+ dns_message_id = 1;`
	`643`	`+ dns_unique_id = 1;`
`642`	`644`	`}`
`643`	`645`
`644`	`646`	`nsapi_error_t nsapi_dns_call_in(call_in_callback_cb_t cb, int delay, mbed::Callback<void()> func)`
`@@ -843,7 +845,7 @@ static void nsapi_dns_query_async_timeout(void)`
`843`	`845`	`dns_mutex->unlock();`
`844`	`846`	`}`
`845`	`847`
`846`		`-nsapi_error_t nsapi_dns_query_async_cancel(intptr_t id)`
	`848`	`+nsapi_error_t nsapi_dns_query_async_cancel(nsapi_size_or_error_t id)`
`847`	`849`	`{`
`848`	`850`	`dns_mutex->lock();`
`849`	`851`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ nsapi_size_or_error_t nsapi_dns_query_multiple(S stack, const char host,`
`216`	`216`	`* @param id Unique id of the hostname translation operation`
`217`	`217`	`* @return 0 on success, negative error code on failure`
`218`	`218`	`*/`
`219`		`-nsapi_error_t nsapi_dns_query_async_cancel(nsapi_error_t id);`
	`219`	`+nsapi_error_t nsapi_dns_query_async_cancel(nsapi_size_or_error_t id);`
`220`	`220`
`221`	`221`	`/** Set a call in callback`
`222`	`222`	`*`