fixup! unicoap: basic group communication support

Remove separate multicast timer. Use existing request timer instead.

Author: elenaf9

sys/net/application_layer/unicoap/client/client.c

@@ -35,12 +35,6 @@ static void _on_response_timeout(unicoap_scheduled_event_t* timeout) {
     unicoap_client_memo_free(unicoap_client_memo_of_timeout(timeout));
 }
 
-static void _on_multicast_response_timeout(unicoap_scheduled_event_t* timeout)
-{
-    _CLIENT_DEBUG("multicast window closed\n");
-    unicoap_client_memo_free(unicoap_client_memo_of_multicast_timeout(timeout));
-}
-
 int unicoap_client_callback_success(unicoap_client_memo_t* memo, const unicoap_packet_t* packet,
                             unicoap_block_option_t block) {
     (void)block;
@@ -141,6 +135,18 @@ int unicoap_client_send_request_body(unicoap_message_t* request,
                                     .token_length = sizeof(token),
                                 } };
 
+    ipv6_addr_t ep_addr;
+    memcpy(ep_addr.u8, endpoint->_tl_ep.addr.ipv6, 16);
+    bool multicast = endpoint->_tl_ep.family == AF_INET6 && ipv6_addr_is_multicast(&ep_addr);
+
+    if (multicast) {
+        if (flags && UNICOAP_CLIENT_FLAG_RELIABLE) {
+            _CLIENT_DEBUG("error trying to send reliable datagram via multicast\n");
+            return -EINVAL;
+        }
+        flags |= UNICOAP_CLIENT_FLAG_MULTICAST;
+    }
+
     if (unicoap_callback_is_present(callback)) {
         _CLIENT_DEBUG("need a memo\n");
         if (!(memo = unicoap_client_memo_create(endpoint))) {
@@ -150,26 +156,13 @@ int unicoap_client_send_request_body(unicoap_message_t* request,
         memo->callback_arg = callback_arg;
         memo->flags = flags;
 
-        unicoap_event_schedule(&memo->super.exchange.timeout, _on_response_timeout,
-                               CONFIG_UNICOAP_TIMEOUT_CLIENT_RESPONSE_MS);
-    }
-
-    ipv6_addr_t addr;
-    memcpy(addr.u8, endpoint->_tl_ep.addr.ipv6, 16);
-
-    if (endpoint->_tl_ep.family == AF_INET6 && ipv6_addr_is_multicast(&addr)) {
-         flags |= UNICOAP_CLIENT_FLAG_MULTICAST;
-
-        if (memo && (CONFIG_UNICOAP_TIMEOUT_CLIENT_MULTICAST_RESPONSE_MS > 0)) {
-            unicoap_event_schedule(&memo->super.multicast.timeout, _on_multicast_response_timeout,
+        if (!multicast) {
+            unicoap_event_schedule(&memo->super.exchange.timeout, _on_response_timeout,
+                                   CONFIG_UNICOAP_TIMEOUT_CLIENT_RESPONSE_MS);
+        } else if (CONFIG_UNICOAP_TIMEOUT_CLIENT_MULTICAST_RESPONSE_MS > 0) {
+            unicoap_event_schedule(&memo->super.exchange.timeout, _on_response_timeout,
                                    CONFIG_UNICOAP_TIMEOUT_CLIENT_MULTICAST_RESPONSE_MS);
         }
-
-        if (flags == UNICOAP_CLIENT_FLAG_RELIABLE) {
-            _CLIENT_DEBUG("error trying to send reliable datagram via multicastn");
-            unicoap_client_callback_failure(memo, -EINVAL);
-            goto error;
-        }
     }
 
     /* TODO: OSCORE */

sys/net/application_layer/unicoap/include/private/state.h

@@ -173,15 +173,6 @@ typedef struct {
     } exchange;
 
 
-    /**
-     * @brief Multicast state
-     *
-     * State tracked by the request-response layer for multicast operations.
-     */
-    struct {
-        unicoap_scheduled_event_t timeout; /**< Timeout */
-    } multicast;
-
     /**
      * @brief Messaging state
      *
@@ -214,16 +205,6 @@ static inline unicoap_memo_t* unicoap_memo_of_timeout(unicoap_scheduled_event_t*
     return container_of(timeout, unicoap_memo_t, exchange.timeout);
 }
 
-/**
- * @brief Returns memo of scheduled multicast timeout event
- * @param[in] timeout Scheduled multicast timeout event
- * @returns Common memo state object
- */
-static inline unicoap_memo_t* unicoap_memo_of_multicast_timeout(unicoap_scheduled_event_t* timeout)
-{
-    return container_of(timeout, unicoap_memo_t, multicast.timeout);
-}
-
 /**
  * @brief Returns memo of scheduled event
  * @param[in] event Superclass event
@@ -399,15 +380,6 @@ static inline unicoap_client_memo_t* unicoap_client_memo_of_timeout(unicoap_sche
     return unicoap_client_memo_of_super(unicoap_memo_of_timeout(timeout));
 }
 
-/**
- * @brief Returns client memo of scheduled multicast timeout event
- * @param[in] event Superclass timeout event
- * @returns Client memo state object
- */
-static inline unicoap_client_memo_t* unicoap_client_memo_of_multicast_timeout(unicoap_scheduled_event_t* timeout) {
-    return unicoap_client_memo_of_super(unicoap_memo_of_multicast_timeout(timeout));
-}
-
 /**
  * @brief Invokes the the client callback
  */

sys/net/application_layer/unicoap/state.c

@@ -120,9 +120,6 @@ static void _deinit_client(unicoap_client_memo_t* memo) {
     memo->callback._any = NULL;
     memo->callback_arg = NULL;
     memo->flags = 0;
-    unicoap_event_cancel(&memo->super.exchange.timeout);
-    unicoap_event_cancel(&memo->super.multicast.timeout);
-
 #if IS_ACTIVE(CONFIG_UNICOAP_CLIENT_CANCELLABLE)
     memo->reference_id = 0;
 #endif
@@ -591,13 +588,17 @@ unicoap_preprocessing_result_t unicoap_exchange_preprocess(unicoap_packet_t* pac
                 }
             }
 
+            if ((memo->flags && UNICOAP_CLIENT_FLAG_MULTICAST) == 0) {
+                unicoap_event_cancel(&memo->super.exchange.timeout);
+            }
+
             if (truncated) {
                 _CLIENT_DEBUG("truncated, not processing\n");
                 unicoap_client_callback_failure(memo, -ENOBUFS);
                 unicoap_client_memo_free(memo);
                 return UNICOAP_PREPROCESSING_ERROR_TRUNCATED;
             }
-            unicoap_event_cancel(&memo->super.exchange.timeout);
+
             arg->client = memo;
             *flags = _messaging_flags_client(memo->flags);
             return UNICOAP_PREPROCESSING_SUCCESS_RESPONSE;