nanocoap: align macros to use kconfig symbols

RIOT-OS · May 15, 2020 · 7c3d1bc · 7c3d1bc
1 parent b75a426
commit 7c3d1bc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/sys/include/net/nanocoap/cache.h b/sys/include/net/nanocoap/cache.h
@@ -35,22 +35,22 @@ extern "C" {
 /**
  * @brief The number of maximum cache entries.
  */
-#ifndef NANOCOAP_CACHE_ENTRIES
-#define NANOCOAP_CACHE_ENTRIES            (8)
+#ifndef CONFIG_NANOCOAP_CACHE_ENTRIES
+#define CONFIG_NANOCOAP_CACHE_ENTRIES          (8)
 #endif
 
 /**
  * @brief The length of the cache key in bytes.
  */
-#ifndef NANOCOAP_CACHE_KEY_LENGTH
-#define NANOCOAP_CACHE_KEY_LENGTH         (8)
+#ifndef CONFIG_NANOCOAP_CACHE_KEY_LENGTH
+#define CONFIG_NANOCOAP_CACHE_KEY_LENGTH       (8)
 #endif
 
 /**
  * @brief Size of the buffer to store responses in the cache.
  */
-#ifndef NANOCOAP_CACHE_RESPONSE_SIZE
-#define NANOCOAP_CACHE_RESPONSE_SIZE      (128)
+#ifndef CONFIG_NANOCOAP_CACHE_RESPONSE_SIZE
+#define CONFIG_NANOCOAP_CACHE_RESPONSE_SIZE    (128)
 #endif
 
 /**
@@ -65,7 +65,7 @@ typedef struct {
     /**
      * @brief the calculated cache key, see nanocoap_cache_key_generate().
      */
-    uint8_t cache_key[NANOCOAP_CACHE_KEY_LENGTH];
+    uint8_t cache_key[CONFIG_NANOCOAP_CACHE_KEY_LENGTH];
 
     /**
      * @brief packet representation of the response
@@ -75,7 +75,7 @@ typedef struct {
     /**
      * @brief buffer to hold the response message.
      */
-    uint8_t response_buf[NANOCOAP_CACHE_RESPONSE_SIZE];
+    uint8_t response_buf[CONFIG_NANOCOAP_CACHE_RESPONSE_SIZE];
 
     size_t response_len; /**< length of the message in @p response */
 

diff --git a/sys/net/application_layer/gcoap/forward_proxy/forward_proxy.c b/sys/net/application_layer/gcoap/forward_proxy/forward_proxy.c
@@ -25,7 +25,7 @@ typedef struct {
     int in_use;
     sock_udp_ep_t ep;
 #if IS_ACTIVE(MODULE_NANOCOAP_CACHE)
-    uint8_t cache_key[NANOCOAP_CACHE_KEY_LENGTH];
+    uint8_t cache_key[CONFIG_NANOCOAP_CACHE_KEY_LENGTH];
 #endif
 } client_ep_t;
 
@@ -103,7 +103,7 @@ static int _cache_lookup_and_process(coap_pkt_t *pdu,
     }
 
 #if IS_ACTIVE(MODULE_NANOCOAP_CACHE)
-    memcpy(cep->cache_key, cache_key, NANOCOAP_CACHE_KEY_LENGTH);
+    memcpy(cep->cache_key, cache_key, CONFIG_NANOCOAP_CACHE_KEY_LENGTH);
 #endif
 
     return 0;

diff --git a/sys/net/application_layer/nanocoap/cache.c b/sys/net/application_layer/nanocoap/cache.c
@@ -30,7 +30,7 @@
 static clist_node_t _cache_list_head = { NULL };
 static clist_node_t _empty_list_head = { NULL };
 
-static nanocoap_cache_entry_t _cache_entries[NANOCOAP_CACHE_ENTRIES];
+static nanocoap_cache_entry_t _cache_entries[CONFIG_NANOCOAP_CACHE_ENTRIES];
 
 static nanocoap_cache_replacement_strategy_t _replacement_strategy = NULL;
 
@@ -63,7 +63,7 @@ void nanocoap_cache_init(void)
     _empty_list_head.next = NULL;
     memset(_cache_entries, 0, sizeof(_cache_entries));
     /* construct list of empty entries */
-    for (unsigned i = 0; i < NANOCOAP_CACHE_ENTRIES; i++) {
+    for (unsigned i = 0; i < CONFIG_NANOCOAP_CACHE_ENTRIES; i++) {
         clist_rpush(&_empty_list_head, &_cache_entries[i].node);
     }
 
@@ -105,15 +105,15 @@ void nanocoap_cache_key_generate(const coap_pkt_t *req, uint8_t *cache_key)
 
 ssize_t nanocoap_cache_key_compare(uint8_t *cache_key1, uint8_t *cache_key2)
 {
-    return memcmp(cache_key1, cache_key2, NANOCOAP_CACHE_KEY_LENGTH);
+    return memcmp(cache_key1, cache_key2, CONFIG_NANOCOAP_CACHE_KEY_LENGTH);
 }
 
 static int _compare_cache_keys(clist_node_t *ce, void *arg)
 {
     nanocoap_cache_entry_t *iterator = (nanocoap_cache_entry_t *) ce;
     uint8_t *cache_key = (uint8_t *) arg;
 
-    if (!memcmp(iterator->cache_key, cache_key, NANOCOAP_CACHE_KEY_LENGTH)) {
+    if (!memcmp(iterator->cache_key, cache_key, CONFIG_NANOCOAP_CACHE_KEY_LENGTH)) {
         return 1;
     }
     return 0;
@@ -249,7 +249,7 @@ nanocoap_cache_entry_t *nanocoap_cache_add_by_key(const uint8_t *cache_key,
         }
     }
 
-    memcpy(ce->cache_key, cache_key, NANOCOAP_CACHE_KEY_LENGTH);
+    memcpy(ce->cache_key, cache_key, CONFIG_NANOCOAP_CACHE_KEY_LENGTH);
     memcpy(&ce->response_pkt, resp, sizeof(coap_pkt_t));
     memcpy(&ce->response_buf, resp->hdr, resp_len);
     ce->response_pkt.hdr = (coap_hdr_t *) ce->response_buf;