PR #492: Fix wolfIP integration and add MQTT configuration

Co-Authored-By: [email protected] <[email protected]>

Author: devin-ai-integration[bot]

fullstack/freertos-wolfip-wolfmqtt/include/mqtt_config.h

@@ -0,0 +1,39 @@
+/* mqtt_config.h
+ *
+ * Copyright (C) 2006-2024 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL.
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef MQTT_CONFIG_H
+#define MQTT_CONFIG_H
+
+/* MQTT Configuration */
+#define MQTT_MAX_PACKET_SIZE 1024
+#define MQTT_DEFAULT_CMD_TIMEOUT_MS 30000
+#define MQTT_KEEP_ALIVE_SEC 60
+#define MQTT_CLIENT_ID "FreeRTOS_Client"
+#define MQTT_TEST_TOPIC "test/topic"
+#define MQTT_HOST "10.10.0.1"
+#define MQTT_PORT 8883
+
+/* Debug Configuration */
+#ifndef WOLFMQTT_DEBUG
+#define WOLFMQTT_DEBUG
+#endif
+
+#endif /* MQTT_CONFIG_H */

fullstack/freertos-wolfip-wolfmqtt/src/wolfip_freertos.c

@@ -19,249 +19,77 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wolfip_freertos.h"
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <linux/if.h>
-#include <linux/if_tun.h>
 #include <arpa/inet.h>
-#include <sys/time.h>
-#include <poll.h>
-#include <sys/socket.h>
-#include <sys/random.h>
-#include <errno.h>
-
-/* Implementation of wolfIP's required random number generator */
-uint32_t wolfIP_getrandom(void) {
-    uint32_t ret;
-    getrandom(&ret, sizeof(ret), 0);
-    return ret;
-}
-
-struct wolfIP *g_wolfip = NULL;
-static TaskHandle_t g_network_task = NULL;
-static int tap_fd = -1;
-
-/* TUN/TAP device functions */
-static int tap_init(struct ll *dev, const char *ifname) {
-    struct ifreq ifr;
-    int sock_fd;
-
-    if ((tap_fd = open("/dev/net/tun", O_RDWR)) < 0) {
-        perror("Error opening /dev/net/tun");
-        return -1;
-    }
-
-    memset(&ifr, 0, sizeof(ifr));
-    ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
-    strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-
-    if (ioctl(tap_fd, TUNSETIFF, (void *)&ifr) < 0) {
-        perror("ioctl TUNSETIFF");
-        close(tap_fd);
-        return -1;
-    }
-
-    /* Get MAC address */
-    if (ioctl(tap_fd, SIOCGIFHWADDR, &ifr) < 0) {
-        perror("ioctl SIOCGIFHWADDR");
-        close(tap_fd);
-        return -1;
-    }
-
-    strncpy(dev->ifname, ifname, sizeof(dev->ifname) - 1);
-    memcpy(dev->mac, ifr.ifr_hwaddr.sa_data, 6);
-    dev->mac[5] ^= 1; /* Make MAC unique */
+#include "wolfip_freertos.h"
+#include "../../../wolfip/wolfip.h"
 
-    /* Configure network interface */
-    sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock_fd < 0) {
-        perror("socket");
-        close(tap_fd);
-        return -1;
-    }
+/* External functions from linux_tap.c */
+extern int tap_init(struct ll *ll, const char *ifname, uint32_t host_ip);
 
-    /* Set interface UP */
-    if (ioctl(sock_fd, SIOCGIFFLAGS, &ifr) < 0) {
-        perror("ioctl SIOCGIFFLAGS");
-        close(sock_fd);
-        return -1;
-    }
-    ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
-    if (ioctl(sock_fd, SIOCSIFFLAGS, &ifr) < 0) {
-        perror("ioctl SIOCSIFFLAGS");
-        close(sock_fd);
-        return -1;
-    }
+static struct wolfIP *g_ipstack = NULL;
 
