martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aqhome: started working on MTQQ client.

Browse Source
This commit is contained in:
Martin Preuss
2023-03-28 21:43:01 +02:00
parent 8d89d7a1a3
commit 562b3d863d
10 changed files with 831 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aqhome/0BUILD
View File

@@ -60,6 +60,7 @@
msg
ipc
nodes
mqtt
</subdirs>
@@ -67,6 +68,7 @@
aqhmsg
aqhipc
aqhnodes
aqhmqtt
</useTargets>
<libraries>

90
aqhome/libtest.c
View File

@@ -9,6 +9,8 @@
#include "aqhome/msg/endpoint_log.h"
#include "aqhome/msg/endpoint_tty.h"
#include "aqhome/ipc/endpoint_node_ipc_tcp.h"
#include "aqhome/mqtt/endpoint_mqttc.h"
#include "aqhome/mqtt/msg_mqtt_connect.h"
#include "aqhome/msgmanager.h"
#include "aqhome/aqhome.h"
@@ -17,7 +19,8 @@
#include <gwenhywfar/text.h>
#include <gwenhywfar/gwentime.h>
#include <gwenhywfar/buffer.h>
#include <gwenhywfar/endpoint_ipc_tcp.h>
#include <gwenhywfar/endpoint_tcpd_ipc.h>
#include <gwenhywfar/endpoint_tcpc.h>
#include <unistd.h>
#include <time.h>
@@ -120,7 +123,7 @@ int testEndpoints()
}
GWEN_MsgEndpointMgr_AddEndpoint(emgr, epLog);
epTcp=AQH_TcpIpcNodeEndpoint_new(NULL, "127.0.0.1", 45454, AQH_MSGMGR_ENDPOINTGROUP_IPC);
epTcp=AQH_TcpdIpcNodeEndpoint_new("127.0.0.1", 45454, NULL, AQH_MSGMGR_ENDPOINTGROUP_IPC);
if (epTcp==NULL) {
DBG_ERROR(AQH_LOGDOMAIN, "Error creating endpoint TCP");
return 2;
@@ -136,11 +139,92 @@ int testEndpoints()
int testMsgMqttConnect()
{
GWEN_MSG *msg;
GWEN_BUFFER *dbuf;
msg=GWEN_ConnectMqttMsg_new("MQTT", 4,
AQH_MQTTMSG_CONNECT_FLAGS_USERNAME | AQH_MQTTMSG_CONNECT_FLAGS_PASSWD,
512,
"CLIENTID123",
"USER123",
"PASSWD123");
if (msg==NULL) {
DBG_ERROR(NULL, "Error creating message");
return 2;
}
dbuf=GWEN_Buffer_new(0, 256, 0, 1);
AQH_ConnectMqttMsg_DumpToBuffer(msg, dbuf, "created");
fprintf(stdout, "%s\n", GWEN_Buffer_GetStart(dbuf));
GWEN_Buffer_free(dbuf);
GWEN_Text_DumpString((const char*) GWEN_Msg_GetConstBuffer(msg), GWEN_Msg_GetBytesInBuffer(msg), 2);
return 0;
}
int testMqttConnection()
{
int rv;
GWEN_MSG_ENDPOINT_MGR *emgr;
GWEN_MSG_ENDPOINT *epTcp;
GWEN_MSG *msgOut;
rv=AQH_Init();
if (rv<0) {
}
//emgr=AQH_MsgManager_new(0xc0);
emgr=GWEN_MsgEndpointMgr_new();
epTcp=AQH_MqttClientEndpoint_new("127.0.0.1", 1883, "MQTTClient", 0);
if (epTcp==NULL) {
DBG_ERROR(NULL, "Error creating endpoint TCPc");
return 2;
}
GWEN_MsgEndpointMgr_AddEndpoint(emgr, epTcp);
rv=GWEN_TcpcEndpoint_StartConnect(epTcp);
if (rv<0) {
DBG_ERROR(NULL, "Error starting connect (%d)", rv);
return 2;
}
msgOut=GWEN_ConnectMqttMsg_new("MQTT", 4, 0, 10, "CLIENTID123", NULL, NULL);
if (msgOut==NULL) {
DBG_ERROR(NULL, "Error creating message");
return 2;
}
GWEN_MsgEndpoint_AddSendMessage(epTcp, msgOut);
for (;;) {
GWEN_MSG *msg;
DBG_DEBUG(AQH_LOGDOMAIN, "Next loop");
//GWEN_MsgManager_LoopOnce(emgr);
GWEN_MsgEndpointMgr_IoLoopOnce(emgr);
msg=GWEN_MsgEndpoint_TakeFirstReceivedMessage(epTcp);
if (msg) {
DBG_ERROR(NULL, "Received this message:");
GWEN_Text_DumpString((const char*) GWEN_Msg_GetConstBuffer(msg), GWEN_Msg_GetBytesInBuffer(msg), 2);
GWEN_Msg_free(msg);
break;
}
}
return 0;
}
int main(int argc, char **argv)
{
return testEndpoints();
//return testEndpoints();
//return testMsgMqttConnect();
return testMqttConnection();
}

82
aqhome/mqtt/0BUILD Normal file
View File

@@ -0,0 +1,82 @@
<?xml?>
<gwbuild>
<target type="ConvenienceLibrary" name="aqhmqtt" >
<includes type="c" >
$(gwenhywfar_cflags)
-I$(topsrcdir)
-I$(topbuilddir)
</includes>
<includes type="tm2" >
--include=$(builddir)
--include=$(srcdir)
</includes>
<define name="BUILDING_AQHOME" />
<setVar name="local/cflags">$(visibility_cflags)</setVar>
<setVar name="tm2flags" >
--api=AQHOME_API
</setVar>
<setVar name="local/typefiles" >
</setVar>
<setVar name="local/built_sources" >
</setVar>
<setVar name="local/built_headers_pub">
</setVar>
<setVar name="local/built_headers_priv" >
</setVar>
<headers dist="false" install="$(pkgincludedir)/ipc" >
$(local/built_headers_pub)
</headers>
<headers dist="true" install="$(pkgincludedir)/ipc" >
endpoint_mqttc.h
msg_mqtt.h
msg_mqtt_connect.h
</headers>
<headers dist="true" >
</headers>
<sources>
$(local/typefiles)
endpoint_mqttc.c
msg_mqtt.c
msg_mqtt_connect.c
</sources>
<extradist>
</extradist>
<useTargets>
</useTargets>
<subdirs>
</subdirs>
</target>
</gwbuild>

121
aqhome/mqtt/endpoint_mqttc.c Normal file
View File

@@ -0,0 +1,121 @@
/****************************************************************************
* This file is part of the project AqHome.
* AqHome (c) by 2023 Martin Preuss, all rights reserved.
*
* The license for this file can be found in the file COPYING which you
* should have received along with this file.
****************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "aqhome/mqtt/endpoint_mqttc_p.h"
#include "aqhome/mqtt/msg_mqtt.h"
#include <gwenhywfar/endpoint_tcpc.h>
#include <gwenhywfar/debug.h>
#define GWEN_MSG_ENDPOINT_MQTTC_NAME "mqttc"
#define GWEN_ENDPOINT_MQTTC_BUFFERSIZE 1024
GWEN_INHERIT(GWEN_MSG_ENDPOINT, AQH_ENDPOINT_MQTTC)
static void GWENHYWFAR_CB _freeData(void *bp, void *p);
static int _isMsgComplete(GWEN_MSG_ENDPOINT *ep, GWEN_MSG *msg);
static int _calcAndSetPayloadSizeAndOffset(GWEN_MSG *msg);
GWEN_MSG_ENDPOINT *AQH_MqttClientEndpoint_new(const char *host, int port, const char *name, int groupId)
{
GWEN_MSG_ENDPOINT *ep;
AQH_ENDPOINT_MQTTC *xep;
ep=GWEN_TcpcEndpoint_new(host, port, name?name:GWEN_MSG_ENDPOINT_MQTTC_NAME, groupId);
if (ep==NULL) {
DBG_INFO(AQH_LOGDOMAIN, "here");
return NULL;
}
GWEN_NEW_OBJECT(AQH_ENDPOINT_MQTTC, xep);
GWEN_INHERIT_SETDATA(GWEN_MSG_ENDPOINT, AQH_ENDPOINT_MQTTC, ep, xep, _freeData);
GWEN_MsgEndpoint_SetDefaultBufferSize(ep, GWEN_ENDPOINT_MQTTC_BUFFERSIZE);
GWEN_MsgEndpoint_SetIsMsgCompleteFn(ep, _isMsgComplete);
return ep;
}
void _freeData(void *bp, void *p)
{
AQH_ENDPOINT_MQTTC *xep;
xep=(AQH_ENDPOINT_MQTTC*) p;
GWEN_FREE_OBJECT(xep);
}
int _isMsgComplete(GWEN_UNUSED GWEN_MSG_ENDPOINT *ep, GWEN_MSG *msg)
{
int rv;
if (!(GWEN_Msg_GetFlags(msg) & GWEN_MSG_FLAGS_PAYLOADINFO_SET)) {
rv=_calcAndSetPayloadSizeAndOffset(msg);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
return rv;
}
}
rv=AQH_MqttMsg_IsMsgComplete(msg);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
return rv;
}
return rv;
}
int _calcAndSetPayloadSizeAndOffset(GWEN_MSG *msg)
{
int remainingBytesInBuffer;
uint32_t mqttRemainingLength=0;
remainingBytesInBuffer=GWEN_Msg_GetBytesInBuffer(msg);
if (remainingBytesInBuffer>1) {
const uint8_t *ptr;
int idx;
ptr=GWEN_Msg_GetConstBuffer(msg);
idx=1;
remainingBytesInBuffer--;
while(remainingBytesInBuffer) {
uint8_t len;
len=ptr[idx];
mqttRemainingLength<<=8;
mqttRemainingLength+=(len & 0x7f);
if (!(len & 0x80)) {
/* last byte of size */
GWEN_Msg_SetParsedPayloadSize(msg, mqttRemainingLength);
GWEN_Msg_SetParsedPayloadOffset(msg, idx+1); /* payload follows at next byte */
GWEN_Msg_AddFlags(msg, GWEN_MSG_FLAGS_PAYLOADINFO_SET);
return 1; /* size successfully determined */
}
}
}
return 0;
}

