Skip to content

Added example for wolfMQTT broker #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dgarske wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Added example for wolfMQTT broker #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 65 additions & 6 deletions src/port/stm32h563/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ ENABLE_SSH ?= 0
# MQTT support: set ENABLE_MQTT=1 to include wolfMQTT client (requires TLS)
ENABLE_MQTT ?= 0

# MQTT Broker: set ENABLE_MQTT_BROKER=1 to include wolfMQTT broker (requires TLS)
ENABLE_MQTT_BROKER ?= 0

# Library paths - default to sibling directories (clone alongside pattern)
WOLFSSL_ROOT ?= $(ROOT)/../wolfssl
WOLFSSH_ROOT ?= $(ROOT)/../wolfssh
Expand Down Expand Up @@ -198,25 +201,74 @@ SRCS += $(WOLFMQTT_SRCS)

# wolfMQTT objects use relaxed warnings + MQTT/SSL include paths + user_settings.h
$(WOLFMQTT_ROOT)/%.o: $(WOLFMQTT_ROOT)/%.c
$(CC) $(CFLAGS_WOLFSSL) -DENABLE_MQTT -DWOLFSSL_USER_SETTINGS -DWOLFMQTT_USER_SETTINGS -I$(WOLFMQTT_ROOT) -I$(WOLFSSL_ROOT) -c $< -o $@
$(CC) $(CFLAGS_WOLFSSL) -DENABLE_MQTT -DWOLFSSL_USER_SETTINGS -DWOLFMQTT_USER_SETTINGS $(if $(filter 1,$(ENABLE_MQTT_BROKER)),-DENABLE_MQTT_BROKER) -I$(WOLFMQTT_ROOT) -I$(WOLFSSL_ROOT) -I$(ROOT)/src -c $< -o $@

endif # ENABLE_MQTT

# -----------------------------------------------------------------------------
# MQTT Broker Support (wolfMQTT broker) - requires TLS
# -----------------------------------------------------------------------------
ifeq ($(ENABLE_MQTT_BROKER),1)

# MQTT Broker requires TLS
ifeq ($(ENABLE_TLS),0)
$(error ENABLE_MQTT_BROKER=1 requires ENABLE_TLS=1)
endif

