From 00c53864846a4a22dfedaf49e41ac0f4ed3143c1 Mon Sep 17 00:00:00 2001
From: Eric Blankenhorn <eric@wolfssl.com>
Date: Tue, 31 Oct 2023 15:23:27 -0500
Subject: [PATCH] Finalize

---
 .github/workflows/mqtt-sn-check.yml  | 97 ----------------------------
 examples/sn-client/sn-client.c       |  2 +-
 examples/sn-client/sn-client_qos-1.c |  2 +-
 examples/sn-client/sn-multithread.c  |  2 +-
 wolfmqtt/mqtt_client.h               |  5 ++
 5 files changed, 8 insertions(+), 100 deletions(-)
 delete mode 100644 .github/workflows/mqtt-sn-check.yml

diff --git a/.github/workflows/mqtt-sn-check.yml b/.github/workflows/mqtt-sn-check.yml
deleted file mode 100644
index 5bc04c0e1..000000000
--- a/.github/workflows/mqtt-sn-check.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-name: MQTT-SN Build Test
-
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
-    steps:
-    - name: Install dependencies
-      run: |
-        # Don't prompt for anything
-        export DEBIAN_FRONTEND=noninteractive
-        sudo apt-get update
-        # Install mosquitto
-        sudo apt-get install -y mosquitto bubblewrap
-
-    - name: Setup mosquitto broker
-      run: |
-        # Disable default broker daemon
-        sleep 1
-
-    - uses: actions/checkout@master
-      with:
-        repository: eclipse/paho.mqtt-sn.embedded-c
-        path: gateway
-    - name: Build gateway
-      working-directory: ./gateway/MQTTSNGateway
-      run: ./build.sh udp -DDEBUG -DDEBUG_NW
-    - name: Write config to change broker
-      working-directory: ./gateway/MQTTSNGateway/bin
-      run: |
-        printf "GatewayID=1\nGatewayName=PahoGateway-01\nMaxNumberOfClients=30\nKeepAlive=60\nBrokerName=localhost\nBrokerPortNo=1883\nAggregatingGateway=NO\nQoS-1=NO\nForwarder=NO\nPredefinedTopic=NO\nClientAuthentication=NO\nGatewayPortNo=10000\nMulticastPortNo=1883\nMulticastIP=225.1.1.1\nMulticastTTL=1\n" > gateway.conf
-    - name: Display gateway config
-      working-directory: ./gateway/MQTTSNGateway/bin
-      run: more gateway.conf
-    - name: Run gateway
-      working-directory: ./gateway/MQTTSNGateway/bin
-      run: sudo ./MQTT-SNGateway &> ~/gateway.log &
-           sleep 1 # let the broker set everything up
-
-    # This is some debug info useful if something goes wrong
-    - name: Show network status
-      run: |
-        sudo ifconfig
-        sudo route
-        sudo netstat -tulpan
-
-    - uses: actions/checkout@master
-      with:
-        repository: wolfssl/wolfssl
-        path: wolfssl
-    - name: wolfssl autogen
-      working-directory: ./wolfssl
-      run: ./autogen.sh
-    - name: wolfssl configure
-      working-directory: ./wolfssl
-      run: ./configure --enable-enckeys
-    - name: wolfssl make
-      working-directory: ./wolfssl
-      run: make
-    - name: wolfssl make install
-      working-directory: ./wolfssl
-      run: sudo make install
-
-    - uses: actions/checkout@master
-    - name: wolfmqtt autogen
-      run: ./autogen.sh
-
-    - name: wolfmqtt configure with SN Enabled
-      run: |
-        export WOLFMQTT_NO_EXTERNAL_BROKER_TESTS=1
-        ./configure --enable-sn
-    - name: wolfmqtt make
-      run: make
-    - name: test SN Client
-      run: ./examples/sn-client/sn-client $1
-           RESULT=$?
-           [ $RESULT -ne 0 ] && echo -e "\n\nMQTT-SN Client failed!" && exit 1
-
-    # Cleanup
-#    - name: Stop gateway
-#      run: |
-#        sudo kill -2 $(pgrep -f "MQTT-SNGateway")
-
-    # capture logs on failure
-    - name: Show logs on failure
-      if: failure() || cancelled()
-      run: |
-        sudo kill -2 $(pgrep -f "MQTT-SNGateway")
-        sudo cat ~/gateway.log
diff --git a/examples/sn-client/sn-client.c b/examples/sn-client/sn-client.c
index fa4cb45b9..e60c1f5af 100644
--- a/examples/sn-client/sn-client.c
+++ b/examples/sn-client/sn-client.c
@@ -24,7 +24,7 @@
     #include <config.h>
 #endif
 
-#include "wolfmqtt/mqtt_sn_client.h"
+#include "wolfmqtt/mqtt_client.h"
 
 #include "sn-client.h"
 #include "examples/mqttnet.h"
diff --git a/examples/sn-client/sn-client_qos-1.c b/examples/sn-client/sn-client_qos-1.c
index 7b1291334..cee87110a 100644
--- a/examples/sn-client/sn-client_qos-1.c
+++ b/examples/sn-client/sn-client_qos-1.c
@@ -28,7 +28,7 @@
     #include <config.h>
 #endif
 
-#include "wolfmqtt/mqtt_sn_client.h"
+#include "wolfmqtt/mqtt_client.h"
 
 #include "sn-client.h"
 #include "examples/mqttnet.h"
diff --git a/examples/sn-client/sn-multithread.c b/examples/sn-client/sn-multithread.c
index b97e1836e..4e7d934ee 100644
--- a/examples/sn-client/sn-multithread.c
+++ b/examples/sn-client/sn-multithread.c
@@ -24,7 +24,7 @@
     #include <config.h>
 #endif
 
-#include "wolfmqtt/mqtt_sn_client.h"
+#include "wolfmqtt/mqtt_client.h"
 
 #include "sn-client.h"
 #include "examples/mqttnet.h"
diff --git a/wolfmqtt/mqtt_client.h b/wolfmqtt/mqtt_client.h
index 75b9a7ed1..f381d2f8f 100644
--- a/wolfmqtt/mqtt_client.h
+++ b/wolfmqtt/mqtt_client.h
@@ -41,10 +41,12 @@
 #include "wolfmqtt/mqtt_types.h"
 #include "wolfmqtt/mqtt_packet.h"
 #include "wolfmqtt/mqtt_socket.h"
+
 #ifdef WOLFMQTT_SN
 #include "wolfmqtt/mqtt_sn_packet.h"
 #endif
 
+
 /* This macro allows the disconnect callback to be triggered when
  * MqttClient_Disconnect_ex is called. Normally the CB is only used to handle
  * errors from MqttPacket_HandleNetError.
@@ -211,6 +213,9 @@ typedef struct _MqttClient {
 #endif
 } MqttClient;
 
+#ifdef WOLFMQTT_SN
+#include "wolfmqtt/mqtt_sn_client.h"
+#endif
 
 /* Application Interfaces */