pkg/wolfmqtt: update package from v1.7 to v1.12.0

RIOT-OS · HendrikVE · Jan 10, 2022 · Jan 10, 2022 · Jan 18, 2022 · Jan 18, 2022
commit 951272760583c22ae5c06a57f49bdb996eac6107
diff --git a/pkg/wolfmqtt/Makefile b/pkg/wolfmqtt/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME    = wolfmqtt
 PKG_URL     = https://github.com/wolfssl/wolfmqtt.git
-PKG_VERSION = 238a70ec96a7501853b81241352c5091a86e9251 # v1.7
+PKG_VERSION = v1.12.0
 PKG_LICENSE = GPLv2
 
 include $(RIOTBASE)/pkg/pkg.mk

diff --git a/...hes/0002-adapt-network-code-to-RIOT.patch → ...hes/0001-adapt-network-code-to-RIOT.patch b/...hes/0002-adapt-network-code-to-RIOT.patch → ...hes/0001-adapt-network-code-to-RIOT.patch
@@ -1,33 +1,20 @@
-From 4aeefeec027a2e56c2db52158db68bf325af22e5 Mon Sep 17 00:00:00 2001
+From 54ec318b58a7deaaa5ae9ba4b3944d35281f3805 Mon Sep 17 00:00:00 2001
 From: Hendrik van Essen <hendrik.ve@fu-berlin.de>
 Date: Fri, 29 Jan 2021 02:19:42 +0100
-Subject: [PATCH 2/8] adapt network code to RIOT
+Subject: [PATCH 01/10] adapt network code to RIOT
 
 ---
- wolfmqtt/mqtt_types.h                   |   2 +-
- wolfmqtt_examples/mqttexample.c         |   9 ++
- wolfmqtt_examples/mqttnet.c             | 188 +++++++++++++++++++-----
- wolfmqtt_examples/sn-client/sn-client.c |  13 +-
- 4 files changed, 172 insertions(+), 40 deletions(-)
+ examples/mqttexample.c         |   9 ++
+ examples/mqttnet.c             | 186 ++++++++++++++++++++++++++-------
+ examples/sn-client/sn-client.c |  13 ++-
+ wolfmqtt/mqtt_types.h          |   2 +-
+ 4 files changed, 170 insertions(+), 40 deletions(-)
 
