kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-15 17:43:51 +01:00
Code Releases Activity

suit: replace SUIT_URL_MAX with CONFIG_SOCK_URLPATH_MAXLEN

Browse Source
This commit is contained in:
Benjamin Valentin 2022-05-25 13:12:21 +02:00
parent e16074f8ae
commit d9114f81c4
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/include/suit.h
View File

@ -62,13 +62,6 @@ extern "C" {
#define CONFIG_SUIT_COMPONENT_MAX_NAME_LEN (32U) #define CONFIG_SUIT_COMPONENT_MAX_NAME_LEN (32U)
#endif #endif
/**
* @brief Maximum length of a SUIT resource URL
*/
#ifndef SUIT_URL_MAX
#define SUIT_URL_MAX 128
#endif
/** /**
* @brief Current SUIT serialization format version * @brief Current SUIT serialization format version
* *

2
sys/suit/transport/coap.c
View File

@ -47,7 +47,7 @@ static ssize_t _trigger_handler(coap_pkt_t *pkt, uint8_t *buf, size_t len,
unsigned code; unsigned code;
size_t payload_len = pkt->payload_len; size_t payload_len = pkt->payload_len;
if (payload_len) { if (payload_len) {
if (payload_len >= SUIT_URL_MAX) { if (payload_len >= CONFIG_SOCK_URLPATH_MAXLEN) {
code = COAP_CODE_REQUEST_ENTITY_TOO_LARGE; code = COAP_CODE_REQUEST_ENTITY_TOO_LARGE;
} }
else { else {

4
sys/suit/transport/worker.c
View File

@ -76,7 +76,7 @@
#define SUIT_MSG_TRIGGER 0x12345 #define SUIT_MSG_TRIGGER 0x12345
static char _stack[SUIT_WORKER_STACKSIZE]; static char _stack[SUIT_WORKER_STACKSIZE];
static char _url[SUIT_URL_MAX]; static char _url[CONFIG_SOCK_URLPATH_MAXLEN];
static uint8_t _manifest_buf[SUIT_MANIFEST_BUFSIZE]; static uint8_t _manifest_buf[SUIT_MANIFEST_BUFSIZE];
static kernel_pid_t _suit_worker_pid; static kernel_pid_t _suit_worker_pid;
@ -113,7 +113,7 @@ static void _suit_handle_url(const char *url)
memset(&manifest, 0, sizeof(manifest)); memset(&manifest, 0, sizeof(manifest));
manifest.urlbuf = _url; manifest.urlbuf = _url;
manifest.urlbuf_len = SUIT_URL_MAX; manifest.urlbuf_len = CONFIG_SOCK_URLPATH_MAXLEN;
int res; int res;
if ((res = suit_parse(&manifest, _manifest_buf, size)) != SUIT_OK) { if ((res = suit_parse(&manifest, _manifest_buf, size)) != SUIT_OK) {

5
tests/suit_manifest/main.c
View File

@ -38,7 +38,6 @@
#include TEST_MANIFEST_INCLUDE(file1.bin.h) #include TEST_MANIFEST_INCLUDE(file1.bin.h)
#include TEST_MANIFEST_INCLUDE(file2.bin.h) #include TEST_MANIFEST_INCLUDE(file2.bin.h)
#define SUIT_URL_MAX 128
typedef struct { typedef struct {
const unsigned char *data; const unsigned char *data;
@ -73,13 +72,13 @@ const size_t num_payloads = ARRAY_SIZE(payloads);
static int test_suit_manifest(const unsigned char *manifest_bin, static int test_suit_manifest(const unsigned char *manifest_bin,
size_t manifest_bin_len) size_t manifest_bin_len)
{ {
char _url[SUIT_URL_MAX]; char _url[CONFIG_SOCK_URLPATH_MAXLEN];
suit_manifest_t manifest; suit_manifest_t manifest;
memset(&manifest, 0, sizeof(manifest)); memset(&manifest, 0, sizeof(manifest));
manifest.urlbuf = _url; manifest.urlbuf = _url;
manifest.urlbuf_len = SUIT_URL_MAX; manifest.urlbuf_len = CONFIG_SOCK_URLPATH_MAXLEN;
int res; int res;
if ((res = if ((res =