-    close(sock_fd);
-    return 0;
-}
-
-static int tap_poll(struct ll *ll, void *buf, uint32_t len) {
-    struct pollfd pfd;
+int wolfip_init(void)
+{
+    struct wolfIP *ipstack;
+    ip4 ip, netmask, gateway;
+    struct ll *dev;
     int ret;
 
-    pfd.fd = tap_fd;
-    pfd.events = POLLIN;
-
-    do {
-        ret = poll(&pfd, 1, 1); /* Short timeout */
-    } while (ret < 0 && errno == EINTR);
-
-    if (ret < 0) {
-        perror("poll");
-        return -1;
-    }
-    if (ret == 0) {
-        return 0;
-    }
-
-    do {
-        ret = read(tap_fd, buf, len);
-    } while (ret < 0 && errno == EINTR);
-
-    return ret;
-}
-
-static int tap_send(struct ll *ll, void *buf, uint32_t len) {
-    return write(tap_fd, buf, len);
-}
-
-/* Network task implementation */
-static void wolfIP_NetworkTask(void *pvParameters) {
-    TickType_t last_wake_time;
-    const TickType_t frequency = pdMS_TO_TICKS(WOLFIP_POLL_INTERVAL_MS);
-    struct timeval tv;
-    
-    last_wake_time = xTaskGetTickCount();
-    
-    while (1) {
-        gettimeofday(&tv, NULL);
-        wolfIP_poll(g_wolfip, tv.tv_sec * 1000 + tv.tv_usec / 1000);
-        vTaskDelayUntil(&last_wake_time, frequency);
-    }
-}
-
-int wolfIP_FreeRTOS_Init(void) {
-    struct ll *tapdev;
-    
     /* Initialize wolfIP */
-    wolfIP_init_static(&g_wolfip);
-    if (!g_wolfip) {
+    wolfIP_init_static(&ipstack);
+    if (!ipstack) {
         printf("Failed to initialize wolfIP\n");
         return -1;
     }
-    
-    /* Setup TUN/TAP interface */
-    tapdev = wolfIP_getdev(g_wolfip);
-    if (!tapdev) {
-        printf("Failed to get device from wolfIP\n");
+
+    /* Configure IP settings */
+    ip = htonl(0x0A0A000A);      /* 10.10.0.10 */
+    netmask = htonl(0xFFFFFF00); /* 255.255.255.0 */
+    gateway = htonl(0x0A0A0001); /* 10.10.0.1 */
+
+    /* Get device interface */
+    dev = wolfIP_getdev(ipstack);
+    if (!dev) {
+        printf("Failed to get device interface\n");
         return -1;
     }
 
-    printf("Initializing TAP device wtap0...\n");
-    if (tap_init(tapdev, "wtap0") < 0) {
-        printf("Failed to initialize TAP device: %s\n", strerror(errno));
+    /* Initialize TAP device */
+    ret = tap_init(dev, "wtap0", ip);
+    if (ret < 0) {
+        printf("Failed to initialize TAP device\n");
         return -1;
     }
-    printf("TAP device initialized successfully\n");
 
-    /* Set device callbacks */
-    tapdev->poll = tap_poll;
-    tapdev->send = tap_send;
-    
-    /* Configure IP settings */
-    printf("Configuring network settings:\n");
-    printf("  IP: 10.10.0.10\n");
-    printf("  Netmask: 255.255.255.0\n");
-    printf("  Gateway: 10.10.0.1\n");
-    
-    wolfIP_ipconfig_set(g_wolfip, 
-        atoip4("10.10.0.10"),     /* IP */
-        atoip4("255.255.255.0"),    /* Netmask */
-        atoip4("10.10.0.1"));     /* Gateway */
-        
-    printf("Network configuration complete\n");
+    /* Set IP configuration */
+    wolfIP_ipconfig_set(ipstack, ip, netmask, gateway);
+
+    /* Print IP configuration */
+    wolfIP_ipconfig_get(ipstack, &ip, &netmask, &gateway);
+    printf("IP Configuration:\n");
+    printf("IP: %d.%d.%d.%d\n",
+           (ntohl(ip) >> 24) & 0xFF,
+           (ntohl(ip) >> 16) & 0xFF,
+           (ntohl(ip) >> 8) & 0xFF,
+           ntohl(ip) & 0xFF);
+    printf("Netmask: %d.%d.%d.%d\n",
+           (ntohl(netmask) >> 24) & 0xFF,
+           (ntohl(netmask) >> 16) & 0xFF,
+           (ntohl(netmask) >> 8) & 0xFF,
+           ntohl(netmask) & 0xFF);
+    printf("Gateway: %d.%d.%d.%d\n",
+           (ntohl(gateway) >> 24) & 0xFF,
+           (ntohl(gateway) >> 16) & 0xFF,
+           (ntohl(gateway) >> 8) & 0xFF,
+           ntohl(gateway) & 0xFF);
+
+    g_ipstack = ipstack;
     return 0;
 }
 
-static void UDP_Echo_Task(void* pvParameters) {
-    int sockfd;
-    uint8_t buf[1024];
-    int ret;
-    struct wolfIP_sockaddr_in addr;
-    struct wolfIP_sockaddr_in client_addr;
-    socklen_t client_len;
-
-    sockfd = wolfIP_sock_socket(g_wolfip, AF_INET, SOCK_DGRAM, 0);
-    if (sockfd < 0) {
-        printf("Failed to create UDP socket\n");
-        return;
-    }
-
-    memset(&addr, 0, sizeof(addr));
-    addr.sin_family = AF_INET;
-    addr.sin_port = htons(UDP_TEST_PORT);
-    addr.sin_addr.s_addr = htonl(INADDR_ANY);
-
-    if (wolfIP_sock_bind(g_wolfip, sockfd, (struct wolfIP_sockaddr*)&addr, sizeof(addr)) < 0) {
-        printf("Failed to bind UDP socket\n");
-        wolfIP_sock_close(g_wolfip, sockfd);
-        return;
-    }
-
-    printf("UDP Echo Server running on port %d\n", UDP_TEST_PORT);
-
-    while (1) {
-        client_len = sizeof(client_addr);
-        ret = wolfIP_sock_recvfrom(g_wolfip, sockfd, buf, sizeof(buf), 0,
-                                (struct wolfIP_sockaddr*)&client_addr, &client_len);
-        if (ret > 0) {
-            uint32_t ip = ntohl(client_addr.sin_addr.s_addr);
-            printf("Received %d bytes from %d.%d.%d.%d:%d\n", ret,
-                   (ip >> 24) & 0xFF,
-                   (ip >> 16) & 0xFF,
-                   (ip >> 8) & 0xFF,
-                   ip & 0xFF,
-                   ntohs(client_addr.sin_port));
-            wolfIP_sock_sendto(g_wolfip, sockfd, buf, ret, 0,
-                           (struct wolfIP_sockaddr*)&client_addr, client_len);
-        }
-        vTaskDelay(pdMS_TO_TICKS(10));
-    }
-}
-
-int wolfIP_Start_UDP_Echo(void) {
-    BaseType_t ret;
-    
-    ret = xTaskCreate(UDP_Echo_Task,
-                     "UDP_Echo",
-                     WOLFIP_TASK_STACK_SIZE,
-                     NULL,
-                     tskIDLE_PRIORITY + 1,
-                     NULL);
-                     
-    return (ret == pdPASS) ? 0 : -1;
-}
-
-int wolfIP_FreeRTOS_Start(void) {
-    BaseType_t ret;
-    
-    if (!g_wolfip) {
-        printf("wolfIP not initialized\n");
-        return -1;
-    }
-    
-    ret = xTaskCreate(wolfIP_NetworkTask,
-                     "WolfIP_Net",
-                     WOLFIP_TASK_STACK_SIZE,
-                     NULL,
-                     WOLFIP_TASK_PRIORITY,
-                     &g_network_task);
-                     
-    return (ret == pdPASS) ? 0 : -1;
+struct wolfIP* wolfip_get_stack(void)
+{
+    return g_ipstack;
 }

fullstack/freertos-wolfip-wolfmqtt/src/wolfip_freertos.h

@@ -22,26 +22,9 @@
 #ifndef WOLFIP_FREERTOS_H
 #define WOLFIP_FREERTOS_H
 
-#include "FreeRTOS.h"
-#include "task.h"
-#include "wolfip.h"
+#include "../../../wolfip/wolfip.h"
 
-/* Global wolfIP instance */
-extern struct wolfIP *g_wolfip;
-
-/* Network task configuration */
-#define WOLFIP_TASK_PRIORITY (tskIDLE_PRIORITY + 2)
-#define WOLFIP_TASK_STACK_SIZE (8 * 1024)
-#define WOLFIP_POLL_INTERVAL_MS 10
-#define UDP_TEST_PORT 7777
-
-/* Initialize wolfIP with FreeRTOS */
-int wolfIP_FreeRTOS_Init(void);
-
-/* Start wolfIP network task */
-int wolfIP_FreeRTOS_Start(void);
-
-/* Start UDP echo server task */
-int wolfIP_Start_UDP_Echo(void);
+int wolfip_init(void);
+struct wolfIP* wolfip_get_stack(void);
 
 #endif /* WOLFIP_FREERTOS_H */

fullstack/freertos-wolfip-wolfmqtt/test_mqtt.sh

@@ -10,12 +10,10 @@ if [ "$EUID" -ne 0 ]; then
 fi
 
 # Certificate paths (relative to wolfssl-examples repo)
-CA_CERT="../../../wolfssl/certs/ca-cert.pem"
-CLIENT_CERT="../../../wolfssl/certs/client-cert.pem"
-CLIENT_KEY="../../../wolfssl/certs/client-key.pem"
+CERT_PATH=$(realpath ../../../wolfssl/certs)
 
 # Verify certificate files exist
-for cert in "$CA_CERT" "$CLIENT_CERT" "$CLIENT_KEY"; do
+for cert in "$CERT_PATH/ca-cert.pem" "$CERT_PATH/client-cert.pem" "$CERT_PATH/client-key.pem"; do
     if [ ! -f "$cert" ]; then
         echo "Error: Certificate file not found: $cert"
         exit 1
@@ -25,9 +23,9 @@ done
 # Start mosquitto subscriber for testing with TLS
 echo "Starting MQTT subscriber on test/topic with TLS..."
 mosquitto_sub -h 10.10.0.1 -p 8883 \
-    --cafile "$CA_CERT" \
-    --cert "$CLIENT_CERT" \
-    --key "$CLIENT_KEY" \
+    --cafile "$CERT_PATH/ca-cert.pem" \
+    --cert "$CERT_PATH/client-cert.pem" \
+    --key "$CERT_PATH/client-key.pem" \
     --tls-version tlsv1.3 \
     -t "test/topic" -v &
 SUB_PID=$!