Fixes for Broker on MacOS (enable broker with --enable-all)

Author: dgarske

configure.ac

@@ -158,7 +158,7 @@ then
     test "$enable_v5" = "" && enable_v5=yes
     test "$enable_discb" = "" && enable_discb=yes
     test "$enable_mt" = "" && enable_mt=yes
-    test "$enable_" = "" && enable_=yes
+    test "$enable_broker" = "" && enable_broker=yes
 fi
 
 # TLS Support with wolfSSL

scripts/broker.test

@@ -70,9 +70,10 @@ wait_for_file() {
     local file="$1"
     local timeout_sec="${2:-5}"
     local waited=0
-    while [ ! -f "$file" ] && [ $waited -lt $timeout_sec ]; do
+    local max_iters=$((timeout_sec * 10))
+    while [ ! -f "$file" ] && [ $waited -lt $max_iters ]; do
         sleep 0.1
-        waited=$(echo "$waited + 0.1" | bc)
+        waited=$((waited + 1))
     done
     [ -f "$file" ]
 }

src/mqtt_packet.c

@@ -441,8 +441,9 @@ int MqttEncode_Props(MqttPacketType packet, MqttProp* props, byte* buf)
             }
             case MQTT_DATA_TYPE_STRING:
             {
-                tmp = MqttEncode_String(buf,
-                        (const char*)cur_prop->data_str.str);
+                tmp = MqttEncode_Data(buf,
+                        (const byte*)cur_prop->data_str.str,
+                        cur_prop->data_str.len);
                 rc += tmp;
                 if (buf != NULL) {
                     buf += tmp;
@@ -475,15 +476,17 @@ int MqttEncode_Props(MqttPacketType packet, MqttProp* props, byte* buf)
             {
                 /* String is prefixed with a Two Byte Integer length field that
                    gives the number of bytes */
-                tmp = MqttEncode_String(buf,
-                        (const char*)cur_prop->data_str.str);
+                tmp = MqttEncode_Data(buf,
+                        (const byte*)cur_prop->data_str.str,
+                        cur_prop->data_str.len);
                 rc += tmp;
                 if (buf != NULL) {
                     buf += tmp;
                 }
 
-                tmp = MqttEncode_String(buf,
-                        (const char*)cur_prop->data_str2.str);
+                tmp = MqttEncode_Data(buf,
+                        (const byte*)cur_prop->data_str2.str,
+                        cur_prop->data_str2.len);
                 rc += tmp;
                 if (buf != NULL) {
                     buf += tmp;
@@ -2681,9 +2684,9 @@ int MqttProps_Init(void)
     int ret = MQTT_CODE_SUCCESS;
 #if !defined(WOLFMQTT_DYN_PROP) && defined(WOLFMQTT_MULTITHREAD)
     if (clientPropStack_lockInit == 0) {
-        clientPropStack_lockInit++;
         ret = wm_SemInit(&clientPropStack_lock);
     }
+    clientPropStack_lockInit++;
 #endif
     return  ret;
 }