RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

paho: use GNRC instead of lwip

Browse Source
This commit is contained in:
Oleg Hahm 2022-11-27 01:22:06 +01:00
parent 388f9a2015
commit ef2b581c10
6 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
examples/paho-mqtt/Makefile
View File

@ -34,24 +34,12 @@ USEMODULE += netdev_default
USEPKG += paho-mqtt
# paho-mqtt depends on TCP support, choose which stacks you want
GNRC_IPV6 ?= 1
LWIP_IPV4 ?= 0
LWIP_IPV6 ?= 1
LWIP_IPV6 ?= 0
ifneq (0,$(LWIP_IPV4))
USEMODULE += ipv4_addr
USEMODULE += lwip_arp
USEMODULE += lwip_ipv4
USEMODULE += lwip_dhcp_auto
CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
endif
ifneq (0,$(LWIP_IPV6))
USEMODULE += ipv6_addr
USEMODULE += lwip_ipv6_autoconfig
endif
USEMODULE += lwip_netdev
USEMODULE += lwip
include Makefile.lwip
include Makefile.gnrc
USEMODULE += sock_async_event
USEMODULE += sock_ip

2
examples/paho-mqtt/Makefile.ci
View File

@ -1,7 +1,9 @@
BOARD_INSUFFICIENT_MEMORY := \
airfy-beacon \
blackpill \
blackpill-128kib \
bluepill \
bluepill-128kib \
bluepill-stm32f030c8 \
calliope-mini \
hifive1 \

16
examples/paho-mqtt/Makefile.gnrc Normal file
View File

@ -0,0 +1,16 @@
ifneq (0,$(GNRC_IPV6))
ifneq (0,$(USE_LWIP))
$(error No valid choice: Select either LWIP or GNRC)
endif
USEMODULE += auto_init_gnrc_netif
# Activate ICMPv6 error messages
USEMODULE += gnrc_icmpv6_error
# Specify the mandatory networking modules for IPv6
USEMODULE += gnrc_ipv6_default
# Additional networking modules that can be dropped if not needed
USEMODULE += gnrc_icmpv6_echo
else
ifeq (0,$(USE_LWIP))
$(error No network stack selected. Please choose either GNRC or LWIP)
endif
endif

25
examples/paho-mqtt/Makefile.lwip Normal file
View File

@ -0,0 +1,25 @@
USE_LWIP := 0
ifneq (0,$(LWIP_IPV4))
USE_LWIP := 1
endif
ifneq (0,$(LWIP_IPV6))
USE_LWIP := 1
endif
ifneq (0,$(LWIP_IPV4))
USEMODULE += ipv4_addr
USEMODULE += lwip_arp
USEMODULE += lwip_ipv4
USEMODULE += lwip_dhcp_auto
CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
endif
ifneq (0,$(LWIP_IPV6))
USEMODULE += ipv6_addr
USEMODULE += lwip_ipv6_autoconfig
endif
ifneq (0,$(USE_LWIP))
USEMODULE += lwip_netdev
USEMODULE += lwip
endif

6
examples/paho-mqtt/main.c
View File

@ -29,6 +29,9 @@
#include "paho_mqtt.h"
#include "MQTTClient.h"
#define MAIN_QUEUE_SIZE (8)
static msg_t _main_msg_queue[MAIN_QUEUE_SIZE];
#define BUF_SIZE 1024
#define MQTT_VERSION_v311 4 /* MQTT v3.1.1 version is 4 */
#define COMMAND_TIMEOUT_MS 4000
@ -293,6 +296,9 @@ static unsigned char readbuf[BUF_SIZE];
int main(void)
{
if (IS_USED(MODULE_GNRC_ICMPV6_ECHO)) {
msg_init_queue(_main_msg_queue, MAIN_QUEUE_SIZE);
}
#ifdef MODULE_LWIP
/* let LWIP initialize */
ztimer_sleep(ZTIMER_MSEC, 1 * MS_PER_SEC);

4
pkg/paho-mqtt/contrib/riot_iface.c
View File

@ -39,11 +39,9 @@
#define TSRB_MAX_SIZE (1024)
#endif
#ifdef MODULE_LWIP
static uint8_t buffer[TSRB_MAX_SIZE];
static uint8_t _temp_buf[TSRB_MAX_SIZE];
static tsrb_t tsrb_lwip_tcp;
#endif
#ifndef PAHO_MQTT_YIELD_MS
#define PAHO_MQTT_YIELD_MS (10)
@ -75,7 +73,7 @@ static int mqtt_read(struct Network *n, unsigned char *buf, int len,
uint32_t send_time = ztimer_now(ZTIMER_MSEC) + timeout_ms;
do {
rc = sock_tcp_read(&n->sock, _buf, _len, _timeout);
if (rc == -EAGAIN) {
if ((rc == -EAGAIN) || (rc == -ETIMEDOUT)) {
rc = 0;
}