diff --git a/AGWAPI.c b/AGWAPI.c
index 5e46d7e..e84a1d1 100644
--- a/AGWAPI.c
+++ b/AGWAPI.c
@@ -563,10 +563,28 @@ int AGWConnected(struct BPQConnectionInfo * Con, int Stream)
(memcmp(sockptr->CallSign1, ApplCall, 10) == 0) || (memcmp(sockptr->CallSign2, ApplCall, 10) == 0))
{
// Create Key
-
+
+ char callsign[10];
+ int port;
+ int sesstype;
+ int paclen;
+ int maxframe;
+ int l4window;
+
+
keyptr=(byte *)&Con->CallKey;
- *(keyptr++)='1';
+ // Try using the BPQ Port Number if a L2 connect, first free port number if not
+
+ GetConnectionInfo(Stream, callsign,
+ &port, &sesstype, &paclen,
+ &maxframe, &l4window);
+
+
+ if (port == 0)
+ port = 64;
+
+ *(keyptr++)='0' + port;
memcpy(keyptr, ApplCall, 10);
keyptr+=10;
memcpy(keyptr,ConnectingCall, 10);
@@ -686,8 +704,9 @@ int AGWDoMonitorData()
struct AGWSocketConnectionInfo * sockptr;
byte AGWBuffer[1000];
int n;
- int Stamp, Frametype;
+ int Frametype;
BOOL RXFlag;
+ time_t Stamp;
// Look for Monitor Data
@@ -708,7 +727,7 @@ int AGWDoMonitorData()
return 0;
}
- Stamp = (UINT)monbuff->Timestamp;
+ Stamp = monbuff->Timestamp;
memcpy(Buffer, monbuff, RawLen);
diff --git a/AGWMoncode.c b/AGWMoncode.c
index 1610548..84f4fe3 100644
--- a/AGWMoncode.c
+++ b/AGWMoncode.c
@@ -69,7 +69,7 @@ static UCHAR * DISPLAYIPDATAGRAM(IPMSG * IP, UCHAR * Output, int MsgLen);
static UCHAR * DISPLAYARPDATAGRAM(UCHAR * Datagram, UCHAR * Output);
-int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, int Stamp, int * FrameType, int useLocalTime, int DoNodes)
+int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, time_t Stamp, int * FrameType, int useLocalTime, int DoNodes)
{
UCHAR * ptr;
int n;
@@ -365,7 +365,7 @@ int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, int Stamp, int * FrameT
}
if (Output == NULL)
- return NULL;
+ return 0;
if (Output[-1] != 13)
Output += sprintf((char *)Output, "\r");
diff --git a/ARDOP.c b/ARDOP.c
index d79b632..3c3e3a0 100644
--- a/ARDOP.c
+++ b/ARDOP.c
@@ -3260,7 +3260,7 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
STREAM->NeedDisc = 100; // 10 secs
}
}
-
+ strcpy(STREAM->MyCall, TNC->TargetCall);
return;
}
else
@@ -3347,29 +3347,13 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
WritetoTrace(TNC, Buffer, MsgLen - 1);
- // Release Session3
+ // Release Session
if (TNC->Streams[0].Connected)
{
// Create a traffic record
- char logmsg[120];
- time_t Duration;
-
- Duration = time(NULL) - STREAM->ConnectTime;
-
- if (Duration == 0)
- Duration = 1;
-
- sprintf(logmsg,"Port %2d %9s Bytes Sent %d BPS %d Bytes Received %d BPS %d Time %d Seconds",
- TNC->Port, STREAM->RemoteCall,
- STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
- STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
- Debugprintf(logmsg);
-
- STREAM->ConnectTime = 0; // Prevent retrigger
-
+ hookL4SessionDeleted(TNC, STREAM);
}
@@ -3853,7 +3837,6 @@ VOID ARDOPProcessDataPacket(struct TNCINFO * TNC, UCHAR * Type, UCHAR * Data, in
STREAM->BytesRXed += Length;
Data[Length] = 0;
- Debugprintf("ARDOP: RXD %d bytes", Length);
sprintf(TNC->WEB_TRAFFIC, "Sent %d RXed %d Queued %d",
STREAM->BytesTXed - STREAM->BytesOutstanding, STREAM->BytesRXed, STREAM->BytesOutstanding);
@@ -3959,6 +3942,8 @@ VOID ARDOPProcessDataPacket(struct TNCINFO * TNC, UCHAR * Type, UCHAR * Data, in
BPQTRACE((MESSAGE *)buffptr, TRUE);
+ ReleaseBuffer(buffptr);
+
}
else
{
diff --git a/BBSHTMLConfig.c b/BBSHTMLConfig.c
index c37533c..e4c8248 100644
--- a/BBSHTMLConfig.c
+++ b/BBSHTMLConfig.c
@@ -116,7 +116,7 @@ int SendWebMailHeader(char * Reply, char * Key, struct HTTPConnectionInfo * Sess
struct UserInfo * FindBBS(char * Name);
void ReleaseWebMailStruct(WebMailInfo * WebMail);
VOID TidyWelcomeMsg(char ** pPrompt);
-int MailAPIProcessHTTPMessage(char * response, char * Method, char * URL, char * request, BOOL LOCAL, char * Param);
+int MailAPIProcessHTTPMessage(struct HTTPConnectionInfo * Session, char * response, char * Method, char * URL, char * request, BOOL LOCAL, char * Param);
char UNC[] = "";
char CHKD[] = "checked=checked ";
@@ -494,9 +494,9 @@ void ProcessMailHTTPMessage(struct HTTPConnectionInfo * Session, char * Method,
return;
}
- if (_memicmp(URL, "/Mail/API/", 10) == 0)
+ if (_memicmp(URL, "/Mail/API/v1/", 13) == 0)
{
- *RLen = MailAPIProcessHTTPMessage(Reply, Method, URL, input, LOCAL, Context);
+ *RLen = MailAPIProcessHTTPMessage(Session, Reply, Method, URL, input, LOCAL, Context);
return;
}
diff --git a/BPQMail.c b/BPQMail.c
index fc6a172..289592d 100644
--- a/BPQMail.c
+++ b/BPQMail.c
@@ -1392,7 +1392,7 @@ DWORD Stack[16];
BOOL Restarting = FALSE;
-Dump_Process_State(struct _EXCEPTION_POINTERS * exinfo, char * Msg)
+void Dump_Process_State(struct _EXCEPTION_POINTERS * exinfo, char * Msg)
{
unsigned int SPPtr;
unsigned int SPVal;
diff --git a/BPQMail.vcproj.NOTTSDESKTOP.John.user b/BPQMail.vcproj.NOTTSDESKTOP.John.user
new file mode 100644
index 0000000..fa82c00
--- /dev/null
+++ b/BPQMail.vcproj.NOTTSDESKTOP.John.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BPQWinAPP.vcproj.NOTTSDESKTOP.John.user b/BPQWinAPP.vcproj.NOTTSDESKTOP.John.user
new file mode 100644
index 0000000..fa82c00
--- /dev/null
+++ b/BPQWinAPP.vcproj.NOTTSDESKTOP.John.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Bpq32.c b/Bpq32.c
index 8f59fc9..65155bf 100644
--- a/Bpq32.c
+++ b/Bpq32.c
@@ -1227,6 +1227,9 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
// Allow interlocking of KISS and Session mode ports (eg ARDOP and VARA) (45)
// Add ARDOP UI Packets to MH (45)
// Add support for Qtsm Mgmt Interface (45)
+// NodeAPI improvements (46)
+// Add MQTT Interface (46)
+// Fix buffer leak in ARDOP codev(46)
diff --git a/CBPQ32.vcproj b/CBPQ32.vcproj
index a580f7a..d8b6051 100644
--- a/CBPQ32.vcproj
+++ b/CBPQ32.vcproj
@@ -20,7 +20,7 @@
+
+
+
+
+
diff --git a/CBPQ32.vcproj.NOTTSDESKTOP.John-skigdebian.user b/CBPQ32.vcproj.NOTTSDESKTOP.John-skigdebian.user
new file mode 100644
index 0000000..f4ba73a
--- /dev/null
+++ b/CBPQ32.vcproj.NOTTSDESKTOP.John-skigdebian.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CBPQ32.vcproj.NOTTSDESKTOP.John.user b/CBPQ32.vcproj.NOTTSDESKTOP.John.user
new file mode 100644
index 0000000..f4ba73a
--- /dev/null
+++ b/CBPQ32.vcproj.NOTTSDESKTOP.John.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CHeaders.h b/CHeaders.h
index 163cab5..a8203fc 100644
--- a/CHeaders.h
+++ b/CHeaders.h
@@ -153,6 +153,7 @@ int APIENTRY Reboot();
int APIENTRY Reconfig();
Dll int APIENTRY SaveNodes ();
+
struct SEM;
void GetSemaphore(struct SEM * Semaphore, int ID);
@@ -251,6 +252,7 @@ extern UCHAR MYCALLWITHALIAS[13];
extern APPLCALLS APPLCALLTABLE[NumberofAppls];
extern UCHAR MYNODECALL[]; // NODE CALLSIGN (ASCII)
+extern char NODECALLLOPPED[]; // NODE CALLSIGN (ASCII). Null terminated
extern UCHAR MYNETROMCALL[]; // NETROM CALLSIGN (ASCII)
extern UCHAR NETROMCALL[]; // NETORM CALL (AX25)
@@ -427,4 +429,16 @@ extern char Message[MaxBPQPortNo + 1][1000]; // Beacon Text
extern int MinCounter[MaxBPQPortNo + 1]; // Interval Countdown
extern BOOL SendFromFile[MaxBPQPortNo + 1];
-DllExport uint64_t APIENTRY GetPortFrequency(int PortNo, char * FreqStringMhz);
\ No newline at end of file
+extern BOOL MQTT;
+extern char MQTT_HOST[80];
+extern int MQTT_PORT;
+extern char MQTT_USER[80];
+extern char MQTT_PASS[80];
+
+DllExport uint64_t APIENTRY GetPortFrequency(int PortNo, char * FreqStringMhz);
+
+
+void hookL2SessionAccepted(int Port, char * remotecall, char * ourcall, struct _LINKTABLE * LINK);
+void hookL2SessionDeleted(struct _LINKTABLE * LINK);
+void hookL2SessionAttempt(int Port, char * ourcall, char * remotecall, struct _LINKTABLE * LINK);
+void hookL4SessionDeleted(struct TNCINFO * TNC, void * STREAM);
diff --git a/Cmd.c b/Cmd.c
index 60c4003..5a194cf 100644
--- a/Cmd.c
+++ b/Cmd.c
@@ -2838,12 +2838,6 @@ noFlip3:
RESET2(LINK); // RESET ALL FLAGS
- toCall[ConvFromAX25(LINK->LINKCALL, toCall)] = 0;
- fromCall[ConvFromAX25(LINK->OURCALL, fromCall)] = 0;
-
- hookL2SessionAttempt(CONNECTPORT, fromCall, toCall, LINK);
-
-
if (CMD->String[0] == 'N' && SUPPORT2point2)
LINK->L2STATE = 1; // New (2.2) send XID
else
diff --git a/CommonCode.c b/CommonCode.c
index 1b6352f..52b516a 100644
--- a/CommonCode.c
+++ b/CommonCode.c
@@ -28,6 +28,7 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
#include
#include
#include
+#include "mqtt.h"
#pragma data_seg("_BPQDATA")
@@ -735,22 +736,7 @@ VOID CheckForDetach(struct TNCINFO * TNC, int Stream, struct STREAMINFO * STREAM
// Create a traffic record
- if (STREAM->Connected && STREAM->ConnectTime)
- {
- Duration = time(NULL) - STREAM->ConnectTime;
-
- if (Duration == 0)
- Duration = 1; // Or will get divide by zero error
-
- sprintf(logmsg,"Port %2d %9s Bytes Sent %d BPS %d Bytes Received %d BPS %d Time %d Seconds",
- TNC->Port, STREAM->RemoteCall,
- STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
- STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
- Debugprintf(logmsg);
-
- STREAM->ConnectTime = 0;
- }
+ hookL4SessionDeleted(TNC, STREAM);
if (STREAM->BPQtoPACTOR_Q) // Still data to send?
return; // Will close when all acked
@@ -3716,6 +3702,11 @@ VOID OpenReportingSockets()
Chatreportdest.sin_port = htons(81);
_beginthread(ResolveUpdateThread, 0, NULL);
+
+ printf("MQTT Enabled %d\n", MQTT);
+
+ if (MQTT)
+ MQTTConnect(MQTT_HOST, MQTT_PORT, MQTT_USER, MQTT_PASS);
}
VOID WriteMiniDumpThread();
diff --git a/Events.c b/Events.c
index 34ed64a..a3ae616 100644
--- a/Events.c
+++ b/Events.c
@@ -23,6 +23,8 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
#include "compatbits.h"
#include
+#include "asmstrucs.h"
+#include "tncinfo.h"
VOID __cdecl Debugprintf(const char * format, ...);
@@ -37,6 +39,10 @@ VOID __cdecl Debugprintf(const char * format, ...);
#endif
extern BOOL EventsEnabled;
+void MQTTReportSession(char * Msg);
+
+
+extern char Modenames[19][10];
// Runs use specified routine on certain event
#ifndef WIN32
@@ -110,13 +116,97 @@ DllExport void APIENTRY RunEventProgram(char * Program, char * Param)
void hookL2SessionAccepted(int Port, char * remotecall, char * ourcall, struct _LINKTABLE * LINK)
{
+ // Incoming SABM
+
+ LINK->ConnectTime = time(NULL);
+ LINK->bytesTXed = LINK->bytesRXed = 0;
+
+ strcpy(LINK->callingCall, remotecall);
+ strcpy(LINK->receivingCall, ourcall);
+ strcpy(LINK->Direction, "In");
+
}
-void hookL2SessionDeleted(int Port, char * fromCall, char * toCall, struct _LINKTABLE * LINK)
+void hookL2SessionDeleted(struct _LINKTABLE * LINK)
{
+ // calculate session time and av bytes/min in and out
+
+ if (LINK->ConnectTime)
+ {
+ if (LINK->bytesTXed == 0 && LINK->bytesRXed == 0)
+ {
+ // assume failed connect and ignore for now - maybe log later
+
+ }
+ else
+ {
+ char Msg[256];
+ char timestamp[16];
+ time_t sessionTime = time(NULL) - LINK->ConnectTime;
+ double avBytesSent = LINK->bytesTXed / (sessionTime / 60.0);
+ double avBytesRXed = LINK->bytesRXed / (sessionTime / 60.0);
+ time_t Now = time(NULL);
+ struct tm * TM = localtime(&Now);
+
+ sprintf(timestamp, "%02d:%02d:%02d", TM->tm_hour, TM->tm_min, TM->tm_sec);
+
+ if (sessionTime == 0)
+ sessionTime = 1; // Or will get divide by zero error
+
+ Debugprintf("KISS Session Stats Port %d %s %s %d secs Bytes Sent %d BPM %4.2f Bytes Received %d %4.2f BPM ",
+ LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall, sessionTime, LINK->bytesTXed, avBytesSent, LINK->bytesRXed, avBytesRXed, timestamp);
+
+
+ sprintf(Msg, "{\"mode\": \"%s\", \"direction\": \"%s\", \"port\": %d, \"callfrom\": \"%s\", \"callto\": \"%s\", \"time\": %d, \"bytesSent\": %d,"
+ "\"BPMSent\": %4.2f, \"BytesReceived\": %d, \"BPMReceived\": %4.2f, \"timestamp\": \"%s\"}",
+ "KISS", LINK->Direction, LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall, sessionTime,
+ LINK->bytesTXed, avBytesSent, LINK->bytesRXed, avBytesRXed, timestamp);
+
+ MQTTReportSession(Msg);
+ }
+
+ LINK->ConnectTime = 0;
+ }
}
void hookL2SessionAttempt(int Port, char * ourcall, char * remotecall, struct _LINKTABLE * LINK)
{
+ LINK->ConnectTime = time(NULL);
+ LINK->bytesTXed = LINK->bytesRXed = 0;
+
+ strcpy(LINK->callingCall, ourcall);
+ strcpy(LINK->receivingCall, remotecall);
+ strcpy(LINK->Direction, "Out");
}
+
+void hookL4SessionDeleted(struct TNCINFO * TNC, struct STREAMINFO * STREAM)
+{
+ char Msg[256];
+
+ char timestamp[16];
+
+ if (STREAM->ConnectTime)
+ {
+ time_t sessionTime = time(NULL) - STREAM->ConnectTime;
+ double avBytesRXed = STREAM->BytesRXed / (sessionTime / 60.0);
+ double avBytesSent = STREAM->BytesTXed / (sessionTime / 60.0);
+ time_t Now = time(NULL);
+ struct tm * TM = localtime(&Now);
+ sprintf(timestamp, "%02d:%02d:%02d", TM->tm_hour, TM->tm_min, TM->tm_sec);
+
+ if (sessionTime == 0)
+ sessionTime = 1; // Or will get divide by zero error
+
+ sprintf(Msg, "{\"mode\": \"%s\", \"port\": %d, \"callfrom\": \"%s\", \"callto\": \"%s\", \"time\": %d, \"bytesSent\": %d,"
+ "\"BPMSent\": %4.2f, \"BytesReceived\": %d, \"BPMRECEIVED\": %4.2f, \"timestamp\": \"%s\"}",
+ Modenames[TNC->Hardware - 1], TNC->Port, STREAM->MyCall, STREAM->RemoteCall, sessionTime,
+ STREAM->BytesTXed, avBytesSent, STREAM->BytesRXed, avBytesRXed, timestamp);
+
+ MQTTReportSession(Msg);
+
+ STREAM->ConnectTime = 0;
+ }
+}
+
+
diff --git a/FLDigi.c b/FLDigi.c
index b46ee65..5153697 100644
--- a/FLDigi.c
+++ b/FLDigi.c
@@ -2951,22 +2951,7 @@ SendKReply:
if (STREAM->Connected)
{
- // Create a traffic record
-
- char logmsg[120];
- time_t Duration;
-
- Duration = time(NULL) - STREAM->ConnectTime;
-
- if (Duration == 0)
- Duration = 1;
-
- sprintf(logmsg,"Port %2d %9s Bytes Sent %d BPS %d Bytes Received %d BPS %d Time %d Seconds",
- TNC->Port, STREAM->RemoteCall,
- STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
- STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
- Debugprintf(logmsg);
+ hookL4SessionDeleted(TNC, STREAM);
}
STREAM->Connecting = FALSE;
diff --git a/FreeDATA.c b/FreeDATA.c
index b2ae499..eb12eec 100644
--- a/FreeDATA.c
+++ b/FreeDATA.c
@@ -2019,20 +2019,7 @@ VOID FreeDataProcessTNCMessage(struct TNCINFO * TNC, char * Call, unsigned char
{
// Create a traffic record
- char logmsg[120];
- time_t Duration;
-
- Duration = time(NULL) - STREAM->ConnectTime;
-
- if (Duration == 0)
- Duration = 1;
-
- sprintf(logmsg,"Port %2d %9s Bytes Sent %d BPS %d Bytes Received %d BPS %d Time %d Seconds",
- TNC->Port, STREAM->RemoteCall,
- STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
- STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
- Debugprintf(logmsg);
+ hookL4SessionDeleted(TNC, STREAM);
}
STREAM->Connected = FALSE; // Back to Command Mode
@@ -3158,22 +3145,8 @@ void ProcessTNCJSON(struct TNCINFO * TNC, char * Msg, int Len)
if (STREAM->Connected)
{
- // Create a traffic record
-
- char logmsg[120];
- time_t Duration;
-
- Duration = time(NULL) - STREAM->ConnectTime;
-
- if (Duration == 0)
- Duration = 1;
-
- sprintf(logmsg,"Port %2d %9s Bytes Sent %d BPS %d Bytes Received %d BPS %d Time %d Seconds",
- TNC->Port, STREAM->RemoteCall,
- STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
- STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
- Debugprintf(logmsg);
+
+ hookL4SessionDeleted(TNC, STREAM);
STREAM->Connected = FALSE; // Back to Command Mode
STREAM->ReportDISC = TRUE; // Tell Node
@@ -3351,20 +3324,7 @@ void ProcessTNCJSON(struct TNCINFO * TNC, char * Msg, int Len)
{
// Create a traffic record
- char logmsg[120];
- time_t Duration;
-
- Duration = time(NULL) - STREAM->ConnectTime;
-
- if (Duration == 0)
- Duration = 1;
-
- sprintf(logmsg,"Port %2d %9s Bytes Sent %d BPS %d Bytes Received %d BPS %d Time %d Seconds",
- TNC->Port, STREAM->RemoteCall,
- STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
- STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
- Debugprintf(logmsg);
+ hookL4SessionDeleted(TNC, STREAM);
STREAM->Connected = FALSE; // Back to Command Mode
STREAM->ReportDISC = TRUE; // Tell Node
diff --git a/HTTPcode.c b/HTTPcode.c
index 1e4502c..14ed523 100644
--- a/HTTPcode.c
+++ b/HTTPcode.c
@@ -112,6 +112,7 @@ struct PORTCONTROL * APIENTRY GetPortTableEntryFromSlot(int portslot);
int SetupNodeMenu(char * Buff, int SYSOP);
int StatusProc(char * Buff);
int ProcessMailSignon(struct TCPINFO * TCP, char * MsgPtr, char * Appl, char * Reply, struct HTTPConnectionInfo ** Session, BOOL WebMail, int LOCAL);
+int ProcessMailAPISignon(struct TCPINFO * TCP, char * MsgPtr, char * Appl, char * Reply, struct HTTPConnectionInfo ** Session, BOOL WebMail, int LOCAL);
int ProcessChatSignon(struct TCPINFO * TCP, char * MsgPtr, char * Appl, char * Reply, struct HTTPConnectionInfo ** Session, int LOCAL);
VOID APRSProcessHTTPMessage(SOCKET sock, char * MsgPtr, BOOL LOCAL, BOOL COOKIE);
@@ -1166,6 +1167,9 @@ int SendMessageFile(SOCKET sock, char * FN, BOOL OnlyifExists, int allowDeflate)
if (_stricmp(ptr, "js") == 0)
strcpy(Type, "Content-Type: text/javascript\r\n");
+
+ if (_stricmp(ptr, "css") == 0)
+ strcpy(Type, "Content-Type: text/css\r\n");
if (_stricmp(ptr, "pdf") == 0)
strcpy(Type, "Content-Type: application/pdf\r\n");
@@ -1180,7 +1184,8 @@ int SendMessageFile(SOCKET sock, char * FN, BOOL OnlyifExists, int allowDeflate)
Compressed = MsgBytes;
}
- if (_stricmp(ptr, "jpg") == 0 || _stricmp(ptr, "jpeg") == 0 || _stricmp(ptr, "png") == 0 || _stricmp(ptr, "gif") == 0 || _stricmp(ptr, "ico") == 0)
+ if (_stricmp(ptr, "jpg") == 0 || _stricmp(ptr, "jpeg") == 0 || _stricmp(ptr, "png") == 0 ||
+ _stricmp(ptr, "gif") == 0 || _stricmp(ptr, "bmp") == 0 || _stricmp(ptr, "ico") == 0)
strcpy(Type, "Content-Type: image\r\n");
HeaderLen = sprintf(Header, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\n"
@@ -1793,37 +1798,60 @@ int InnerProcessHTTPMessage(struct ConnectionInfo * conn)
if (_memicmp(Context, "/api/", 5) == 0 || _stricmp(Context, "/api") == 0)
{
char * Compressed;
- ReplyLen = APIProcessHTTPMessage(_REPLYBUFFER, Method, Context, MsgPtr, LOCAL, COOKIE);
-
- if (memcmp(_REPLYBUFFER, "HTTP", 4) == 0)
+
+ // if for mail api process signon here and rearrange url from
+ // api/v1/mail to mail/api/v1 so it goes to mail handler later
+
+ if (_memicmp(Context, "/api/v1/mail/", 13) == 0)
{
- // Full Message - just send it
+ memcpy(MsgPtr, "GET /mail/api/v1/", 17);
+
+ if (memcmp(&Context[13], "login", 5) == 0)
+ {
+ ReplyLen = ProcessMailAPISignon(TCP, MsgPtr, "M", Reply, &Session, FALSE, LOCAL);
+ memcpy(MsgPtr, "GET /mail/api/v1/", 17);
- sendandcheck(sock, _REPLYBUFFER, ReplyLen);
+ if (ReplyLen) // Error message
+ goto Returnit;
+ }
- return 0;
+ memcpy(Context, "/mail/api/v1/", 13);
+ goto doHeader;
}
-
- if (allowDeflate)
- Compressed = Compressit(_REPLYBUFFER, ReplyLen, &ReplyLen);
else
- Compressed = _REPLYBUFFER;
+ {
+ ReplyLen = APIProcessHTTPMessage(_REPLYBUFFER, Method, Context, MsgPtr, LOCAL, COOKIE);
+
+ if (memcmp(_REPLYBUFFER, "HTTP", 4) == 0)
+ {
+ // Full Message - just send it
- HeaderLen = sprintf(Header, "HTTP/1.1 200 OK\r\n"
- "Content-Length: %d\r\n"
- "Content-Type: application/json\r\n"
- "Connection: close\r\n"
- "%s\r\n", ReplyLen, Encoding);
+ sendandcheck(sock, _REPLYBUFFER, ReplyLen);
- sendandcheck(sock, Header, HeaderLen);
- sendandcheck(sock, Compressed, ReplyLen);
+ return 0;
+ }
- if (allowDeflate)
- free (Compressed);
+ if (allowDeflate)
+ Compressed = Compressit(_REPLYBUFFER, ReplyLen, &ReplyLen);
+ else
+ Compressed = _REPLYBUFFER;
- return 0;
- }
+ HeaderLen = sprintf(Header, "HTTP/1.1 200 OK\r\n"
+ "Content-Length: %d\r\n"
+ "Content-Type: application/json\r\n"
+ "Connection: close\r\n"
+ "Access-Control-Allow-Origin: *\r\n"
+ "%s\r\n", ReplyLen, Encoding);
+
+ sendandcheck(sock, Header, HeaderLen);
+ sendandcheck(sock, Compressed, ReplyLen);
+ if (allowDeflate)
+ free (Compressed);
+
+ return 0;
+ }
+ }
// APRS process internally
@@ -2128,10 +2156,33 @@ doHeader:
if (Session == 0)
Session = &Dummy;
- Session->TNC = (void *)LOCAL; // TNC only used for Web Terminal Sessions
+ if (LOCAL)
+ Session->TNC = (void *)1; // TNC only used for Web Terminal Sessions
+ else
+ Session->TNC = (void *)0;
ProcessMailHTTPMessage(Session, Method, Context, MsgPtr, _REPLYBUFFER, &ReplyLen, MsgLen);
+ if (Context && _memicmp(Context, "/mail/api/", 10) == 0)
+ {
+
+ // compress if allowed
+
+ if (allowDeflate)
+ Compressed = Compressit(_REPLYBUFFER, ReplyLen, &ReplyLen);
+ else
+ Compressed = Reply;
+
+ HeaderLen = sprintf(Header, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: text/html\r\n%s\r\n", ReplyLen, Encoding);
+ sendandcheck(sock, Header, HeaderLen);
+ sendandcheck(sock, Compressed, ReplyLen);
+
+ if (allowDeflate)
+ free (Compressed);
+
+ return 0;
+ }
+
if (memcmp(_REPLYBUFFER, "HTTP", 4) == 0)
{
// Full Header provided by appl - just send it
@@ -2156,11 +2207,16 @@ doHeader:
return 0;
}
+ if (Context && _memicmp(Context, "/mail/api/", 10) != 0)
+ {
+
// Add tail
strcpy(&_REPLYBUFFER[ReplyLen], Tail);
ReplyLen += strlen(Tail);
+ }
+
// compress if allowed
if (allowDeflate)
@@ -4183,6 +4239,67 @@ int ProcessNodeSignon(SOCKET sock, struct TCPINFO * TCP, char * MsgPtr, char * A
return ReplyLen;
}
+int ProcessMailAPISignon(struct TCPINFO * TCP, char * MsgPtr, char * Appl, char * Reply, struct HTTPConnectionInfo ** Session, BOOL WebMail, int LOCAL)
+{
+ int ReplyLen = 0;
+ char * input = strstr(MsgPtr, "\r\n\r\n"); // End of headers
+ char * user, * password, * Key;
+ struct HTTPConnectionInfo * NewSession;
+ int i;
+ struct UserRec * USER;
+
+ user = strlop(MsgPtr, '?');
+ password = strlop(user, '&');
+ strlop(password, ' ');
+
+
+ for (i = 0; i < TCP->NumberofUsers; i++)
+ {
+ USER = TCP->UserRecPtr[i];
+
+ if (user && _stricmp(user, USER->UserName) == 0)
+ {
+ if ((strcmp(password, USER->Password) == 0) && (USER->Secure || WebMail))
+ {
+ // ok
+
+ NewSession = AllocateSession(Appl[0], 'M');
+
+ *Session = NewSession;
+
+ if (NewSession)
+ {
+ ReplyLen = 0;
+ strcpy(NewSession->Callsign, USER->Callsign);
+ }
+ else
+ {
+ ReplyLen = SetupNodeMenu(Reply, LOCAL);
+ ReplyLen += sprintf(&Reply[ReplyLen], "%s", BusyError);
+ }
+ return ReplyLen;
+
+ }
+ }
+ }
+
+ // Pass failed attempt to BBS code so it can try a bbs user login
+
+ NewSession = AllocateSession(Appl[0], 'M');
+
+ *Session = NewSession;
+
+ if (NewSession)
+ ReplyLen = 0;
+ else
+ {
+ ReplyLen = SetupNodeMenu(Reply, LOCAL);
+ ReplyLen += sprintf(&Reply[ReplyLen], "%s", BusyError);
+ }
+
+ return ReplyLen;
+}
+
diff --git a/L2Code.c b/L2Code.c
index da2d7d7..78369c7 100644
--- a/L2Code.c
+++ b/L2Code.c
@@ -110,7 +110,7 @@ int seeifInterlockneeded(struct PORTCONTROL * PORT);
int seeifUnlockneeded(struct _LINKTABLE * LINK);
int CheckKissInterlock(struct PORTCONTROL * MYPORT, int Exclusive);
void hookL2SessionAccepted(int Port, char * fromCall, char * toCall, struct _LINKTABLE * LINK);
-void hookL2SessionDeleted(int Port, char * fromCall, char * toCall, struct _LINKTABLE * LINK);
+void hookL2SessionDeleted(struct _LINKTABLE * LINK);
void hookL2SessionAttempt(int Port, char * fromCall, char * toCall, struct _LINKTABLE * LINK);
@@ -1131,6 +1131,9 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
return;
}
+ toCall[ConvFromAX25(ADJBUFFER->DEST, toCall)] = 0;
+ fromCall[ConvFromAX25(ADJBUFFER->ORIGIN, fromCall)] = 0;
+
SETUPNEWL2SESSION(LINK, PORT, Buffer, MSGFLAG);
if (LINK->L2STATE != 5) // Setup OK?
@@ -1143,10 +1146,6 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
seeifInterlockneeded(PORT);
- toCall[ConvFromAX25(ADJBUFFER->DEST, toCall)] = 0;
- fromCall[ConvFromAX25(ADJBUFFER->ORIGIN, fromCall)] = 0;
-
-
// IF CONNECT TO APPL ADDRESS, SET UP APPL SESSION
if (APPLMASK == 0)
@@ -1161,13 +1160,8 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
int Paclen= PORT->PORTPACLEN;
UCHAR * ptr;
- if (LogAllConnects)
- {
- char toCall[12], fromCall[12];
- toCall[ConvFromAX25(ADJBUFFER->DEST, toCall)] = 0;
- fromCall[ConvFromAX25(ADJBUFFER->ORIGIN, fromCall)] = 0;
+ if (LogAllConnects)
WriteConnectLog(fromCall, toCall, "AX.25");
- }
hookL2SessionAccepted(PORT->PORTNUMBER, fromCall, toCall, LINK);
@@ -1284,7 +1278,9 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
// ACCEPT THE CONNECT, THEN INVOKE THE ALIAS
L2SENDUA(PORT, Buffer, ADJBUFFER);
-
+
+ hookL2SessionAccepted(PORT->PORTNUMBER, fromCall, toCall, LINK);
+
if (PORT->TNC && PORT->TNC->Hardware == H_KISSHF)
{
struct DATAMESSAGE * Msg;
@@ -1383,6 +1379,9 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
L2SENDUA(PORT, Buffer, ADJBUFFER);
+ hookL2SessionAccepted(PORT->PORTNUMBER, fromCall, toCall, LINK);
+
+
if (PORT->TNC && PORT->TNC->Hardware == H_KISSHF)
{
struct DATAMESSAGE * Msg;
@@ -2442,6 +2441,8 @@ VOID PROC_I_FRAME(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE *
Length = Buffer->LENGTH - (MSGHDDRLEN + 15); // Buffer Header + addrs + CTL
Info = &Buffer->PID;
+ LINK->bytesRXed += Length;
+
// Adjust for DIGIS
EOA = &Buffer->ORIGIN[6]; // End of address Bit
@@ -2647,6 +2648,13 @@ VOID RESET2(struct _LINKTABLE * LINK)
VOID SENDSABM(struct _LINKTABLE * LINK)
{
+ char toCall[10];
+ char fromCall[10];
+
+ toCall[ConvFromAX25(LINK->LINKCALL, toCall)] = 0;
+ fromCall[ConvFromAX25(LINK->OURCALL, fromCall)] = 0;
+ hookL2SessionAttempt(LINK->LINKPORT->PORTNUMBER, fromCall, toCall, LINK);
+
L2SENDCOMMAND(LINK, SABM | PFBIT);
}
@@ -3260,12 +3268,7 @@ VOID SENDFRMR(struct _LINKTABLE * LINK)
VOID CLEAROUTLINK(struct _LINKTABLE * LINK)
{
- char toCall[12], fromCall[12];
-
- toCall[ConvFromAX25(LINK->LINKCALL, toCall)] = 0;
- fromCall[ConvFromAX25(LINK->OURCALL, fromCall)] = 0;
-
- hookL2SessionDeleted(LINK->LINKPORT->PORTNUMBER, fromCall, toCall, LINK);
+ hookL2SessionDeleted(LINK);
seeifUnlockneeded(LINK);
diff --git a/L4Code.c b/L4Code.c
index 483746e..a087281 100644
--- a/L4Code.c
+++ b/L4Code.c
@@ -603,6 +603,9 @@ VOID L4BG()
// If we want to enforce PACLEN this may be a good place to do it
Msglen = Msg->LENGTH - (MSGHDDRLEN + 1); //Dont include PID
+
+ LINK->bytesTXed += Msglen;
+
Paclen = L4->SESSPACLEN;
if (Paclen == 0)
diff --git a/MQTTAsync.h b/MQTTAsync.h
new file mode 100644
index 0000000..e11af04
--- /dev/null
+++ b/MQTTAsync.h
@@ -0,0 +1,2383 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2023 IBM Corp., Ian Craggs and others
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Ian Craggs - initial API and implementation
+ * Ian Craggs, Allan Stockdill-Mander - SSL connections
+ * Ian Craggs - multiple server connection support
+ * Ian Craggs - MQTT 3.1.1 support
+ * Ian Craggs - fix for bug 444103 - success/failure callbacks not invoked
+ * Ian Craggs - automatic reconnect and offline buffering (send while disconnected)
+ * Ian Craggs - binary will message
+ * Ian Craggs - binary password
+ * Ian Craggs - remove const on eyecatchers #168
+ * Ian Craggs - MQTT 5.0
+ *******************************************************************************/
+
+/********************************************************************/
+
+/**
+ * @cond MQTTAsync_main
+ * @mainpage Asynchronous MQTT client library for C (MQTTAsync)
+ *
+ * © Copyright 2009, 2023 IBM Corp., Ian Craggs and others
+ *
+ * @brief An Asynchronous MQTT client library for C.
+ *
+ * An MQTT client application connects to MQTT-capable servers.
+ * A typical client is responsible for collecting information from a telemetry
+ * device and publishing the information to the server. It can also subscribe
+ * to topics, receive messages, and use this information to control the
+ * telemetry device.
+ *
+ * MQTT clients implement the published MQTT v3 protocol. You can write your own
+ * API to the MQTT protocol using the programming language and platform of your
+ * choice. This can be time-consuming and error-prone.
+ *
+ * To simplify writing MQTT client applications, this library encapsulates
+ * the MQTT v3 protocol for you. Using this library enables a fully functional
+ * MQTT client application to be written in a few lines of code.
+ * The information presented here documents the API provided
+ * by the Asynchronous MQTT Client library for C.
+ *
+ * Using the client
+ * Applications that use the client library typically use a similar structure:
+ *
+ * - Create a client object
+ * - Set the options to connect to an MQTT server
+ * - Set up callback functions
+ * - Connect the client to an MQTT server
+ * - Subscribe to any topics the client needs to receive
+ * - Repeat until finished:
+ *
+ * - Publish any messages the client needs to
+ * - Handle any incoming messages
+ *
+ * - Disconnect the client
+ * - Free any memory being used by the client
+ *
+ * Some simple examples are shown here:
+ *
+ * - @ref publish
+ * - @ref subscribe
+ *
+ * Additional information about important concepts is provided here:
+ *
+ * - @ref async
+ * - @ref wildcard
+ * - @ref qos
+ * - @ref tracing
+ * - @ref auto_reconnect
+ * - @ref offline_publish
+ *
+ * @endcond
+ */
+
+/*
+/// @cond EXCLUDE
+*/
+#if !defined(MQTTASYNC_H)
+#define MQTTASYNC_H
+
+#if defined(__cplusplus)
+ extern "C" {
+#endif
+
+#include
+/*
+/// @endcond
+*/
+
+#include "MQTTExportDeclarations.h"
+
+#include "MQTTProperties.h"
+#include "MQTTReasonCodes.h"
+#include "MQTTSubscribeOpts.h"
+#if !defined(NO_PERSISTENCE)
+#include "MQTTClientPersistence.h"
+#endif
+
+/**
+ * Return code: No error. Indicates successful completion of an MQTT client
+ * operation.
+ */
+#define MQTTASYNC_SUCCESS 0
+/**
+ * Return code: A generic error code indicating the failure of an MQTT client
+ * operation.
+ */
+#define MQTTASYNC_FAILURE -1
+
+/* error code -2 is MQTTAsync_PERSISTENCE_ERROR */
+
+#define MQTTASYNC_PERSISTENCE_ERROR -2
+
+/**
+ * Return code: The client is disconnected.
+ */
+#define MQTTASYNC_DISCONNECTED -3
+/**
+ * Return code: The maximum number of messages allowed to be simultaneously
+ * in-flight has been reached.
+ */
+#define MQTTASYNC_MAX_MESSAGES_INFLIGHT -4
+/**
+ * Return code: An invalid UTF-8 string has been detected.
+ */
+#define MQTTASYNC_BAD_UTF8_STRING -5
+/**
+ * Return code: A NULL parameter has been supplied when this is invalid.
+ */
+#define MQTTASYNC_NULL_PARAMETER -6
+/**
+ * Return code: The topic has been truncated (the topic string includes
+ * embedded NULL characters). String functions will not access the full topic.
+ * Use the topic length value to access the full topic.
+ */
+#define MQTTASYNC_TOPICNAME_TRUNCATED -7
+/**
+ * Return code: A structure parameter does not have the correct eyecatcher
+ * and version number.
+ */
+#define MQTTASYNC_BAD_STRUCTURE -8
+/**
+ * Return code: A qos parameter is not 0, 1 or 2
+ */
+#define MQTTASYNC_BAD_QOS -9
+/**
+ * Return code: All 65535 MQTT msgids are being used
+ */
+#define MQTTASYNC_NO_MORE_MSGIDS -10
+/**
+ * Return code: the request is being discarded when not complete
+ */
+#define MQTTASYNC_OPERATION_INCOMPLETE -11
+/**
+ * Return code: no more messages can be buffered
+ */
+#define MQTTASYNC_MAX_BUFFERED_MESSAGES -12
+/**
+ * Return code: Attempting SSL connection using non-SSL version of library
+ */
+#define MQTTASYNC_SSL_NOT_SUPPORTED -13
+/**
+ * Return code: protocol prefix in serverURI should be:
+ * @li @em tcp:// or @em mqtt:// - Insecure TCP
+ * @li @em ssl:// or @em mqtts:// - Encrypted SSL/TLS
+ * @li @em ws:// - Insecure websockets
+ * @li @em wss:// - Secure web sockets
+ *
+ * The TLS enabled prefixes (ssl, mqtts, wss) are only valid if the TLS
+ * version of the library is linked with.
+ */
+#define MQTTASYNC_BAD_PROTOCOL -14
+/**
+ * Return code: don't use options for another version of MQTT
+ */
+#define MQTTASYNC_BAD_MQTT_OPTION -15
+/**
+ * Return code: call not applicable to the client's version of MQTT
+ */
+#define MQTTASYNC_WRONG_MQTT_VERSION -16
+/**
+ * Return code: 0 length will topic
+ */
+#define MQTTASYNC_0_LEN_WILL_TOPIC -17
+/*
+ * Return code: connect or disconnect command ignored because there is already a connect or disconnect
+ * command at the head of the list waiting to be processed. Use the onSuccess/onFailure callbacks to wait
+ * for the previous connect or disconnect command to be complete.
+ */
+#define MQTTASYNC_COMMAND_IGNORED -18
+ /*
+ * Return code: maxBufferedMessages in the connect options must be >= 0
+ */
+ #define MQTTASYNC_MAX_BUFFERED -19
+
+/**
+ * Default MQTT version to connect with. Use 3.1.1 then fall back to 3.1
+ */
+#define MQTTVERSION_DEFAULT 0
+/**
+ * MQTT version to connect with: 3.1
+ */
+#define MQTTVERSION_3_1 3
+/**
+ * MQTT version to connect with: 3.1.1
+ */
+#define MQTTVERSION_3_1_1 4
+/**
+ * MQTT version to connect with: 5
+ */
+#define MQTTVERSION_5 5
+/**
+ * Bad return code from subscribe, as defined in the 3.1.1 specification
+ */
+#define MQTT_BAD_SUBSCRIBE 0x80
+
+
+/**
+ * Initialization options
+ */
+typedef struct
+{
+ /** The eyecatcher for this structure. Must be MQTG. */
+ char struct_id[4];
+ /** The version number of this structure. Must be 0 */
+ int struct_version;
+ /** 1 = we do openssl init, 0 = leave it to the application */
+ int do_openssl_init;
+} MQTTAsync_init_options;
+
+#define MQTTAsync_init_options_initializer { {'M', 'Q', 'T', 'G'}, 0, 0 }
+
+/**
+ * Global init of mqtt library. Call once on program start to set global behaviour.
+ * handle_openssl_init - if mqtt library should handle openssl init (1) or rely on the caller to init it before using mqtt (0)
+ */
+LIBMQTT_API void MQTTAsync_global_init(MQTTAsync_init_options* inits);
+
+/**
+ * A handle representing an MQTT client. A valid client handle is available
+ * following a successful call to MQTTAsync_create().
+ */
+typedef void* MQTTAsync;
+/**
+ * A value representing an MQTT message. A token is returned to the
+ * client application when a message is published. The token can then be used to
+ * check that the message was successfully delivered to its destination (see
+ * MQTTAsync_publish(),
+ * MQTTAsync_publishMessage(),
+ * MQTTAsync_deliveryComplete(), and
+ * MQTTAsync_getPendingTokens()).
+ */
+typedef int MQTTAsync_token;
+
+/**
+ * A structure representing the payload and attributes of an MQTT message. The
+ * message topic is not part of this structure (see MQTTAsync_publishMessage(),
+ * MQTTAsync_publish(), MQTTAsync_receive(), MQTTAsync_freeMessage()
+ * and MQTTAsync_messageArrived()).
+ */
+typedef struct
+{
+ /** The eyecatcher for this structure. must be MQTM. */
+ char struct_id[4];
+ /** The version number of this structure. Must be 0 or 1.
+ * 0 indicates no message properties */
+ int struct_version;
+ /** The length of the MQTT message payload in bytes. */
+ int payloadlen;
+ /** A pointer to the payload of the MQTT message. */
+ void* payload;
+ /**
+ * The quality of service (QoS) assigned to the message.
+ * There are three levels of QoS:
+ *
+ * - QoS0
+ * - Fire and forget - the message may not be delivered
+ * - QoS1
+ * - At least once - the message will be delivered, but may be
+ * delivered more than once in some circumstances.
+ * - QoS2
+ * - Once and one only - the message will be delivered exactly once.
+ *
+ */
+ int qos;
+ /**
+ * The retained flag serves two purposes depending on whether the message
+ * it is associated with is being published or received.
+ *
+ * retained = true
+ * For messages being published, a true setting indicates that the MQTT
+ * server should retain a copy of the message. The message will then be
+ * transmitted to new subscribers to a topic that matches the message topic.
+ * For subscribers registering a new subscription, the flag being true
+ * indicates that the received message is not a new one, but one that has
+ * been retained by the MQTT server.
+ *
+ * retained = false
+ * For publishers, this indicates that this message should not be retained
+ * by the MQTT server. For subscribers, a false setting indicates this is
+ * a normal message, received as a result of it being published to the
+ * server.
+ */
+ int retained;
+ /**
+ * The dup flag indicates whether or not this message is a duplicate.
+ * It is only meaningful when receiving QoS1 messages. When true, the
+ * client application should take appropriate action to deal with the
+ * duplicate message. This is an output parameter only.
+ */
+ int dup;
+ /** The message identifier is reserved for internal use by the
+ * MQTT client and server. It is an output parameter only - writing
+ * to it will serve no purpose. It contains the MQTT message id of
+ * an incoming publish message.
+ */
+ int msgid;
+ /**
+ * The MQTT V5 properties associated with the message.
+ */
+ MQTTProperties properties;
+} MQTTAsync_message;
+
+#define MQTTAsync_message_initializer { {'M', 'Q', 'T', 'M'}, 1, 0, NULL, 0, 0, 0, 0, MQTTProperties_initializer }
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * receipt of messages. The function is registered with the client library by
+ * passing it as an argument to MQTTAsync_setCallbacks(). It is
+ * called by the client library when a new message that matches a client
+ * subscription has been received from the server. This function is executed on
+ * a separate thread to the one on which the client application is running.
+ *
+ * Note: Neither MQTTAsync_create() nor MQTTAsync_destroy() should be
+ * called within this callback.
+ * @param context A pointer to the context value originally passed to
+ * MQTTAsync_setCallbacks(), which contains any application-specific context.
+ * @param topicName The topic associated with the received message.
+ * @param topicLen The length of the topic if there are one
+ * more NULL characters embedded in topicName, otherwise topicLen
+ * is 0. If topicLen is 0, the value returned by strlen(topicName)
+ * can be trusted. If topicLen is greater than 0, the full topic name
+ * can be retrieved by accessing topicName as a byte array of length
+ * topicLen.
+ * @param message The MQTTAsync_message structure for the received message.
+ * This structure contains the message payload and attributes.
+ * @return This function must return 0 or 1 indicating whether or not
+ * the message has been safely received by the client application.
+ * Returning 1 indicates that the message has been successfully handled.
+ * To free the message storage, ::MQTTAsync_freeMessage must be called.
+ * To free the topic name storage, ::MQTTAsync_free must be called.
+ * Returning 0 indicates that there was a problem. In this
+ * case, the client library will reinvoke MQTTAsync_messageArrived() to
+ * attempt to deliver the message to the application again.
+ * Do not free the message and topic storage when returning 0, otherwise
+ * the redelivery will fail.
+ */
+typedef int MQTTAsync_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message);
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of delivery of messages to the server. The function is
+ * registered with the client library by passing it as an argument to MQTTAsync_setCallbacks().
+ * It is called by the client library after the client application has
+ * published a message to the server. It indicates that the necessary
+ * handshaking and acknowledgements for the requested quality of service (see
+ * MQTTAsync_message.qos) have been completed. This function is executed on a
+ * separate thread to the one on which the client application is running.
+ *
+ * Note: Neither MQTTAsync_create() nor MQTTAsync_destroy() should be
+ * called within this callback.
+ * @param context A pointer to the context value originally passed to
+ * MQTTAsync_setCallbacks(), which contains any application-specific context.
+ * @param token The ::MQTTAsync_token associated with
+ * the published message. Applications can check that all messages have been
+ * correctly published by matching the tokens returned from calls to
+ * MQTTAsync_send() and MQTTAsync_sendMessage() with the tokens passed
+ * to this callback.
+ */
+typedef void MQTTAsync_deliveryComplete(void* context, MQTTAsync_token token);
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of the loss of connection to the server. The function is
+ * registered with the client library by passing it as an argument to
+ * MQTTAsync_setCallbacks(). It is called by the client library if the client
+ * loses its connection to the server. The client application must take
+ * appropriate action, such as trying to reconnect or reporting the problem.
+ * This function is executed on a separate thread to the one on which the
+ * client application is running.
+ *
+ * Note: Neither MQTTAsync_create() nor MQTTAsync_destroy() should be
+ * called within this callback.
+ * @param context A pointer to the context value originally passed to
+ * MQTTAsync_setCallbacks(), which contains any application-specific context.
+ * @param cause The reason for the disconnection.
+ * Currently, cause is always set to NULL.
+ */
+typedef void MQTTAsync_connectionLost(void* context, char* cause);
+
+
+/**
+ * This is a callback function, which will be called when the client
+ * library successfully connects. This is superfluous when the connection
+ * is made in response to a MQTTAsync_connect call, because the onSuccess
+ * callback can be used. It is intended for use when automatic reconnect
+ * is enabled, so that when a reconnection attempt succeeds in the background,
+ * the application is notified and can take any required actions.
+ *
+ * Note: Neither MQTTAsync_create() nor MQTTAsync_destroy() should be
+ * called within this callback.
+ * @param context A pointer to the context value originally passed to
+ * MQTTAsync_setCallbacks(), which contains any application-specific context.
+ * @param cause The reason for the disconnection.
+ * Currently, cause is always set to NULL.
+ */
+typedef void MQTTAsync_connected(void* context, char* cause);
+
+/**
+ * This is a callback function, which will be called when the client
+ * library receives a disconnect packet from the server. This applies to MQTT V5 and above only.
+ *
+ * Note: Neither MQTTAsync_create() nor MQTTAsync_destroy() should be
+ * called within this callback.
+ * @param context A pointer to the context value originally passed to
+ * MQTTAsync_setCallbacks(), which contains any application-specific context.
+ * @param properties the properties in the disconnect packet.
+ * @param properties the reason code from the disconnect packet
+ * Currently, cause is always set to NULL.
+ */
+typedef void MQTTAsync_disconnected(void* context, MQTTProperties* properties,
+ enum MQTTReasonCodes reasonCode);
+
+/**
+ * Sets the MQTTAsync_disconnected() callback function for a client.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ *
+ * Note: Neither MQTTAsync_create() nor MQTTAsync_destroy() should be
+ * called within this callback.
+ * @param context A pointer to any application-specific context. The
+ * the context pointer is passed to each of the callback functions to
+ * provide access to the context information in the callback.
+ * @param co A pointer to an MQTTAsync_connected() callback
+ * function. NULL removes the callback setting.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+LIBMQTT_API int MQTTAsync_setDisconnected(MQTTAsync handle, void* context, MQTTAsync_disconnected* co);
+
+/** The connect options that can be updated before an automatic reconnect. */
+typedef struct
+{
+ /** The eyecatcher for this structure. Will be MQCD. */
+ char struct_id[4];
+ /** The version number of this structure. Will be 0 */
+ int struct_version;
+ /**
+ * MQTT servers that support the MQTT v3.1 protocol provide authentication
+ * and authorisation by user name and password. This is the user name parameter.
+ * Set data to NULL to remove. To change, allocate new
+ * storage with ::MQTTAsync_allocate - this will then be free later by the library.
+ */
+ const char* username;
+ /**
+ * The password parameter of the MQTT authentication.
+ * Set data to NULL to remove. To change, allocate new
+ * storage with ::MQTTAsync_allocate - this will then be free later by the library.
+ */
+ struct {
+ int len; /**< binary password length */
+ const void* data; /**< binary password data */
+ } binarypwd;
+} MQTTAsync_connectData;
+
+#define MQTTAsync_connectData_initializer {{'M', 'Q', 'C', 'D'}, 0, NULL, {0, NULL}}
+
+/**
+ * This is a callback function which will allow the client application to update the
+ * connection data.
+ * @param data The connection data which can be modified by the application.
+ * @return Return a non-zero value to update the connect data, zero to keep the same data.
+ */
+typedef int MQTTAsync_updateConnectOptions(void* context, MQTTAsync_connectData* data);
+
+/**
+ * Sets the MQTTAsync_updateConnectOptions() callback function for a client.
+ * @param handle A valid client handle from a successful call to MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the context pointer is passed to each of the callback functions to
+ * provide access to the context information in the callback.
+ * @param co A pointer to an MQTTAsync_updateConnectOptions() callback
+ * function. NULL removes the callback setting.
+ */
+LIBMQTT_API int MQTTAsync_setUpdateConnectOptions(MQTTAsync handle, void* context, MQTTAsync_updateConnectOptions* co);
+
+/**
+ * Sets the MQTTPersistence_beforeWrite() callback function for a client.
+ * @param handle A valid client handle from a successful call to MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the context pointer is passed to the callback function to
+ * provide access to the context information in the callback.
+ * @param co A pointer to an MQTTPersistence_beforeWrite() callback
+ * function. NULL removes the callback setting.
+ */
+LIBMQTT_API int MQTTAsync_setBeforePersistenceWrite(MQTTAsync handle, void* context, MQTTPersistence_beforeWrite* co);
+
+
+/**
+ * Sets the MQTTPersistence_afterRead() callback function for a client.
+ * @param handle A valid client handle from a successful call to MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the context pointer is passed to the callback function to
+ * provide access to the context information in the callback.
+ * @param co A pointer to an MQTTPersistence_beforeWrite() callback
+ * function. NULL removes the callback setting.
+ */
+LIBMQTT_API int MQTTAsync_setAfterPersistenceRead(MQTTAsync handle, void* context, MQTTPersistence_afterRead* co);
+
+
+/** The data returned on completion of an unsuccessful API call in the response callback onFailure. */
+typedef struct
+{
+ /** A token identifying the failed request. */
+ MQTTAsync_token token;
+ /** A numeric code identifying the error. */
+ int code;
+ /** Optional text explaining the error. Can be NULL. */
+ const char *message;
+} MQTTAsync_failureData;
+
+
+/** The data returned on completion of an unsuccessful API call in the response callback onFailure. */
+typedef struct
+{
+ /** The eyecatcher for this structure. Will be MQFD. */
+ char struct_id[4];
+ /** The version number of this structure. Will be 0 */
+ int struct_version;
+ /** A token identifying the failed request. */
+ MQTTAsync_token token;
+ /** The MQTT reason code returned. */
+ enum MQTTReasonCodes reasonCode;
+ /** The MQTT properties on the ack, if any. */
+ MQTTProperties properties;
+ /** A numeric code identifying the MQTT client library error. */
+ int code;
+ /** Optional further text explaining the error. Can be NULL. */
+ const char *message;
+ /** Packet type on which the failure occurred - used for publish QoS 1/2 exchanges*/
+ int packet_type;
+} MQTTAsync_failureData5;
+
+#define MQTTAsync_failureData5_initializer {{'M', 'Q', 'F', 'D'}, 0, 0, MQTTREASONCODE_SUCCESS, MQTTProperties_initializer, 0, NULL, 0}
+
+/** The data returned on completion of a successful API call in the response callback onSuccess. */
+typedef struct
+{
+ /** A token identifying the successful request. Can be used to refer to the request later. */
+ MQTTAsync_token token;
+ /** A union of the different values that can be returned for subscribe, unsubscribe and publish. */
+ union
+ {
+ /** For subscribe, the granted QoS of the subscription returned by the server.
+ * Also for subscribeMany, if only 1 subscription was requested. */
+ int qos;
+ /** For subscribeMany, if more than one subscription was requested,
+ * the list of granted QoSs of the subscriptions returned by the server. */
+ int* qosList;
+ /** For publish, the message being sent to the server. */
+ struct
+ {
+ MQTTAsync_message message; /**< the message being sent to the server */
+ char* destinationName; /**< the topic destination for the message */
+ } pub;
+ /* For connect, the server connected to, MQTT version used, and sessionPresent flag */
+ struct
+ {
+ char* serverURI; /**< the connection string of the server */
+ int MQTTVersion; /**< the version of MQTT being used */
+ int sessionPresent; /**< the session present flag returned from the server */
+ } connect;
+ } alt;
+} MQTTAsync_successData;
+
+
+/** The data returned on completion of a successful API call in the response callback onSuccess. */
+typedef struct
+{
+ char struct_id[4]; /**< The eyecatcher for this structure. Will be MQSD. */
+ int struct_version; /**< The version number of this structure. Will be 0 */
+ /** A token identifying the successful request. Can be used to refer to the request later. */
+ MQTTAsync_token token;
+ enum MQTTReasonCodes reasonCode; /**< MQTT V5 reason code returned */
+ MQTTProperties properties; /**< MQTT V5 properties returned, if any */
+ /** A union of the different values that can be returned for subscribe, unsubscribe and publish. */
+ union
+ {
+ /** For subscribeMany, the list of reasonCodes returned by the server. */
+ struct
+ {
+ int reasonCodeCount; /**< the number of reason codes in the reasonCodes array */
+ enum MQTTReasonCodes* reasonCodes; /**< an array of reasonCodes */
+ } sub;
+ /** For publish, the message being sent to the server. */
+ struct
+ {
+ MQTTAsync_message message; /**< the message being sent to the server */
+ char* destinationName; /**< the topic destination for the message */
+ } pub;
+ /* For connect, the server connected to, MQTT version used, and sessionPresent flag */
+ struct
+ {
+ char* serverURI; /**< the connection string of the server */
+ int MQTTVersion; /**< the version of MQTT being used */
+ int sessionPresent; /**< the session present flag returned from the server */
+ } connect;
+ /** For unsubscribeMany, the list of reasonCodes returned by the server. */
+ struct
+ {
+ int reasonCodeCount; /**< the number of reason codes in the reasonCodes array */
+ enum MQTTReasonCodes* reasonCodes; /**< an array of reasonCodes */
+ } unsub;
+ } alt;
+} MQTTAsync_successData5;
+
+#define MQTTAsync_successData5_initializer {{'M', 'Q', 'S', 'D'}, 0, 0, MQTTREASONCODE_SUCCESS, MQTTProperties_initializer, {.sub={0,0}}}
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of the successful completion of an API call. The function is
+ * registered with the client library by passing it as an argument in
+ * ::MQTTAsync_responseOptions.
+ *
+ * Note: Neither MQTTAsync_create() nor MQTTAsync_destroy() should be
+ * called within this callback.
+ * @param context A pointer to the context value originally passed to
+ * ::MQTTAsync_responseOptions, which contains any application-specific context.
+ * @param response Any success data associated with the API completion.
+ */
+typedef void MQTTAsync_onSuccess(void* context, MQTTAsync_successData* response);
+
+/**
+ * This is a callback function, the MQTT V5 version of ::MQTTAsync_onSuccess.
+ * The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of the successful completion of an API call. The function is
+ * registered with the client library by passing it as an argument in
+ * ::MQTTAsync_responseOptions.
+ *
+ * Note: Neither MQTTAsync_create() nor MQTTAsync_destroy() should be
+ * called within this callback.
+ * @param context A pointer to the context value originally passed to
+ * ::MQTTAsync_responseOptions, which contains any application-specific context.
+ * @param response Any success data associated with the API completion.
+ */
+typedef void MQTTAsync_onSuccess5(void* context, MQTTAsync_successData5* response);
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of the unsuccessful completion of an API call. The function is
+ * registered with the client library by passing it as an argument in
+ * ::MQTTAsync_responseOptions.
+ *
+ * Note: Neither MQTTAsync_create() nor MQTTAsync_destroy() should be
+ * called within this callback.
+ * @param context A pointer to the context value originally passed to
+ * ::MQTTAsync_responseOptions, which contains any application-specific context.
+ * @param response Failure data associated with the API completion.
+ */
+typedef void MQTTAsync_onFailure(void* context, MQTTAsync_failureData* response);
+
+/**
+ * This is a callback function, the MQTT V5 version of ::MQTTAsync_onFailure.
+ * The application must provide an implementation of this function to enable asynchronous
+ * notification of the unsuccessful completion of an API call. The function is
+ * registered with the client library by passing it as an argument in
+ * ::MQTTAsync_responseOptions.
+ *
+ * Note: Neither MQTTAsync_create() nor MQTTAsync_destroy() should be
+ * called within this callback.
+ * @param context A pointer to the context value originally passed to
+ * ::MQTTAsync_responseOptions, which contains any application-specific context.
+ * @param response Failure data associated with the API completion.
+ */
+typedef void MQTTAsync_onFailure5(void* context, MQTTAsync_failureData5* response);
+
+/** Structure to define call options. For MQTT 5.0 there is input data as well as that
+ * describing the response method. So there is now also a synonym ::MQTTAsync_callOptions
+ * to better reflect the use. This responseOptions name is kept for backward
+ * compatibility.
+ */
+typedef struct MQTTAsync_responseOptions
+{
+ /** The eyecatcher for this structure. Must be MQTR */
+ char struct_id[4];
+ /** The version number of this structure. Must be 0 or 1
+ * if 0, no MQTTV5 options */
+ int struct_version;
+ /**
+ * A pointer to a callback function to be called if the API call successfully
+ * completes. Can be set to NULL, in which case no indication of successful
+ * completion will be received.
+ */
+ MQTTAsync_onSuccess* onSuccess;
+ /**
+ * A pointer to a callback function to be called if the API call fails.
+ * Can be set to NULL, in which case no indication of unsuccessful
+ * completion will be received.
+ */
+ MQTTAsync_onFailure* onFailure;
+ /**
+ * A pointer to any application-specific context. The
+ * the context pointer is passed to success or failure callback functions to
+ * provide access to the context information in the callback.
+ */
+ void* context;
+ /**
+ * A token is returned from the call. It can be used to track
+ * the state of this request, both in the callbacks and in future calls
+ * such as ::MQTTAsync_waitForCompletion. This is output only - any
+ * change by the application will be ignored.
+ */
+ MQTTAsync_token token;
+ /**
+ * A pointer to a callback function to be called if the API call successfully
+ * completes. Can be set to NULL, in which case no indication of successful
+ * completion will be received.
+ */
+ MQTTAsync_onSuccess5* onSuccess5;
+ /**
+ * A pointer to a callback function to be called if the API call successfully
+ * completes. Can be set to NULL, in which case no indication of successful
+ * completion will be received.
+ */
+ MQTTAsync_onFailure5* onFailure5;
+ /**
+ * MQTT V5 input properties
+ */
+ MQTTProperties properties;
+ /*
+ * MQTT V5 subscribe options, when used with subscribe only.
+ */
+ MQTTSubscribe_options subscribeOptions;
+ /*
+ * MQTT V5 subscribe option count, when used with subscribeMany only.
+ * The number of entries in the subscribe_options_list array.
+ */
+ int subscribeOptionsCount;
+ /*
+ * MQTT V5 subscribe option array, when used with subscribeMany only.
+ */
+ MQTTSubscribe_options* subscribeOptionsList;
+} MQTTAsync_responseOptions;
+
+#define MQTTAsync_responseOptions_initializer { {'M', 'Q', 'T', 'R'}, 1, NULL, NULL, 0, 0, NULL, NULL, MQTTProperties_initializer, MQTTSubscribe_options_initializer, 0, NULL}
+
+/** A synonym for responseOptions to better reflect its usage since MQTT 5.0 */
+typedef struct MQTTAsync_responseOptions MQTTAsync_callOptions;
+#define MQTTAsync_callOptions_initializer MQTTAsync_responseOptions_initializer
+
+/**
+ * This function sets the global callback functions for a specific client.
+ * If your client application doesn't use a particular callback, set the
+ * relevant parameter to NULL. Any necessary message acknowledgements and
+ * status communications are handled in the background without any intervention
+ * from the client application. If you do not set a messageArrived callback
+ * function, you will not be notified of the receipt of any messages as a
+ * result of a subscription.
+ *
+ * Note: The MQTT client must be disconnected when this function is
+ * called.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the context pointer is passed to each of the callback functions to
+ * provide access to the context information in the callback.
+ * @param cl A pointer to an MQTTAsync_connectionLost() callback
+ * function. You can set this to NULL if your application doesn't handle
+ * disconnections.
+ * @param ma A pointer to an MQTTAsync_messageArrived() callback
+ * function. If this callback is not set, an error will be returned.
+ * You must set this callback because otherwise there would be
+ * no way to deliver any incoming messages.
+ * @param dc A pointer to an MQTTAsync_deliveryComplete() callback
+ * function. You can set this to NULL if you do not want to check
+ * for successful delivery.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+LIBMQTT_API int MQTTAsync_setCallbacks(MQTTAsync handle, void* context, MQTTAsync_connectionLost* cl,
+ MQTTAsync_messageArrived* ma, MQTTAsync_deliveryComplete* dc);
+
+/**
+ * This function sets the callback function for a connection lost event for
+ * a specific client. Any necessary message acknowledgements and status
+ * communications are handled in the background without any intervention
+ * from the client application.
+ *
+ * Note: The MQTT client must be disconnected when this function is
+ * called.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the context pointer is passed the callback functions to provide
+ * access to the context information in the callback.
+ * @param cl A pointer to an MQTTAsync_connectionLost() callback
+ * function. You can set this to NULL if your application doesn't handle
+ * disconnections.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+
+LIBMQTT_API int MQTTAsync_setConnectionLostCallback(MQTTAsync handle, void* context,
+ MQTTAsync_connectionLost* cl);
+
+/**
+ * This function sets the callback function for a message arrived event for
+ * a specific client. Any necessary message acknowledgements and status
+ * communications are handled in the background without any intervention
+ * from the client application. If you do not set a messageArrived callback
+ * function, you will not be notified of the receipt of any messages as a
+ * result of a subscription.
+ *
+ * Note: The MQTT client must be disconnected when this function is
+ * called.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the context pointer is passed to the callback functions to provide
+ * access to the context information in the callback.
+ * @param ma A pointer to an MQTTAsync_messageArrived() callback
+ * function. You can set this to NULL if your application doesn't handle
+ * receipt of messages.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+LIBMQTT_API int MQTTAsync_setMessageArrivedCallback(MQTTAsync handle, void* context,
+ MQTTAsync_messageArrived* ma);
+
+/**
+ * This function sets the callback function for a delivery complete event
+ * for a specific client. Any necessary message acknowledgements and status
+ * communications are handled in the background without any intervention
+ * from the client application.
+ *
+ * Note: The MQTT client must be disconnected when this function is
+ * called.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the context pointer is passed to the callback functions to provide
+ * access to the context information in the callback.
+ * @param dc A pointer to an MQTTAsync_deliveryComplete() callback
+ * function. You can set this to NULL if you do not want to check
+ * for successful delivery.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+LIBMQTT_API int MQTTAsync_setDeliveryCompleteCallback(MQTTAsync handle, void* context,
+ MQTTAsync_deliveryComplete* dc);
+
+/**
+ * Sets the MQTTAsync_connected() callback function for a client.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the context pointer is passed to each of the callback functions to
+ * provide access to the context information in the callback.
+ * @param co A pointer to an MQTTAsync_connected() callback
+ * function. NULL removes the callback setting.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+LIBMQTT_API int MQTTAsync_setConnected(MQTTAsync handle, void* context, MQTTAsync_connected* co);
+
+
+/**
+ * Reconnects a client with the previously used connect options. Connect
+ * must have previously been called for this to work.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+LIBMQTT_API int MQTTAsync_reconnect(MQTTAsync handle);
+
+
+/**
+ * This function creates an MQTT client ready for connection to the
+ * specified server and using the specified persistent storage (see
+ * MQTTAsync_persistence). See also MQTTAsync_destroy().
+ * @param handle A pointer to an ::MQTTAsync handle. The handle is
+ * populated with a valid client reference following a successful return from
+ * this function.
+ * @param serverURI A null-terminated string specifying the server to
+ * which the client will connect. It takes the form
+ * protocol://host:port where protocol must be:
+ *
+ * @em tcp:// or @em mqtt:// - Insecure TCP
+ *
+ * @em ssl:// or @em mqtts:// - Encrypted SSL/TLS
+ *
+ * @em ws:// - Insecure websockets
+ *
+ * @em wss:// - Secure web sockets
+ *
+ * The TLS enabled prefixes (ssl, mqtts, wss) are only valid if a TLS
+ * version of the library is linked with.
+ * For host, you can specify either an IP address or a host name. For
+ * instance, to connect to a server running on the local machines with the
+ * default MQTT port, specify tcp://localhost:1883.
+ * @param clientId The client identifier passed to the server when the
+ * client connects to it. It is a null-terminated UTF-8 encoded string.
+ * @param persistence_type The type of persistence to be used by the client:
+ *
+ * ::MQTTCLIENT_PERSISTENCE_NONE: Use in-memory persistence. If the device or
+ * system on which the client is running fails or is switched off, the current
+ * state of any in-flight messages is lost and some messages may not be
+ * delivered even at QoS1 and QoS2.
+ *
+ * ::MQTTCLIENT_PERSISTENCE_DEFAULT: Use the default (file system-based)
+ * persistence mechanism. Status about in-flight messages is held in persistent
+ * storage and provides some protection against message loss in the case of
+ * unexpected failure.
+ *
+ * ::MQTTCLIENT_PERSISTENCE_USER: Use an application-specific persistence
+ * implementation. Using this type of persistence gives control of the
+ * persistence mechanism to the application. The application has to implement
+ * the MQTTClient_persistence interface.
+ * @param persistence_context If the application uses
+ * ::MQTTCLIENT_PERSISTENCE_NONE persistence, this argument is unused and should
+ * be set to NULL. For ::MQTTCLIENT_PERSISTENCE_DEFAULT persistence, it
+ * should be set to the location of the persistence directory (if set
+ * to NULL, the persistence directory used is the working directory).
+ * Applications that use ::MQTTCLIENT_PERSISTENCE_USER persistence set this
+ * argument to point to a valid MQTTClient_persistence structure.
+ * @return ::MQTTASYNC_SUCCESS if the client is successfully created, otherwise
+ * an error code is returned.
+ */
+LIBMQTT_API int MQTTAsync_create(MQTTAsync* handle, const char* serverURI, const char* clientId,
+ int persistence_type, void* persistence_context);
+
+/** Options for the ::MQTTAsync_createWithOptions call */
+typedef struct
+{
+ /** The eyecatcher for this structure. must be MQCO. */
+ char struct_id[4];
+ /** The version number of this structure. Must be 0, 1, 2 or 3
+ * 0 means no MQTTVersion
+ * 1 means no allowDisconnectedSendAtAnyTime, deleteOldestMessages, restoreMessages
+ * 2 means no persistQoS0
+ */
+ int struct_version;
+ /** Whether to allow messages to be sent when the client library is not connected. */
+ int sendWhileDisconnected;
+ /** The maximum number of messages allowed to be buffered. This is intended to be used to
+ * limit the number of messages queued while the client is not connected. It also applies
+ * when the client is connected, however, so has to be greater than 0. */
+ int maxBufferedMessages;
+ /** Whether the MQTT version is 3.1, 3.1.1, or 5. To use V5, this must be set.
+ * MQTT V5 has to be chosen here, because during the create call the message persistence
+ * is initialized, and we want to know whether the format of any persisted messages
+ * is appropriate for the MQTT version we are going to connect with. Selecting 3.1 or
+ * 3.1.1 and attempting to read 5.0 persisted messages will result in an error on create. */
+ int MQTTVersion;
+ /**
+ * Allow sending of messages while disconnected before a first successful connect.
+ */
+ int allowDisconnectedSendAtAnyTime;
+ /*
+ * When the maximum number of buffered messages is reached, delete the oldest rather than the newest.
+ */
+ int deleteOldestMessages;
+ /*
+ * Restore messages from persistence on create - or clear it.
+ */
+ int restoreMessages;
+ /*
+ * Persist QoS0 publish commands - an option to not persist them.
+ */
+ int persistQoS0;
+} MQTTAsync_createOptions;
+
+#define MQTTAsync_createOptions_initializer { {'M', 'Q', 'C', 'O'}, 2, 0, 100, MQTTVERSION_DEFAULT, 0, 0, 1, 1}
+
+#define MQTTAsync_createOptions_initializer5 { {'M', 'Q', 'C', 'O'}, 2, 0, 100, MQTTVERSION_5, 0, 0, 1, 1}
+
+
+LIBMQTT_API int MQTTAsync_createWithOptions(MQTTAsync* handle, const char* serverURI, const char* clientId,
+ int persistence_type, void* persistence_context, MQTTAsync_createOptions* options);
+
+/**
+ * MQTTAsync_willOptions defines the MQTT "Last Will and Testament" (LWT) settings for
+ * the client. In the event that a client unexpectedly loses its connection to
+ * the server, the server publishes the LWT message to the LWT topic on
+ * behalf of the client. This allows other clients (subscribed to the LWT topic)
+ * to be made aware that the client has disconnected. To enable the LWT
+ * function for a specific client, a valid pointer to an MQTTAsync_willOptions
+ * structure is passed in the MQTTAsync_connectOptions structure used in the
+ * MQTTAsync_connect() call that connects the client to the server. The pointer
+ * to MQTTAsync_willOptions can be set to NULL if the LWT function is not
+ * required.
+ */
+typedef struct
+{
+ /** The eyecatcher for this structure. must be MQTW. */
+ char struct_id[4];
+ /** The version number of this structure. Must be 0 or 1
+ 0 indicates no binary will message support
+ */
+ int struct_version;
+ /** The LWT topic to which the LWT message will be published. */
+ const char* topicName;
+ /** The LWT payload. */
+ const char* message;
+ /**
+ * The retained flag for the LWT message (see MQTTAsync_message.retained).
+ */
+ int retained;
+ /**
+ * The quality of service setting for the LWT message (see
+ * MQTTAsync_message.qos and @ref qos).
+ */
+ int qos;
+ /** The LWT payload in binary form. This is only checked and used if the message option is NULL */
+ struct
+ {
+ int len; /**< binary payload length */
+ const void* data; /**< binary payload data */
+ } payload;
+} MQTTAsync_willOptions;
+
+#define MQTTAsync_willOptions_initializer { {'M', 'Q', 'T', 'W'}, 1, NULL, NULL, 0, 0, { 0, NULL } }
+
+#define MQTT_SSL_VERSION_DEFAULT 0
+#define MQTT_SSL_VERSION_TLS_1_0 1
+#define MQTT_SSL_VERSION_TLS_1_1 2
+#define MQTT_SSL_VERSION_TLS_1_2 3
+
+/**
+* MQTTAsync_sslProperties defines the settings to establish an SSL/TLS connection using the
+* OpenSSL library. It covers the following scenarios:
+* - Server authentication: The client needs the digital certificate of the server. It is included
+* in a store containting trusted material (also known as "trust store").
+* - Mutual authentication: Both client and server are authenticated during the SSL handshake. In
+* addition to the digital certificate of the server in a trust store, the client will need its own
+* digital certificate and the private key used to sign its digital certificate stored in a "key store".
+* - Anonymous connection: Both client and server do not get authenticated and no credentials are needed
+* to establish an SSL connection. Note that this scenario is not fully secure since it is subject to
+* man-in-the-middle attacks.
+*/
+typedef struct
+{
+ /** The eyecatcher for this structure. Must be MQTS */
+ char struct_id[4];
+
+ /** The version number of this structure. Must be 0, 1, 2, 3, 4 or 5.
+ * 0 means no sslVersion
+ * 1 means no verify, CApath
+ * 2 means no ssl_error_context, ssl_error_cb
+ * 3 means no ssl_psk_cb, ssl_psk_context, disableDefaultTrustStore
+ * 4 means no protos, protos_len
+ */
+ int struct_version;
+
+ /** The file in PEM format containing the public digital certificates trusted by the client. */
+ const char* trustStore;
+
+ /** The file in PEM format containing the public certificate chain of the client. It may also include
+ * the client's private key.
+ */
+ const char* keyStore;
+
+ /** If not included in the sslKeyStore, this setting points to the file in PEM format containing
+ * the client's private key.
+ */
+ const char* privateKey;
+
+ /** The password to load the client's privateKey if encrypted. */
+ const char* privateKeyPassword;
+
+ /**
+ * The list of cipher suites that the client will present to the server during the SSL handshake. For a
+ * full explanation of the cipher list format, please see the OpenSSL on-line documentation:
+ * http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT
+ * If this setting is ommitted, its default value will be "ALL", that is, all the cipher suites -excluding
+ * those offering no encryption- will be considered.
+ * This setting can be used to set an SSL anonymous connection ("aNULL" string value, for instance).
+ */
+ const char* enabledCipherSuites;
+
+ /** True/False option to enable verification of the server certificate **/
+ int enableServerCertAuth;
+
+ /** The SSL/TLS version to use. Specify one of MQTT_SSL_VERSION_DEFAULT (0),
+ * MQTT_SSL_VERSION_TLS_1_0 (1), MQTT_SSL_VERSION_TLS_1_1 (2) or MQTT_SSL_VERSION_TLS_1_2 (3).
+ * Only used if struct_version is >= 1.
+ */
+ int sslVersion;
+
+ /**
+ * Whether to carry out post-connect checks, including that a certificate
+ * matches the given host name.
+ * Exists only if struct_version >= 2
+ */
+ int verify;
+
+ /**
+ * From the OpenSSL documentation:
+ * If CApath is not NULL, it points to a directory containing CA certificates in PEM format.
+ * Exists only if struct_version >= 2
+ */
+ const char* CApath;
+
+ /**
+ * Callback function for OpenSSL error handler ERR_print_errors_cb
+ * Exists only if struct_version >= 3
+ */
+ int (*ssl_error_cb) (const char *str, size_t len, void *u);
+
+ /**
+ * Application-specific contex for OpenSSL error handler ERR_print_errors_cb
+ * Exists only if struct_version >= 3
+ */
+ void* ssl_error_context;
+
+ /**
+ * Callback function for setting TLS-PSK options. Parameters correspond to that of
+ * SSL_CTX_set_psk_client_callback, except for u which is the pointer ssl_psk_context.
+ * Exists only if struct_version >= 4
+ */
+ unsigned int (*ssl_psk_cb) (const char *hint, char *identity, unsigned int max_identity_len, unsigned char *psk, unsigned int max_psk_len, void *u);
+
+ /**
+ * Application-specific contex for ssl_psk_cb
+ * Exists only if struct_version >= 4
+ */
+ void* ssl_psk_context;
+
+ /**
+ * Don't load default SSL CA. Should be used together with PSK to make sure
+ * regular servers with certificate in place is not accepted.
+ * Exists only if struct_version >= 4
+ */
+ int disableDefaultTrustStore;
+
+ /**
+ * The protocol-lists must be in wire-format, which is defined as a vector of non-empty, 8-bit length-prefixed, byte strings.
+ * The length-prefix byte is not included in the length. Each string is limited to 255 bytes. A byte-string length of 0 is invalid.
+ * A truncated byte-string is invalid.
+ * Check documentation for SSL_CTX_set_alpn_protos
+ * Exists only if struct_version >= 5
+ */
+ const unsigned char *protos;
+
+ /**
+ * The length of the vector protos vector
+ * Exists only if struct_version >= 5
+ */
+ unsigned int protos_len;
+} MQTTAsync_SSLOptions;
+
+#define MQTTAsync_SSLOptions_initializer { {'M', 'Q', 'T', 'S'}, 5, NULL, NULL, NULL, NULL, NULL, 1, MQTT_SSL_VERSION_DEFAULT, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, 0 }
+
+/** Utility structure where name/value pairs are needed */
+typedef struct
+{
+ const char* name; /**< name string */
+ const char* value; /**< value string */
+} MQTTAsync_nameValue;
+
+/**
+ * MQTTAsync_connectOptions defines several settings that control the way the
+ * client connects to an MQTT server.
+ *
+ * Suitable default values are set in the following initializers:
+ * - MQTTAsync_connectOptions_initializer: for MQTT 3.1.1 non-WebSockets
+ * - MQTTAsync_connectOptions_initializer5: for MQTT 5.0 non-WebSockets
+ * - MQTTAsync_connectOptions_initializer_ws: for MQTT 3.1.1 WebSockets
+ * - MQTTAsync_connectOptions_initializer5_ws: for MQTT 5.0 WebSockets
+ */
+typedef struct
+{
+ /** The eyecatcher for this structure. must be MQTC. */
+ char struct_id[4];
+ /** The version number of this structure. Must be 0, 1, 2, 3 4 5 6, 7 or 8.
+ * 0 signifies no SSL options and no serverURIs
+ * 1 signifies no serverURIs
+ * 2 signifies no MQTTVersion
+ * 3 signifies no automatic reconnect options
+ * 4 signifies no binary password option (just string)
+ * 5 signifies no MQTTV5 properties
+ * 6 signifies no HTTP headers option
+ * 7 signifies no HTTP proxy and HTTPS proxy options
+ */
+ int struct_version;
+ /** The "keep alive" interval, measured in seconds, defines the maximum time
+ * that should pass without communication between the client and the server
+ * The client will ensure that at least one message travels across the
+ * network within each keep alive period. In the absence of a data-related
+ * message during the time period, the client sends a very small MQTT
+ * "ping" message, which the server will acknowledge. The keep alive
+ * interval enables the client to detect when the server is no longer
+ * available without having to wait for the long TCP/IP timeout.
+ * Set to 0 if you do not want any keep alive processing.
+ */
+ int keepAliveInterval;
+ /**
+ * This is a boolean value. The cleansession setting controls the behaviour
+ * of both the client and the server at connection and disconnection time.
+ * The client and server both maintain session state information. This
+ * information is used to ensure "at least once" and "exactly once"
+ * delivery, and "exactly once" receipt of messages. Session state also
+ * includes subscriptions created by an MQTT client. You can choose to
+ * maintain or discard state information between sessions.
+ *
+ * When cleansession is true, the state information is discarded at
+ * connect and disconnect. Setting cleansession to false keeps the state
+ * information. When you connect an MQTT client application with
+ * MQTTAsync_connect(), the client identifies the connection using the
+ * client identifier and the address of the server. The server checks
+ * whether session information for this client
+ * has been saved from a previous connection to the server. If a previous
+ * session still exists, and cleansession=true, then the previous session
+ * information at the client and server is cleared. If cleansession=false,
+ * the previous session is resumed. If no previous session exists, a new
+ * session is started.
+ */
+ int cleansession;
+ /**
+ * This controls how many messages can be in-flight simultaneously.
+ */
+ int maxInflight;
+ /**
+ * This is a pointer to an MQTTAsync_willOptions structure. If your
+ * application does not make use of the Last Will and Testament feature,
+ * set this pointer to NULL.
+ */
+ MQTTAsync_willOptions* will;
+ /**
+ * MQTT servers that support the MQTT v3.1 protocol provide authentication
+ * and authorisation by user name and password. This is the user name
+ * parameter.
+ */
+ const char* username;
+ /**
+ * MQTT servers that support the MQTT v3.1 protocol provide authentication
+ * and authorisation by user name and password. This is the password
+ * parameter.
+ */
+ const char* password;
+ /**
+ * The time interval in seconds to allow a connect to complete.
+ */
+ int connectTimeout;
+ /**
+ * The time interval in seconds after which unacknowledged publish requests are
+ * retried during a TCP session. With MQTT 3.1.1 and later, retries are
+ * not required except on reconnect. 0 turns off in-session retries, and is the
+ * recommended setting. Adding retries to an already overloaded network only
+ * exacerbates the problem.
+ */
+ int retryInterval;
+ /**
+ * This is a pointer to an MQTTAsync_SSLOptions structure. If your
+ * application does not make use of SSL, set this pointer to NULL.
+ */
+ MQTTAsync_SSLOptions* ssl;
+ /**
+ * A pointer to a callback function to be called if the connect successfully
+ * completes. Can be set to NULL, in which case no indication of successful
+ * completion will be received.
+ */
+ MQTTAsync_onSuccess* onSuccess;
+ /**
+ * A pointer to a callback function to be called if the connect fails.
+ * Can be set to NULL, in which case no indication of unsuccessful
+ * completion will be received.
+ */
+ MQTTAsync_onFailure* onFailure;
+ /**
+ * A pointer to any application-specific context. The
+ * the context pointer is passed to success or failure callback functions to
+ * provide access to the context information in the callback.
+ */
+ void* context;
+ /**
+ * The number of entries in the serverURIs array.
+ */
+ int serverURIcount;
+ /**
+ * An array of null-terminated strings specifying the servers to
+ * which the client will connect. Each string takes the form protocol://host:port.
+ * protocol must be tcp, ssl, ws or wss.
+ * The TLS enabled prefixes (ssl, wss) are only valid if a TLS version of the library
+ * is linked with.
+ * For host, you can
+ * specify either an IP address or a domain name. For instance, to connect to
+ * a server running on the local machines with the default MQTT port, specify
+ * tcp://localhost:1883.
+ */
+ char* const* serverURIs;
+ /**
+ * Sets the version of MQTT to be used on the connect.
+ * MQTTVERSION_DEFAULT (0) = default: start with 3.1.1, and if that fails, fall back to 3.1
+ * MQTTVERSION_3_1 (3) = only try version 3.1
+ * MQTTVERSION_3_1_1 (4) = only try version 3.1.1
+ */
+ int MQTTVersion;
+ /**
+ * Reconnect automatically in the case of a connection being lost. 0=false, 1=true
+ */
+ int automaticReconnect;
+ /**
+ * The minimum automatic reconnect retry interval in seconds. Doubled on each failed retry.
+ */
+ int minRetryInterval;
+ /**
+ * The maximum automatic reconnect retry interval in seconds. The doubling stops here on failed retries.
+ */
+ int maxRetryInterval;
+ /**
+ * Optional binary password. Only checked and used if the password option is NULL
+ */
+ struct {
+ int len; /**< binary password length */
+ const void* data; /**< binary password data */
+ } binarypwd;
+ /*
+ * MQTT V5 clean start flag. Only clears state at the beginning of the session.
+ */
+ int cleanstart;
+ /**
+ * MQTT V5 properties for connect
+ */
+ MQTTProperties *connectProperties;
+ /**
+ * MQTT V5 properties for the will message in the connect
+ */
+ MQTTProperties *willProperties;
+ /**
+ * A pointer to a callback function to be called if the connect successfully
+ * completes. Can be set to NULL, in which case no indication of successful
+ * completion will be received.
+ */
+ MQTTAsync_onSuccess5* onSuccess5;
+ /**
+ * A pointer to a callback function to be called if the connect fails.
+ * Can be set to NULL, in which case no indication of unsuccessful
+ * completion will be received.
+ */
+ MQTTAsync_onFailure5* onFailure5;
+ /**
+ * HTTP headers for websockets
+ */
+ const MQTTAsync_nameValue* httpHeaders;
+ /**
+ * HTTP proxy
+ */
+ const char* httpProxy;
+ /**
+ * HTTPS proxy
+ */
+ const char* httpsProxy;
+} MQTTAsync_connectOptions;
+
+/** Initializer for connect options for MQTT 3.1.1 non-WebSocket connections */
+#define MQTTAsync_connectOptions_initializer { {'M', 'Q', 'T', 'C'}, 8, 60, 1, 65535, NULL, NULL, NULL, 30, 0,\
+NULL, NULL, NULL, NULL, 0, NULL, MQTTVERSION_DEFAULT, 0, 1, 60, {0, NULL}, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
+
+/** Initializer for connect options for MQTT 5.0 non-WebSocket connections */
+#define MQTTAsync_connectOptions_initializer5 { {'M', 'Q', 'T', 'C'}, 8, 60, 0, 65535, NULL, NULL, NULL, 30, 0,\
+NULL, NULL, NULL, NULL, 0, NULL, MQTTVERSION_5, 0, 1, 60, {0, NULL}, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
+
+/** Initializer for connect options for MQTT 3.1.1 WebSockets connections.
+ * The keepalive interval is set to 45 seconds to avoid webserver 60 second inactivity timeouts.
+ */
+#define MQTTAsync_connectOptions_initializer_ws { {'M', 'Q', 'T', 'C'}, 8, 45, 1, 65535, NULL, NULL, NULL, 30, 0,\
+NULL, NULL, NULL, NULL, 0, NULL, MQTTVERSION_DEFAULT, 0, 1, 60, {0, NULL}, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
+
+/** Initializer for connect options for MQTT 5.0 WebSockets connections.
+ * The keepalive interval is set to 45 seconds to avoid webserver 60 second inactivity timeouts.
+ */
+#define MQTTAsync_connectOptions_initializer5_ws { {'M', 'Q', 'T', 'C'}, 8, 45, 0, 65535, NULL, NULL, NULL, 30, 0,\
+NULL, NULL, NULL, NULL, 0, NULL, MQTTVERSION_5, 0, 1, 60, {0, NULL}, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
+
+
+/**
+ * This function attempts to connect a previously-created client (see
+ * MQTTAsync_create()) to an MQTT server using the specified options. If you
+ * want to enable asynchronous message and status notifications, you must call
+ * MQTTAsync_setCallbacks() prior to MQTTAsync_connect().
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param options A pointer to a valid MQTTAsync_connectOptions
+ * structure.
+ * @return ::MQTTASYNC_SUCCESS if the client connect request was accepted.
+ * If the client was unable to connect to the server, an error code is
+ * returned via the onFailure callback, if set.
+ * Error codes greater than 0 are returned by the MQTT protocol:
+ * 1: Connection refused: Unacceptable protocol version
+ * 2: Connection refused: Identifier rejected
+ * 3: Connection refused: Server unavailable
+ * 4: Connection refused: Bad user name or password
+ * 5: Connection refused: Not authorized
+ * 6-255: Reserved for future use
+ */
+LIBMQTT_API int MQTTAsync_connect(MQTTAsync handle, const MQTTAsync_connectOptions* options);
+
+/** Options for the ::MQTTAsync_disconnect call */
+typedef struct
+{
+ /** The eyecatcher for this structure. Must be MQTD. */
+ char struct_id[4];
+ /** The version number of this structure. Must be 0 or 1. 0 signifies no V5 properties */
+ int struct_version;
+ /**
+ * The client delays disconnection for up to this time (in
+ * milliseconds) in order to allow in-flight message transfers to complete.
+ */
+ int timeout;
+ /**
+ * A pointer to a callback function to be called if the disconnect successfully
+ * completes. Can be set to NULL, in which case no indication of successful
+ * completion will be received.
+ */
+ MQTTAsync_onSuccess* onSuccess;
+ /**
+ * A pointer to a callback function to be called if the disconnect fails.
+ * Can be set to NULL, in which case no indication of unsuccessful
+ * completion will be received.
+ */
+ MQTTAsync_onFailure* onFailure;
+ /**
+ * A pointer to any application-specific context. The
+ * the context pointer is passed to success or failure callback functions to
+ * provide access to the context information in the callback.
+ */
+ void* context;
+ /**
+ * MQTT V5 input properties
+ */
+ MQTTProperties properties;
+ /**
+ * Reason code for MQTTV5 disconnect
+ */
+ enum MQTTReasonCodes reasonCode;
+ /**
+ * A pointer to a callback function to be called if the disconnect successfully
+ * completes. Can be set to NULL, in which case no indication of successful
+ * completion will be received.
+ */
+ MQTTAsync_onSuccess5* onSuccess5;
+ /**
+ * A pointer to a callback function to be called if the disconnect fails.
+ * Can be set to NULL, in which case no indication of unsuccessful
+ * completion will be received.
+ */
+ MQTTAsync_onFailure5* onFailure5;
+} MQTTAsync_disconnectOptions;
+
+#define MQTTAsync_disconnectOptions_initializer { {'M', 'Q', 'T', 'D'}, 0, 0, NULL, NULL, NULL,\
+ MQTTProperties_initializer, MQTTREASONCODE_SUCCESS, NULL, NULL }
+
+#define MQTTAsync_disconnectOptions_initializer5 { {'M', 'Q', 'T', 'D'}, 1, 0, NULL, NULL, NULL,\
+ MQTTProperties_initializer, MQTTREASONCODE_SUCCESS, NULL, NULL }
+
+/**
+ * This function attempts to disconnect the client from the MQTT
+ * server. In order to allow the client time to complete handling of messages
+ * that are in-flight when this function is called, a timeout period is
+ * specified. When the timeout period has expired, the client disconnects even
+ * if there are still outstanding message acknowledgements.
+ * The next time the client connects to the same server, any QoS 1 or 2
+ * messages which have not completed will be retried depending on the
+ * cleansession settings for both the previous and the new connection (see
+ * MQTTAsync_connectOptions.cleansession and MQTTAsync_connect()).
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param options The client delays disconnection for up to this time (in
+ * milliseconds) in order to allow in-flight message transfers to complete.
+ * @return ::MQTTASYNC_SUCCESS if the client successfully disconnects from
+ * the server. An error code is returned if the client was unable to disconnect
+ * from the server
+ */
+LIBMQTT_API int MQTTAsync_disconnect(MQTTAsync handle, const MQTTAsync_disconnectOptions* options);
+
+
+/**
+ * This function allows the client application to test whether or not a
+ * client is currently connected to the MQTT server.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @return Boolean true if the client is connected, otherwise false.
+ */
+LIBMQTT_API int MQTTAsync_isConnected(MQTTAsync handle);
+
+
+/**
+ * This function attempts to subscribe a client to a single topic, which may
+ * contain wildcards (see @ref wildcard). This call also specifies the
+ * @ref qos requested for the subscription
+ * (see also MQTTAsync_subscribeMany()).
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param topic The subscription topic, which may include wildcards.
+ * @param qos The requested quality of service for the subscription.
+ * @param response A pointer to a response options structure. Used to set callback functions.
+ * @return ::MQTTASYNC_SUCCESS if the subscription request is successful.
+ * An error code is returned if there was a problem registering the
+ * subscription.
+ */
+LIBMQTT_API int MQTTAsync_subscribe(MQTTAsync handle, const char* topic, int qos, MQTTAsync_responseOptions* response);
+
+
+/**
+ * This function attempts to subscribe a client to a list of topics, which may
+ * contain wildcards (see @ref wildcard). This call also specifies the
+ * @ref qos requested for each topic (see also MQTTAsync_subscribe()).
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param count The number of topics for which the client is requesting
+ * subscriptions.
+ * @param topic An array (of length count) of pointers to
+ * topics, each of which may include wildcards.
+ * @param qos An array (of length count) of @ref qos
+ * values. qos[n] is the requested QoS for topic[n].
+ * @param response A pointer to a response options structure. Used to set callback functions.
+ * @return ::MQTTASYNC_SUCCESS if the subscription request is successful.
+ * An error code is returned if there was a problem registering the
+ * subscriptions.
+ */
+LIBMQTT_API int MQTTAsync_subscribeMany(MQTTAsync handle, int count, char* const* topic, const int* qos, MQTTAsync_responseOptions* response);
+
+/**
+ * This function attempts to remove an existing subscription made by the
+ * specified client.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param topic The topic for the subscription to be removed, which may
+ * include wildcards (see @ref wildcard).
+ * @param response A pointer to a response options structure. Used to set callback functions.
+ * @return ::MQTTASYNC_SUCCESS if the subscription is removed.
+ * An error code is returned if there was a problem removing the
+ * subscription.
+ */
+LIBMQTT_API int MQTTAsync_unsubscribe(MQTTAsync handle, const char* topic, MQTTAsync_responseOptions* response);
+
+/**
+ * This function attempts to remove existing subscriptions to a list of topics
+ * made by the specified client.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param count The number subscriptions to be removed.
+ * @param topic An array (of length count) of pointers to the topics of
+ * the subscriptions to be removed, each of which may include wildcards.
+ * @param response A pointer to a response options structure. Used to set callback functions.
+ * @return ::MQTTASYNC_SUCCESS if the subscriptions are removed.
+ * An error code is returned if there was a problem removing the subscriptions.
+ */
+LIBMQTT_API int MQTTAsync_unsubscribeMany(MQTTAsync handle, int count, char* const* topic, MQTTAsync_responseOptions* response);
+
+
+/**
+ * This function attempts to publish a message to a given topic (see also
+ * ::MQTTAsync_sendMessage()). An ::MQTTAsync_token is issued when
+ * this function returns successfully if the QoS is greater than 0.
+ * If the client application needs to
+ * test for successful delivery of messages, a callback should be set
+ * (see ::MQTTAsync_onSuccess() and ::MQTTAsync_deliveryComplete()).
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param destinationName The topic associated with this message.
+ * @param payloadlen The length of the payload in bytes.
+ * @param payload A pointer to the byte array payload of the message.
+ * @param qos The @ref qos of the message.
+ * @param retained The retained flag for the message.
+ * @param response A pointer to an ::MQTTAsync_responseOptions structure. Used to set callback functions.
+ * This is optional and can be set to NULL.
+ * @return ::MQTTASYNC_SUCCESS if the message is accepted for publication.
+ * An error code is returned if there was a problem accepting the message.
+ */
+LIBMQTT_API int MQTTAsync_send(MQTTAsync handle, const char* destinationName, int payloadlen, const void* payload, int qos,
+ int retained, MQTTAsync_responseOptions* response);
+
+/**
+ * This function attempts to publish a message to a given topic (see also
+ * MQTTAsync_publish()). An ::MQTTAsync_token is issued when
+ * this function returns successfully if the QoS is greater than 0.
+ * If the client application needs to
+ * test for successful delivery of messages, a callback should be set
+ * (see ::MQTTAsync_onSuccess() and ::MQTTAsync_deliveryComplete()).
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param destinationName The topic associated with this message.
+ * @param msg A pointer to a valid MQTTAsync_message structure containing
+ * the payload and attributes of the message to be published.
+ * @param response A pointer to an ::MQTTAsync_responseOptions structure. Used to set callback functions.
+ * @return ::MQTTASYNC_SUCCESS if the message is accepted for publication.
+ * An error code is returned if there was a problem accepting the message.
+ */
+LIBMQTT_API int MQTTAsync_sendMessage(MQTTAsync handle, const char* destinationName, const MQTTAsync_message* msg, MQTTAsync_responseOptions* response);
+
+
+/**
+ * This function sets a pointer to an array of tokens for
+ * messages that are currently in-flight (pending completion).
+ *
+ * Important note: The memory used to hold the array of tokens is
+ * malloc()'d in this function. The client application is responsible for
+ * freeing this memory when it is no longer required.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param tokens The address of a pointer to an ::MQTTAsync_token.
+ * When the function returns successfully, the pointer is set to point to an
+ * array of tokens representing messages pending completion. The last member of
+ * the array is set to -1 to indicate there are no more tokens. If no tokens
+ * are pending, the pointer is set to NULL.
+ * @return ::MQTTASYNC_SUCCESS if the function returns successfully.
+ * An error code is returned if there was a problem obtaining the list of
+ * pending tokens.
+ */
+LIBMQTT_API int MQTTAsync_getPendingTokens(MQTTAsync handle, MQTTAsync_token **tokens);
+
+/**
+ * Tests whether a request corresponding to a token is complete.
+ *
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param token An ::MQTTAsync_token associated with a request.
+ * @return 1 if the request has been completed, 0 if not.
+ */
+#define MQTTASYNC_TRUE 1
+LIBMQTT_API int MQTTAsync_isComplete(MQTTAsync handle, MQTTAsync_token token);
+
+
+/**
+ * Waits for a request corresponding to a token to complete. This only works for
+ * messages with QoS greater than 0. A QoS 0 message has no MQTT token.
+ * This function will always return ::MQTTASYNC_SUCCESS for a QoS 0 message.
+ *
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param token An ::MQTTAsync_token associated with a request.
+ * @param timeout the maximum time to wait for completion, in milliseconds
+ * @return ::MQTTASYNC_SUCCESS if the request has been completed in the time allocated,
+ * ::MQTTASYNC_FAILURE or ::MQTTASYNC_DISCONNECTED if not.
+ */
+LIBMQTT_API int MQTTAsync_waitForCompletion(MQTTAsync handle, MQTTAsync_token token, unsigned long timeout);
+
+
+/**
+ * This function frees memory allocated to an MQTT message, including the
+ * additional memory allocated to the message payload. The client application
+ * calls this function when the message has been fully processed. Important
+ * note: This function does not free the memory allocated to a message
+ * topic string. It is the responsibility of the client application to free
+ * this memory using the MQTTAsync_free() library function.
+ * @param msg The address of a pointer to the ::MQTTAsync_message structure
+ * to be freed.
+ */
+LIBMQTT_API void MQTTAsync_freeMessage(MQTTAsync_message** msg);
+
+/**
+ * This function frees memory allocated by the MQTT C client library, especially the
+ * topic name. This is needed on Windows when the client library and application
+ * program have been compiled with different versions of the C compiler. It is
+ * thus good policy to always use this function when freeing any MQTT C client-
+ * allocated memory.
+ * @param ptr The pointer to the client library storage to be freed.
+ */
+LIBMQTT_API void MQTTAsync_free(void* ptr);
+
+/**
+ * This function is used to allocate memory to be used or freed by the MQTT C client library,
+ * especially the data in the ::MQTTPersistence_afterRead and ::MQTTPersistence_beforeWrite
+ * callbacks. This is needed on Windows when the client library and application
+ * program have been compiled with different versions of the C compiler.
+ * @param size The size of the memory to be allocated.
+ */
+LIBMQTT_API void* MQTTAsync_malloc(size_t size);
+
+/**
+ * This function frees the memory allocated to an MQTT client (see
+ * MQTTAsync_create()). It should be called when the client is no longer
+ * required.
+ * @param handle A pointer to the handle referring to the ::MQTTAsync
+ * structure to be freed.
+ */
+LIBMQTT_API void MQTTAsync_destroy(MQTTAsync* handle);
+
+
+
+enum MQTTASYNC_TRACE_LEVELS
+{
+ MQTTASYNC_TRACE_MAXIMUM = 1,
+ MQTTASYNC_TRACE_MEDIUM,
+ MQTTASYNC_TRACE_MINIMUM,
+ MQTTASYNC_TRACE_PROTOCOL,
+ MQTTASYNC_TRACE_ERROR,
+ MQTTASYNC_TRACE_SEVERE,
+ MQTTASYNC_TRACE_FATAL,
+};
+
+
+/**
+ * This function sets the level of trace information which will be
+ * returned in the trace callback.
+ * @param level the trace level required
+ */
+LIBMQTT_API void MQTTAsync_setTraceLevel(enum MQTTASYNC_TRACE_LEVELS level);
+
+
+/**
+ * This is a callback function prototype which must be implemented if you want
+ * to receive trace information. Do not invoke any other Paho API calls in this
+ * callback function - unpredictable behavior may result.
+ * @param level the trace level of the message returned
+ * @param message the trace message. This is a pointer to a static buffer which
+ * will be overwritten on each call. You must copy the data if you want to keep
+ * it for later.
+ */
+typedef void MQTTAsync_traceCallback(enum MQTTASYNC_TRACE_LEVELS level, char* message);
+
+/**
+ * This function sets the trace callback if needed. If set to NULL,
+ * no trace information will be returned. The default trace level is
+ * MQTTASYNC_TRACE_MINIMUM.
+ * @param callback a pointer to the function which will handle the trace information
+ */
+LIBMQTT_API void MQTTAsync_setTraceCallback(MQTTAsync_traceCallback* callback);
+
+/**
+ * This function returns version information about the library.
+ * no trace information will be returned. The default trace level is
+ * MQTTASYNC_TRACE_MINIMUM
+ * @return an array of strings describing the library. The last entry is a NULL pointer.
+ */
+LIBMQTT_API MQTTAsync_nameValue* MQTTAsync_getVersionInfo(void);
+
+/**
+ * Returns a pointer to a string representation of the error code, or NULL.
+ * Do not free after use. Returns NULL if the error code is unknown.
+ * @param code the MQTTASYNC_ return code.
+ * @return a static string representation of the error code.
+ */
+LIBMQTT_API const char* MQTTAsync_strerror(int code);
+
+
+/*!
+ * @cond MQTTAsync_main
+ * @page async Threading
+ * The client application runs on several threads.
+ * Processing of handshaking and maintaining
+ * the network connection is performed in the background.
+ * This API is thread safe: functions may be called by multiple application
+ * threads.
+ * Notifications of status and message reception are provided to the client
+ * application using callbacks registered with the library by the call to
+ * MQTTAsync_setCallbacks() (see MQTTAsync_messageArrived(),
+ * MQTTAsync_connectionLost() and MQTTAsync_deliveryComplete()).
+ * In addition, some functions allow success and failure callbacks to be set
+ * for individual requests, in the ::MQTTAsync_responseOptions structure. Applications
+ * can be written as a chain of callback functions.
+ *
+ * @page callbacks Callbacks
+ * Any function from this API may be used within a callback. It is not advisable to
+ * use ::MQTTAsync_waitForCompletion within a callback, however, as it is the only
+ * API call that may take some time to complete, which may cause unpredictable
+ * behaviour. All the other API calls are intended to complete quickly, starting
+ * a request in the background, with success or failure notified by other callbacks.
+ *
+ * If no callbacks are assigned, this will include the message arrived callback.
+ * This could be done if the application is a pure publisher, and does
+ * not subscribe to any topics. If however messages are received, and no message
+ * arrived callback is set, then those messages will accumulate
+ * and take up memory, as there is no place for them to be delivered.
+ * A log message will be written to highlight the issue, but it is up
+ * to the application to protect against this situation.
+ *
+ * @page auto_reconnect Automatic Reconnect
+ * The ability for the client library to reconnect automatically in the event
+ * of a connection failure was added in 1.1. The connection lost callback
+ * allows a flexible response to the loss of a connection, so almost any
+ * behaviour can be implemented in that way. Automatic reconnect does have the
+ * advantage of being a little simpler to use.
+ *
+ * To switch on automatic reconnect, the connect options field
+ * automaticReconnect should be set to non-zero. The minimum and maximum times
+ * before the next connection attempt can also be set, the defaults being 1 and
+ * 60 seconds. At each failure to reconnect, the retry interval is doubled until
+ * the maximum value is reached, and there it stays until the connection is
+ * successfully re-established whereupon it is reset.
+ *
+ * When a reconnection attempt is successful, the ::MQTTAsync_connected callback
+ * function is invoked, if set by calling ::MQTTAsync_setConnected. This allows
+ * the application to take any actions needed, such as amending subscriptions.
+ *
+ * @page offline_publish Publish While Disconnected
+ * This feature was not originally available because with persistence enabled,
+ * messages could be stored locally without ever knowing if they could be sent.
+ * The client application could have created the client with an erroneous broker
+ * address or port for instance.
+ *
+ * To enable messages to be published when the application is disconnected
+ * ::MQTTAsync_createWithOptions must be used instead of ::MQTTAsync_create to
+ * create the client object. The ::MQTTAsync_createOptions field sendWhileDisconnected
+ * must be set to non-zero, and the maxBufferedMessages field set as required -
+ * the default being 100.
+ *
+ * ::MQTTAsync_getPendingTokens can be called to return the ids of the messages
+ * waiting to be sent, or for which the sending process has not completed.
+ *
+ * @page wildcard Subscription wildcards
+ * Every MQTT message includes a topic that classifies it. MQTT servers use
+ * topics to determine which subscribers should receive messages published to
+ * the server.
+ *
+ * Consider the server receiving messages from several environmental sensors.
+ * Each sensor publishes its measurement data as a message with an associated
+ * topic. Subscribing applications need to know which sensor originally
+ * published each received message. A unique topic is thus used to identify
+ * each sensor and measurement type. Topics such as SENSOR1TEMP,
+ * SENSOR1HUMIDITY, SENSOR2TEMP and so on achieve this but are not very
+ * flexible. If additional sensors are added to the system at a later date,
+ * subscribing applications must be modified to receive them.
+ *
+ * To provide more flexibility, MQTT supports a hierarchical topic namespace.
+ * This allows application designers to organize topics to simplify their
+ * management. Levels in the hierarchy are delimited by the '/' character,
+ * such as SENSOR/1/HUMIDITY. Publishers and subscribers use these
+ * hierarchical topics as already described.
+ *
+ * For subscriptions, two wildcard characters are supported:
+ *
+ * - A '#' character represents a complete sub-tree of the hierarchy and
+ * thus must be the last character in a subscription topic string, such as
+ * SENSOR/#. This will match any topic starting with SENSOR/, such as
+ * SENSOR/1/TEMP and SENSOR/2/HUMIDITY.
+ * - A '+' character represents a single level of the hierarchy and is
+ * used between delimiters. For example, SENSOR/+/TEMP will match
+ * SENSOR/1/TEMP and SENSOR/2/TEMP.
+ *
+ * Publishers are not allowed to use the wildcard characters in their topic
+ * names.
+ *
+ * Deciding on your topic hierarchy is an important step in your system design.
+ *
+ * @page qos Quality of service
+ * The MQTT protocol provides three qualities of service for delivering
+ * messages between clients and servers: "at most once", "at least once" and
+ * "exactly once".
+ *
+ * Quality of service (QoS) is an attribute of an individual message being
+ * published. An application sets the QoS for a specific message by setting the
+ * MQTTAsync_message.qos field to the required value.
+ *
+ * A subscribing client can set the maximum quality of service a server uses
+ * to send messages that match the client subscriptions. The
+ * MQTTAsync_subscribe() and MQTTAsync_subscribeMany() functions set this
+ * maximum. The QoS of a message forwarded to a subscriber thus might be
+ * different to the QoS given to the message by the original publisher.
+ * The lower of the two values is used to forward a message.
+ *
+ * The three levels are:
+ *
+ * QoS0, At most once: The message is delivered at most once, or it
+ * may not be delivered at all. Its delivery across the network is not
+ * acknowledged. The message is not stored. The message could be lost if the
+ * client is disconnected, or if the server fails. QoS0 is the fastest mode of
+ * transfer. It is sometimes called "fire and forget".
+ *
+ * The MQTT protocol does not require servers to forward publications at QoS0
+ * to a client. If the client is disconnected at the time the server receives
+ * the publication, the publication might be discarded, depending on the
+ * server implementation.
+ *
+ * QoS1, At least once: The message is always delivered at least once.
+ * It might be delivered multiple times if there is a failure before an
+ * acknowledgment is received by the sender. The message must be stored
+ * locally at the sender, until the sender receives confirmation that the
+ * message has been published by the receiver. The message is stored in case
+ * the message must be sent again.
+ *
+ * QoS2, Exactly once: The message is always delivered exactly once.
+ * The message must be stored locally at the sender, until the sender receives
+ * confirmation that the message has been published by the receiver. The
+ * message is stored in case the message must be sent again. QoS2 is the
+ * safest, but slowest mode of transfer. A more sophisticated handshaking
+ * and acknowledgement sequence is used than for QoS1 to ensure no duplication
+ * of messages occurs.
+ * @page publish Publication example
+@code
+#include
+#include
+#include
+#include "MQTTAsync.h"
+
+#if !defined(_WIN32)
+#include
+#else
+#include
+#endif
+
+#if defined(_WRS_KERNEL)
+#include
+#endif
+
+#define ADDRESS "tcp://mqtt.eclipseprojects.io:1883"
+#define CLIENTID "ExampleClientPub"
+#define TOPIC "MQTT Examples"
+#define PAYLOAD "Hello World!"
+#define QOS 1
+#define TIMEOUT 10000L
+
+int finished = 0;
+
+void connlost(void *context, char *cause)
+{
+ MQTTAsync client = (MQTTAsync)context;
+ MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+ int rc;
+
+ printf("\nConnection lost\n");
+ printf(" cause: %s\n", cause);
+
+ printf("Reconnecting\n");
+ conn_opts.keepAliveInterval = 20;
+ conn_opts.cleansession = 1;
+ if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to start connect, return code %d\n", rc);
+ finished = 1;
+ }
+}
+
+void onDisconnectFailure(void* context, MQTTAsync_failureData* response)
+{
+ printf("Disconnect failed\n");
+ finished = 1;
+}
+
+void onDisconnect(void* context, MQTTAsync_successData* response)
+{
+ printf("Successful disconnection\n");
+ finished = 1;
+}
+
+void onSendFailure(void* context, MQTTAsync_failureData* response)
+{
+ MQTTAsync client = (MQTTAsync)context;
+ MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+ int rc;
+
+ printf("Message send failed token %d error code %d\n", response->token, response->code);
+ opts.onSuccess = onDisconnect;
+ opts.onFailure = onDisconnectFailure;
+ opts.context = client;
+ if ((rc = MQTTAsync_disconnect(client, &opts)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to start disconnect, return code %d\n", rc);
+ exit(EXIT_FAILURE);
+ }
+}
+
+void onSend(void* context, MQTTAsync_successData* response)
+{
+ MQTTAsync client = (MQTTAsync)context;
+ MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+ int rc;
+
+ printf("Message with token value %d delivery confirmed\n", response->token);
+ opts.onSuccess = onDisconnect;
+ opts.onFailure = onDisconnectFailure;
+ opts.context = client;
+ if ((rc = MQTTAsync_disconnect(client, &opts)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to start disconnect, return code %d\n", rc);
+ exit(EXIT_FAILURE);
+ }
+}
+
+
+void onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+ printf("Connect failed, rc %d\n", response ? response->code : 0);
+ finished = 1;
+}
+
+
+void onConnect(void* context, MQTTAsync_successData* response)
+{
+ MQTTAsync client = (MQTTAsync)context;
+ MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+ MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+ int rc;
+
+ printf("Successful connection\n");
+ opts.onSuccess = onSend;
+ opts.onFailure = onSendFailure;
+ opts.context = client;
+ pubmsg.payload = PAYLOAD;
+ pubmsg.payloadlen = (int)strlen(PAYLOAD);
+ pubmsg.qos = QOS;
+ pubmsg.retained = 0;
+ if ((rc = MQTTAsync_sendMessage(client, TOPIC, &pubmsg, &opts)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to start sendMessage, return code %d\n", rc);
+ exit(EXIT_FAILURE);
+ }
+}
+
+int messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* m)
+{
+ // not expecting any messages
+ return 1;
+}
+
+int main(int argc, char* argv[])
+{
+ MQTTAsync client;
+ MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+ int rc;
+
+ if ((rc = MQTTAsync_create(&client, ADDRESS, CLIENTID, MQTTCLIENT_PERSISTENCE_NONE, NULL)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to create client object, return code %d\n", rc);
+ exit(EXIT_FAILURE);
+ }
+
+ if ((rc = MQTTAsync_setCallbacks(client, NULL, connlost, messageArrived, NULL)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to set callback, return code %d\n", rc);
+ exit(EXIT_FAILURE);
+ }
+
+ conn_opts.keepAliveInterval = 20;
+ conn_opts.cleansession = 1;
+ conn_opts.onSuccess = onConnect;
+ conn_opts.onFailure = onConnectFailure;
+ conn_opts.context = client;
+ if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to start connect, return code %d\n", rc);
+ exit(EXIT_FAILURE);
+ }
+
+ printf("Waiting for publication of %s\n"
+ "on topic %s for client with ClientID: %s\n",
+ PAYLOAD, TOPIC, CLIENTID);
+ while (!finished)
+ #if defined(_WIN32)
+ Sleep(100);
+ #else
+ usleep(10000L);
+ #endif
+
+ MQTTAsync_destroy(&client);
+ return rc;
+}
+
+ * @endcode
+ * @page subscribe Subscription example
+@code
+#include
+#include
+#include
+#include "MQTTAsync.h"
+
+#if !defined(_WIN32)
+#include
+#else
+#include
+#endif
+
+#if defined(_WRS_KERNEL)
+#include
+#endif
+
+#define ADDRESS "tcp://mqtt.eclipseprojects.io:1883"
+#define CLIENTID "ExampleClientSub"
+#define TOPIC "MQTT Examples"
+#define PAYLOAD "Hello World!"
+#define QOS 1
+#define TIMEOUT 10000L
+
+int disc_finished = 0;
+int subscribed = 0;
+int finished = 0;
+
+void connlost(void *context, char *cause)
+{
+ MQTTAsync client = (MQTTAsync)context;
+ MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+ int rc;
+
+ printf("\nConnection lost\n");
+ if (cause)
+ printf(" cause: %s\n", cause);
+
+ printf("Reconnecting\n");
+ conn_opts.keepAliveInterval = 20;
+ conn_opts.cleansession = 1;
+ if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to start connect, return code %d\n", rc);
+ finished = 1;
+ }
+}
+
+
+int msgarrvd(void *context, char *topicName, int topicLen, MQTTAsync_message *message)
+{
+ printf("Message arrived\n");
+ printf(" topic: %s\n", topicName);
+ printf(" message: %.*s\n", message->payloadlen, (char*)message->payload);
+ MQTTAsync_freeMessage(&message);
+ MQTTAsync_free(topicName);
+ return 1;
+}
+
+void onDisconnectFailure(void* context, MQTTAsync_failureData* response)
+{
+ printf("Disconnect failed, rc %d\n", response->code);
+ disc_finished = 1;
+}
+
+void onDisconnect(void* context, MQTTAsync_successData* response)
+{
+ printf("Successful disconnection\n");
+ disc_finished = 1;
+}
+
+void onSubscribe(void* context, MQTTAsync_successData* response)
+{
+ printf("Subscribe succeeded\n");
+ subscribed = 1;
+}
+
+void onSubscribeFailure(void* context, MQTTAsync_failureData* response)
+{
+ printf("Subscribe failed, rc %d\n", response->code);
+ finished = 1;
+}
+
+
+void onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+ printf("Connect failed, rc %d\n", response->code);
+ finished = 1;
+}
+
+
+void onConnect(void* context, MQTTAsync_successData* response)
+{
+ MQTTAsync client = (MQTTAsync)context;
+ MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+ int rc;
+
+ printf("Successful connection\n");
+
+ printf("Subscribing to topic %s\nfor client %s using QoS%d\n\n"
+ "Press Q to quit\n\n", TOPIC, CLIENTID, QOS);
+ opts.onSuccess = onSubscribe;
+ opts.onFailure = onSubscribeFailure;
+ opts.context = client;
+ if ((rc = MQTTAsync_subscribe(client, TOPIC, QOS, &opts)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to start subscribe, return code %d\n", rc);
+ finished = 1;
+ }
+}
+
+
+int main(int argc, char* argv[])
+{
+ MQTTAsync client;
+ MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+ MQTTAsync_disconnectOptions disc_opts = MQTTAsync_disconnectOptions_initializer;
+ int rc;
+ int ch;
+
+ if ((rc = MQTTAsync_create(&client, ADDRESS, CLIENTID, MQTTCLIENT_PERSISTENCE_NONE, NULL))
+ != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to create client, return code %d\n", rc);
+ rc = EXIT_FAILURE;
+ goto exit;
+ }
+
+ if ((rc = MQTTAsync_setCallbacks(client, client, connlost, msgarrvd, NULL)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to set callbacks, return code %d\n", rc);
+ rc = EXIT_FAILURE;
+ goto destroy_exit;
+ }
+
+ conn_opts.keepAliveInterval = 20;
+ conn_opts.cleansession = 1;
+ conn_opts.onSuccess = onConnect;
+ conn_opts.onFailure = onConnectFailure;
+ conn_opts.context = client;
+ if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to start connect, return code %d\n", rc);
+ rc = EXIT_FAILURE;
+ goto destroy_exit;
+ }
+
+ while (!subscribed && !finished)
+ #if defined(_WIN32)
+ Sleep(100);
+ #else
+ usleep(10000L);
+ #endif
+
+ if (finished)
+ goto exit;
+
+ do
+ {
+ ch = getchar();
+ } while (ch!='Q' && ch != 'q');
+
+ disc_opts.onSuccess = onDisconnect;
+ disc_opts.onFailure = onDisconnectFailure;
+ if ((rc = MQTTAsync_disconnect(client, &disc_opts)) != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to start disconnect, return code %d\n", rc);
+ rc = EXIT_FAILURE;
+ goto destroy_exit;
+ }
+ while (!disc_finished)
+ {
+ #if defined(_WIN32)
+ Sleep(100);
+ #else
+ usleep(10000L);
+ #endif
+ }
+
+destroy_exit:
+ MQTTAsync_destroy(&client);
+exit:
+ return rc;
+}
+
+ * @endcode
+* @page tracing Tracing
+ *
+ * Runtime tracing can be controlled by environment variables or API calls.
+ *
+ * #### Environment variables
+ *
+ * Tracing is switched on by setting the MQTT_C_CLIENT_TRACE environment variable.
+ * A value of ON, or stdout, prints to stdout, any other value is interpreted as a file name to use.
+ *
+ * The amount of trace detail is controlled with the MQTT_C_CLIENT_TRACE_LEVEL environment
+ * variable - valid values are ERROR, PROTOCOL, MINIMUM, MEDIUM and MAXIMUM
+ * (from least to most verbose).
+ *
+ * The variable MQTT_C_CLIENT_TRACE_MAX_LINES limits the number of lines of trace that are output
+ * to a file. Two files are used at most, when they are full, the last one is overwritten with the
+ * new trace entries. The default size is 1000 lines.
+ *
+ * #### Trace API calls
+ *
+ * MQTTAsync_traceCallback() is used to set a callback function which is called whenever trace
+ * information is available. This will be the same information as that printed if the
+ * environment variables were used to control the trace.
+ *
+ * The MQTTAsync_setTraceLevel() calls is used to set the maximum level of trace entries that will be
+ * passed to the callback function. The levels are:
+ * 1. ::MQTTASYNC_TRACE_MAXIMUM
+ * 2. ::MQTTASYNC_TRACE_MEDIUM
+ * 3. ::MQTTASYNC_TRACE_MINIMUM
+ * 4. ::MQTTASYNC_TRACE_PROTOCOL
+ * 5. ::MQTTASYNC_TRACE_ERROR
+ * 6. ::MQTTASYNC_TRACE_SEVERE
+ * 7. ::MQTTASYNC_TRACE_FATAL
+ *
+ * Selecting ::MQTTASYNC_TRACE_MAXIMUM will cause all trace entries at all levels to be returned.
+ * Choosing ::MQTTASYNC_TRACE_ERROR will cause ERROR, SEVERE and FATAL trace entries to be returned
+ * to the callback function.
+ *
+ * ### MQTT Packet Tracing
+ *
+ * A feature that can be very useful is printing the MQTT packets that are sent and received. To
+ * achieve this, use the following environment variable settings:
+ * @code
+ MQTT_C_CLIENT_TRACE=ON
+ MQTT_C_CLIENT_TRACE_LEVEL=PROTOCOL
+ * @endcode
+ * The output you should see looks like this:
+ * @code
+ 20130528 155936.813 3 stdout-subscriber -> CONNECT cleansession: 1 (0)
+ 20130528 155936.813 3 stdout-subscriber <- CONNACK rc: 0
+ 20130528 155936.813 3 stdout-subscriber -> SUBSCRIBE msgid: 1 (0)
+ 20130528 155936.813 3 stdout-subscriber <- SUBACK msgid: 1
+ 20130528 155941.818 3 stdout-subscriber -> DISCONNECT (0)
+ * @endcode
+ * where the fields are:
+ * 1. date
+ * 2. time
+ * 3. socket number
+ * 4. client id
+ * 5. direction (-> from client to server, <- from server to client)
+ * 6. packet details
+ *
+ * ### Default Level Tracing
+ *
+ * This is an extract of a default level trace of a call to connect:
+ * @code
+ 19700101 010000.000 (1152206656) (0)> MQTTClient_connect:893
+ 19700101 010000.000 (1152206656) (1)> MQTTClient_connectURI:716
+ 20130528 160447.479 Connecting to serverURI localhost:1883
+ 20130528 160447.479 (1152206656) (2)> MQTTProtocol_connect:98
+ 20130528 160447.479 (1152206656) (3)> MQTTProtocol_addressPort:48
+ 20130528 160447.479 (1152206656) (3)< MQTTProtocol_addressPort:73
+ 20130528 160447.479 (1152206656) (3)> Socket_new:599
+ 20130528 160447.479 New socket 4 for localhost, port 1883
+ 20130528 160447.479 (1152206656) (4)> Socket_addSocket:163
+ 20130528 160447.479 (1152206656) (5)> Socket_setnonblocking:73
+ 20130528 160447.479 (1152206656) (5)< Socket_setnonblocking:78 (0)
+ 20130528 160447.479 (1152206656) (4)< Socket_addSocket:176 (0)
+ 20130528 160447.479 (1152206656) (4)> Socket_error:95
+ 20130528 160447.479 (1152206656) (4)< Socket_error:104 (115)
+ 20130528 160447.479 Connect pending
+ 20130528 160447.479 (1152206656) (3)< Socket_new:683 (115)
+ 20130528 160447.479 (1152206656) (2)< MQTTProtocol_connect:131 (115)
+ * @endcode
+ * where the fields are:
+ * 1. date
+ * 2. time
+ * 3. thread id
+ * 4. function nesting level
+ * 5. function entry (>) or exit (<)
+ * 6. function name : line of source code file
+ * 7. return value (if there is one)
+ *
+ * ### Memory Allocation Tracing
+ *
+ * Setting the trace level to maximum causes memory allocations and frees to be traced along with
+ * the default trace entries, with messages like the following:
+ * @code
+ 20130528 161819.657 Allocating 16 bytes in heap at file /home/icraggs/workspaces/mqrtc/mqttv3c/src/MQTTPacket.c line 177 ptr 0x179f930
+
+ 20130528 161819.657 Freeing 16 bytes in heap at file /home/icraggs/workspaces/mqrtc/mqttv3c/src/MQTTPacket.c line 201, heap use now 896 bytes
+ * @endcode
+ * When the last MQTT client object is destroyed, if the trace is being recorded
+ * and all memory allocated by the client library has not been freed, an error message will be
+ * written to the trace. This can help with fixing memory leaks. The message will look like this:
+ * @code
+ 20130528 163909.208 Some memory not freed at shutdown, possible memory leak
+ 20130528 163909.208 Heap scan start, total 880 bytes
+ 20130528 163909.208 Heap element size 32, line 354, file /home/icraggs/workspaces/mqrtc/mqttv3c/src/MQTTPacket.c, ptr 0x260cb00
+ 20130528 163909.208 Content
+ 20130528 163909.209 Heap scan end
+ * @endcode
+ * @endcond
+ */
+
+#if defined(__cplusplus)
+ }
+#endif
+
+#endif
diff --git a/MQTTClientPersistence.h b/MQTTClientPersistence.h
new file mode 100644
index 0000000..d3caae4
--- /dev/null
+++ b/MQTTClientPersistence.h
@@ -0,0 +1,277 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2020 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief This structure represents a persistent data store, used to store
+ * outbound and inbound messages, in order to achieve reliable messaging.
+ *
+ * The MQTT Client persists QoS1 and QoS2 messages in order to meet the
+ * assurances of delivery associated with these @ref qos levels. The messages
+ * are saved in persistent storage
+ * The type and context of the persistence implementation are specified when
+ * the MQTT client is created (see MQTTClient_create()). The default
+ * persistence type (::MQTTCLIENT_PERSISTENCE_DEFAULT) uses a file system-based
+ * persistence mechanism. The persistence_context argument passed to
+ * MQTTClient_create() when using the default peristence is a string
+ * representing the location of the persistence directory. If the context
+ * argument is NULL, the working directory will be used.
+ *
+ * To use memory-based persistence, an application passes
+ * ::MQTTCLIENT_PERSISTENCE_NONE as the persistence_type to
+ * MQTTClient_create(). This can lead to message loss in certain situations,
+ * but can be appropriate in some cases (see @ref qos).
+ *
+ * Client applications can provide their own persistence mechanism by passing
+ * ::MQTTCLIENT_PERSISTENCE_USER as the persistence_type. To implement a
+ * custom persistence mechanism, the application must pass an initialized
+ * ::MQTTClient_persistence structure as the persistence_context
+ * argument to MQTTClient_create().
+ *
+ * If the functions defined return an ::MQTTCLIENT_PERSISTENCE_ERROR then the
+ * state of the persisted data should remain as it was prior to the function
+ * being called. For example, if Persistence_put() returns
+ * ::MQTTCLIENT_PERSISTENCE_ERROR, then it is assumed tha tthe persistent store
+ * does not contain the data that was passed to the function. Similarly, if
+ * Persistence_remove() returns ::MQTTCLIENT_PERSISTENCE_ERROR then it is
+ * assumed that the data to be removed is still held in the persistent store.
+ *
+ * It is up to the persistence implementation to log any error information that
+ * may be required to diagnose a persistence mechanism failure.
+ */
+
+/*
+/// @cond EXCLUDE
+*/
+#if !defined(MQTTCLIENTPERSISTENCE_H)
+#define MQTTCLIENTPERSISTENCE_H
+/*
+/// @endcond
+*/
+
+/**
+ * This persistence_type value specifies the default file system-based
+ * persistence mechanism (see MQTTClient_create()).
+ */
+#define MQTTCLIENT_PERSISTENCE_DEFAULT 0
+/**
+ * This persistence_type value specifies a memory-based
+ * persistence mechanism (see MQTTClient_create()).
+ */
+#define MQTTCLIENT_PERSISTENCE_NONE 1
+/**
+ * This persistence_type value specifies an application-specific
+ * persistence mechanism (see MQTTClient_create()).
+ */
+#define MQTTCLIENT_PERSISTENCE_USER 2
+
+/**
+ * Application-specific persistence functions must return this error code if
+ * there is a problem executing the function.
+ */
+#define MQTTCLIENT_PERSISTENCE_ERROR -2
+
+/**
+ * @brief Initialize the persistent store.
+ *
+ * Either open the existing persistent store for this client ID or create a new
+ * one if one doesn't exist. If the persistent store is already open, return
+ * without taking any action.
+ *
+ * An application can use the same client identifier to connect to many
+ * different servers. The clientid in conjunction with the
+ * serverURI uniquely identifies the persistence store required.
+ *
+ * @param handle The address of a pointer to a handle for this persistence
+ * implementation. This function must set handle to a valid reference to the
+ * persistence following a successful return.
+ * The handle pointer is passed as an argument to all the other
+ * persistence functions. It may include the context parameter and/or any other
+ * data for use by the persistence functions.
+ * @param clientID The client identifier for which the persistent store should
+ * be opened.
+ * @param serverURI The connection string specified when the MQTT client was
+ * created (see MQTTClient_create()).
+ * @param context A pointer to any data required to initialize the persistent
+ * store (see ::MQTTClient_persistence).
+ * @return Return 0 if the function completes successfully, otherwise return
+ * ::MQTTCLIENT_PERSISTENCE_ERROR.
+ */
+typedef int (*Persistence_open)(void** handle, const char* clientID, const char* serverURI, void* context);
+
+/**
+ * @brief Close the persistent store referred to by the handle.
+ *
+ * @param handle The handle pointer from a successful call to
+ * Persistence_open().
+ * @return Return 0 if the function completes successfully, otherwise return
+ * ::MQTTCLIENT_PERSISTENCE_ERROR.
+ */
+typedef int (*Persistence_close)(void* handle);
+
+/**
+ * @brief Put the specified data into the persistent store.
+ *
+ * @param handle The handle pointer from a successful call to
+ * Persistence_open().
+ * @param key A string used as the key for the data to be put in the store. The
+ * key is later used to retrieve data from the store with Persistence_get().
+ * @param bufcount The number of buffers to write to the persistence store.
+ * @param buffers An array of pointers to the data buffers associated with
+ * this key.
+ * @param buflens An array of lengths of the data buffers. buflen[n]
+ * gives the length of buffer[n].
+ * @return Return 0 if the function completes successfully, otherwise return
+ * ::MQTTCLIENT_PERSISTENCE_ERROR.
+ */
+typedef int (*Persistence_put)(void* handle, char* key, int bufcount, char* buffers[], int buflens[]);
+
+/**
+ * @brief Retrieve the specified data from the persistent store.
+ *
+ * @param handle The handle pointer from a successful call to
+ * Persistence_open().
+ * @param key A string that is the key for the data to be retrieved. This is
+ * the same key used to save the data to the store with Persistence_put().
+ * @param buffer The address of a pointer to a buffer. This function sets the
+ * pointer to point at the retrieved data, if successful.
+ * @param buflen The address of an int that is set to the length of
+ * buffer by this function if successful.
+ * @return Return 0 if the function completes successfully, otherwise return
+ * ::MQTTCLIENT_PERSISTENCE_ERROR.
+ */
+typedef int (*Persistence_get)(void* handle, char* key, char** buffer, int* buflen);
+
+/**
+ * @brief Remove the data for the specified key from the store.
+ *
+ * @param handle The handle pointer from a successful call to
+ * Persistence_open().
+ * @param key A string that is the key for the data to be removed from the
+ * store. This is the same key used to save the data to the store with
+ * Persistence_put().
+ * @return Return 0 if the function completes successfully, otherwise return
+ * ::MQTTCLIENT_PERSISTENCE_ERROR.
+ */
+typedef int (*Persistence_remove)(void* handle, char* key);
+
+/**
+ * @brief Returns the keys in this persistent data store.
+ *
+ * @param handle The handle pointer from a successful call to
+ * Persistence_open().
+ * @param keys The address of a pointer to pointers to strings. Assuming
+ * successful execution, this function allocates memory to hold the returned
+ * keys (strings used to store the data with Persistence_put()). It also
+ * allocates memory to hold an array of pointers to these strings. keys
+ * is set to point to the array of pointers to strings.
+ * @param nkeys A pointer to the number of keys in this persistent data store.
+ * This function sets the number of keys, if successful.
+ * @return Return 0 if the function completes successfully, otherwise return
+ * ::MQTTCLIENT_PERSISTENCE_ERROR.
+ */
+typedef int (*Persistence_keys)(void* handle, char*** keys, int* nkeys);
+
+/**
+ * @brief Clears the persistence store, so that it no longer contains any
+ * persisted data.
+ *
+ * @param handle The handle pointer from a successful call to
+ * Persistence_open().
+ * @return Return 0 if the function completes successfully, otherwise return
+ * ::MQTTCLIENT_PERSISTENCE_ERROR.
+ */
+typedef int (*Persistence_clear)(void* handle);
+
+/**
+ * @brief Returns whether any data has been persisted using the specified key.
+ *
+ * @param handle The handle pointer from a successful call to
+ * Persistence_open().
+ * @param key The string to be tested for existence in the store.
+ * @return Return 0 if the key was found in the store, otherwise return
+ * ::MQTTCLIENT_PERSISTENCE_ERROR.
+ */
+typedef int (*Persistence_containskey)(void* handle, char* key);
+
+/**
+ * @brief A structure containing the function pointers to a persistence
+ * implementation and the context or state that will be shared across all
+ * the persistence functions.
+ */
+typedef struct {
+ /**
+ * A pointer to any data required to initialize the persistent store.
+ */
+ void* context;
+ /**
+ * A function pointer to an implementation of Persistence_open().
+ */
+ Persistence_open popen;
+ /**
+ * A function pointer to an implementation of Persistence_close().
+ */
+ Persistence_close pclose;
+ /**
+ * A function pointer to an implementation of Persistence_put().
+ */
+ Persistence_put pput;
+ /**
+ * A function pointer to an implementation of Persistence_get().
+ */
+ Persistence_get pget;
+ /**
+ * A function pointer to an implementation of Persistence_remove().
+ */
+ Persistence_remove premove;
+ /**
+ * A function pointer to an implementation of Persistence_keys().
+ */
+ Persistence_keys pkeys;
+ /**
+ * A function pointer to an implementation of Persistence_clear().
+ */
+ Persistence_clear pclear;
+ /**
+ * A function pointer to an implementation of Persistence_containskey().
+ */
+ Persistence_containskey pcontainskey;
+} MQTTClient_persistence;
+
+
+/**
+ * A callback which is invoked just before a write to persistence. This can be
+ * used to transform the data, for instance to encrypt it.
+ * @param context The context as set in ::MQTTAsync_setBeforePersistenceWrite
+ * @param bufcount The number of buffers to write to the persistence store.
+ * @param buffers An array of pointers to the data buffers.
+ * @param buflens An array of lengths of the data buffers.
+ * @return Return 0 if the function completes successfully, otherwise non 0.
+ */
+typedef int MQTTPersistence_beforeWrite(void* context, int bufcount, char* buffers[], int buflens[]);
+
+
+/**
+ * A callback which is invoked just after a read from persistence. This can be
+ * used to transform the data, for instance to decrypt it.
+ * @param context The context as set in ::MQTTAsync_setAfterPersistenceRead
+ * @param buffer The address of a pointer to a buffer.
+ * @param buflen The address of an int that is the length of the buffer.
+ * @return Return 0 if the function completes successfully, otherwise non 0.
+ */
+typedef int MQTTPersistence_afterRead(void* context, char** buffer, int* buflen);
+
+#endif
diff --git a/MQTTExportDeclarations.h b/MQTTExportDeclarations.h
new file mode 100644
index 0000000..d492ef1
--- /dev/null
+++ b/MQTTExportDeclarations.h
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2020, 2020 Andreas Walter
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Andreas Walter - initially moved export declarations into separate fle
+ *******************************************************************************/
+
+#if !defined(EXPORTDECLARATIONS_H)
+#define EXPORTDECLARATIONS_H
+
+#if defined(_WIN32) || defined(_WIN64)
+# if defined(PAHO_MQTT_EXPORTS)
+# define LIBMQTT_API __declspec(dllexport)
+# elif defined(PAHO_MQTT_IMPORTS)
+# define LIBMQTT_API __declspec(dllimport)
+# else
+# define LIBMQTT_API
+# endif
+#else
+# if defined(PAHO_MQTT_EXPORTS)
+# define LIBMQTT_API __attribute__ ((visibility ("default")))
+# else
+# define LIBMQTT_API extern
+# endif
+#endif
+
+#endif
diff --git a/MQTTProperties.h b/MQTTProperties.h
new file mode 100644
index 0000000..bbfd732
--- /dev/null
+++ b/MQTTProperties.h
@@ -0,0 +1,222 @@
+/*******************************************************************************
+ * Copyright (c) 2017, 2023 IBM Corp. and others
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#if !defined(MQTTPROPERTIES_H)
+#define MQTTPROPERTIES_H
+
+#include "MQTTExportDeclarations.h"
+
+#define MQTT_INVALID_PROPERTY_ID -2
+
+/** The one byte MQTT V5 property indicator */
+enum MQTTPropertyCodes {
+ MQTTPROPERTY_CODE_PAYLOAD_FORMAT_INDICATOR = 1, /**< The value is 1 */
+ MQTTPROPERTY_CODE_MESSAGE_EXPIRY_INTERVAL = 2, /**< The value is 2 */
+ MQTTPROPERTY_CODE_CONTENT_TYPE = 3, /**< The value is 3 */
+ MQTTPROPERTY_CODE_RESPONSE_TOPIC = 8, /**< The value is 8 */
+ MQTTPROPERTY_CODE_CORRELATION_DATA = 9, /**< The value is 9 */
+ MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER = 11, /**< The value is 11 */
+ MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL = 17, /**< The value is 17 */
+ MQTTPROPERTY_CODE_ASSIGNED_CLIENT_IDENTIFER = 18,/**< The value is 18 */
+ MQTTPROPERTY_CODE_SERVER_KEEP_ALIVE = 19, /**< The value is 19 */
+ MQTTPROPERTY_CODE_AUTHENTICATION_METHOD = 21, /**< The value is 21 */
+ MQTTPROPERTY_CODE_AUTHENTICATION_DATA = 22, /**< The value is 22 */
+ MQTTPROPERTY_CODE_REQUEST_PROBLEM_INFORMATION = 23,/**< The value is 23 */
+ MQTTPROPERTY_CODE_WILL_DELAY_INTERVAL = 24, /**< The value is 24 */
+ MQTTPROPERTY_CODE_REQUEST_RESPONSE_INFORMATION = 25,/**< The value is 25 */
+ MQTTPROPERTY_CODE_RESPONSE_INFORMATION = 26, /**< The value is 26 */
+ MQTTPROPERTY_CODE_SERVER_REFERENCE = 28, /**< The value is 28 */
+ MQTTPROPERTY_CODE_REASON_STRING = 31, /**< The value is 31 */
+ MQTTPROPERTY_CODE_RECEIVE_MAXIMUM = 33, /**< The value is 33*/
+ MQTTPROPERTY_CODE_TOPIC_ALIAS_MAXIMUM = 34, /**< The value is 34 */
+ MQTTPROPERTY_CODE_TOPIC_ALIAS = 35, /**< The value is 35 */
+ MQTTPROPERTY_CODE_MAXIMUM_QOS = 36, /**< The value is 36 */
+ MQTTPROPERTY_CODE_RETAIN_AVAILABLE = 37, /**< The value is 37 */
+ MQTTPROPERTY_CODE_USER_PROPERTY = 38, /**< The value is 38 */
+ MQTTPROPERTY_CODE_MAXIMUM_PACKET_SIZE = 39, /**< The value is 39 */
+ MQTTPROPERTY_CODE_WILDCARD_SUBSCRIPTION_AVAILABLE = 40,/**< The value is 40 */
+ MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIERS_AVAILABLE = 41,/**< The value is 41 */
+ MQTTPROPERTY_CODE_SHARED_SUBSCRIPTION_AVAILABLE = 42/**< The value is 241 */
+};
+
+/**
+ * Returns a printable string description of an MQTT V5 property code.
+ * @param value an MQTT V5 property code.
+ * @return the printable string description of the input property code.
+ * NULL if the code was not found.
+ */
+LIBMQTT_API const char* MQTTPropertyName(enum MQTTPropertyCodes value);
+
+/** The one byte MQTT V5 property type */
+enum MQTTPropertyTypes {
+ MQTTPROPERTY_TYPE_BYTE,
+ MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER,
+ MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER,
+ MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER,
+ MQTTPROPERTY_TYPE_BINARY_DATA,
+ MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING,
+ MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR
+};
+
+/**
+ * Returns the MQTT V5 type code of an MQTT V5 property.
+ * @param value an MQTT V5 property code.
+ * @return the MQTT V5 type code of the input property. -1 if the code was not found.
+ */
+LIBMQTT_API int MQTTProperty_getType(enum MQTTPropertyCodes value);
+
+/**
+ * The data for a length delimited string
+ */
+typedef struct
+{
+ int len; /**< the length of the string */
+ char* data; /**< pointer to the string data */
+} MQTTLenString;
+
+
+/**
+ * Structure to hold an MQTT version 5 property of any type
+ */
+typedef struct
+{
+ enum MQTTPropertyCodes identifier; /**< The MQTT V5 property id. A multi-byte integer. */
+ /** The value of the property, as a union of the different possible types. */
+ union {
+ unsigned char byte; /**< holds the value of a byte property type */
+ unsigned short integer2; /**< holds the value of a 2 byte integer property type */
+ unsigned int integer4; /**< holds the value of a 4 byte integer property type */
+ struct {
+ MQTTLenString data; /**< The value of a string property, or the name of a user property. */
+ MQTTLenString value; /**< The value of a user property. */
+ };
+ } value;
+} MQTTProperty;
+
+/**
+ * MQTT version 5 property list
+ */
+typedef struct MQTTProperties
+{
+ int count; /**< number of property entries in the array */
+ int max_count; /**< max number of properties that the currently allocated array can store */
+ int length; /**< mbi: byte length of all properties */
+ MQTTProperty *array; /**< array of properties */
+} MQTTProperties;
+
+#define MQTTProperties_initializer {0, 0, 0, NULL}
+
+/**
+ * Returns the length of the properties structure when serialized ready for network transmission.
+ * @param props an MQTT V5 property structure.
+ * @return the length in bytes of the properties when serialized.
+ */
+int MQTTProperties_len(MQTTProperties* props);
+
+/**
+ * Add a property pointer to the property array. Memory is allocated in this function,
+ * so MQTTClient_create or MQTTAsync_create must be called first to initialize the
+ * internal heap tracking. Alternatively MQTTAsync_global_init() can be called first
+ * or build with the HIGH_PERFORMANCE option which disables the heap tracking.
+ * @param props The property list to add the property to.
+ * @param prop The property to add to the list.
+ * @return 0 on success, -1 on failure.
+ */
+LIBMQTT_API int MQTTProperties_add(MQTTProperties* props, const MQTTProperty* prop);
+
+/**
+ * Serialize the given property list to a character buffer, e.g. for writing to the network.
+ * @param pptr pointer to the buffer - move the pointer as we add data
+ * @param properties pointer to the property list, can be NULL
+ * @return whether the write succeeded or not: number of bytes written, or < 0 on failure.
+ */
+int MQTTProperties_write(char** pptr, const MQTTProperties* properties);
+
+/**
+ * Reads a property list from a character buffer into an array.
+ * @param properties pointer to the property list to be filled. Should be initalized but empty.
+ * @param pptr pointer to the character buffer.
+ * @param enddata pointer to the end of the character buffer so we don't read beyond.
+ * @return 1 if the properties were read successfully.
+ */
+int MQTTProperties_read(MQTTProperties* properties, char** pptr, char* enddata);
+
+/**
+ * Free all memory allocated to the property list, including any to individual properties.
+ * @param properties pointer to the property list.
+ */
+LIBMQTT_API void MQTTProperties_free(MQTTProperties* properties);
+
+/**
+ * Copy the contents of a property list, allocating additional memory if needed.
+ * @param props pointer to the property list.
+ * @return the duplicated property list.
+ */
+LIBMQTT_API MQTTProperties MQTTProperties_copy(const MQTTProperties* props);
+
+/**
+ * Checks if property list contains a specific property.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @return 1 if found, 0 if not.
+ */
+LIBMQTT_API int MQTTProperties_hasProperty(MQTTProperties *props, enum MQTTPropertyCodes propid);
+
+/**
+ * Returns the number of instances of a property id. Most properties can exist only once.
+ * User properties and subscription ids can exist more than once.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @return the number of times found. Can be 0.
+ */
+LIBMQTT_API int MQTTProperties_propertyCount(MQTTProperties *props, enum MQTTPropertyCodes propid);
+
+/**
+ * Returns the integer value of a specific property. The property given must be a numeric type.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @return the integer value of the property. -9999999 on failure.
+ */
+LIBMQTT_API int MQTTProperties_getNumericValue(MQTTProperties *props, enum MQTTPropertyCodes propid);
+
+/**
+ * Returns the integer value of a specific property when it's not the only instance.
+ * The property given must be a numeric type.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @param index the instance number, starting at 0.
+ * @return the integer value of the property. -9999999 on failure.
+ */
+LIBMQTT_API int MQTTProperties_getNumericValueAt(MQTTProperties *props, enum MQTTPropertyCodes propid, int index);
+
+/**
+ * Returns a pointer to the property structure for a specific property.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @return the pointer to the property structure if found. NULL if not found.
+ */
+LIBMQTT_API MQTTProperty* MQTTProperties_getProperty(MQTTProperties *props, enum MQTTPropertyCodes propid);
+
+/**
+ * Returns a pointer to the property structure for a specific property when it's not the only instance.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @param index the instance number, starting at 0.
+ * @return the pointer to the property structure if found. NULL if not found.
+ */
+LIBMQTT_API MQTTProperty* MQTTProperties_getPropertyAt(MQTTProperties *props, enum MQTTPropertyCodes propid, int index);
+
+#endif /* MQTTPROPERTIES_H */
diff --git a/MQTTReasonCodes.h b/MQTTReasonCodes.h
new file mode 100644
index 0000000..2dc08ea
--- /dev/null
+++ b/MQTTReasonCodes.h
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2017, 2020 IBM Corp. and others
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#if !defined(MQTTREASONCODES_H)
+#define MQTTREASONCODES_H
+
+#include "MQTTExportDeclarations.h"
+
+/** The MQTT V5 one byte reason code */
+enum MQTTReasonCodes {
+ MQTTREASONCODE_SUCCESS = 0,
+ MQTTREASONCODE_NORMAL_DISCONNECTION = 0,
+ MQTTREASONCODE_GRANTED_QOS_0 = 0,
+ MQTTREASONCODE_GRANTED_QOS_1 = 1,
+ MQTTREASONCODE_GRANTED_QOS_2 = 2,
+ MQTTREASONCODE_DISCONNECT_WITH_WILL_MESSAGE = 4,
+ MQTTREASONCODE_NO_MATCHING_SUBSCRIBERS = 16,
+ MQTTREASONCODE_NO_SUBSCRIPTION_FOUND = 17,
+ MQTTREASONCODE_CONTINUE_AUTHENTICATION = 24,
+ MQTTREASONCODE_RE_AUTHENTICATE = 25,
+ MQTTREASONCODE_UNSPECIFIED_ERROR = 128,
+ MQTTREASONCODE_MALFORMED_PACKET = 129,
+ MQTTREASONCODE_PROTOCOL_ERROR = 130,
+ MQTTREASONCODE_IMPLEMENTATION_SPECIFIC_ERROR = 131,
+ MQTTREASONCODE_UNSUPPORTED_PROTOCOL_VERSION = 132,
+ MQTTREASONCODE_CLIENT_IDENTIFIER_NOT_VALID = 133,
+ MQTTREASONCODE_BAD_USER_NAME_OR_PASSWORD = 134,
+ MQTTREASONCODE_NOT_AUTHORIZED = 135,
+ MQTTREASONCODE_SERVER_UNAVAILABLE = 136,
+ MQTTREASONCODE_SERVER_BUSY = 137,
+ MQTTREASONCODE_BANNED = 138,
+ MQTTREASONCODE_SERVER_SHUTTING_DOWN = 139,
+ MQTTREASONCODE_BAD_AUTHENTICATION_METHOD = 140,
+ MQTTREASONCODE_KEEP_ALIVE_TIMEOUT = 141,
+ MQTTREASONCODE_SESSION_TAKEN_OVER = 142,
+ MQTTREASONCODE_TOPIC_FILTER_INVALID = 143,
+ MQTTREASONCODE_TOPIC_NAME_INVALID = 144,
+ MQTTREASONCODE_PACKET_IDENTIFIER_IN_USE = 145,
+ MQTTREASONCODE_PACKET_IDENTIFIER_NOT_FOUND = 146,
+ MQTTREASONCODE_RECEIVE_MAXIMUM_EXCEEDED = 147,
+ MQTTREASONCODE_TOPIC_ALIAS_INVALID = 148,
+ MQTTREASONCODE_PACKET_TOO_LARGE = 149,
+ MQTTREASONCODE_MESSAGE_RATE_TOO_HIGH = 150,
+ MQTTREASONCODE_QUOTA_EXCEEDED = 151,
+ MQTTREASONCODE_ADMINISTRATIVE_ACTION = 152,
+ MQTTREASONCODE_PAYLOAD_FORMAT_INVALID = 153,
+ MQTTREASONCODE_RETAIN_NOT_SUPPORTED = 154,
+ MQTTREASONCODE_QOS_NOT_SUPPORTED = 155,
+ MQTTREASONCODE_USE_ANOTHER_SERVER = 156,
+ MQTTREASONCODE_SERVER_MOVED = 157,
+ MQTTREASONCODE_SHARED_SUBSCRIPTIONS_NOT_SUPPORTED = 158,
+ MQTTREASONCODE_CONNECTION_RATE_EXCEEDED = 159,
+ MQTTREASONCODE_MAXIMUM_CONNECT_TIME = 160,
+ MQTTREASONCODE_SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED = 161,
+ MQTTREASONCODE_WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED = 162
+};
+
+/**
+ * Returns a printable string description of an MQTT V5 reason code.
+ * @param value an MQTT V5 reason code.
+ * @return the printable string description of the input reason code.
+ * NULL if the code was not found.
+ */
+LIBMQTT_API const char* MQTTReasonCode_toString(enum MQTTReasonCodes value);
+
+#endif
diff --git a/MQTTSubscribeOpts.h b/MQTTSubscribeOpts.h
new file mode 100644
index 0000000..264e4d0
--- /dev/null
+++ b/MQTTSubscribeOpts.h
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#if !defined(SUBOPTS_H)
+#define SUBOPTS_H
+
+/** The MQTT V5 subscribe options, apart from QoS which existed before V5. */
+typedef struct MQTTSubscribe_options
+{
+ /** The eyecatcher for this structure. Must be MQSO. */
+ char struct_id[4];
+ /** The version number of this structure. Must be 0.
+ */
+ int struct_version;
+ /** To not receive our own publications, set to 1.
+ * 0 is the original MQTT behaviour - all messages matching the subscription are received.
+ */
+ unsigned char noLocal;
+ /** To keep the retain flag as on the original publish message, set to 1.
+ * If 0, defaults to the original MQTT behaviour where the retain flag is only set on
+ * publications sent by a broker if in response to a subscribe request.
+ */
+ unsigned char retainAsPublished;
+ /** 0 - send retained messages at the time of the subscribe (original MQTT behaviour)
+ * 1 - send retained messages on subscribe only if the subscription is new
+ * 2 - do not send retained messages at all
+ */
+ unsigned char retainHandling;
+} MQTTSubscribe_options;
+
+#define MQTTSubscribe_options_initializer { {'M', 'Q', 'S', 'O'}, 0, 0, 0, 0 }
+
+#endif
diff --git a/MailNode.vcproj.NOTTSDESKTOP.John-skigdebian.user b/MailNode.vcproj.NOTTSDESKTOP.John-skigdebian.user
new file mode 100644
index 0000000..4aa3c72
--- /dev/null
+++ b/MailNode.vcproj.NOTTSDESKTOP.John-skigdebian.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MailNode.vcproj.NOTTSDESKTOP.John.user b/MailNode.vcproj.NOTTSDESKTOP.John.user
new file mode 100644
index 0000000..4aa3c72
--- /dev/null
+++ b/MailNode.vcproj.NOTTSDESKTOP.John.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/RigControl.c b/RigControl.c
index 6003e31..fd47e24 100644
--- a/RigControl.c
+++ b/RigControl.c
@@ -9422,7 +9422,7 @@ return TRUE;
#include
#include
-//#include
+//
//#include
#include
//#include
diff --git a/TelnetV6.c b/TelnetV6.c
index eb8f9a1..50ef424 100644
--- a/TelnetV6.c
+++ b/TelnetV6.c
@@ -4677,7 +4677,7 @@ MsgLoop:
if (strstr(MsgPtr, "Password :"))
{
- // Send “CMSTelnet” + gateway callsign + frequency + emission type if info is available
+ // Send "CMSTelnet" + gateway callsign + frequency + emission type if info is available
TRANSPORTENTRY * Sess1 = TNC->PortRecord->ATTACHEDSESSIONS[Stream];
TRANSPORTENTRY * Sess2 = NULL;
diff --git a/UIARQ.c b/UIARQ.c
index 99b2b49..6f35353 100644
--- a/UIARQ.c
+++ b/UIARQ.c
@@ -1240,20 +1240,7 @@ SendKReply:
{
// Create a traffic record
- char logmsg[120];
- time_t Duration;
-
- Duration = time(NULL) - STREAM->ConnectTime;
-
- if (Duration == 0)
- Duration = 1;
-
- sprintf(logmsg,"Port %2d %9s Bytes Sent %d BPS %d Bytes Received %d BPS %d Time %d Seconds",
- TNC->Port, STREAM->RemoteCall,
- STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
- STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
- Debugprintf(logmsg);
+ hookL4SessionDeleted(TNC, STREAM);
}
STREAM->Connecting = FALSE;
diff --git a/UZ7HODrv.c b/UZ7HODrv.c
index b61aea1..1e85313 100644
--- a/UZ7HODrv.c
+++ b/UZ7HODrv.c
@@ -884,6 +884,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
if (STREAM->ReportDISC)
{
+ hookL4SessionDeleted(TNC, STREAM);
STREAM->ReportDISC = FALSE;
buff->PORT = Stream;
@@ -2230,6 +2231,8 @@ VOID ProcessAGWPacket(struct TNCINFO * TNC, UCHAR * Message)
buffptr->Len = RXHeader->DataLength;
memcpy(buffptr->Data, Message, RXHeader->DataLength);
+ STREAM->BytesRXed += RXHeader->DataLength;
+
C_Q_ADD(&STREAM->PACTORtoBPQ_Q, buffptr);
return;
}
@@ -2291,7 +2294,7 @@ VOID ProcessAGWPacket(struct TNCINFO * TNC, UCHAR * Message)
// if (STREAM->Disconnecting) //
// ReleaseTNC(TNC);
-
+
STREAM->Disconnecting = FALSE;
STREAM->DiscWhenAllSent = 10;
STREAM->FramesOutstanding = 0;
@@ -2467,6 +2470,8 @@ GotStream:
}
+ strcpy(STREAM->MyCall, TNC->TargetCall);
+
if (App < 32)
{
char AppName[13];
@@ -2502,6 +2507,9 @@ GotStream:
return;
}
}
+
+ strcpy(STREAM->MyCall, TNC->TargetCall);
+
// Not to a known appl - drop through to Node
@@ -2740,7 +2748,7 @@ GotStream:
// Capabilities - along with Version used to indicate QtSoundModem
// with ability to set and read Modem type and frequency/
- if (Message[2] == 24 && Message[3] == 3 && Message[4] == 100)
+ if ((Message[2] == 24 && Message[3] == 3 && Message[4] == 100) || TNC->AGWInfo->isQTSM)
{
// Set flag on any other ports on same TNC (all ports with this as master port)
@@ -2928,6 +2936,9 @@ VOID SendData(int Stream, struct TNCINFO * TNC, char * Key, char * Msg, int MsgL
memcpy(AGW->TXHeader.callfrom, &Key[11], 10);
memcpy(AGW->TXHeader.callto, &Key[1], 10);
+ TNC->Streams[Stream].BytesTXed += MsgLen;
+
+
// If Length is greater than Paclen we should fragment
if (TNC->PortRecord->ATTACHEDSESSIONS[Stream])
diff --git a/VARA.c b/VARA.c
index 7c6deef..5eea38b 100644
--- a/VARA.c
+++ b/VARA.c
@@ -2264,6 +2264,8 @@ VOID VARAProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
STREAM->NeedDisc = 100; // 10 secs
}
}
+
+ strcpy(STREAM->MyCall, TNC->TargetCall);
return;
}
else
@@ -2374,22 +2376,7 @@ VOID VARAProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
{
// Create a traffic record
- char logmsg[120];
- time_t Duration;
-
- Duration = time(NULL) - STREAM->ConnectTime;
-
- if (Duration == 0)
- Duration = 1;
-
- sprintf(logmsg,"Port %2d %9s Bytes Sent %d BPS %d Bytes Received %d BPS %d Time %d Seconds",
- TNC->Port, STREAM->RemoteCall,
- STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
- STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
- Debugprintf(logmsg);
-
- STREAM->ConnectTime= 0; //Prevent retrigger
+ hookL4SessionDeleted(TNC, STREAM);
}
diff --git a/Versions.h b/Versions.h
index a33d31e..8e7e6f1 100644
--- a/Versions.h
+++ b/Versions.h
@@ -10,8 +10,8 @@
#endif
-#define KVers 6,0,24,45
-#define KVerstring "6.0.24.45\0"
+#define KVers 6,0,24,46
+#define KVerstring "6.0.24.46\0"
#ifdef CKernel
diff --git a/WINMOR.c b/WINMOR.c
index 8bb62ae..796dc58 100644
--- a/WINMOR.c
+++ b/WINMOR.c
@@ -2368,22 +2368,7 @@ VOID ProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
if (TNC->Streams[0].Connected)
{
- // Create a traffic record
-
- char logmsg[120];
- time_t Duration;
-
- Duration = time(NULL) - STREAM->ConnectTime;
-
- if (Duration == 0)
- Duration = 1; // Avoid zero divide
-
- sprintf(logmsg,"Port %2d %9s Bytes Sent %d BPS %d Bytes Received %d BPS %d Time %d Seconds",
- TNC->Port, STREAM->RemoteCall,
- STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
- STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
- Debugprintf(logmsg);
+ hookL4SessionDeleted(TNC, STREAM);
GetSemaphore(&Semaphore, 50);
WritetoTrace(TNC, Buffer, MsgLen - 2);
diff --git a/WinRPRHelper.vcproj.NOTTSDESKTOP.John.user b/WinRPRHelper.vcproj.NOTTSDESKTOP.John.user
new file mode 100644
index 0000000..fa82c00
--- /dev/null
+++ b/WinRPRHelper.vcproj.NOTTSDESKTOP.John.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WinmorControl.vcproj.NOTTSDESKTOP.John.user b/WinmorControl.vcproj.NOTTSDESKTOP.John.user
new file mode 100644
index 0000000..fa82c00
--- /dev/null
+++ b/WinmorControl.vcproj.NOTTSDESKTOP.John.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/asmstrucs.h b/asmstrucs.h
index f8b4d1e..354d0c4 100644
--- a/asmstrucs.h
+++ b/asmstrucs.h
@@ -756,7 +756,6 @@ typedef struct KISSINFO
int QtSMFreq;
int QtSMStats; // Set if stats received as KISS Command
-
// UCHAR WIN32INFO[16]; // FOR WINDOWS DRIVER
} *PKISSINFO;
@@ -880,6 +879,11 @@ typedef struct _LINKTABLE
UCHAR OURCALL[7]; // CALLSIGN OF OUR END
UCHAR DIGIS[56]; // LEVEL 2 DIGIS IN PATH
+ char callingCall[10]; // for reporting. Link and Our calls depand on which end connected
+ char receivingCall[10]; // for reporting. Link and Our calls depand on which end connected
+
+ char Direction[4]; // In or Out
+
PPORTCONTROL LINKPORT; // PORT NUMBER
UCHAR LINKTYPE; // 1 = UP, 2= DOWN, 3 = INTERNODE
@@ -927,6 +931,10 @@ typedef struct _LINKTABLE
int IFrameRetryCounter; // Number of times an I frame in repeated without a frame being acked
+ time_t ConnectTime; // For session stats
+ int bytesRXed; // Info bytes only
+ int bytesTXed;
+
} LINKTABLE;
#pragma pack(1)
diff --git a/bpqmail.h b/bpqmail.h
index 48270a1..4ee6628 100644
--- a/bpqmail.h
+++ b/bpqmail.h
@@ -55,7 +55,7 @@ extern int ProgramErrors;
extern struct _EXCEPTION_POINTERS exinfox;
#ifdef WIN32
-Dump_Process_State(struct _EXCEPTION_POINTERS * exinfo, char * Msg);
+void Dump_Process_State(struct _EXCEPTION_POINTERS * exinfo, char * Msg);
#define My__except_Routine(Message) \
__except(memcpy(&exinfo, GetExceptionInformation(), sizeof(struct _EXCEPTION_POINTERS)), EXCEPTION_EXECUTE_HANDLER)\
diff --git a/cMain.c b/cMain.c
index b2cc48d..b63a69c 100644
--- a/cMain.c
+++ b/cMain.c
@@ -36,6 +36,7 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
#include "kernelresource.h"
#include "CHeaders.h"
#include "tncinfo.h"
+#include "mqtt.h"
VOID L2Routine(struct PORTCONTROL * PORT, PMESSAGE Buffer);
VOID ProcessIframe(struct _LINKTABLE * LINK, PDATAMESSAGE Buffer);
@@ -48,6 +49,7 @@ void ADSBTimer();
VOID SendSmartID(struct PORTCONTROL * PORT);
int CanPortDigi(int Port);
int KissEncode(UCHAR * inbuff, UCHAR * outbuff, int len);
+void MQTTTimer();
#include "configstructs.h"
@@ -82,6 +84,7 @@ char MYCALL[7] = ""; // DB 7 DUP (0) ; NODE CALLSIGN (BIT SHIFTED)
char MYALIASTEXT[6] = ""; // DB ' ' ; NODE ALIAS (KEEP TOGETHER)
char MYALIASLOPPED[10];
+char MYCALLLOPPED[10];
UCHAR MYCALLWITHALIAS[13] = "";
@@ -91,6 +94,7 @@ APPLCALLS APPLCALLTABLE[NumberofAppls] = {0};
UCHAR MYNODECALL[10] = ""; // NODE CALLSIGN (ASCII)
UCHAR MYNETROMCALL[10] = ""; // NETROM CALLSIGN (ASCII)
+char NODECALLLOPPED[10];
VOID * FREE_Q = NULL;
@@ -142,6 +146,15 @@ extern UCHAR LogDirectory[260];
extern BOOL EventsEnabled;
extern BOOL SaveAPRSMsgs;
BOOL M0LTEMap = FALSE;
+BOOL MQTT = FALSE;
+char MQTT_HOST[80] = "";
+int MQTT_PORT = 0;
+char MQTT_USER[80] = "";
+char MQTT_PASS[80] = "";
+
+int MQTT_Connecting = 0;
+int MQTT_Connected = 0;
+
//TNCTABLE DD 0
//NUMBEROFSTREAMS DD 0
@@ -438,7 +451,6 @@ Loop:
if (TNC->DisconnectScript)
{
int n = 0;
- char command[256];
struct DATAMESSAGE * Buffer;
TRANSPORTENTRY Session = {0}; // = TNC->PortRecord->ATTACHEDSESSIONS[Sessno];
@@ -729,6 +741,10 @@ BOOL Start()
memcpy(MYNETROMCALL, cfg->C_NETROMCALL, 10);
strlop(MYNETROMCALL, ' ');
+ strlop(MYNODECALL, ' ');
+
+ memcpy(NODECALLLOPPED, MYNODECALL, 10);
+ strlop(NODECALLLOPPED, ' ');
APPLCALLTABLE[0].APPLQUAL = BBSQUAL;
@@ -793,8 +809,12 @@ BOOL Start()
EventsEnabled = cfg->C_EVENTS;
SaveAPRSMsgs = cfg->C_SaveAPRSMsgs;
M0LTEMap = cfg->C_M0LTEMap;
-
-
+ MQTT = cfg->C_MQTT;
+ strcpy(MQTT_HOST, cfg->C_MQTT_HOST);
+ MQTT_PORT = cfg->C_MQTT_PORT;
+ strcpy(MQTT_USER, cfg->C_MQTT_USER);
+ strcpy(MQTT_PASS, cfg->C_MQTT_PASS);
+
// Get pointers to PASSWORD and APPL1 commands
// int APPL1 = 0;
@@ -2067,6 +2087,9 @@ VOID TIMERINTERRUPT()
sendFreqReport();
sendModeReport();
+ if (MQTT)
+ MQTTTimer();
+
/*
if (QCOUNT < 200)
{
@@ -2218,6 +2241,9 @@ L2Packet:
time(&Message->Timestamp);
Message->PORT = CURRENTPORT;
+
+ if (MQTT && PORT->PROTOCOL == 0)
+ MQTTKISSRX(Buffer);
// Bridge if requested
diff --git a/compatbits.h.bak b/compatbits.h.bak
new file mode 100644
index 0000000..22a851b
--- /dev/null
+++ b/compatbits.h.bak
@@ -0,0 +1,239 @@
+/*
+
+Stuff to make compiling on WINDOWS and LINUX easier
+
+*/
+
+#ifndef _COMPATBITS_
+#define _COMPATBITS_
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#ifdef WIN32
+
+#define _CRT_SECURE_NO_DEPRECATE
+#include
+
+#define strtoll _strtoi64
+
+#ifdef _WIN64
+#include "stdint.h"
+#else
+#include "winstdint.h"
+#endif
+
+#include "winsock2.h"
+#include "WS2tcpip.h"
+
+#include
+
+#include
+#include "commctrl.h"
+#include "Commdlg.h"
+#include
+
+#define Dll __declspec(dllexport)
+#define DllExport __declspec(dllexport)
+
+#define ioctl ioctlsocket
+
+#define pthread_t uintptr_t
+
+int pthread_equal(pthread_t T1, pthread_t T2);
+
+uintptr_t _beginthread(void(__cdecl *start_address)(void *), unsigned stack_size, void *arglist);
+
+#else
+
+int Sleep(int ms);
+
+#define ioctlsocket ioctl
+
+#define Dll
+#define DllExport
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+
+#define BOOL int
+#define VOID void
+#define UCHAR unsigned char
+#define USHORT unsigned short
+#define ULONG unsigned long
+#define UINT unsigned int
+#define SHORT short
+#define DWORD unsigned int
+#define BYTE unsigned char
+#define APIENTRY
+#define WINAPI
+#define WINUSERAPI
+#define TCHAR char
+#define TRUE 1
+#define FALSE 0
+#define FAR
+#define byte UCHAR
+//#define Byte UCHAR
+#define Word WORD
+
+typedef DWORD COLORREF;
+#define RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((USHORT)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)))
+
+#define GetRValue(rgb) rgb & 0xFF
+#define GetGValue(rgb) (rgb >> 8) & 0xFF
+#define GetBValue(rgb) (rgb >> 16) & 0xFF
+
+
+#define HWND unsigned int
+#define HINSTANCE unsigned int
+#define HKEY unsigned int
+#define UINT_PTR unsigned int *
+
+#define HANDLE UINT
+#define SOCKET int
+
+#define INVALID_SOCKET -1
+#define SOCKET_ERROR -1
+
+#define HMENU UINT
+#define WNDPROC UINT
+#define __cdecl
+
+#define strtok_s strtok_r
+
+#define _memicmp memicmp
+#define _stricmp stricmp
+#define _strdup strdup
+#define _strupr strupr
+#define _strlwr strlwr
+
+#define _snprintf snprintf
+
+#define _gcvt gcvt
+#define _fcvt fcvt
+#define _atoi64 atoll
+
+#define DeleteFile unlink
+#define MoveFile rename
+#define CreateDirectory mkdir
+
+uint64_t GetTickCount();
+
+
+int sprintf_s(char * string, int plen, const char * format, ...);
+
+
+int memicmp(unsigned char *a, unsigned char *b, int n);
+int stricmp(const unsigned char * pStr1, const unsigned char *pStr2);
+char * strupr(char* s);
+char * strlwr(char* s);
+
+pthread_t _beginthread(void(*start_address)(), unsigned stack_size, VOID * arglist);
+
+
+
+#define WSAGetLastError() errno
+#define GetLastError() errno
+void closesocket(int sock);
+#define GetCurrentProcessId getpid
+#define GetCurrentThreadId pthread_self
+
+char * inet_ntoa(struct in_addr in);
+
+#define LOBYTE(w) ((BYTE)((ULONG *)(w) & 0xff))
+#define HIBYTE(w) ((BYTE)((ULONG *)(w) >> 8))
+
+#define LOWORD(l) ((SHORT) ((l) & 0xffff))
+
+#define WSAEWOULDBLOCK 11
+
+#define MAX_PATH 250
+
+typedef int (*PROC)();
+
+typedef struct tagRECT
+{
+ unsigned int left;
+ unsigned int top;
+ unsigned int right;
+ unsigned int bottom;
+} RECT, *PRECT, *NPRECT, *LPRECT;
+
+#define HBRUSH int
+
+#define _timezone timezone
+
+#endif
+
+
+
+#ifdef LINBPQ
+
+
+#ifndef WIN32
+void SetWindowText(HWND hWnd, char * lpString);
+BOOL MySetDlgItemText(HWND hWnd, int item, char * lpString);
+BOOL CopyFile(char * In, char * Out, BOOL Failifexists);
+int GetNumberofPorts();
+int SendMsg(int stream, char * msg, int len);
+int SendRaw(int port, char * msg, int len);
+VOID md5(char *arg, unsigned char * checksum);
+
+// Send Raw (KISS mode) frame to port (BPQHOST function 10)
+
+int APIENTRY SendRaw(int port, char * msg, int len);
+
+
+
+
+BOOL MySetDlgItemText();
+
+VOID OutputDebugString(char * string);
+
+#endif
+
+#ifdef APIENTRY
+#undef APIENTRY
+#endif
+#define APIENTRY
+
+typedef struct sockaddr_in SOCKADDR_IN;
+typedef struct sockaddr_in *PSOCKADDR_IN;
+typedef struct sockaddr_in *LPSOCKADDR_IN;
+
+typedef struct sockaddr SOCKADDR;
+typedef struct sockaddr *PSOCKADDR;
+typedef struct sockaddr *LPSOCKADDR;
+
+#define __int16 short
+#define __int32 long
+
+
+#endif
+
+#endif
+
diff --git a/config.c b/config.c
index 81586b6..6408e25 100644
--- a/config.c
+++ b/config.c
@@ -302,7 +302,7 @@ static char *keywords[] =
"APPL5QUAL", "APPL6QUAL", "APPL7QUAL", "APPL8QUAL",
"BTEXT:", "NETROMCALL", "C_IS_CHAT", "MAXRTT", "MAXHOPS", // IPGATEWAY= no longer allowed
"LogL4Connects", "LogAllConnects", "SAVEMH", "ENABLEADIFLOG", "ENABLEEVENTS", "SAVEAPRSMSGS",
-"EnableM0LTEMap"
+"EnableM0LTEMap", "MQTT", "MQTT_HOST", "MQTT_PORT", "MQTT_USER", "MQTT_PASS"
}; /* parameter keywords */
static void * offset[] =
@@ -323,7 +323,7 @@ static void * offset[] =
&xxcfg.C_APPL[4].ApplQual, &xxcfg.C_APPL[5].ApplQual, &xxcfg.C_APPL[6].ApplQual, &xxcfg.C_APPL[7].ApplQual,
&xxcfg.C_BTEXT, &xxcfg.C_NETROMCALL, &xxcfg.C_C, &xxcfg.C_MAXRTT, &xxcfg.C_MAXHOPS, // IPGATEWAY= no longer allowed
&xxcfg.C_LogL4Connects, &xxcfg.C_LogAllConnects, &xxcfg.C_SaveMH, &xxcfg.C_ADIF, &xxcfg.C_EVENTS, &xxcfg.C_SaveAPRSMsgs,
-&xxcfg.C_M0LTEMap}; /* offset for corresponding data in config file */
+&xxcfg.C_M0LTEMap, &xxcfg.C_MQTT, &xxcfg.C_MQTT_HOST, &xxcfg.C_MQTT_PORT, &xxcfg.C_MQTT_USER, &xxcfg.C_MQTT_PASS}; /* offset for corresponding data in config file */
static int routine[] =
{
@@ -343,7 +343,7 @@ static int routine[] =
14, 14 ,14, 14,
15, 0, 2, 9, 9,
2, 2, 2, 2, 2, 2,
-2} ; // Routine to process param
+2, 2, 0, 1, 20, 20} ; // Routine to process param
int PARAMLIM = sizeof(routine)/sizeof(int);
//int NUMBEROFKEYWORDS = sizeof(routine)/sizeof(int);
@@ -365,7 +365,8 @@ static char *pkeywords[] =
"BCALL", "DIGIMASK", "NOKEEPALIVES", "COMPORT", "DRIVER", "WL2KREPORT", "UIONLY",
"UDPPORT", "IPADDR", "I2CBUS", "I2CDEVICE", "UDPTXPORT", "UDPRXPORT", "NONORMALIZE",
"IGNOREUNLOCKEDROUTES", "INP3ONLY", "TCPPORT", "RIGPORT", "PERMITTEDAPPLS", "HIDE",
-"SMARTID", "KISSCOMMAND", "SendtoM0LTEMap", "PortFreq", "M0LTEMapInfo", "QTSMPort"}; /* parameter keywords */
+"SMARTID", "KISSCOMMAND", "SendtoM0LTEMap", "PortFreq", "M0LTEMapInfo", "QTSMPort",
+"MQTT", "MQTT_HOST", "MQTT_PORT", "MQTT_USER", "MQTT_PASS"}; /* parameter keywords */
static void * poffset[] =
{
@@ -606,6 +607,11 @@ BOOL ProcessConfig()
paramok[79]=1; // SaveAPRSMsgs optional
paramok[79]=1; // SaveAPRSMsgs optional
paramok[80]=1; // EnableM0LTEMap optional
+ paramok[81]=1; // MQTT Params
+ paramok[82]=1; // MQTT Params
+ paramok[83]=1; // MQTT Params
+ paramok[84]=1; // MQTT Params
+ paramok[85]=1; // MQTT Params
for (i=0; i < PARAMLIM; i++)
{
@@ -1153,6 +1159,26 @@ NextAPRS:
}
+ if (_memicmp("MQTT_HOST=", rec, 10) == 0)
+ {
+ strcpy(xxcfg.C_MQTT_HOST, &rec[10]);
+ xxcfg.C_MQTT_HOST[strlen(xxcfg.C_MQTT_HOST)-1] = '\0';
+ return 0;
+ }
+ if (_memicmp("MQTT_USER=", rec, 10) == 0)
+ {
+ strcpy(xxcfg.C_MQTT_USER, &rec[10]);
+ xxcfg.C_MQTT_USER[strlen(xxcfg.C_MQTT_USER)-1] = '\0';
+ return 0;
+ }
+ if (_memicmp("MQTT_PASS=", rec, 10) == 0)
+ {
+ strcpy(xxcfg.C_MQTT_PASS, &rec[10]);
+ xxcfg.C_MQTT_PASS[strlen(xxcfg.C_MQTT_PASS)-1] = '\0';
+ return 0;
+}
+
+
if (xindex(rec,"=") >= 0)
sscanf(rec,"%[^=]=%s",key_word,value);
else
diff --git a/configstructs.h b/configstructs.h
index e68f7cd..ef6f23b 100644
--- a/configstructs.h
+++ b/configstructs.h
@@ -165,7 +165,12 @@ struct CONFIGTABLE
struct ROUTECONFIG C_ROUTE[MaxLockedRoutes];
struct APPLCONFIG C_APPL[NumberofAppls];
struct PORTCONFIG C_PORT[MaxBPQPortNo + 4];
-
+ int C_MQTT;
+ char C_MQTT_HOST[80];
+ int C_MQTT_PORT;
+ char C_MQTT_USER[80];
+ char C_MQTT_PASS[80];
+
//#define ApplOffset 80000 // Applications offset in config buffer
//#define InfoOffset 85000 // Infomsg offset in buffer
//#define InfoMax 2000 // Max Info
diff --git a/debug/bpq32.pdb b/debug/bpq32.pdb
new file mode 100644
index 0000000..05ac07e
Binary files /dev/null and b/debug/bpq32.pdb differ
diff --git a/kiss.c b/kiss.c
index 678b091..0066f2b 100644
--- a/kiss.c
+++ b/kiss.c
@@ -78,6 +78,7 @@ int i2c_smbus_read_byte()
#include "CHeaders.h"
+#include "mqtt.h"
#include "kiss.h"
int i2cPoll(struct PORTCONTROL * PORT, NPASYINFO npKISSINFO);
@@ -994,6 +995,10 @@ DONTCHECKDCD:
*/
SENDFRAME(KISS, Buffer);
+
+ if (MQTT)
+ MQTTKISSTX(Buffer);
+
}
VOID SENDFRAME(struct KISSINFO * KISS, PMESSAGE Buffer)
@@ -1180,6 +1185,10 @@ VOID SENDFRAME(struct KISSINFO * KISS, PMESSAGE Buffer)
ASYSEND(PORT, ENCBUFF, (int)(ptr2 - (char *)ENCBUFF));
+ if (MQTT)
+ MQTTKISSTX_RAW((char *)ENCBUFF, (int)(ptr2 - (char *)ENCBUFF), PORT);
+
+
// Pass buffer to trace routines
C_Q_ADD(&TRACE_Q, Buffer);
@@ -1739,6 +1748,9 @@ SeeifMore:
}
else
*/
+ if (MQTT)
+ MQTTKISSRX_RAW((char *)Buffer, len, PORT);
+
C_Q_ADD(&KISS->PORT.PORTRX_Q, (UINT *)Buffer);
}
diff --git a/mailapi.c b/mailapi.c
index b60ec77..b2de101 100644
--- a/mailapi.c
+++ b/mailapi.c
@@ -10,6 +10,12 @@
#include "CHeaders.h"
#include
#include "bpqmail.h"
+#include "httpconnectioninfo.h"
+
+struct MsgInfo * GetMsgFromNumber(int msgno);
+BOOL CheckUserMsg(struct MsgInfo * Msg, char * Call, BOOL SYSOP);
+char * doXMLTransparency(char * string);
+void ConvertTitletoUTF8(WebMailInfo * WebMail, char * Title, char * UTF8Title, int Len);
// Constants
@@ -21,18 +27,50 @@ typedef struct MailToken {
char token[TOKEN_SIZE + 1];
time_t expiration_time;
struct UserInfo * User;
- char Call[10];
+ char Call[10];
+ int Auth; // Security level of user
+
struct MailToken* next;
} MailToken;
static MailToken * token_list = NULL;
+typedef struct MailAPI
+{
+ char *URL;
+ int URLLen;
+ int (* APIRoutine)();
+ int Auth;
+} MailAPI;
+
+// Auth defines
+
+#define AuthNone 0
+#define AuthUser 1
+#define AuthBBSUser 2
+#define AuthSysop 4
+
+
static int verify_token(const char* token);
static void remove_expired_tokens();
static int request_token(char * response);
static void add_token_to_list(MailToken* token);
static MailToken * find_token(const char* token);
+int sendMsgList(struct HTTPConnectionInfo * Session, char * response, char * Rest, int Auth);
+int sendFwdQueueLen(struct HTTPConnectionInfo * Session, char * response, char * Rest, int Auth);
+int sendFwdConfig(struct HTTPConnectionInfo * Session, char * response, char * Rest, int Auth);
+
+static struct MailAPI APIList[] =
+{
+ "/mail/api/v1/msgs", 17, sendMsgList, AuthBBSUser | AuthSysop,
+ "/mail/api/v1/FwdQLen", 20, sendFwdQueueLen, AuthBBSUser | AuthSysop,
+ "/mail/api/v1/FwdConfig", 22, sendFwdConfig, AuthBBSUser | AuthSysop,
+};
+
+static int APICount = sizeof(APIList) / sizeof(struct MailAPI);
+
+
static MailToken * generate_token()
{
// Generate a random authentication token
@@ -143,7 +181,129 @@ static int send_http_response(char * response, const char* msg)
}
-int MailAPIProcessHTTPMessage(char * response, char * Method, char * URL, char * request, BOOL LOCAL, char *Params)
+int MailAPIProcessHTTPMessage(struct HTTPConnectionInfo * Session, char * response, char * Method, char * URL, char * request, BOOL LOCAL, char *Params)
+{
+ char * pass = strlop(Params, '&');
+ int Flags = 0, n;
+ MailToken * Token;
+ char Msg[64];
+ struct UserInfo * User;
+ int Auth = 0;
+
+ if (LOCAL)
+ Auth = AuthSysop;
+
+ // Check if the request is for token generation
+
+ if (strcmp(Method, "GET") != 0)
+ return send_http_response(response, "403 (Bad Method)");
+
+ if (_stricmp(URL, "/mail/api/v1/login") == 0)
+ {
+ // Key is in Session->Key
+
+ // Signon may have been validated in Node. If Session->Callsign is set
+
+ if (Session->Callsign[0] == 0)
+ {
+ // Try BBS logon
+
+ User = LookupCall(Params);
+
+ if (User)
+ {
+ // Check Password
+
+ if (pass[0] == 0 || strcmp(User->pass, pass) != 0 || User->flags & F_Excluded)
+ return send_http_response(response, "403 (Login Failed)");
+
+ strcpy(Session->Callsign, User->Call);
+ Auth = AuthBBSUser;
+ }
+ }
+ else
+ {
+ User = LookupCall(Session->Callsign);
+
+ if (User)
+ {
+ Auth = AuthUser;
+ if (User->flags & F_SYSOP)
+ Auth |= AuthSysop;
+ }
+ }
+
+ n = sprintf_s(Msg, sizeof(Msg), "API Connect from %s", _strupr(Params));
+ WriteLogLine(NULL, '|',Msg, n, LOG_BBS);
+
+ Token = zalloc(sizeof(MailToken));
+
+ strcpy(Token->token, Session->Key);
+ strcpy(Token->Call, Session->Callsign);
+ Token->Auth = Auth;
+
+ Token->expiration_time = time(NULL) + TOKEN_EXPIRATION; // Set token expiration time
+ add_token_to_list(Token);
+
+ // Return Token
+
+ sprintf(response, "{\"access_token\":\"%s\", \"expires_in\":%d, \"scope\":\"create\"}\r\n",
+ Token->token, Token->expiration_time);
+
+ return strlen(response);
+ }
+
+ // Determine the requested API endpoint
+
+ for (n = 0; n < APICount; n++)
+ {
+ struct MailAPI * APIEntry;
+ char * rest;
+
+ APIEntry = &APIList[n];
+
+ if (_memicmp(URL, APIEntry->URL, APIEntry->URLLen) == 0)
+ {
+ rest = &request[4 + APIEntry->URLLen]; // Anything following?
+
+ if (rest[0] =='?')
+ {
+ //Key
+
+ strlop(rest, ' ');
+ strlop(rest, '&');
+
+ Token = find_token(&rest[1]);
+
+ if (Token)
+ {
+ strcpy(Session->Callsign, Token->Call);
+ strcpy(Session->Key, Token->token);
+ }
+ else
+ return send_http_response(response, "403 (Invalid Security Token)");
+ }
+
+ if (APIEntry->Auth)
+ {
+ // Check Level
+ }
+
+ if (rest[0] == ' ' || rest[0] == '/' || rest[0] == '?')
+ {
+ return APIEntry->APIRoutine(Session, response, rest, Auth);
+ }
+ }
+
+ }
+
+ return send_http_response(response, "401 Invalid API Call");
+
+
+ return 0;
+}
+
+int WebMailAPIProcessHTTPMessage(char * response, char * Method, char * URL, char * request, BOOL LOCAL, char *Params)
{
char * pass = strlop(Params, '&');
int Flags = 0;
@@ -185,7 +345,7 @@ int MailAPIProcessHTTPMessage(char * response, char * Method, char * URL, char *
// Return Token
sprintf(response, "{\"access_token\":\"%s\", \"expires_in\":%d, \"scope\":\"create\"}\r\n",
- Token->token, TOKEN_EXPIRATION);
+ Token->token, Token->expiration_time);
return strlen(response);
@@ -194,3 +354,296 @@ int MailAPIProcessHTTPMessage(char * response, char * Method, char * URL, char *
return 0;
}
+
+// Unauthorised users can only get bulls.
+// Autothorised may read only users message or all messages depending on sysop status
+
+int sendMsgList(struct HTTPConnectionInfo * Session, char * response, char * Rest, int Auth)
+{
+ struct UserInfo * User = LookupCall(Session->Callsign);
+ int m;
+ struct MsgInfo * Msg;
+ char * ptr = response;
+ int n = NumberofMessages; //LineCount;
+ char Via[64];
+ int Count = 0;
+ struct UserInfo DummyUser = {""};
+ ptr[0] = 0;
+
+ if (User == 0)
+ User=&DummyUser;
+
+ n = sprintf(ptr,"{\"msgs\":[\r\n");
+ ptr += n;
+
+ for (m = LatestMsg; m >= 1; m--)
+ {
+ if (ptr > &response[244000])
+ break; // protect buffer
+
+ Msg = GetMsgFromNumber(m);
+
+ if (Msg == 0 || Msg->type == 0 || Msg->status == 0)
+ continue; // Protect against corrupt messages
+
+ if (Msg && CheckUserMsg(Msg, User->Call, Auth & AuthSysop))
+ {
+ char UTF8Title[4096];
+ char * EncodedTitle;
+
+ // List if it is the right type and in the page range we want
+
+
+ if (Count++ < Session->WebMailSkip)
+ continue;
+
+ ptr += sprintf(ptr, "{\r\n");
+
+
+ strcpy(Via, Msg->via);
+ strlop(Via, '.');
+
+ // make sure title is HTML safe (no < > etc) and UTF 8 encoded
+
+ EncodedTitle = doXMLTransparency(Msg->title);
+
+ memset(UTF8Title, 0, 4096); // In case convert fails part way through
+ ConvertTitletoUTF8(Session->WebMail, EncodedTitle, UTF8Title, 4095);
+
+ ptr += sprintf(ptr, "\"id\": \"%d\",\r\n", Msg->number);
+ ptr += sprintf(ptr, "\"mid\": \"%s\",\r\n", Msg->bid);
+ ptr += sprintf(ptr, "\"rcvd\": \"%d\",\r\n", Msg->datecreated);
+ ptr += sprintf(ptr, "\"type\": \"%c\",\r\n", Msg->type);
+ ptr += sprintf(ptr, "\"status\": \"%c\",\r\n", Msg->status);
+ ptr += sprintf(ptr, "\"to\": \"%s\",\r\n", Msg->to);
+ ptr += sprintf(ptr, "\"from\": \"%s\",\r\n", Msg->from);
+ ptr += sprintf(ptr, "\"size\": \"%d\",\r\n", Msg->length);
+ ptr += sprintf(ptr, "\"subject\": \"%s\"\r\n", UTF8Title);
+
+ free(EncodedTitle);
+
+ // ptr += sprintf(ptr, "%6d %s %c%c %5d %-8s%-8s%-8s%s\r\n",
+ // Session->Key, Msg->number, Msg->number,
+ // FormatDateAndTime((time_t)Msg->datecreated, TRUE), Msg->type,
+ // Msg->status, Msg->length, Msg->to, Via,
+ // Msg->from, UTF8Title);
+
+ ptr += sprintf(ptr, "},\r\n");
+
+ n--;
+
+ if (n == 0)
+ break;
+ }
+ }
+
+ if (response[n] == 0) // No entries
+ {
+ response[strlen(response) - 2] = '\0'; // remove \r\n
+ strcat(response, "]}\r\n");
+ }
+ else
+ {
+ response[strlen(response)-3 ] = '\0'; // remove ,\r\n
+ strcat(response, "\r\n]}\r\n");
+ }
+ return strlen(response);
+}
+
+int sendFwdQueueLen(struct HTTPConnectionInfo * Session, char * response, char * Rest, int Auth)
+{
+ struct UserInfo * USER;
+ char * ptr = response;
+ int n;
+ int i = 0;
+ int Len = 0;
+
+ n = sprintf(ptr,"{\"forwardqueuelength\":[\r\n");
+ ptr += n;
+
+ for (USER = BBSChain; USER; USER = USER->BBSNext)
+ {
+ int Count = CountMessagestoForward (USER);
+
+ ptr += sprintf(ptr, "{");
+ ptr += sprintf(ptr, "\"call\": \"%s\",", USER->Call);
+ ptr += sprintf(ptr, "\"queueLength\": \"%d\"", Count);
+ ptr += sprintf(ptr, "},\r\n");
+ }
+
+ if (response[n] == 0) // No entries
+ {
+ response[strlen(response) - 2] = '\0'; // remove \r\n
+ strcat(response, "]}\r\n");
+ }
+ else
+ {
+ response[strlen(response)-3 ] = '\0'; // remove ,\r\n
+ strcat(response, "\r\n]}\r\n");
+ }
+ return strlen(response);
+}
+
+VOID APIMultiStringValue(char ** values, char * Multi)
+{
+ char ** Calls;
+ char * ptr = &Multi[0];
+
+ *ptr = 0;
+
+ if (values)
+ {
+ Calls = values;
+
+ while(Calls[0])
+ {
+ ptr += sprintf(ptr, "\"%s\",", Calls[0]);
+ Calls++;
+ }
+ if (ptr != &Multi[0])
+ *(--ptr) = 0;
+ }
+}
+
+char * APIConvTime(int ss)
+{
+ int hh, mm;
+ static char timebuf[64];
+
+ hh = ss / 3600;
+ mm = (ss - (hh * 3600)) / 60;
+ ss = ss % 60;
+
+ sprintf(timebuf, "%02d:%02d:%02d", hh, mm, ss);
+
+ return timebuf;
+}
+
+
+int sendFwdConfig(struct HTTPConnectionInfo * Session, char * response, char * Rest, int Auth)
+{
+ struct UserInfo * USER;
+ char * ptr = response;
+ int n = 0;
+ int i = 0;
+ int Len = 0;
+
+
+ for (USER = BBSChain; USER; USER = USER->BBSNext)
+ {
+ struct BBSForwardingInfo * FWDInfo = USER->ForwardingInfo;
+
+ int Count = CountMessagestoForward (USER);
+
+ char TO[2048] = "";
+ char AT[2048] = "";
+ char TIMES[2048] = "";
+ char FWD[100000] = "";
+ char HRB[2048] = "";
+ char HRP[2048] = "";
+
+ APIMultiStringValue(FWDInfo->TOCalls, TO);
+ APIMultiStringValue(FWDInfo->ATCalls, AT);
+ APIMultiStringValue(FWDInfo->FWDTimes, TIMES);
+ APIMultiStringValue(FWDInfo->ConnectScript, FWD);
+ APIMultiStringValue(FWDInfo->Haddresses, HRB);
+ APIMultiStringValue(FWDInfo->HaddressesP, HRP);
+
+
+ ptr += sprintf(ptr, "{\r\n");
+ ptr += sprintf(ptr, " \"%s\": {\r\n", USER->Call);
+ ptr += sprintf(ptr, " \"queueLength\": %d,\r\n", Count);
+ ptr += sprintf(ptr, " \"to\": [%s],\r\n", TO);
+ ptr += sprintf(ptr, " \"at\": [%s],\r\n", AT);
+ ptr += sprintf(ptr, " \"hrp\": [%s],\r\n",HRP);
+ ptr += sprintf(ptr, " \"hrb\": [%s],\r\n",HRB);
+ ptr += sprintf(ptr, " \"times\": [%s],\r\n",TIMES);
+ ptr += sprintf(ptr, " \"connectScript\": [%s],\r\n",FWD);
+ ptr += sprintf(ptr, " \"bbsHa\": \"%s\",\r\n", (FWDInfo->BBSHA)?FWDInfo->BBSHA:"");
+ ptr += sprintf(ptr, " \"enableForwarding\": %s,\r\n", (FWDInfo->Enabled)?"true":"false");
+ ptr += sprintf(ptr, " \"forwardingInterval\": %s,\r\n", APIConvTime(FWDInfo->FwdInterval));
+ ptr += sprintf(ptr, " \"requestReverse\": %s,\r\n", (FWDInfo->ReverseFlag)?"true":"false");
+ ptr += sprintf(ptr, " \"reverseInterval\": %s,\r\n", APIConvTime(FWDInfo->RevFwdInterval));
+ ptr += sprintf(ptr, " \"sendNewMessagesWithoutWaiting\": %s,\r\n", (FWDInfo->SendNew)?"true":"false");
+ ptr += sprintf(ptr, " \"fbbBlocked\": %s,\r\n", (FWDInfo->AllowBlocked)?"true":"false");
+ ptr += sprintf(ptr, " \"maxBlock\": %d,\r\n", FWDInfo->MaxFBBBlockSize);
+ ptr += sprintf(ptr, " \"sendPersonalMailOnly\": %s,\r\n", (FWDInfo->PersonalOnly)?"true":"false");
+ ptr += sprintf(ptr, " \"allowBinary\": %s,\r\n", (FWDInfo->AllowCompressed)?"true":"false");
+ ptr += sprintf(ptr, " \"useB1Protocol\": %s,\r\n", (FWDInfo->AllowB1)?"true":"false");
+ ptr += sprintf(ptr, " \"useB2Protocol\": %s,\r\n", (FWDInfo->AllowB2)?"true":"false");
+ ptr += sprintf(ptr, " \"incomingConnectTimeout\": %s\r\n", APIConvTime(FWDInfo->ConTimeout));
+ ptr += sprintf(ptr, " }\r\n},\r\n");
+ }
+
+ if (response[n]) // No entries
+ {
+ response[strlen(response)-3 ] = '\0'; // remove ,\r\n
+ strcat(response, "\r\n");
+ }
+
+ return strlen(response);
+}
+
+
+
+/*
+{
+ "GB7BEX": {
+ "queueLength": 0,
+ "forwardingConfig": {
+ "to": [],
+ "at": [
+ "OARC",
+ "GBR",
+ "WW"
+ ],
+ "times": [],
+ "connectScript": [
+ "PAUSE 3",
+ "INTERLOCK 3",
+ "NC 3 !GB7BEX"
+ ],
+ "hierarchicalRoutes": [],
+ "hr": [
+ "#38.GBR.EURO"
+ ],
+ "bbsHa": "GB7BEX.#38.GBR.EURO",
+ "enableForwarding": true,
+ "forwardingInterval": "00:56:40",
+ "requestReverse": false,
+ "reverseInterval": "00:56:40",
+ "sendNewMessagesWithoutWaiting": true,
+ "fbbBlocked": true,
+ "maxBlock": 1000,
+ "sendPersonalMailOnly": false,
+ "allowBinary": true,
+ "useB1Protocol": false,
+ "useB2Protocol": true,
+ "sendCtrlZInsteadOfEx": false,
+ "incomingConnectTimeout": "00:02:00"
+ }
+ },
+ "GB7RDG": {
+ "queueLength": 0,
+ "forwardingConfig": {
+ "to": [],
+...
+ "incomingConnectTimeout": "00:02:00"
+ }
+ }
+}
+
+
+
+# HELP packetmail_queue_length The number of messages in the packetmail queue
+# TYPE packetmail_queue_length gauge
+packetmail_queue_length{partner="DM4RW"} 0 1729090716916
+packetmail_queue_length{partner="G8BPQ"} 3 1729090716916
+packetmail_queue_length{partner="GB7BEX"} 0 1729090716916
+packetmail_queue_length{partner="GB7BPQ"} 1 1729090716916
+packetmail_queue_length{partner="GB7MNS"} 0 1729090716916
+packetmail_queue_length{partner="GB7NOT"} 0 1729090716916
+packetmail_queue_length{partner="GB7NWL"} 0 1729090716916
+packetmail_queue_length{partner="GM8BPQ"} 0 1729090716916
+
+*/
\ No newline at end of file
diff --git a/makefile b/makefile
index 0bd8491..58534d7 100644
--- a/makefile
+++ b/makefile
@@ -13,22 +13,26 @@ OBJS = pngwtran.o pngrtran.o pngset.o pngrio.o pngwio.o pngtrans.o pngrutil.o pn
MailCommands.o MailDataDefs.o LinBPQ.o MailRouting.o MailTCP.o MBLRoutines.o md5.o Moncode.o \
NNTPRoutines.o RigControl.o TelnetV6.o WINMOR.o TNCCode.o UZ7HODrv.o WPRoutines.o \
SCSTrackeMulti.o SCSPactor.o SCSTracker.o HanksRT.o UIRoutines.o AGWAPI.o AGWMoncode.o \
- DRATS.o FreeDATA.o base64.o Events.o nodeapi.o mailapi.o
+ DRATS.o FreeDATA.o base64.o Events.o nodeapi.o mailapi.o mqtt.o
# Configuration:
CC = gcc
all: CFLAGS = -DLINBPQ -MMD -g -fcommon
+all: LDFLAGS = -l:libpaho-mqtt3a.a -l:libjansson.a
all: linbpq
+nomqtt: CFLAGS = -DLINBPQ -MMD -fcommon -g -DNOMQTT
+nomqtt: linbpq
+
noi2c: CFLAGS = -DLINBPQ -MMD -DNOI2C -g -fcommon
noi2c: linbpq
-
+
linbpq: $(OBJS)
- gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz -lpthread -lconfig -lpcap -o linbpq
+ gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq
sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
-include *.d
diff --git a/mqtt.c b/mqtt.c
new file mode 100644
index 0000000..51e5631
--- /dev/null
+++ b/mqtt.c
@@ -0,0 +1,382 @@
+
+#define _CRT_SECURE_NO_DEPRECATE
+
+#ifndef NOMQTT
+
+#include "MQTTAsync.h"
+#ifndef WIN32
+#include
+#endif
+
+#include "CHeaders.h"
+#include "asmstrucs.h"
+#include "mqtt.h"
+
+extern int MQTT_Connecting;
+extern int MQTT_Connected;
+
+
+DllExport int APIENTRY MQTTSend(char * topic, char * Msg, int MsgLen);
+
+MQTTAsync client = NULL;
+
+time_t MQTTLastStatus = 0;
+
+void MQTTSendStatus()
+{
+ char topic[256];
+ char payload[128];
+
+ sprintf(topic, "PACKETNODE/%s", NODECALLLOPPED);
+ strcpy(payload,"{\"status\":\"online\"}");
+
+ MQTTSend(topic, payload, strlen(payload));
+ MQTTLastStatus = time(NULL);
+}
+
+void MQTTTimer()
+{
+ if (MQTT_Connecting == 0 && MQTT_Connected == 0)
+ MQTTConnect(MQTT_HOST, MQTT_PORT, MQTT_USER, MQTT_PASS);
+
+ if ((time(NULL) - MQTTLastStatus) > 1800)
+ MQTTSendStatus();
+
+}
+
+
+void MQTTDisconnect()
+{
+ if (MQTT_Connected)
+ {
+ MQTTAsync_disconnectOptions disc_opts = MQTTAsync_disconnectOptions_initializer;
+
+ MQTTAsync_disconnect(client, &disc_opts);
+
+ MQTT_Connecting = MQTT_Connected = 0;
+
+ // Try to recconect. If it fails system will rety every minute
+
+ MQTTConnect(MQTT_HOST, MQTT_PORT, MQTT_USER, MQTT_PASS);
+ }
+}
+
+DllExport int APIENTRY MQTTSend(char * topic, char * Msg, int MsgLen)
+{
+ int rc;
+
+ MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+ MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+
+ pubmsg.payload = Msg;
+ pubmsg.payloadlen = MsgLen;
+ rc = MQTTAsync_sendMessage(client, topic, &pubmsg, &opts);
+
+ if (rc)
+ MQTTDisconnect();
+
+ return rc;
+}
+
+
+
+void onConnect(void* context, MQTTAsync_successData* response)
+{
+ MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+ MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+
+ MQTT_Connecting = 0;
+ MQTT_Connected = 1;
+
+ printf("Successful MQTT connection\n");
+
+ // Send start up message
+
+ MQTTSendStatus();
+
+}
+
+void onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+ printf("MQTT connection failed, rc %d\n", response ? response->code : 0);
+ MQTT_Connecting = 0;
+}
+
+
+
+char* jsonEncodeMessage(MESSAGE *msg)
+{
+ char From[10];
+ char To[10];
+
+ char buffer[1024];
+ unsigned long long SaveMMASK = MMASK;
+ BOOL SaveMTX = MTX;
+ BOOL SaveMCOM = MCOM;
+ BOOL SaveMUI = MUIONLY;
+ int len;
+ char *msg_str;
+ char payload_timestamp[16];
+
+ struct tm * TM = localtime(&msg->Timestamp);
+ sprintf(payload_timestamp, "%02d:%02d:%02d", TM->tm_hour, TM->tm_min, TM->tm_sec);
+
+
+ IntSetTraceOptionsEx(MMASK, TRUE, TRUE, FALSE);
+ From[ConvFromAX25(msg->ORIGIN, From)] = 0;
+ To[ConvFromAX25(msg->DEST, To)] = 0;
+
+ len = IntDecodeFrame(msg, buffer, msg->Timestamp, 0xffffffffffffffff, FALSE, FALSE);
+ IntSetTraceOptionsEx(SaveMMASK, SaveMTX, SaveMCOM, SaveMUI);
+
+ buffer[len] = 0;
+
+#ifdef WIN32
+
+ msg_str = zalloc(2048);
+
+ sprintf(msg_str, "{\"from\": \"%s\", \"to\": \"%s\", \"payload\": \"%s\", \"port\": %d, \"timestamp\": \"%s\"}",
+ From, To, buffer, msg->PORT, payload_timestamp);
+
+#else
+
+ json_t *root;
+
+ root = json_object();
+
+ json_object_set_new(root, "from", json_string(From));
+ json_object_set_new(root, "to", json_string(To));
+
+
+ json_object_set_new(root, "payload", json_string(buffer));
+ json_object_set_new(root, "port", json_integer(msg->PORT));
+ sprintf(payload_timestamp, "%02d:%02d:%02d", TM->tm_hour, TM->tm_min, TM->tm_sec);
+ json_object_set_new(root, "timestamp", json_string(payload_timestamp));
+ msg_str = json_dumps(root, 0);
+ json_decref(root);
+
+#endif
+
+ return msg_str;
+}
+
+void MQTTKISSTX(void *message)
+{
+ MESSAGE *msg = (MESSAGE *)message;
+ char topic[256];
+ char *msg_str;
+
+ sprintf(topic, "PACKETNODE/ax25/trace/bpqformat/%s/sent/%d", NODECALLLOPPED, msg->PORT);
+
+ msg_str = jsonEncodeMessage(msg);
+
+ MQTTSend(topic, msg_str, strlen(msg_str));
+
+ free(msg_str);
+}
+
+void MQTTKISSTX_RAW(char* buffer, int bufferLength, void* PORT)
+{
+ PPORTCONTROL PPORT = (PPORTCONTROL)PORT;
+ char topic[256];
+
+ sprintf(topic, "PACKETNODE/kiss/%s/sent/%d", NODECALLLOPPED, PPORT->PORTNUMBER);
+
+ MQTTSend(topic, buffer, bufferLength);
+}
+
+
+void MQTTKISSRX(void *message)
+{
+ MESSAGE *msg = (MESSAGE *)message;
+ char topic[256];
+ char *msg_str;
+
+
+ sprintf(topic, "PACKETNODE/ax25/trace/bpqformat/%s/rcvd/%d", NODECALLLOPPED, msg->PORT);
+ msg_str = jsonEncodeMessage(msg);
+
+ MQTTSend(topic, msg_str, strlen(msg_str));
+
+ free(msg_str);
+}
+
+void MQTTKISSRX_RAW(char* buffer, int bufferLength, void* PORT)
+{
+ PPORTCONTROL PPORT = (PPORTCONTROL)PORT;
+ char topic[256];
+
+ sprintf(topic, "PACKETNODE/kiss/%s/rcvd/%d", NODECALLLOPPED, PPORT->PORTNUMBER);
+
+ MQTTSend(topic, buffer, bufferLength);
+
+}
+
+void MQTTReportSession(char * Msg)
+{
+ char topic[256];
+ sprintf(topic, "PACKETNODE/stats/session/%s", NODECALLLOPPED);
+
+ MQTTSend(topic, Msg, strlen(Msg));
+}
+
+
+char* replace(char* str, char* a, char* b)
+{
+ int len = strlen(str);
+ int lena = strlen(a), lenb = strlen(b);
+ char * p;
+
+ for (p = str; p = strstr(p, a); p) {
+ if (lena != lenb) // shift end as needed
+ memmove(p + lenb, p + lena,
+ len - (p - str) + lenb);
+ memcpy(p, b, lenb);
+ }
+ return str;
+}
+
+int MQTTPublish(void *message, char *topic)
+{
+ MESSAGE *msg = (MESSAGE *)message;
+ char From[10];
+ char To[10];
+ MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+ MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+
+ unsigned long long SaveMMASK = MMASK;
+ BOOL SaveMTX = MTX;
+ BOOL SaveMCOM = MCOM;
+ BOOL SaveMUI = MUIONLY;
+ int len;
+ char* replaced_buffer;
+ char buffer[1024];
+
+ time_t timestamp = msg->Timestamp;
+
+
+ From[ConvFromAX25(msg->ORIGIN, From)] = 0;
+ To[ConvFromAX25(msg->DEST, To)] = 0;
+
+
+ IntSetTraceOptionsEx(8, TRUE, TRUE, FALSE);
+ len = IntDecodeFrame(msg, buffer, timestamp, 1, FALSE, FALSE);
+ IntSetTraceOptionsEx(SaveMMASK, SaveMTX, SaveMCOM, SaveMUI);
+
+ // MQTT _really_ doesn't like \r, so replace it with something
+ // that is at least human readable
+
+ replaced_buffer = replace(buffer, "\r", "\r\n");
+
+ pubmsg.payload = replaced_buffer;
+ pubmsg.payloadlen = strlen(replaced_buffer);
+
+ printf("%s\n", replaced_buffer);
+
+ return MQTTAsync_sendMessage(client, topic, &pubmsg, &opts);
+}
+
+int MQTTConnect(char* host, int port, char* user, char* pass)
+{
+ MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+ int rc;
+ char hostString[256];
+
+ sprintf(hostString, "tcp://%s:%d", host, port);
+
+ printf("MQTT Connect to %s\n", hostString);
+
+ rc = MQTTAsync_create(&client, hostString, NODECALLLOPPED, MQTTCLIENT_PERSISTENCE_NONE, NULL);
+
+ if (rc != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to create client, return code %d\n", rc);
+ return rc;
+ }
+
+ conn_opts.keepAliveInterval = 20;
+ conn_opts.cleansession = 1;
+ conn_opts.username = user;
+ conn_opts.password = pass;
+ conn_opts.onSuccess = onConnect;
+ conn_opts.onFailure = onConnectFailure;
+// conn_opts.automaticReconnect = 1;
+// conn_opts.minRetryInterval = 30;
+// conn_opts.maxRetryInterval = 300;
+
+ rc = MQTTAsync_connect(client, &conn_opts);
+
+ if (rc != MQTTASYNC_SUCCESS)
+ {
+ printf("Failed to start connect, return code %d\n", rc);
+ return rc;
+ }
+
+ MQTT_Connecting = 1;
+
+ return 0;
+}
+
+/*
+void MQTTMessageEvent(void* message)
+{
+ struct MsgInfo* msg = (struct MsgInfo *)message;
+ char *msg_str;
+ char * ptr;
+ MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+ MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+ char topic[256];
+
+ json_t *root = json_object();
+ json_object_set_new(root, "id", json_integer(msg->number));
+ json_object_set_new(root, "size", json_integer(msg->length));
+ json_object_set_new(root, "type", json_string(msg->type == 'P' ? "P" : "B"));
+ json_object_set_new(root, "to", json_string(msg->to));
+ json_object_set_new(root, "from", json_string(msg->from));
+ json_object_set_new(root, "subj", json_string(msg->title));
+
+ switch(msg->status) {
+ case 'N':
+ json_object_set_new(root, "event", json_string("newmsg"));
+ break;
+ case 'F':
+ json_object_set_new(root, "event", json_string("fwded"));
+ break;
+ case 'R':
+ json_object_set_new(root, "event", json_string("read"));
+ break;
+ case 'K':
+ json_object_set_new(root, "event", json_string("killed"));
+ break;
+ }
+
+ msg_str = json_dumps(root, 0);
+
+ pubmsg.payload = msg_str;
+ pubmsg.payloadlen = strlen(msg_str);
+
+
+ sprintf(topic, "PACKETNODE/event/%s/pmsg", NODECALLLOPPED);
+
+ MQTTAsync_sendMessage(client, topic, &pubmsg, &opts);
+}
+*/
+
+#else
+
+// Dummies ofr build without MQTT libraries
+
+int MQTTConnect(char* host, int port, char* user, char* pass)
+{
+ return 0;
+}
+
+void MQTTKISSTX(void *message) {};
+void MQTTKISSTX_RAW(char* buffer, int bufferLength, void* PORT) {};
+void MQTTKISSRX(void *message) {};
+void MQTTKISSRX_RAW(char* buffer, int bufferLength, void* PORT) {};
+void MQTTTimer() {};
+void MQTTReportSession(char * Msg) {};
+
+#endif
+
diff --git a/mqtt.h b/mqtt.h
new file mode 100644
index 0000000..63147d2
--- /dev/null
+++ b/mqtt.h
@@ -0,0 +1,10 @@
+int MQTTConnect(char* host, int port, char* user, char* pass);
+int MQTTPublish(void * msg, char *topic);
+
+void MQTTKISSTX(void *message);
+void MQTTKISSTX_RAW(char* buffer, int bufferLength, void* PORT);
+void MQTTKISSRX(void *message);
+void MQTTKISSRX_RAW(char* buffer, int bufferLength, void* PORT);
+
+void MQTTMessageEvent(void *message);
+
diff --git a/nodeapi.c b/nodeapi.c
index c5070e7..8ac9c3c 100644
--- a/nodeapi.c
+++ b/nodeapi.c
@@ -22,6 +22,20 @@ typedef struct Token {
struct Token* next;
} Token;
+typedef struct API
+{
+ char *URL;
+ int URLLen;
+ int (* APIRoutine)();
+ int Auth;
+} API;
+
+// Auth defines
+
+#define AuthNone 0
+#define AuthUser 1
+#define Auth BBSUser 2
+#define AuthSysop 4
// Function prototypes
void handle_request(SOCKET client_socket, char * request, char * response);
@@ -36,12 +50,12 @@ void add_token_to_list(Token* token);
Token* find_token(const char* token);
Token* generate_token();
-int sendPortList(char * response, char * token,int Flags);
-int sendNodeList(char * response, char * token,int Flags);
-int sendUserList(char * response, char * token,int Flags);
-int sendInfo(char * response, char * token, int Flags);
-int sendLinks(char * response, char * token, int Flags);
-int sendPortMHList(char * response, char * token, int param);
+int sendPortList(char * response, char * token, char * Rest);
+int sendNodeList(char * response, char * token, char * Rest);
+int sendUserList(char * response, char * token, char * Rest);
+int sendInfo(char * response, char * token, char * Rest);
+int sendLinks(char * response, char * token, char * Rest);
+int sendPortMHList(char * response, char * token, char * Rest);
void BuildPortMH(char * MHJSON, struct PORTCONTROL * PORT);
DllExport struct PORTCONTROL * APIENTRY GetPortTableEntryFromSlot(int portslot);
@@ -49,6 +63,21 @@ DllExport struct PORTCONTROL * APIENTRY GetPortTableEntryFromSlot(int portslot);
// Token list
Token* token_list = NULL;
+
+struct API APIList[] =
+{
+ "/api/ports", 10, sendPortList, 0,
+ "/api/nodes", 10, sendNodeList, 0,
+ "/api/info", 9, sendInfo, 0,
+ "/api/links", 10, sendLinks, 0,
+ "/api/users", 10, sendUserList, 0,
+ "/api/mheard", 11, sendPortMHList, 0
+};
+
+int APICount = sizeof(APIList) / sizeof(struct API);
+
+
+
int xx()
{
while (1)
@@ -67,7 +96,7 @@ int APIProcessHTTPMessage(char * response, char * Method, char * URL, char * req
const char * auth_header = "Authorization: Bearer ";
char * token_begin = strstr(request, auth_header);
char token[TOKEN_SIZE + 1]= "";
- int Flags = 0;
+ int Flags = 0, n;
// Node Flags isn't currently used
@@ -94,7 +123,7 @@ int APIProcessHTTPMessage(char * response, char * Method, char * URL, char * req
}
else
{
- // Token must be first param of URL
+ // There may be a token as first param, but if auth not needed may be misisng
Tok = strlop(URL, '?');
param = strlop(Tok, '&');
@@ -105,19 +134,34 @@ int APIProcessHTTPMessage(char * response, char * Method, char * URL, char * req
strcpy(token, Tok);
}
+ else param = Tok;
}
remove_expired_tokens(); // Tidy up
// Check if the request is for token generation
+ if (strcmp(Method, "OPTIONS") == 0)
+ {
+ // CORS Request
+
+ char Resp[] =
+ "HTTP/1.1 200 OK\r\n"
+ "Access-Control-Allow-Origin: *\r\n"
+ "Access-Control-Allow-Methods: POST, GET, OPTIONS\r\n"
+ "Access-Control-Allow-Headers: authorization";
+
+ return send_http_response(response, Resp);
+ }
+
if (strcmp(Method, "GET") != 0)
return send_http_response(response, "403 (Bad Method)");
if (_stricmp(URL, "/api/request_token") == 0)
return request_token(response);
- if (token[0] == 0)
+/*
+if (token[0] == 0)
{
// Extract the token from the request (assuming it's present in the request headers)
if (token_begin == NULL)
@@ -137,20 +181,26 @@ int APIProcessHTTPMessage(char * response, char * Method, char * URL, char * req
return send_http_response(response, "401 Unauthorized");
}
+ */
+
// Determine the requested API endpoint
- if (_stricmp(URL, "/api/ports") == 0)
- return sendPortList(response, token, Flags);
- else if (_stricmp(URL, "/api/nodes") == 0)
- return sendNodeList(response, token, Flags);
- else if (_stricmp(URL, "/api/users") == 0)
- return sendUserList(response, token, Flags);
- else if (_stricmp(URL, "/api/info") == 0)
- return sendInfo(response, token, Flags);
- else if (_stricmp(URL, "/api/links") == 0)
- return sendLinks(response, token, Flags);
- else if (strstr(URL, "/api/mheardport") != 0)
- return sendPortMHList(response, token, atoi(param));
+ for (n = 0; n < APICount; n++)
+ {
+ struct API * APIEntry;
+ char * rest;
+
+ APIEntry = &APIList[n];
+
+ if (_memicmp(URL, APIEntry->URL, APIEntry->URLLen) == 0)
+ {
+ rest = &request[4 + APIEntry->URLLen]; // Anything following?
+
+ if (rest[0] == ' ' || rest[0] == '/' || rest[0] == '?')
+ return APIEntry->APIRoutine(response, token, rest);
+ }
+
+ }
return send_http_response(response, "401 Invalid API Call");
}
@@ -294,7 +344,7 @@ int send_http_response(char * response, const char* msg)
extern int MasterPort[MAXBPQPORTS+1]; // Pointer to first BPQ port for a specific MPSK or UZ7HO host
-int sendPortList(char * response, char * token, int Flags)
+int sendPortList(char * response, char * token, char * param)
{
char * Array = 0;
int ArrayLen = 0;
@@ -506,7 +556,7 @@ extern struct DEST_LIST * DESTS; // NODE LIST
extern int DEST_LIST_LEN;
-int sendNodeList(char * response, char * token, int Flags)
+int sendNodeList(char * response, char * token, char * param)
{
int ArrayPtr = 0;
@@ -610,16 +660,16 @@ int sendNodeList(char * response, char * token, int Flags)
}
-int sendUserList(char * response, char * token, int Flags)
+int sendUserList(char * response, char * token, char * param)
{
int ArrayPtr = 0;
int n = MAXCIRCUITS;
TRANSPORTENTRY * L4 = L4TABLE;
- TRANSPORTENTRY * Partner;
+// TRANSPORTENTRY * Partner;
int MaxLinks = MAXLINKS;
char State[12] = "", Type[12] = "Uplink";
char LHS[50] = "", MID[10] = "", RHS[50] = "";
- char Line[100];
+// char Line[100];
char Normcall[10];
int len;
@@ -634,7 +684,7 @@ int sendUserList(char * response, char * token, int Flags)
len = ConvFromAX25(L4->L4USER, Normcall);
Normcall[len] = 0;
- ArrayPtr += sprintf(&response[ArrayPtr], " {\"Call\", \"%s\"},\r\n", Normcall);
+ ArrayPtr += sprintf(&response[ArrayPtr], " {\"Call\": \"%s\"},\r\n", Normcall);
L4++;
}
}
@@ -656,7 +706,7 @@ extern char MYALIASLOPPED[];
extern char TextVerstring[];
extern char LOCATOR[];
-int sendInfo(char * response, char * token, int Flags)
+int sendInfo(char * response, char * token, char * param)
{
char call[10];
@@ -669,7 +719,7 @@ int sendInfo(char * response, char * token, int Flags)
return strlen(response);
}
-int sendLinks(char * response, char * token, int Flags)
+int sendLinks(char * response, char * token, char * param)
{
struct _LINKTABLE * Links = LINKS;
int MaxLinks = MAXLINKS;
@@ -734,19 +784,37 @@ int sendLinks(char * response, char * token, int Flags)
return ReplyLen;
}
-int sendPortMHList(char * response, char * token, int param)
+int sendPortMHList(char * response, char * token, char * param)
{
- struct PORTCONTROL * PORTVEC = GetPortTableEntryFromPortNum(param);
+ struct PORTCONTROL * PORTVEC ;
+ int n;
+ int port = 0;
+ if (param[0] = '?' || param[0] == '/')
+ port = atoi(¶m[1]);
+
+ PORTVEC = GetPortTableEntryFromPortNum(port);
response[0] = 0;
if (PORTVEC == 0)
return send_http_response(response, "401 Invalid API Call");
- BuildPortMH( response, PORTVEC );
- response[ strlen(response)-3 ] = '\0'; // remove ,\r\n
+ n = sprintf(response,"{\"mheard\":[\r\n");
+
+ BuildPortMH(&response[n], PORTVEC );
+
+ if (response[n] == 0) // No entries
+ {
+ response[strlen(response) - 2] = '\0'; // remove \r\n
+ strcat(response, "]}\r\n");
+ }
+ else
+ {
+ response[strlen(response)-3 ] = '\0'; // remove ,\r\n
+ strcat(response, "\r\n]}\r\n");
// printf("MH for port %d:\r\n%s\r\n", PORTVEC->PORTNUMBER, response);
- return strlen(response);
+ }
+ return strlen(response);
}
diff --git a/paho-mqtt3a.dll b/paho-mqtt3a.dll
new file mode 100644
index 0000000..e978f04
Binary files /dev/null and b/paho-mqtt3a.dll differ
diff --git a/paho-mqtt3a.lib b/paho-mqtt3a.lib
new file mode 100644
index 0000000..1fb6329
Binary files /dev/null and b/paho-mqtt3a.lib differ
diff --git a/tncinfo.h b/tncinfo.h
index db29429..b5b3edb 100644
--- a/tncinfo.h
+++ b/tncinfo.h
@@ -222,6 +222,9 @@ struct STREAMINFO
char MyCall[10] ; // Call we are using
char RemoteCall[10]; // Callsign
+ char callingCall[10]; // for reporting. My abnd Remote calls depend on which end connected
+ char receivingCall[10]; // for reporting. Link and Our calls depand on which end connected
+
char AGWKey[21]; // Session Key for AGW Session Based Drivers
time_t ConnectTime; // Time connection made