-diff --git a/wolfmqtt/mqtt_types.h b/wolfmqtt/mqtt_types.h
-index 8d70c2b..d822aca 100644
---- a/wolfmqtt/mqtt_types.h
-+++ b/wolfmqtt/mqtt_types.h
-@@ -91,7 +91,7 @@
-         #include <dispatch/dispatch.h>
-         typedef dispatch_semaphore_t wm_Sem;
-
--    #elif defined(__FreeBSD__) || defined(__linux__)
-+    #elif defined(__FreeBSD__) || defined(__linux__) || defined(RIOT_OS)
-         /* Posix Style Semaphore */
-         #define WOLFMQTT_POSIX_SEMAPHORES
-         #include <semaphore.h>
-diff --git a/wolfmqtt_examples/mqttexample.c b/wolfmqtt_examples/mqttexample.c
-index 42e8035..722cb17 100644
---- a/wolfmqtt_examples/mqttexample.c
-+++ b/wolfmqtt_examples/mqttexample.c
-@@ -211,7 +211,16 @@ void mqtt_show_usage(MQTTCtx* mqttCtx)
+diff --git a/examples/mqttexample.c b/examples/mqttexample.c
+index b375156..e919cf0 100644
+--- a/examples/mqttexample.c
++++ b/examples/mqttexample.c
+@@ -245,7 +245,16 @@ void mqtt_show_usage(MQTTCtx* mqttCtx)
  void mqtt_init_ctx(MQTTCtx* mqttCtx)
  {
      XMEMSET(mqttCtx, 0, sizeof(MQTTCtx));
@@ -44,11 +31,11 @@ index 42e8035..722cb17 100644
      mqttCtx->qos = DEFAULT_MQTT_QOS;
      mqttCtx->clean_session = 1;
      mqttCtx->keep_alive_sec = DEFAULT_KEEP_ALIVE_SEC;
-diff --git a/wolfmqtt_examples/mqttnet.c b/wolfmqtt_examples/mqttnet.c
-index f53a8ea..97a51ba 100644
---- a/wolfmqtt_examples/mqttnet.c
-+++ b/wolfmqtt_examples/mqttnet.c
-@@ -96,6 +96,31 @@
+diff --git a/examples/mqttnet.c b/examples/mqttnet.c
+index 8bd298a..0b10c87 100644
+--- a/examples/mqttnet.c
++++ b/examples/mqttnet.c
+@@ -102,6 +102,31 @@
          #error wolfMQTT must be built with WOLFMQTT_NONBLOCK defined for Harmony
      #endif
 
@@ -80,15 +67,15 @@ index f53a8ea..97a51ba 100644
  /* Linux */
  #else
      #include <sys/types.h>
-@@ -557,7 +582,6 @@ static int NetConnect(void *context, const char* host, word16 port,
+@@ -568,7 +593,6 @@ static int NetConnect(void *context, const char* host, word16 port,
      int timeout_ms)
  {
      SocketContext *sock = (SocketContext*)context;
 -    int type = SOCK_STREAM;
      int rc = -1;
      SOERROR_T so_error = 0;
      struct addrinfo *result = NULL;
-@@ -572,12 +596,28 @@ static int NetConnect(void *context, const char* host, word16 port,
+@@ -583,12 +607,28 @@ static int NetConnect(void *context, const char* host, word16 port,
                  host, port, timeout_ms, mqttCtx->use_tls);
 
              XMEMSET(&hints, 0, sizeof(hints));
@@ -119,7 +106,7 @@ index f53a8ea..97a51ba 100644
 
              rc = getaddrinfo(host, NULL, &hints, &result);
              if (rc == 0) {
-@@ -588,18 +628,34 @@ static int NetConnect(void *context, const char* host, word16 port,
+@@ -599,18 +639,34 @@ static int NetConnect(void *context, const char* host, word16 port,
                      goto exit;
                  }
 
@@ -160,7 +147,7 @@ index f53a8ea..97a51ba 100644
                  }
                  else {
                      rc = -1;
-@@ -614,7 +670,8 @@ static int NetConnect(void *context, const char* host, word16 port,
+@@ -625,7 +681,8 @@ static int NetConnect(void *context, const char* host, word16 port,
              rc = -1;
 
              /* Create socket */
@@ -170,15 +157,16 @@ index f53a8ea..97a51ba 100644
              if (sock->fd == SOCKET_INVALID)
                  goto exit;
 
-@@ -642,8 +699,17 @@ static int NetConnect(void *context, const char* host, word16 port,
+@@ -652,9 +709,17 @@ static int NetConnect(void *context, const char* host, word16 port,
              }
          #endif
 
 +            /* Default to error */
 +            rc = -1;
 +
              /* Start connect */
--            rc = SOCK_CONNECT(sock->fd, (struct sockaddr*)&sock->addr, sizeof(sock->addr));
+-            rc = SOCK_CONNECT(sock->fd, (struct sockaddr*)&sock->addr,
+-                    sizeof(sock->addr));
 +            if (sock->addr.ss_family == AF_INET) {
 +                rc = SOCK_CONNECT(sock->fd, (struct sockaddr*) &sock->addr, sizeof(struct sockaddr_in));
 +            }
@@ -187,9 +175,9 @@ index f53a8ea..97a51ba 100644
 +            }
 +
              if (rc < 0) {
-                 /* Check for error */
-                 socklen_t len = sizeof(so_error);
-@@ -687,8 +753,7 @@ static int SN_NetConnect(void *context, const char* host, word16 port,
+                 /* set default error case */
+                 rc = MQTT_CODE_ERROR_NETWORK;
+@@ -702,8 +767,7 @@ static int SN_NetConnect(void *context, const char* host, word16 port,
      int timeout_ms)
  {
      SocketContext *sock = (SocketContext*)context;
@@ -199,8 +187,8 @@ index f53a8ea..97a51ba 100644
      SOERROR_T so_error = 0;
      struct addrinfo *result = NULL;
      struct addrinfo hints;
-@@ -697,13 +762,29 @@ static int SN_NetConnect(void *context, const char* host, word16 port,
-     PRINTF("NetConnect: Host %s, Port %u, Timeout %d ms, Use TLS %d\n",
+@@ -712,13 +776,29 @@ static int SN_NetConnect(void *context, const char* host, word16 port,
+     PRINTF("NetConnect: Host %s, Port %u, Timeout %d ms, Use TLS %d",
          host, port, timeout_ms, mqttCtx->use_tls);
 
 -    /* Get address information for host and locate IPv4 */
@@ -234,7 +222,7 @@ index f53a8ea..97a51ba 100644
 
      rc = getaddrinfo(host, NULL, &hints, &result);
      if (rc == 0) {
-@@ -714,18 +795,34 @@ static int SN_NetConnect(void *context, const char* host, word16 port,
+@@ -729,18 +809,34 @@ static int SN_NetConnect(void *context, const char* host, word16 port,
              goto exit;
          }
 
@@ -243,11 +231,11 @@ index f53a8ea..97a51ba 100644
 -            if (result_i->ai_family == AF_INET)
 +            if (hints.ai_family == AF_UNSPEC) {
 +                /* take first result which is either IPv4 or IPv6 */
-                 break;
++                break;
 +            }
 +            else if (hints.ai_family == result_i->ai_family) {
 +                /* take first matching IPv4/IPv6 result */
-+                break;
+                 break;
 +            }
 +
              result_i = result_i->ai_next;
@@ -275,7 +263,7 @@ index f53a8ea..97a51ba 100644
          }
          else {
              rc = -1;
-@@ -736,16 +833,17 @@ static int SN_NetConnect(void *context, const char* host, word16 port,
+@@ -751,16 +847,17 @@ static int SN_NetConnect(void *context, const char* host, word16 port,
      if (rc != 0)
          goto exit;
 
@@ -301,15 +289,16 @@ index f53a8ea..97a51ba 100644
      #ifndef WOLFMQTT_NO_TIMEOUT
          fd_set fdset;
          struct timeval tv;
-@@ -758,8 +856,16 @@ static int SN_NetConnect(void *context, const char* host, word16 port,
+@@ -773,9 +870,16 @@ static int SN_NetConnect(void *context, const char* host, word16 port,
          (void)timeout_ms;
      #endif /* !WOLFMQTT_NO_TIMEOUT */
 
 +        /* Default to error */
 +        rc = -1;
 +
          /* Start connect */
--        rc = SOCK_CONNECT(sock->fd, (struct sockaddr*)&sock->addr, sizeof(sock->addr));
+-        rc = SOCK_CONNECT(sock->fd, (struct sockaddr*)&sock->addr,
+-                sizeof(sock->addr));
 +        if (sock->addr.ss_family == AF_INET) {
 +            rc = SOCK_CONNECT(sock->fd, (struct sockaddr*) &sock->addr, sizeof(struct sockaddr_in));
 +        }
@@ -319,16 +308,7 @@ index f53a8ea..97a51ba 100644
      }
 
    exit:
-@@ -895,7 +1001,7 @@ static int NetRead_ex(void *context, byte* buf, int buf_len,
-                 }
-                 /* Check if rx or error */
-             #ifdef WOLFMQTT_ENABLE_STDIN_CAP
--                else if ((!mqttCtx->test_mode && FD_ISSET(STDIN, &recvfds)) 
-+                else if ((!mqttCtx->test_mode && FD_ISSET(STDIN, &recvfds))
-                 #ifdef WOLFMQTT_MULTITHREAD
-                     || FD_ISSET(sock->pfd[0], &recvfds)
-                 #endif
-@@ -903,9 +1009,11 @@ static int NetRead_ex(void *context, byte* buf, int buf_len,
+@@ -918,9 +1022,11 @@ static int NetRead_ex(void *context, byte* buf, int buf_len,
                      return MQTT_CODE_STDIN_WAKE;
                  }
              #endif
@@ -342,7 +322,7 @@ index f53a8ea..97a51ba 100644
                  }
              }
              else {
-@@ -1041,6 +1149,9 @@ int MqttClientNet_Init(MqttNet* net, MQTTCtx* mqttCtx)
+@@ -1054,6 +1160,9 @@ int MqttClientNet_Init(MqttNet* net, MQTTCtx* mqttCtx)
      }
  #endif /* MICROCHIP_MPLAB_HARMONY */
 
@@ -352,16 +332,7 @@ index f53a8ea..97a51ba 100644
      if (net) {
          SocketContext* sockCtx;
 
-@@ -1059,7 +1170,7 @@ int MqttClientNet_Init(MqttNet* net, MQTTCtx* mqttCtx)
-         sockCtx->fd = SOCKET_INVALID;
-         sockCtx->stat = SOCK_BEGIN;
-         sockCtx->mqttCtx = mqttCtx;
--    
-+
-     #if defined(WOLFMQTT_MULTITHREAD) && defined(WOLFMQTT_ENABLE_STDIN_CAP)
-         /* setup the pipe for waking select() */
-         if (pipe(sockCtx->pfd) != 0) {
-@@ -1075,6 +1186,9 @@ int MqttClientNet_Init(MqttNet* net, MQTTCtx* mqttCtx)
+@@ -1088,6 +1197,9 @@ int MqttClientNet_Init(MqttNet* net, MQTTCtx* mqttCtx)
  #ifdef WOLFMQTT_SN
  int SN_ClientNet_Init(MqttNet* net, MQTTCtx* mqttCtx)
  {
@@ -371,12 +342,12 @@ index f53a8ea..97a51ba 100644
      if (net) {
          SocketContext* sockCtx;
 
-diff --git a/wolfmqtt_examples/sn-client/sn-client.c b/wolfmqtt_examples/sn-client/sn-client.c
-index 8dffc14..607986b 100644
---- a/wolfmqtt_examples/sn-client/sn-client.c
-+++ b/wolfmqtt_examples/sn-client/sn-client.c
-@@ -460,8 +460,17 @@ int main(int argc, char** argv)
-     mqttCtx.app_name = "sn-client";
+diff --git a/examples/sn-client/sn-client.c b/examples/sn-client/sn-client.c
+index 38ade12..3492280 100644
+--- a/examples/sn-client/sn-client.c
++++ b/examples/sn-client/sn-client.c
+@@ -683,8 +683,17 @@ int main(int argc, char** argv)
+     mqttCtx.client_id = DEFAULT_CLIENT_ID"-SN";
 
      /* Settings for MQTT-SN gateway */
 -    mqttCtx.host = "localhost";
@@ -395,6 +366,19 @@ index 8dffc14..607986b 100644
 
      /* parse arguments */
      rc = mqtt_parse_args(&mqttCtx, argc, argv);
+diff --git a/wolfmqtt/mqtt_types.h b/wolfmqtt/mqtt_types.h
+index f8e8f4d..edbe5ea 100644
+--- a/wolfmqtt/mqtt_types.h
++++ b/wolfmqtt/mqtt_types.h
+@@ -95,7 +95,7 @@
+             dispatch_semaphore_t sem;
+         } wm_Sem;
+
+-    #elif defined(__FreeBSD__) || defined(__linux__) || defined(__QNX__)
++    #elif defined(__FreeBSD__) || defined(__linux__) || defined(__QNX__) || defined(RIOT_OS)
+         /* Posix Style Pthread Mutex and Conditional */
+         #define WOLFMQTT_POSIX_SEMAPHORES
+         #include <pthread.h>
 -- 
 2.25.1