|
27 | 27 | #include "EventQueue.h"
|
28 | 28 | #include "OnboardNetworkStack.h"
|
29 | 29 | #include "Kernel.h"
|
| 30 | +#include "PlatformMutex.h" |
30 | 31 |
|
31 | 32 | #define CLASS_IN 1
|
32 | 33 |
|
@@ -76,9 +77,6 @@ struct DNS_QUERY {
|
76 | 77 | uint8_t count;
|
77 | 78 | };
|
78 | 79 |
|
79 |
| -typedef nsapi_error_t (*nsapi_dns_call_t)(mbed::Callback<void()> func); |
80 |
| -typedef nsapi_error_t (*nsapi_dns_call_in_t)(int delay, mbed::Callback<void()> func); |
81 |
| - |
82 | 80 | static void nsapi_dns_cache_add(const char *host, nsapi_addr_t *address, uint32_t ttl);
|
83 | 81 | static nsapi_size_or_error_t nsapi_dns_cache_find(const char *host, nsapi_version_t version, nsapi_addr_t *address);
|
84 | 82 |
|
@@ -107,10 +105,10 @@ static uint16_t dns_message_id = 1;
|
107 | 105 | static int dns_unique_id = 1;
|
108 | 106 | static DNS_QUERY *dns_query_queue[DNS_QUERY_QUEUE_SIZE];
|
109 | 107 | // Protects cache shared between blocking and asynchronous calls
|
110 |
| -static rtos::Mutex dns_cache_mutex; |
| 108 | +static PlatformMutex dns_cache_mutex; |
111 | 109 | // Protects from several threads running asynchronous DNS
|
112 |
| -static rtos::Mutex dns_mutex; |
113 |
| -static nsapi_dns_call_in_t dns_call_in = 0; |
| 110 | +static PlatformMutex dns_mutex; |
| 111 | +static call_in_callback_cb_t dns_call_in = 0; |
114 | 112 |
|
115 | 113 | // DNS server configuration
|
116 | 114 | extern "C" nsapi_error_t nsapi_dns_add_server(nsapi_addr_t addr)
|
@@ -558,7 +556,7 @@ nsapi_value_or_error_t nsapi_dns_query_async(NetworkStack *stack, const char *ho
|
558 | 556 | return nsapi_dns_query_multiple_async(stack, host, callback, 0, call_in_cb, version);
|
559 | 557 | }
|
560 | 558 |
|
561 |
| -void nsapi_dns_call_in_set(nsapi_dns_call_in_t callback) |
| 559 | +void nsapi_dns_call_in_set(call_in_callback_cb_t callback) |
562 | 560 | {
|
563 | 561 | dns_call_in = callback;
|
564 | 562 | }
|
@@ -1069,9 +1067,7 @@ static void nsapi_dns_query_async_response(void *ptr)
|
1069 | 1067 |
|
1070 | 1068 | nsapi_dns_query_async_resp(query, status, addresses);
|
1071 | 1069 |
|
1072 |
| - if (addresses) { |
1073 |
| - delete[] addresses; |
1074 |
| - } |
| 1070 | + delete[] addresses; |
1075 | 1071 | } else {
|
1076 | 1072 | dns_mutex.unlock();
|
1077 | 1073 | }
|
|
0 commit comments