aqhome: Added parser for needaddr message.
This commit is contained in:
@@ -52,6 +52,7 @@
|
||||
msg_value.h
|
||||
msg_sendstats.h
|
||||
msg_ping.h
|
||||
msg_needaddr.h
|
||||
</headers>
|
||||
|
||||
|
||||
@@ -62,6 +63,7 @@
|
||||
msg_value.c
|
||||
msg_sendstats.c
|
||||
msg_ping.c
|
||||
msg_needaddr.c
|
||||
</sources>
|
||||
|
||||
<useTargets>
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "aqhome/msg_value.h"
|
||||
#include "aqhome/msg_sendstats.h"
|
||||
#include "aqhome/msg_ping.h"
|
||||
#include "aqhome/msg_needaddr.h"
|
||||
|
||||
#include <gwenhywfar/debug.h>
|
||||
#include <gwenhywfar/text.h>
|
||||
@@ -152,8 +153,12 @@ void _packetReceived(AQH_SERIAL *sr, AQH_MSG *msg)
|
||||
AQH_MsgValue_DumpToBuffer(msg, dbuf, "received");
|
||||
fprintf(stdout, "%s", GWEN_Buffer_GetStart(dbuf));
|
||||
}
|
||||
else if (msgType==AQH_MSG_TYPE_NEED_ADDRESS) {
|
||||
AQH_MsgNeedAddr_DumpToBuffer(msg, dbuf, "received");
|
||||
fprintf(stdout, "%s", GWEN_Buffer_GetStart(dbuf));
|
||||
}
|
||||
else {
|
||||
fprintf(stdout, " %s: Received (%s):\n", GWEN_Buffer_GetStart(dbuf), msgIsValid?"valid":"invalid");
|
||||
fprintf(stdout, " %s: Received (%d):\n", GWEN_Buffer_GetStart(dbuf), msgType);
|
||||
GWEN_Text_DumpString(ptr, len, 6);
|
||||
}
|
||||
GWEN_Buffer_free(dbuf);
|
||||
|
||||
53
aqhome/msg_needaddr.c
Normal file
53
aqhome/msg_needaddr.c
Normal 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.
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#include "aqhome/msg_needaddr.h"
|
||||
|
||||
#include <gwenhywfar/misc.h>
|
||||
#include <gwenhywfar/list.h>
|
||||
#include <gwenhywfar/error.h>
|
||||
#include <gwenhywfar/debug.h>
|
||||
|
||||
|
||||
|
||||
uint32_t AQH_MsgNeedAddr_GetUid(const AQH_MSG *msg)
|
||||
{
|
||||
if ((AQH_Msg_GetMsgType(msg)==AQH_MSG_TYPE_NEED_ADDRESS) &&
|
||||
(AQH_Msg_GetBytesInBuffer(msg)>=AQH_MSG_NEEDADDR_MINSIZE)) {
|
||||
const uint8_t *ptr;
|
||||
|
||||
ptr=AQH_Msg_GetConstBuffer(msg)+AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_NEEDADDR_UID;
|
||||
return (uint32_t)(ptr[0])+(ptr[1]<<8)+(ptr[2]<<16)+(ptr[3]<<24);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void AQH_MsgNeedAddr_DumpToBuffer(const AQH_MSG *msg, GWEN_BUFFER *dbuf, const char *sText)
|
||||
{
|
||||
if ((AQH_Msg_GetMsgType(msg)==AQH_MSG_TYPE_NEED_ADDRESS) &&
|
||||
(AQH_Msg_GetBytesInBuffer(msg)>=AQH_MSG_NEEDADDR_MINSIZE)) {
|
||||
GWEN_Buffer_AppendArgs(dbuf,
|
||||
"0x%02x->0x%02x: NEED_ADDRESS %s (uid=0x%08x)\n",
|
||||
AQH_Msg_GetSourceAddress(msg),
|
||||
AQH_Msg_GetDestAddress(msg),
|
||||
sText,
|
||||
(unsigned int) AQH_MsgNeedAddr_GetUid(msg));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
36
aqhome/msg_needaddr.h
Normal file
36
aqhome/msg_needaddr.h
Normal file
@@ -0,0 +1,36 @@
|
||||
/****************************************************************************
|
||||
* 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_NEEDADDR_H
|
||||
#define AQH_MSG_NEEDADDR_H
|
||||
|
||||
|
||||
#include <aqhome/api.h>
|
||||
|
||||
#include "aqhome/msg.h"
|
||||
|
||||
#include <gwenhywfar/list.h>
|
||||
#include <gwenhywfar/buffer.h>
|
||||
|
||||
|
||||
|
||||
#define AQH_MSG_OFFS_NEEDADDR_UID 0
|
||||
|
||||
#define AQH_MSG_NEEDADDR_MINSIZE (AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_NEEDADDR_UID+4)
|
||||
|
||||
|
||||
|
||||
|
||||
AQHOME_API uint32_t AQH_MsgNeedAddr_GetUid(const AQH_MSG *msg);
|
||||
AQHOME_API void AQH_MsgNeedAddr_DumpToBuffer(const AQH_MSG *msg, GWEN_BUFFER *dbuf, const char *sText);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user