From a2cd5ed903dd8d4009c18a2d33953138687cbee8 Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Fri, 8 Oct 2021 12:10:28 +0200
Subject: [PATCH 1/3] dtls: set CONFIG_DTLS_PEER_MAX in dtls.h header

---
 pkg/tinydtls/doc.txt   | 7 -------
 sys/include/net/dtls.h | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/tinydtls/doc.txt b/pkg/tinydtls/doc.txt
index afab4ae621..3a4f7bf5ea 100644
--- a/pkg/tinydtls/doc.txt
+++ b/pkg/tinydtls/doc.txt
@@ -62,13 +62,6 @@
  */
 #ifndef CONFIG_DTLS_CONTEXT_MAX
 #define CONFIG_DTLS_CONTEXT_MAX    (2)
-#endif
-
- /**
- * @brief The maximum number DTLS peers (i.e. sessions)
- */
-#ifndef CONFIG_DTLS_PEER_MAX
-#define CONFIG_DTLS_PEER_MAX       (1)
 #endif
 
  /**
diff --git a/sys/include/net/dtls.h b/sys/include/net/dtls.h
index 4a1af9ed97..bfc9dada4e 100644
--- a/sys/include/net/dtls.h
+++ b/sys/include/net/dtls.h
@@ -40,6 +40,13 @@
 extern "C" {
 #endif
 
+/**
+ * @brief The maximum number DTLS peers (i.e. sessions)
+ */
+#ifndef CONFIG_DTLS_PEER_MAX
+#define CONFIG_DTLS_PEER_MAX       (1)
+#endif
+
 #ifdef __cplusplus
 }
 #endif

From 945b05886b91f28027bcdc0ac5f5f6be8ac1ddbc Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Fri, 8 Oct 2021 12:12:10 +0200
Subject: [PATCH 2/3] dsm: rename DTLS_PEER_MAX to CONFIG_DSM_PEER_MAX

To make avoid confusion with tinydtls's `DTLS_PEER_MAX` and
`CONFIG_DTLS_PEER_MAX`
---
 sys/include/net/dsm.h |  4 ++--
 sys/net/dsm/dsm.c     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/include/net/dsm.h b/sys/include/net/dsm.h
index 8c7c16ad96..cf80bbefdc 100644
--- a/sys/include/net/dsm.h
+++ b/sys/include/net/dsm.h
@@ -40,8 +40,8 @@ extern "C" {
 /**
  * @brief   Maximum number of maintained DTLS sessions (tinyDTLS)
  */
-#ifndef DTLS_PEER_MAX
-#define DTLS_PEER_MAX   (1)
+#ifndef CONFIG_DSM_PEER_MAX
+#define CONFIG_DSM_PEER_MAX   (1)
 #endif
 
 /**
diff --git a/sys/net/dsm/dsm.c b/sys/net/dsm/dsm.c
index f54602615e..62f6ed1d24 100644
--- a/sys/net/dsm/dsm.c
+++ b/sys/net/dsm/dsm.c
@@ -37,13 +37,13 @@ static int _find_session(sock_dtls_t *sock, sock_dtls_session_t *to_find,
                          dsm_session_t **session);
 
 static mutex_t _lock;
-static dsm_session_t _sessions[DTLS_PEER_MAX];
+static dsm_session_t _sessions[CONFIG_DSM_PEER_MAX];
 static uint8_t _available_slots;
 
 void dsm_init(void)
 {
     mutex_init(&_lock);
-    _available_slots = DTLS_PEER_MAX;
+    _available_slots = CONFIG_DSM_PEER_MAX;
 }
 
 dsm_state_t dsm_store(sock_dtls_t *sock, sock_dtls_session_t *session,
@@ -116,7 +116,7 @@ uint8_t dsm_get_num_available_slots(void)
 
 uint8_t dsm_get_num_maximum_slots(void)
 {
-    return DTLS_PEER_MAX;
+    return CONFIG_DSM_PEER_MAX;
 }
 
 ssize_t dsm_get_least_recently_used_session(sock_dtls_t *sock, sock_dtls_session_t *session)
@@ -124,12 +124,12 @@ ssize_t dsm_get_least_recently_used_session(sock_dtls_t *sock, sock_dtls_session
     int res = -1;
     dsm_session_t *session_slot = NULL;
 
-    if (dsm_get_num_available_slots() == DTLS_PEER_MAX) {
+    if (dsm_get_num_available_slots() == CONFIG_DSM_PEER_MAX) {
         return res;
     }
 
     mutex_lock(&_lock);
-    for (uint8_t i=0; i < DTLS_PEER_MAX; i++) {
+    for (uint8_t i=0; i < CONFIG_DSM_PEER_MAX; i++) {
         if (_sessions[i].state != SESSION_STATE_ESTABLISHED) {
             continue;
         }
@@ -164,7 +164,7 @@ static int _find_session(sock_dtls_t *sock, sock_dtls_session_t *to_find,
     dsm_session_t *empty_session = NULL;
 
     sock_dtls_session_get_udp_ep(to_find, &to_find_ep);
-    for (uint8_t i=0; i < DTLS_PEER_MAX; i++) {
+    for (uint8_t i=0; i < CONFIG_DSM_PEER_MAX; i++) {
         if (_sessions[i].state == SESSION_STATE_NONE) {
             empty_session = &_sessions[i];
             continue;

From 65ff161b3a931140e8dc2efd1380fab2d70be8b5 Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Fri, 8 Oct 2021 12:15:53 +0200
Subject: [PATCH 3/3] dsm: make CONFIG_DSM_PEER_MAX depend on
 CONFIG_DTLS_PEER_MAX

---
 sys/include/net/dsm.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/include/net/dsm.h b/sys/include/net/dsm.h
index cf80bbefdc..4e75541ace 100644
--- a/sys/include/net/dsm.h
+++ b/sys/include/net/dsm.h
@@ -31,6 +31,8 @@
 #define NET_DSM_H
 
 #include <stdint.h>
+
+#include "dtls.h"
 #include "net/sock/dtls.h"
 
 #ifdef __cplusplus
@@ -41,7 +43,7 @@ extern "C" {
  * @brief   Maximum number of maintained DTLS sessions (tinyDTLS)
  */
 #ifndef CONFIG_DSM_PEER_MAX
-#define CONFIG_DSM_PEER_MAX   (1)
+#define CONFIG_DSM_PEER_MAX   (CONFIG_DTLS_PEER_MAX)
 #endif
 
 /**