riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11791 from haukepetersen/fix_mqttsn_cliidmaxlen

Browse Source 
net/mqttsn: fix client ID length to comply to the standard
This commit is contained in:
Martine Lenders 2019-07-04 12:15:21 +02:00 committed by GitHub
commit 1f857b7988
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/include/net/asymcute.h
View File

@ -95,15 +95,6 @@ extern "C" {
#define ASYMCUTE_LISTENER_STACKSIZE (THREAD_STACKSIZE_DEFAULT) #define ASYMCUTE_LISTENER_STACKSIZE (THREAD_STACKSIZE_DEFAULT)
#endif #endif
#ifndef ASYMCUTE_ID_MAXLEN
/**
* @brief Maximum client ID length
*
* @note Must be less than (256 - 8) and less than (ASYMCUTE_BUFSIZE - 8)
*/
#define ASYMCUTE_ID_MAXLEN (32U)
#endif
#ifndef ASYMCUTE_TOPIC_MAXLEN #ifndef ASYMCUTE_TOPIC_MAXLEN
/** /**
* @brief Maximum topic length * @brief Maximum topic length
@ -273,7 +264,7 @@ struct asymcute_con {
uint8_t keepalive_retry_cnt; /**< keep alive transmission counter */ uint8_t keepalive_retry_cnt; /**< keep alive transmission counter */
uint8_t state; /**< connection state */ uint8_t state; /**< connection state */
uint8_t rxbuf[ASYMCUTE_BUFSIZE]; /**< connection specific receive buf */ uint8_t rxbuf[ASYMCUTE_BUFSIZE]; /**< connection specific receive buf */
char cli_id[ASYMCUTE_ID_MAXLEN + 1];/**< buffer to store client ID */ char cli_id[MQTTSN_CLI_ID_MAXLEN + 1]; /**< buffer to store client ID */
}; };
/** /**

10
sys/include/net/emcute.h
View File

@ -114,16 +114,6 @@ extern "C" {
#define EMCUTE_BUFSIZE (512U) #define EMCUTE_BUFSIZE (512U)
#endif #endif
#ifndef EMCUTE_ID_MAXLEN
/**
* @brief Maximum client ID length
*
* @note **Must** be less than (256 - 6) AND less than
* (@ref EMCUTE_BUFSIZE - 6).
*/
#define EMCUTE_ID_MAXLEN (196U)
#endif
#ifndef EMCUTE_TOPIC_MAXLEN #ifndef EMCUTE_TOPIC_MAXLEN
/** /**
* @brief Maximum topic length * @brief Maximum topic length

10
sys/include/net/mqttsn.h
View File

@ -35,6 +35,16 @@ extern "C" {
#define MQTTSN_DEFAULT_PORT (1883U) #define MQTTSN_DEFAULT_PORT (1883U)
#endif #endif
/**
* @name The client ID must contain 1-23 characters
*
* @see MQTT-SN spec v1.2, section 5.3.1
* @{
*/
#define MQTTSN_CLI_ID_MINLEN (1U)
#define MQTTSN_CLI_ID_MAXLEN (23U)
/** @} */
/** /**
* @brief MQTT-SN flags * @brief MQTT-SN flags
* *

2
sys/net/application_layer/asymcute/asymcute.c
View File

@ -712,7 +712,7 @@ int asymcute_connect(asymcute_con_t *con, asymcute_req_t *req,
return ASYMCUTE_NOTSUP; return ASYMCUTE_NOTSUP;
} }
/* make sure the client ID will fit into the dedicated buffer */ /* make sure the client ID will fit into the dedicated buffer */
if (id_len > ASYMCUTE_ID_MAXLEN) { if ((id_len < MQTTSN_CLI_ID_MINLEN) || (id_len > MQTTSN_CLI_ID_MAXLEN)) {
return ASYMCUTE_OVERFLOW; return ASYMCUTE_OVERFLOW;
} }
/* check if the context is not already connected to any gateway */ /* check if the context is not already connected to any gateway */

4
sys/net/application_layer/emcute/emcute.c
View File

@ -28,6 +28,7 @@
#include "thread_flags.h" #include "thread_flags.h"
#include "net/emcute.h" #include "net/emcute.h"
#include "net/mqttsn.h"
#include "emcute_internal.h" #include "emcute_internal.h"
#define ENABLE_DEBUG (0) #define ENABLE_DEBUG (0)
@ -490,7 +491,8 @@ int emcute_willupd_msg(const void *data, size_t len)
void emcute_run(uint16_t port, const char *id) void emcute_run(uint16_t port, const char *id)
{ {
assert(strlen(id) < EMCUTE_ID_MAXLEN); assert(strlen(id) >= MQTTSN_CLI_ID_MINLEN &&
strlen(id) <= MQTTSN_CLI_ID_MAXLEN);
sock_udp_ep_t local = SOCK_IPV6_EP_ANY; sock_udp_ep_t local = SOCK_IPV6_EP_ANY;
sock_udp_ep_t remote; sock_udp_ep_t remote;