25
aqhome/mqtt/endpoint_mqttc.h Normal file
View File

@@ -0,0 +1,25 @@
/****************************************************************************
* This file is part of the project AqHome.
* AqHome (c) by 2023 Martin Preuss, all rights reserved.
*
* The license for this file can be found in the file COPYING which you
* should have received along with this file.
****************************************************************************/
#ifndef AQH_ENDPOINT_MQTTC_H
#define AQH_ENDPOINT_MQTTC_H
#include <aqhome/api.h>
#include <gwenhywfar/endpoint.h>
AQHOME_API GWEN_MSG_ENDPOINT *AQH_MqttClientEndpoint_new(const char *host, int port, const char *name, int groupId);
#endif

26
aqhome/mqtt/endpoint_mqttc_p.h Normal file
View File

@@ -0,0 +1,26 @@
/****************************************************************************
* This file is part of the project AqHome.
* AqHome (c) by 2023 Martin Preuss, all rights reserved.
*
* The license for this file can be found in the file COPYING which you
* should have received along with this file.
****************************************************************************/
#ifndef AQH_ENDPOINT_MQTTC_P_H
#define AQH_ENDPOINT_MQTTC_P_H
#include "aqhome/mqtt/endpoint_mqttc.h"
typedef struct AQH_ENDPOINT_MQTTC AQH_ENDPOINT_MQTTC;
struct AQH_ENDPOINT_MQTTC {
int dummy;
};
#endif

