From e6499f4a24499e90e99c4c7f6eeeafd6d3573809 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Thu, 24 Mar 2022 12:00:27 +0100 Subject: [PATCH 1/2] session.h: Modify session_t for RIOT Now the addr member of session_t includes both the IPv6 address and the port. Signed-off-by: Leandro Lanzieri --- session.c | 4 ++-- session.h | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/session.c b/session.c index 300224e8..7c4f3c85 100644 --- a/session.c +++ b/session.c @@ -34,8 +34,8 @@ #elif defined(WITH_RIOT_GNRC) #define _dtls_address_equals_impl(A,B) \ ((A)->size == (B)->size \ - && (A)->port == (B)->port \ - && ipv6_addr_equal(&((A)->addr),&((B)->addr)) \ + && (A)->addr.port == (B)->addr.port \ + && ipv6_addr_equal(&((A)->addr.addr6),&((B)->addr.addr6)) \ && (A)->ifindex == (B)->ifindex) #else /* WITH_CONTIKI */ diff --git a/session.h b/session.h index a8ac8f3f..0321b20b 100644 --- a/session.h +++ b/session.h @@ -34,10 +34,12 @@ typedef struct { #elif defined(WITH_RIOT_GNRC) #include "net/ipv6/addr.h" typedef struct { - unsigned char size; - ipv6_addr_t addr; - unsigned short port; - int ifindex; + unsigned char size; /**< size of session_t::addr */ + struct { + unsigned short port; /**< transport layer port */ + ipv6_addr_t addr6; /**< IPv6 address */ + } addr; /**< session IP address and port */ + int ifindex; /**< network interface index */ } session_t; #else /* ! WITH_CONTIKI && ! WITH_RIOT_GNRC */ From a45122b771515533f622f433b5090c576b4e0352 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Tue, 29 Mar 2022 11:08:18 +0200 Subject: [PATCH 2/2] session.h: add documentation to contiki definition Signed-off-by: Leandro Lanzieri --- session.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/session.h b/session.h index 0321b20b..7d022034 100644 --- a/session.h +++ b/session.h @@ -25,10 +25,10 @@ #ifdef WITH_CONTIKI #include "ip/uip.h" typedef struct { - unsigned char size; - uip_ipaddr_t addr; - unsigned short port; - int ifindex; + unsigned char size; /**< size of session_t::addr */ + uip_ipaddr_t addr; /**< session IP address */ + unsigned short port; /**< transport layer port */ + int ifindex; /**< network interface index */ } session_t; /* TODO: Add support for RIOT over sockets */ #elif defined(WITH_RIOT_GNRC)