Merge pull request #5 from LinuxJedi/stm32-lwip

STM32 LWIP

Author: douzzer

examples/Linux-LWIP/README.md

@@ -96,4 +96,3 @@ sudo docker-compose -f docker-compose.yml down
 ## Notes
 
 * The `lwip-include/arch` directory is a copy of the lwIP directory from `contrib/ports/unix/port/include/arch`.
-* `fflush()` is used after `printf()` because docker-compose buffers `stdout`.

examples/Linux-LWIP/echo.c

@@ -18,8 +18,7 @@
 /* Called by echo_msgrecv() when it effectively gets an EOF */
 static void echo_msgclose(struct tcp_pcb *pcb)
 {
-    printf("Closing connection from: %s\n", ipaddr_ntoa(&(pcb->remote_ip)));
-    fflush(stdout);
+    fprintf(stderr, "Closing connection from: %s\n", ipaddr_ntoa(&(pcb->remote_ip)));
     /* Tell sentry_action() that this is a disconnect event which decrements
      * the connection count */
     sentry_action(&pcb->local_ip, &pcb->remote_ip, pcb->local_port, pcb->remote_port, SENTRY_ACTION_DISCONNECT);
@@ -42,8 +41,7 @@ static err_t echo_msgrecv(void *arg, struct tcp_pcb *pcb, struct pbuf *p,
 
         for (q = p; q != NULL; q = q->next)
         {
-            printf("Got: %.*s\n", q->len, q->payload);
-            fflush(stdout);
+            fprintf(stderr, "Got: %.*s\n", q->len, q->payload);
         }
     }
     else if (err == ERR_OK && p == NULL)
@@ -58,8 +56,7 @@ static err_t echo_msgrecv(void *arg, struct tcp_pcb *pcb, struct pbuf *p,
 static void echo_msgerr(void *arg, err_t err)
 {
     LWIP_DEBUGF(ECHO_DEBUG, ("echo_msgerr: %s (%i)\n", lwip_strerr(err), err));
-    printf("Err: %s\n", lwip_strerr(err));
-    fflush(stdout);
+    fprintf(stderr, "Err: %s\n", lwip_strerr(err));
 }
 
 /* TCP accept connection callback handler */
@@ -68,17 +65,15 @@ static err_t echo_msgaccept(void *arg, struct tcp_pcb *pcb, err_t err)
     /* Accepted new connection */
     LWIP_PLATFORM_DIAG(("echo_msgaccept called\n"));
 
-    printf("Connect from: %s port: %d\n", ipaddr_ntoa(&(pcb->remote_ip)), pcb->remote_port);
-    fflush(stdout);
+    fprintf(stderr, "Connect from: %s port: %d\n", ipaddr_ntoa(&(pcb->remote_ip)), pcb->remote_port);
 
     /* The below is an alternative hook to check for incoming connections. The
      * down side of this is that it will only trigger after the initial SYN/ACK
      */
     /*
     if (sentry_action(pcb, SENTRY_ACTION_CONNECT) != 0)
     {
-        printf("Sentry rejected connection\n");
-        fflush(stdout);
+        fprintf(stderr, "Sentry rejected connection\n");
         tcp_abort(pcb);
         return ERR_ABRT;
     }
@@ -129,15 +124,13 @@ int sentry_tcp_inpkt(struct tcp_pcb *pcb, struct tcp_hdr *hdr, uint16_t optlen,
          * yet, that happens immediately after this callback, so we get these
          * details from other sources. The same sources that are about to fill
          * in the details into the sruct */
-        printf("Incomming connection from: %s\n",
+        fprintf(stderr, "Incomming connection from: %s\n",
                 ipaddr_ntoa(ip_current_src_addr()));
-        fflush(stdout);
         if (sentry_action(ip_current_dest_addr(), ip_current_src_addr(),
                     pcb->local_port, hdr->src , SENTRY_ACTION_CONNECT) != 0)
         {
-            printf("Sentry rejected connection from: %s\n",
+            fprintf(stderr, "Sentry rejected connection from: %s\n",
                     ipaddr_ntoa(ip_current_src_addr()));
-            fflush(stdout);
             return ERR_ABRT;
         }
     }

examples/Linux-LWIP/main.c

@@ -23,16 +23,15 @@
 static err_t pcap_output(struct netif *netif, struct pbuf *p)
 {
     pcap_t *pcap = netif->state;
-    //printf("Sending packet with length %d\n", p->tot_len);
+    //fprintf(stderr, "Sending packet with length %d\n", p->tot_len);
 
     /* Just fire the raw packet data down PCAP */
     int r = pcap_sendpacket(pcap, (uint8_t *)p->payload, p->tot_len);
 
     if (r != 0)
     {
-        printf("Error sending packet\n");
-        printf("Error: %s\n", pcap_geterr(pcap));
-        fflush(stdout);
+        fprintf(stderr, "Error sending packet\n");
+        fprintf(stderr, "Error: %s\n", pcap_geterr(pcap));
         return ERR_IF;
     }
 
@@ -49,17 +48,15 @@ static err_t filter_input(struct pbuf *p, struct netif *inp)
     /* "src" contains the source hardware address from the packet */
     if (sentry_action_mac(ethaddr) != 0)
     {
-        printf("Sentry rejected MAC address %02X:%02X:%02X:%02X:%02X:%02X\n",
+        fprintf(stderr, "Sentry rejected MAC address %02X:%02X:%02X:%02X:%02X:%02X\n",
                 ethaddr->addr[0], ethaddr->addr[1], ethaddr->addr[2],
                 ethaddr->addr[3], ethaddr->addr[4], ethaddr->addr[5]);
-        fflush(stdout);
         /* Basically drop the packet */
         return ERR_ABRT;
     }
-    printf("Sentry accepted MAC address %02X:%02X:%02X:%02X:%02X:%02X\n",
+    fprintf(stderr, "Sentry accepted MAC address %02X:%02X:%02X:%02X:%02X:%02X\n",
             ethaddr->addr[0], ethaddr->addr[1], ethaddr->addr[2],
             ethaddr->addr[3], ethaddr->addr[4], ethaddr->addr[5]);
-    fflush(stdout);
     /* We passed the MAC filter, so pass the packet to the regular internal
      * lwIP input callback */
     return netif_input(p, inp);
@@ -113,24 +110,21 @@ int main(size_t argc, char **argv)
     /* Initialize wolfSentry */
     if (sentry_init() != 0)
     {
-        printf("Sentry init failure\n");
-        fflush(stdout);
+        fprintf(stderr, "Sentry init failure\n");
         return -1;
     }
 
     /* Initialize TCP listener */
     if (echo_init() != 0)
     {
-        printf("TCP init failure\n");
-        fflush(stdout);
+        fprintf(stderr, "TCP init failure\n");
         return -1;
     }
 
     /* Initialize ICMP listener */
     if (ping_init() != 0)
     {
-        printf("ICMP init failure\n");
-        fflush(stdout);
+        fprintf(stderr, "ICMP init failure\n");
         return -1;
     }
 
@@ -149,22 +143,20 @@ int main(size_t argc, char **argv)
                 continue;
 
             case -1:
-                printf("Error: %s\n", pcap_geterr(pcap));
-                fflush(stdout);
+                fprintf(stderr, "Error: %s\n", pcap_geterr(pcap));
                 continue;
 
             case 1:
                 break;
 
             default:
-                printf("Unknown result: %d\n", r);
-                fflush(stdout);
+                fprintf(stderr, "Unknown result: %d\n", r);
                 continue;
         }
 
         /* Copy the packet to lwIP's packet buffer and trigger a lwIP packet
          * input */
-        //printf("Packet length: %d / %d\n", hdr->len, hdr->caplen);
+        //fprintf(stderr, "Packet length: %d / %d\n", hdr->len, hdr->caplen);
         struct pbuf *pbuf = pbuf_alloc(PBUF_RAW, hdr->len, PBUF_RAM);
         memcpy(pbuf->payload, data, hdr->len);
         netif.input(pbuf, &netif);

examples/Linux-LWIP/ping.c

@@ -25,14 +25,12 @@ static u8_t ping_recv(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_a
       {
           /* RAW recv needs to free if not returning 0 */
           pbuf_free(p);
-          printf("Ping rejected from %s\n", ipaddr_ntoa(addr));
-          fflush(stdout);
+          fprintf(stderr, "Ping rejected from %s\n", ipaddr_ntoa(addr));
           return 1;
       }
   }
 
-  printf("Ping accepted from %s\n", ipaddr_ntoa(addr));
-  fflush(stdout);
+  fprintf(stderr, "Ping accepted from %s\n", ipaddr_ntoa(addr));
   return 0;
 }
 

examples/Linux-LWIP/sentry.c

@@ -30,7 +30,7 @@ static wolfsentry_errcode_t test_action(
     (void)route_table;
     (void)action_results;
 
-    /*printf("action callback: a=\"%s\" parent_event=\"%s\" trigger=\"%s\" t=%u r_id=%u caller_arg=%p\n",
+    /*fprintf(stderr, "action callback: a=\"%s\" parent_event=\"%s\" trigger=\"%s\" t=%u r_id=%u caller_arg=%p\n",
            wolfsentry_action_get_label(action),
            wolfsentry_event_get_label(parent_event),
            wolfsentry_event_get_label(trigger_event),
@@ -52,8 +52,7 @@ int sentry_init()
     if (ret < 0) {
         fprintf(stderr, "wolfsentry_init() returned " WOLFSENTRY_ERROR_FMT "\n",
                 WOLFSENTRY_ERROR_FMT_ARGS(ret));
-        printf("unable to initialize wolfSentry");
-        fflush(stdout);
+        fprintf(stderr, "unable to initialize wolfSentry");
     }
 
     /* Insert the possible actions into wolfSentry */
@@ -119,8 +118,7 @@ int sentry_init()
 
     if (f == NULL) {
         fprintf(stderr, "fopen(%s): %s\n",wolfsentry_config_path,strerror(errno));
-        printf("unable to open wolfSentry config file");
-        fflush(stdout);
+        fprintf(stderr, "unable to open wolfSentry config file");
     }
 
     /* Initalize the wolfSentry JSON parser */
@@ -131,26 +129,23 @@ int sentry_init()
         fprintf(stderr, "wolfsentry_config_json_init() returned "
                 WOLFSENTRY_ERROR_FMT "\n",
                 WOLFSENTRY_ERROR_FMT_ARGS(ret));
-        printf("error while initializing wolfSentry config parser");
-        fflush(stdout);
+        fprintf(stderr, "error while initializing wolfSentry config parser");
     }
 
     /* wolfSentry uses a streaming reader/parser for the config file */
     for (;;) {
         /* Read some data from the config file */
         size_t n = fread(buf, 1, sizeof buf, f);
         if ((n < sizeof buf) && ferror(f)) {
-            fprintf(stderr,"fread(%s): %s\n",wolfsentry_config_path, strerror(errno));
-            printf("error while reading wolfSentry config file");
-            fflush(stdout);
+            fprintf(stderr, "fread(%s): %s\n",wolfsentry_config_path, strerror(errno));
+            fprintf(stderr, "error while reading wolfSentry config file");
         }
 
         /* Send the read data into the JSON parser */
         ret = wolfsentry_config_json_feed(jps, buf, n, err_buf, sizeof err_buf);
         if (ret < 0) {
             fprintf(stderr, "%.*s\n", (int)sizeof err_buf, err_buf);
-            printf("error while loading wolfSentry config file");
-            fflush(stdout);
+            fprintf(stderr, "error while loading wolfSentry config file");
         }
         if ((n < sizeof buf) && feof(f))
             break;
@@ -160,8 +155,7 @@ int sentry_init()
     /* Clean up the JSON parser */
     if ((ret = wolfsentry_config_json_fini(&jps, err_buf, sizeof err_buf)) < 0) {
         fprintf(stderr, "%.*s\n", (int)sizeof err_buf, err_buf);
-        printf("error while loading wolfSentry config file");
-        fflush(stdout);
+        fprintf(stderr, "error while loading wolfSentry config file");
     }
 
     return 0;
@@ -225,9 +219,8 @@ int sentry_action(ip_addr_t *local_ip, ip_addr_t *remote_ip, in_port_t local_por
             NULL,
             &action_results);
 
-    printf("TCP Sentry action returned " WOLFSENTRY_ERROR_FMT "\n",
+    fprintf(stderr, "TCP Sentry action returned " WOLFSENTRY_ERROR_FMT "\n",
                 WOLFSENTRY_ERROR_FMT_ARGS(ret));
-    fflush(stdout);
 
     /* Check the result, if it contains "reject" then notify the caller */
     if (WOLFSENTRY_ERROR_DECODE_ERROR_CODE(ret) >= 0) {
@@ -270,9 +263,8 @@ int sentry_action_ping(const ip_addr_t *addr, u8_t type)
             NULL,
             NULL,
             &action_results);
-    printf("PING Sentry action returned " WOLFSENTRY_ERROR_FMT "\n",
+    fprintf(stderr, "PING Sentry action returned " WOLFSENTRY_ERROR_FMT "\n",
                 WOLFSENTRY_ERROR_FMT_ARGS(ret));
-    fflush(stdout);
     if (WOLFSENTRY_ERROR_DECODE_ERROR_CODE(ret) >= 0) {
         if (WOLFSENTRY_MASKIN_BITS(action_results, WOLFSENTRY_ACTION_RES_REJECT)) {
             return -1;
@@ -312,9 +304,8 @@ int sentry_action_mac(struct eth_addr *addr)
             NULL,
             &action_results);
 
-    printf("MAC Sentry action returned " WOLFSENTRY_ERROR_FMT "\n",
+    fprintf(stderr, "MAC Sentry action returned " WOLFSENTRY_ERROR_FMT "\n",
                 WOLFSENTRY_ERROR_FMT_ARGS(ret));
-    fflush(stdout);
     if (WOLFSENTRY_ERROR_DECODE_ERROR_CODE(ret) >= 0) {
         if (WOLFSENTRY_MASKIN_BITS(action_results, WOLFSENTRY_ACTION_RES_REJECT)) {
             return -1;

examples/STM32/Inc/echo.h

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#ifndef __ECHO_H__
+#define __ECHO_H__
+
+#include <stdint.h>
+
+struct pbuf;
+struct tcp_pcb;
+struct tcp_hdr;
+
+int echo_init(void);
+int sentry_tcp_inpkt(struct tcp_pcb *pcb, struct tcp_hdr *hdr, uint16_t optlen, uint16_t opt1len, uint8_t *opt2, struct pbuf *p);
+
+#endif

examples/STM32/Inc/ping.h

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#ifndef __PING_H__
+#define __PING_H__
+
+int ping_init(void);
+
+#endif

examples/STM32/Inc/sentry.h

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#ifndef __SENTRY_H__
+#define __SENTRY_H__
+#include "lwip/tcp.h"
+#include "lwip/sockets.h"
+#include <netif/etharp.h>
+#include <stdbool.h>
+
+typedef enum {
+    SENTRY_ACTION_NONE,
+    SENTRY_ACTION_CONNECT,
+    SENTRY_ACTION_DISCONNECT
+} sentry_action_type;
+
+int sentry_init(void);
+int sentry_action(ip_addr_t *local_ip, ip_addr_t *remote_ip, in_port_t local_port, in_port_t remote_port, sentry_action_type action);
+int sentry_action_ping(const ip_addr_t *addr, u8_t type);
+int sentry_action_mac(struct eth_addr *addr);
+#endif