153
aqhome/mqtt/msg_mqtt.c Normal file
View File

@@ -0,0 +1,153 @@
/****************************************************************************
* This file is part of the project AqHome.
* AqHome (c) by 2023 Martin Preuss, all rights reserved.
*
* The license for this file can be found in the file COPYING which you
* should have received along with this file.
****************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "aqhome/mqtt/msg_mqtt.h"
#include <gwenhywfar/debug.h>
// maximum remaining length: fff ffff
static void _flagsToDb(uint8_t flags, GWEN_DB_NODE *dbDest, const char *varNameFlags, const char *varNameQos);
GWEN_MSG *GWEN_MqttMsg_new(uint8_t typeAndFlags, uint32_t payloadLen, const uint8_t *payload)
{
if (payloadLen>0xfffffffu) {
DBG_ERROR(AQH_LOGDOMAIN, "Too many bytes in payload, can't encode into MQTT message");
return NULL;
}
else {
GWEN_MSG *msg;
uint8_t *ptr;
uint32_t i;
uint32_t len;
msg=GWEN_Msg_new(payloadLen+1+4);
ptr=GWEN_Msg_GetBuffer(msg);
*(ptr++)=typeAndFlags;
len=payloadLen;
i=0;
do {
uint8_t b;
b=len & 0x7f;
len>>=7;
if (len)
b|=0x80;
*(ptr++)=b;
} while(len && i<4);
if (payloadLen) {
GWEN_Msg_SetParsedPayloadSize(msg, payloadLen);
GWEN_Msg_SetParsedPayloadOffset(msg, ptr-GWEN_Msg_GetBuffer(msg));
memmove(ptr, payload, payloadLen);
ptr+=payloadLen;
}
i=ptr-GWEN_Msg_GetBuffer(msg);
GWEN_Msg_SetBytesInBuffer(msg, i);
return msg;
}
}
int AQH_MqttMsg_IsMsgComplete(const GWEN_MSG *msg)
{
if (msg && (GWEN_Msg_GetFlags(msg) & GWEN_MSG_FLAGS_PAYLOADINFO_SET)) {
uint32_t msgLength;
msgLength=GWEN_Msg_GetParsedPayloadOffset(msg)+GWEN_Msg_GetParsedPayloadSize(msg);
if (GWEN_Msg_GetBytesInBuffer(msg)>=msgLength)
return 1;
}
return 0;
}
void AQH_MqttMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText)
{
}
int AQH_MqttMsg_toDb(const GWEN_MSG *msg, GWEN_DB_NODE *dbDest)
{
const uint8_t *msgPtr;
uint32_t msgLen;
uint8_t b;
const char *s;
msgPtr=GWEN_Msg_GetConstBuffer(msg);
msgLen=GWEN_Msg_GetBytesInBuffer(msg);
if (msgLen<2) {
DBG_ERROR(AQH_LOGDOMAIN, "Message too small (%d bytes)", msgLen);
return GWEN_ERROR_BAD_DATA;
}
b=msgPtr[0];
s=AQH_MqttMsg_MsgTypeToString(b);
GWEN_DB_SetCharValue(dbDest, GWEN_DB_FLAGS_OVERWRITE_VARS, "cmdString", s);
GWEN_DB_SetIntValue(dbDest, GWEN_DB_FLAGS_OVERWRITE_VARS, "cmdAndFlags", b);
_flagsToDb(b & 0x0f, dbDest, "flags", "qos");
return 0;
}
const char *AQH_MqttMsg_MsgTypeToString(uint8_t t)
{
switch(t & 0xf0) {
case (AQH_MQTTMSG_MSGTYPE_CONNECT & 0xf0): return "CONNECT";
case (AQH_MQTTMSG_MSGTYPE_CONNACK & 0xf0): return "CONACK";
case (AQH_MQTTMSG_MSGTYPE_PUBLISH & 0xf0): return "PUBLISH";
case (AQH_MQTTMSG_MSGTYPE_PUBACK & 0xf0): return "PUBACK";
case (AQH_MQTTMSG_MSGTYPE_PUBREC & 0xf0): return "PUBREC";
case (AQH_MQTTMSG_MSGTYPE_PUBREL & 0xf0): return "PUBREL";
case (AQH_MQTTMSG_MSGTYPE_PUBCOMP & 0xf0): return "PUBCOMP";
case (AQH_MQTTMSG_MSGTYPE_SUBSCRIBE & 0xf0): return "SUBSCRIBE";
case (AQH_MQTTMSG_MSGTYPE_SUBACK & 0xf0): return "SUBACK";
case (AQH_MQTTMSG_MSGTYPE_UNSUBSCRIBE & 0xf0): return "UNSUBSCRIBE";
case (AQH_MQTTMSG_MSGTYPE_UNSUBACK & 0xf0): return "UNSUBACK";
case (AQH_MQTTMSG_MSGTYPE_PINGREQ & 0xf0): return "PINGREQ";
case (AQH_MQTTMSG_MSGTYPE_PINGRESP & 0xf0): return "PINGRESP";
case (AQH_MQTTMSG_MSGTYPE_DISCONNECT & 0xf0): return "DISCONNECT";
default: return "(unknown)";
}
}
void _flagsToDb(uint8_t flags, GWEN_DB_NODE *dbDest, const char *varNameFlags, const char *varNameQos)
{
GWEN_DB_DeleteVar(dbDest, varNameFlags);
GWEN_DB_DeleteVar(dbDest, varNameQos);
if (flags & AQH_MQTTMSG_FLAGS_DUP)
GWEN_DB_SetCharValue(dbDest, GWEN_DB_FLAGS_DEFAULT, varNameFlags, "dup");
if (flags & AQH_MQTTMSG_FLAGS_RETAIN)
GWEN_DB_SetCharValue(dbDest, GWEN_DB_FLAGS_DEFAULT, varNameFlags, "retain");
GWEN_DB_SetIntValue(dbDest, GWEN_DB_FLAGS_DEFAULT, varNameQos, (flags>>1) & 0x3);
}

59
aqhome/mqtt/msg_mqtt.h Normal file
View File

@@ -0,0 +1,59 @@
/****************************************************************************
* This file is part of the project AqHome.
* AqHome (c) by 2023 Martin Preuss, all rights reserved.
*
* The license for this file can be found in the file COPYING which you
* should have received along with this file.
****************************************************************************/
#ifndef AQH_MSG_MQTT_H
#define AQH_MSG_MQTT_H
#include <aqhome/api.h>
#include <gwenhywfar/msg.h>
#include <gwenhywfar/buffer.h>
#include <gwenhywfar/db.h>
#define AQH_MQTTMSG_OFFS_CONTROL 0
#define AQH_MQTTMSG_OFFS_REMAINING_LENGTH 1
/* from https://docs.solace.com/API/MQTT-311-Prtl-Conformance-Spec/MQTT%20Control%20Packet%20format.htm
*/
#define AQH_MQTTMSG_MSGTYPE_CONNECT 0x10u
#define AQH_MQTTMSG_MSGTYPE_CONNACK 0x20u
#define AQH_MQTTMSG_MSGTYPE_PUBLISH 0x30u
#define AQH_MQTTMSG_MSGTYPE_PUBACK 0x40u
#define AQH_MQTTMSG_MSGTYPE_PUBREC 0x50u /* assured delivery part 1 */
#define AQH_MQTTMSG_MSGTYPE_PUBREL 0x62u /* assured delivery part 2 */
#define AQH_MQTTMSG_MSGTYPE_PUBCOMP 0x70u /* assured delivery part 3 */
#define AQH_MQTTMSG_MSGTYPE_SUBSCRIBE 0x82u
#define AQH_MQTTMSG_MSGTYPE_SUBACK 0x90u
#define AQH_MQTTMSG_MSGTYPE_UNSUBSCRIBE 0xa2u
#define AQH_MQTTMSG_MSGTYPE_UNSUBACK 0xb0u
#define AQH_MQTTMSG_MSGTYPE_PINGREQ 0xc0u
#define AQH_MQTTMSG_MSGTYPE_PINGRESP 0xd0u
#define AQH_MQTTMSG_MSGTYPE_DISCONNECT 0xe0u
#define AQH_MQTTMSG_FLAGS_DUP 0x08u
#define AQH_MQTTMSG_FLAGS_QOS2 0x04u
#define AQH_MQTTMSG_FLAGS_QOS1 0x02u
#define AQH_MQTTMSG_FLAGS_RETAIN 0x01u
AQHOME_API GWEN_MSG *GWEN_MqttMsg_new(uint8_t typeAndFlags, uint32_t payloadLen, const uint8_t *payload);
AQHOME_API int AQH_MqttMsg_IsMsgComplete(const GWEN_MSG *msg);
AQHOME_API void AQH_MqttMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText);
AQHOME_API const char *AQH_MqttMsg_MsgTypeToString(uint8_t t);
#endif

