IOT-1072 Unfork libcoap: update forked headers

[platform/upstream/iotivity.git] / resource / csdk / connectivity / lib / libcoap-4.1.1 / async.c

diff --git a/resource/csdk/connectivity/lib/libcoap-4.1.1/async.c b/resource/csdk/connectivity/lib/libcoap-4.1.1/async.c
index 5bf5d95..fd2852e 100644 (file)
--- a/resource/csdk/connectivity/lib/libcoap-4.1.1/async.c
+++ b/resource/csdk/connectivity/lib/libcoap-4.1.1/async.c
@@ -13,26 +13,22 @@
 
 #ifndef WITHOUT_ASYNC
 
-#include "config.h"
-
-#include "utlist.h"
-
-#include "mem.h"
-#include "debug.h"
-#include "async.h"
+#include "include/coap/config.h"
+#include "include/coap/utlist.h"
+#include "include/coap/mem.h"
+#include "include/coap/debug.h"
+#include "include/coap/async.h"
 
 coap_async_state_t *
-coap_register_async(coap_context_t *context, coap_address_t *peer, coap_pdu_t *request,
-        unsigned char flags, void *data)
-{
+coap_register_async(coap_context_t *context, coap_address_t *peer,
+        coap_pdu_t *request, unsigned char flags, void *data) {
     coap_async_state_t *s;
     coap_tid_t id;
 
     coap_transaction_id(peer, request, &id);
     LL_SEARCH_SCALAR(context->async_state, s, id, id);
 
-    if (s != NULL)
-    {
+    if (s != NULL) {
         /* We must return NULL here as the caller must know that he is
          * responsible for releasing @p data. */
         debug("asynchronous state for transaction %d already registered\n", id);
@@ -41,28 +37,26 @@ coap_register_async(coap_context_t *context, coap_address_t *peer, coap_pdu_t *r
 
     /* store information for handling the asynchronous task */
     s = (coap_async_state_t *) coap_malloc(sizeof(coap_async_state_t) +
-            request->hdr->coap_hdr_udp_t.token_length);
-    if (!s)
-    {
+            request->transport_hdr->udp.token_length);
+    if (!s) {
         coap_log(LOG_CRIT, "coap_register_async: insufficient memory\n");
         return NULL;
     }
 
-    memset(s, 0, sizeof(coap_async_state_t) + request->hdr->coap_hdr_udp_t.token_length);
+    memset(s, 0, sizeof(coap_async_state_t) + request->transport_hdr->udp.token_length);
 
     /* set COAP_ASYNC_CONFIRM according to request's type */
     s->flags = flags & ~COAP_ASYNC_CONFIRM;
-    if (request->hdr->coap_hdr_udp_t.type == COAP_MESSAGE_CON)
+    if (request->transport_hdr->udp.type == COAP_MESSAGE_CON)
         s->flags |= COAP_ASYNC_CONFIRM;
 
     s->appdata = data;
 
     memcpy(&s->peer, peer, sizeof(coap_address_t));
 
-    if (request->hdr->coap_hdr_udp_t.token_length)
-    {
-        s->tokenlen = request->hdr->coap_hdr_udp_t.token_length;
-        memcpy(s->token, request->hdr->coap_hdr_udp_t.token, request->hdr->coap_hdr_udp_t.token_length);
+    if (request->transport_hdr->udp.token_length) {
+        s->tokenlen = request->transport_hdr->udp.token_length;
+        memcpy(s->token, request->transport_hdr->udp.token, request->transport_hdr->udp.token_length);
     }
 
     memcpy(&s->id, &id, sizeof(coap_tid_t));
@@ -75,15 +69,14 @@ coap_register_async(coap_context_t *context, coap_address_t *peer, coap_pdu_t *r
 }
 
 coap_async_state_t *
-coap_find_async(coap_context_t *context, coap_tid_t id)
-{
+coap_find_async(coap_context_t *context, coap_tid_t id) {
     coap_async_state_t *tmp;
     LL_SEARCH_SCALAR(context->async_state, tmp, id, id);
     return tmp;
 }
 
-int coap_remove_async(coap_context_t *context, coap_tid_t id, coap_async_state_t **s)
-{
+int
+coap_remove_async(coap_context_t *context, coap_tid_t id, coap_async_state_t **s) {
     coap_async_state_t *tmp = coap_find_async(context, id);
 
     if (tmp)
@@ -93,8 +86,8 @@ int coap_remove_async(coap_context_t *context, coap_tid_t id, coap_async_state_t
     return tmp != NULL;
 }
 
-void coap_free_async(coap_async_state_t *s)
-{
+void
+coap_free_async(coap_async_state_t *s) {
     if (s && (s->flags & COAP_ASYNC_RELEASE_DATA) != 0)
         coap_free(s->appdata);
     coap_free(s);