Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
17735: examples/gcoap_dtls: Increase stack size r=maribu a=maribu

### Contribution description

As the title says. The stack size was copied over from `tests/pkg_tinydtls_sock_async` cargo-cult style. Also some typos in the README were fixed.

### Testing procedure

Previously on my Nucleo-F767ZI, the CoAP client triggered the MPU stack guard on sending the DTLS hello. With this, the board no longer crashes.

### Issues/PRs references

None

19182: pkg/libfixmath: bump version r=maribu a=benpicco



19184: pkg/tinydtls: bump version r=maribu a=benpicco



Co-authored-by: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
Co-authored-by: Benjamin Valentin <benjamin.valentin@ml-pa.com>
  • Loading branch information
3 people authored Jan 22, 2023
4 parents 855dc07 + 08d8d8d + d102723 + bb515ab commit e807cf7
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 406 deletions.
7 changes: 6 additions & 1 deletion core/lib/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,12 @@ static void *main_trampoline(void *arg)
LOG_INFO(CONFIG_BOOT_MSG_STRING "\n");
}

main();
int res = main();

if (IS_USED(MODULE_TEST_UTILS_MAIN_EXIT_CB)) {
void test_utils_main_exit_cb(int res);
test_utils_main_exit_cb(res);
}

#ifdef MODULE_TEST_UTILS_PRINT_STACK_USAGE
void print_stack_usage_metric(const char *name, void *stack, unsigned max_size);
Expand Down
1 change: 1 addition & 0 deletions examples/gcoap_dtls/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,4 @@ ifndef CONFIG_KCONFIG_MODULE_GCOAP
GCOAP_RESEND_BUFS_MAX ?= 2
CFLAGS += -DCONFIG_GCOAP_RESEND_BUFS_MAX=$(GCOAP_RESEND_BUFS_MAX)
endif
CFLAGS += -DTHREAD_STACKSIZE_MAIN=\(2*THREAD_STACKSIZE_LARGE\)
10 changes: 5 additions & 5 deletions examples/gcoap_dtls/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

This is an additional gcoap example, but with enabled DTLS. It only provides a
custom configured makefile, while the code is a symlink to the original gcoap
example. Therefore, the infos and usage notes of the other README also applies to this
example.
example. Therefore, the infos and usage notes of the other README also applies
to this example.

Please note, that with DTLS the default port is 5684 and not 5683, thus CoAP requests
must be sent to this port.
Please note, that with DTLS the default port is 5684 and not 5683, thus CoAP
requests must be sent to this port.

Since DTLS has higher memory and and ROM requirements, more boards are blacklisted
Since DTLS has higher memory and ROM requirements, more boards are blacklisted
for this example compared to the non-DTLS gcoap example.

### CoAP query with DTLS enabled
Expand Down
1 change: 1 addition & 0 deletions makefiles/pseudomodules.inc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,7 @@ PSEUDOMODULES += crypto_aes_unroll

# declare shell version of test_utils_interactive_sync
PSEUDOMODULES += test_utils_interactive_sync_shell
PSEUDOMODULES += test_utils_main_exit_cb

# All auto_init modules are pseudomodules
PSEUDOMODULES += auto_init_%
Expand Down
4 changes: 2 additions & 2 deletions pkg/libfixmath/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME := libfixmath
PKG_VERSION := 24488b16cc0359daada0682a9bd3a11a801d0a01
PKG_VERSION := b987044c73dcaba496bb5bc86e69d134cd8790ec
PKG_URL := https://github.com/PetteriAimonen/libfixmath
PKG_LICENSE := MIT

Expand All @@ -9,4 +9,4 @@ all: $(filter libfixmath-unittests,$(USEMODULE))
$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/$(PKG_NAME) -f $(CURDIR)/Makefile.$(PKG_NAME)

libfixmath-unittests:
$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/unittests -f $(CURDIR)/Makefile.$(PKG_NAME)-unittests
$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/tests -f $(CURDIR)/Makefile.$(PKG_NAME)-unittests
3 changes: 2 additions & 1 deletion pkg/libfixmath/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ CFLAGS += $(libfixmath_options:CONFIG_FIXMATH_%=-DFIXMATH_%)
INCLUDES += -I$(PKG_SOURCE_DIR)/libfixmath

ifneq (,$(filter libfixmath-unittests,$(USEMODULE)))
INCLUDES += -I$(PKG_SOURCE_DIR)/unittests
INCLUDES += -I$(PKG_SOURCE_DIR)
INCLUDES += -I$(PKG_SOURCE_DIR)/tests
endif
87 changes: 0 additions & 87 deletions pkg/libfixmath/patches/0001-Fix-warnings.patch

This file was deleted.

Loading

0 comments on commit e807cf7

Please sign in to comment.