223
aqhome/mqtt/msg_mqtt_connect.c Normal file
View File

@@ -0,0 +1,223 @@
/****************************************************************************
* This file is part of the project AqHome.
* AqHome (c) by 2023 Martin Preuss, all rights reserved.
*
* The license for this file can be found in the file COPYING which you
* should have received along with this file.
****************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "aqhome/mqtt/msg_mqtt_connect.h"
#include <gwenhywfar/debug.h>
static int _dumpPayload(const uint8_t *payloadPtr, uint32_t payloadLen, GWEN_BUFFER *dbuf);
static void _appendStringWithLen(GWEN_BUFFER *buf, const char *s);
static int _dumpString(const uint8_t *ptr, uint32_t len, GWEN_BUFFER *buf);
GWEN_MSG *GWEN_ConnectMqttMsg_new(const char *protoName,
uint8_t protoLevel,
uint8_t connectFlags,
uint16_t keepAliveTime,
const char *clientId,
const char *userName,
const char *password)
{
GWEN_MSG *msg;
GWEN_BUFFER *buf;
buf=GWEN_Buffer_new(0, 64, 0, 1);
_appendStringWithLen(buf, protoName?protoName:"MQTT");
GWEN_Buffer_AppendByte(buf, protoLevel?protoLevel:4);
GWEN_Buffer_AppendByte(buf, connectFlags);
GWEN_Buffer_AppendByte(buf, (keepAliveTime>>8) & 0xff);
GWEN_Buffer_AppendByte(buf, keepAliveTime & 0xff);
_appendStringWithLen(buf, clientId);
/* here could be inserted: will topic, will message */
if (connectFlags & AQH_MQTTMSG_CONNECT_FLAGS_USERNAME)
_appendStringWithLen(buf, userName);
if (connectFlags & AQH_MQTTMSG_CONNECT_FLAGS_PASSWD)
_appendStringWithLen(buf, password);
msg=GWEN_MqttMsg_new(AQH_MQTTMSG_MSGTYPE_CONNECT, GWEN_Buffer_GetUsedBytes(buf), (const uint8_t*) GWEN_Buffer_GetStart(buf));
GWEN_Buffer_free(buf);
if (msg==NULL) {
DBG_INFO(AQH_LOGDOMAIN, "here");
return NULL;
}
return msg;
}
void AQH_ConnectMqttMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText)
{
const uint8_t *msgPtr;
uint32_t msgLen;
msgPtr=GWEN_Msg_GetConstBuffer(msg);
msgLen=GWEN_Msg_GetBytesInBuffer(msg);
if (msgLen>1) {
uint32_t payloadLen;
const uint8_t *payloadPtr;
int rv;
payloadLen=GWEN_Msg_GetParsedPayloadSize(msg);
payloadPtr=msgPtr+GWEN_Msg_GetParsedPayloadOffset(msg);
GWEN_Buffer_AppendArgs(dbuf, "%s %s", AQH_MqttMsg_MsgTypeToString(msgPtr[0] & 0xf0), sText);
GWEN_Buffer_AppendString(dbuf, "(");
rv=_dumpPayload(payloadPtr, payloadLen, dbuf);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
}
else {
GWEN_Buffer_AppendString(dbuf, ")");
}
}
}
int _dumpPayload(const uint8_t *payloadPtr, uint32_t payloadLen, GWEN_BUFFER *dbuf)
{
int rv;
uint8_t connectFlags;
uint16_t keepAliveTime;
GWEN_Buffer_AppendString(dbuf, "proto: ");
rv=_dumpString(payloadPtr, payloadLen, dbuf);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
return rv;
}
payloadLen-=rv;
payloadPtr+=rv;
if (payloadLen<4) { /* expect at least proto ver(1), flags(1) and keepAlive(2) bytes */
DBG_ERROR(AQH_LOGDOMAIN, "Msg too small");
return GWEN_ERROR_BAD_DATA;
}
else {
GWEN_Buffer_AppendArgs(dbuf, " proto ver: %d", payloadPtr[0]);
payloadLen--;
payloadPtr++;
connectFlags=payloadPtr[0];
GWEN_Buffer_AppendArgs(dbuf, " flags: %02x", connectFlags);
payloadLen--;
payloadPtr++;
keepAliveTime=(payloadPtr[0]<<8)+payloadPtr[1];
GWEN_Buffer_AppendArgs(dbuf, " keep alive: %d", keepAliveTime);
payloadLen-=2;
payloadPtr+=2;
}
GWEN_Buffer_AppendString(dbuf, " client id: ");
rv=_dumpString(payloadPtr, payloadLen, dbuf);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
return rv;
}
payloadLen-=rv;
payloadPtr+=rv;
if (connectFlags & AQH_MQTTMSG_CONNECT_FLAGS_WILL_FLAG) {
GWEN_Buffer_AppendString(dbuf, " will topic: ");
rv=_dumpString(payloadPtr, payloadLen, dbuf);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
return rv;
}
payloadLen-=rv;
payloadPtr+=rv;
GWEN_Buffer_AppendString(dbuf, " will msg: ");
rv=_dumpString(payloadPtr, payloadLen, dbuf);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
return rv;
}
payloadLen-=rv;
payloadPtr+=rv;
}
if (connectFlags & AQH_MQTTMSG_CONNECT_FLAGS_USERNAME) {
GWEN_Buffer_AppendString(dbuf, " username: ");
rv=_dumpString(payloadPtr, payloadLen, dbuf);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
return rv;
}
payloadLen-=rv;
payloadPtr+=rv;
}
if (connectFlags & AQH_MQTTMSG_CONNECT_FLAGS_PASSWD) {
GWEN_Buffer_AppendString(dbuf, " password: ");
rv=_dumpString(payloadPtr, payloadLen, dbuf);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
return rv;
}
payloadLen-=rv;
payloadPtr+=rv;
}
return 0;
}
void _appendStringWithLen(GWEN_BUFFER *buf, const char *s)
{
unsigned int len;
len=strlen(s);
GWEN_Buffer_AppendByte(buf, (len>>8) & 0xff);
GWEN_Buffer_AppendByte(buf, len & 0xff);
if (s && *s)
GWEN_Buffer_AppendString(buf, s);
}
int _dumpString(const uint8_t *ptr, uint32_t len, GWEN_BUFFER *buf)
{
if (len>1) {
int slen;
slen=(ptr[0]<<8)+ptr[1];
if (slen) {
if (slen>(len-2)) {
DBG_ERROR(AQH_LOGDOMAIN, "Invalid string length (%lu, remaining %lu)",
(unsigned long int) slen, (unsigned long int) len);
return GWEN_ERROR_BAD_DATA;
}
GWEN_Buffer_AppendBytes(buf, (const char*) ptr+2, slen);
}
return slen+2;
}
return GWEN_ERROR_BAD_DATA;
}