# Validate wolfMQTT exists
ifeq ($(wildcard $(WOLFMQTT_ROOT)/wolfmqtt/mqtt_broker.h),)
$(error wolfMQTT (with broker) not found at $(WOLFMQTT_ROOT). Clone it: git clone https://github.com/wolfSSL/wolfMQTT.git)
endif

CFLAGS += -DENABLE_MQTT_BROKER
CFLAGS += -DWOLFMQTT_USER_SETTINGS
CFLAGS += -I$(WOLFMQTT_ROOT)

# MQTT broker wrapper
SRCS += mqtt_broker.c

# wolfMQTT broker source files
# Note: mqtt_client.c is needed by broker internals (MqttClient_Init, etc.)
WOLFMQTT_BROKER_SRCS := \
$(WOLFMQTT_ROOT)/src/mqtt_broker.c

# Only add shared wolfMQTT sources if MQTT client is not already enabled
ifneq ($(ENABLE_MQTT),1)
WOLFMQTT_BROKER_SRCS += \
$(WOLFMQTT_ROOT)/src/mqtt_client.c \
$(WOLFMQTT_ROOT)/src/mqtt_packet.c \
$(WOLFMQTT_ROOT)/src/mqtt_socket.c
endif

SRCS += $(WOLFMQTT_BROKER_SRCS)

# wolfMQTT objects use relaxed warnings + include paths + user_settings.h
# Only define this pattern rule if MQTT client didn't already define it
ifneq ($(ENABLE_MQTT),1)
$(WOLFMQTT_ROOT)/%.o: $(WOLFMQTT_ROOT)/%.c
$(CC) $(CFLAGS_WOLFSSL) -DENABLE_MQTT_BROKER -DWOLFSSL_USER_SETTINGS -DWOLFMQTT_USER_SETTINGS -I$(WOLFMQTT_ROOT) -I$(WOLFSSL_ROOT) -I$(ROOT)/src -c $< -o $@
endif

endif # ENABLE_MQTT_BROKER

# -----------------------------------------------------------------------------
# Build rules
# -----------------------------------------------------------------------------
OBJS := $(patsubst %.c,%.o,$(SRCS))

all: app.bin
@echo "Built with TZEN=$(TZEN) ENABLE_TLS=$(ENABLE_TLS) ENABLE_HTTPS=$(ENABLE_HTTPS) ENABLE_SSH=$(ENABLE_SSH) ENABLE_MQTT=$(ENABLE_MQTT)"
@echo "Built with TZEN=$(TZEN) ENABLE_TLS=$(ENABLE_TLS) ENABLE_HTTPS=$(ENABLE_HTTPS) ENABLE_SSH=$(ENABLE_SSH) ENABLE_MQTT=$(ENABLE_MQTT) ENABLE_MQTT_BROKER=$(ENABLE_MQTT_BROKER)"
ifeq ($(ENABLE_TLS),1)
@echo " wolfSSL: $(WOLFSSL_ROOT)"
endif
ifeq ($(ENABLE_SSH),1)
@echo " wolfSSH: $(WOLFSSH_ROOT)"
endif
ifeq ($(ENABLE_MQTT),1)
@echo " wolfMQTT: $(WOLFMQTT_ROOT)"
@echo " wolfMQTT (client): $(WOLFMQTT_ROOT)"
endif
ifeq ($(ENABLE_MQTT_BROKER),1)
@echo " wolfMQTT (broker): $(WOLFMQTT_ROOT)"
endif

app.elf: $(OBJS) $(LDSCRIPT)
Expand All @@ -230,7 +282,7 @@ app.bin: app.elf

# wolfSSL objects use relaxed warnings + user_settings.h + include paths
$(WOLFSSL_ROOT)/%.o: $(WOLFSSL_ROOT)/%.c
$(CC) $(CFLAGS_WOLFSSL) -DWOLFSSL_USER_SETTINGS $(if $(filter 1,$(ENABLE_SSH)),-DENABLE_SSH) -I$(WOLFSSL_ROOT) -c $< -o $@
$(CC) $(CFLAGS_WOLFSSL) -DWOLFSSL_USER_SETTINGS $(if $(filter 1,$(ENABLE_SSH)),-DENABLE_SSH) $(if $(filter 1,$(ENABLE_MQTT_BROKER)),-DENABLE_MQTT_BROKER) -I$(WOLFSSL_ROOT) -c $< -o $@

clean:
rm -f *.o app.elf app.bin
Expand All @@ -246,6 +298,9 @@ endif
ifeq ($(ENABLE_MQTT),1)
rm -f $(WOLFMQTT_ROOT)/src/*.o
endif
ifeq ($(ENABLE_MQTT_BROKER),1)
rm -f $(WOLFMQTT_ROOT)/src/*.o
endif

# Verify what features are compiled into the binary
verify: app.bin
Expand All @@ -255,9 +310,10 @@ verify: app.bin
@strings app.bin | grep -q "Initializing HTTPS server" && echo " ✓ HTTPS server enabled" || echo " ✗ HTTPS server disabled"
@strings app.bin | grep -q "Initializing SSH server" && echo " ✓ SSH server enabled" || echo " ✗ SSH server disabled"
@strings app.bin | grep -q "Initializing MQTT client" && echo " ✓ MQTT client enabled" || echo " ✗ MQTT client disabled"
@strings app.bin | grep -q "MQTT Broker: Initializing" && echo " ✓ MQTT broker enabled" || echo " ✗ MQTT broker disabled"
@echo ""
@echo "Binary size: $$(ls -lh app.bin | awk '{print $$5}')"
@echo "Build flags: TZEN=$(TZEN) ENABLE_TLS=$(ENABLE_TLS) ENABLE_HTTPS=$(ENABLE_HTTPS) ENABLE_SSH=$(ENABLE_SSH) ENABLE_MQTT=$(ENABLE_MQTT)"
@echo "Build flags: TZEN=$(TZEN) ENABLE_TLS=$(ENABLE_TLS) ENABLE_HTTPS=$(ENABLE_HTTPS) ENABLE_SSH=$(ENABLE_SSH) ENABLE_MQTT=$(ENABLE_MQTT) ENABLE_MQTT_BROKER=$(ENABLE_MQTT_BROKER)"

# Show memory usage
size: app.elf
Expand Down Expand Up @@ -290,6 +346,7 @@ help:
@echo " ENABLE_HTTPS=1 Enable HTTPS web server (requires TLS)"
@echo " ENABLE_SSH=1 Enable SSH server (requires TLS + wolfSSH)"
@echo " ENABLE_MQTT=1 Enable MQTT client (requires TLS + wolfMQTT)"
@echo " ENABLE_MQTT_BROKER=1 Enable MQTT broker (requires TLS + wolfMQTT)"
@echo " WOLFSSL_ROOT= Path to wolfSSL (default: ../wolfssl)"
@echo " WOLFSSH_ROOT= Path to wolfSSH (default: ../wolfssh)"
@echo " WOLFMQTT_ROOT= Path to wolfMQTT (default: ../wolfmqtt)"
Expand All @@ -302,7 +359,8 @@ help:
@echo " make ENABLE_TLS=1 ENABLE_HTTPS=1 # TLS + HTTPS web (port 443)"
@echo " make ENABLE_TLS=1 ENABLE_SSH=1 # TLS + SSH shell (port 22)"
@echo " make ENABLE_TLS=1 ENABLE_MQTT=1 # TLS + MQTT client"
@echo " make ENABLE_TLS=1 ENABLE_HTTPS=1 ENABLE_SSH=1 ENABLE_MQTT=1 # Full featured"
@echo " make ENABLE_TLS=1 ENABLE_MQTT_BROKER=1 # TLS + MQTT broker"
@echo " make ENABLE_TLS=1 ENABLE_HTTPS=1 ENABLE_SSH=1 ENABLE_MQTT=1 ENABLE_MQTT_BROKER=1 # Full featured"
@echo ""
@echo "Full Build Command (recommended):"
@echo " CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy \\"
Expand All @@ -314,5 +372,6 @@ help:
@echo " curl -k https://<ip>/ # HTTPS web server"
@echo " ssh admin@<ip> # SSH (password: wolfip)"
@echo " mosquitto_sub -h test.mosquitto.org -t 'wolfip/status' -v # MQTT subscribe"
@echo " mosquitto_pub -h <ip> -p 8883 --cafile /dev/null --insecure -t test -m hello # MQTT broker publish"

.PHONY: help
6 changes: 3 additions & 3 deletions src/port/stm32h563/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
#define ETHERNET
#define LINK_MTU 1536

#define MAX_TCPSOCKETS 12 /* Need enough for listen + accepted sockets */
#define MAX_TCPSOCKETS 17 /* 12 base + 5 for MQTT broker (listen + 4 clients) */
#define MAX_UDPSOCKETS 2
#define MAX_ICMPSOCKETS 1 /* Reduced from 2 */
#define RXBUF_SIZE (LINK_MTU * 8) /* Reduced from 16 */
#define TXBUF_SIZE (LINK_MTU * 8) /* Reduced from 16 */
#define RXBUF_SIZE (LINK_MTU * 4) /* Reduced for RAM fit with broker */
#define TXBUF_SIZE (LINK_MTU * 4) /* Reduced for RAM fit with broker */

#define MAX_NEIGHBORS 16

Expand Down
27 changes: 27 additions & 0 deletions src/port/stm32h563/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@
#include "mqtt_client.h"
#endif

#ifdef ENABLE_MQTT_BROKER
#include "mqtt_broker.h"
/* Defined in mqtt_broker.c, updated from main loop tick */
extern volatile unsigned long broker_uptime_sec;
#endif

#ifdef ENABLE_TLS

/* Google IP for TLS client test (run: dig +short google.com) */
Expand Down Expand Up @@ -688,6 +694,19 @@ int main(void)
}
#endif

#ifdef ENABLE_MQTT_BROKER
uart_puts("Initializing MQTT broker...\n");
{
mqtt_broker_config_t broker_config = {
.port = 8883,
.use_tls = 1
};
if (mqtt_broker_init(IPStack, &broker_config, uart_puts) < 0) {
uart_puts("ERROR: MQTT broker init failed\n");
}
}
#endif

uart_puts("Entering main loop. Ready for connections!\n");
uart_puts("Loop starting...\n");

Expand Down Expand Up @@ -750,6 +769,14 @@ int main(void)
}
#endif

#ifdef ENABLE_MQTT_BROKER
/* Poll MQTT broker */
mqtt_broker_poll();

/* Update broker uptime counter (approximate seconds from tick) */
broker_uptime_sec = (unsigned long)(tick / 1000);
#endif

#ifdef ENABLE_TLS
/* TLS client test: connect to Google after network settles */
if (!tls_client_test_started && tick > 5000) {
Expand Down
Loading