53
aqhome/mqtt/msg_mqtt_connect.h Normal file
View File

@@ -0,0 +1,53 @@
/****************************************************************************
* This file is part of the project AqHome.
* AqHome (c) by 2023 Martin Preuss, all rights reserved.
*
* The license for this file can be found in the file COPYING which you
* should have received along with this file.
****************************************************************************/
#ifndef AQH_MSG_MQTT_CONNECT_H
#define AQH_MSG_MQTT_CONNECT_H
#include <aqhome/api.h>
#include <aqhome/mqtt/msg_mqtt.h>
#include <gwenhywfar/msg.h>
#include <gwenhywfar/buffer.h>
#define AQH_MQTTMSG_CONNECT_FLAGS_USERNAME 0x80u
#define AQH_MQTTMSG_CONNECT_FLAGS_PASSWD 0x40u
#define AQH_MQTTMSG_CONNECT_FLAGS_WILL_RETAIN 0x20u
#define AQH_MQTTMSG_CONNECT_FLAGS_WILL_QOS2 0x10u
#define AQH_MQTTMSG_CONNECT_FLAGS_WILL_QOS1 0x08u
#define AQH_MQTTMSG_CONNECT_FLAGS_WILL_FLAG 0x04u
#define AQH_MQTTMSG_CONNECT_FLAGS_CLEAN_SESSION 0x01u
/**
* order in payload:
* - client id
* - will topic
* - will message
* - user name
* - password
*/
AQHOME_API GWEN_MSG *GWEN_ConnectMqttMsg_new(const char *protoName, /* "MQTT" */
uint8_t protoLevel, /* 0x04 for MQTT 3.1.1 */
uint8_t connectFlags,
uint16_t keepAliveTime,
const char *clientId,
const char *userName,
const char *password);
AQHOME_API void AQH_ConnectMqttMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText);
#endif