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

aqhome: re-implemented aqhomed.

Browse Source 
- added IPC endpoint2
This commit is contained in:
Martin Preuss
2023-07-12 01:45:24 +02:00
parent 43b23b2636
commit 39987b31c7
25 changed files with 2140 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
aqhome/msg/endpoint2_tty.c
View File

@@ -69,7 +69,7 @@ static int _isAttnLow(GWEN_MSG_ENDPOINT2 *ep);
*/
GWEN_MSG_ENDPOINT2 *AQH_TtyEndpoint_new(const char *devicePath, int groupId)
GWEN_MSG_ENDPOINT2 *AQH_TtyEndpoint2_new(const char *devicePath, int groupId)
{
GWEN_MSG_ENDPOINT2 *ep;
AQH_MSG_ENDPOINT2_TTY *xep;
@@ -117,7 +117,7 @@ void _addSockets(GWEN_MSG_ENDPOINT2 *ep, GWEN_SOCKETSET *readSet, GWEN_SOCKETSET
int rv;
/* (re)connect, set state */
DBG_INFO(GWEN_LOGDOMAIN, "Starting to (re-)connect");
DBG_INFO(AQH_LOGDOMAIN, "Starting to (re-)connect");
rv=GWEN_TtyEndpoint2_Connect(ep);
if (rv<0) {
DBG_INFO(GWEN_LOGDOMAIN, "here (%d)", rv);
@@ -141,6 +141,7 @@ int GWEN_TtyEndpoint2_Connect(GWEN_MSG_ENDPOINT2 *ep)
if (GWEN_MsgEndpoint2_GetState(ep)==GWEN_MSG_ENDPOINT_STATE_UNCONNECTED) {
int fd;
DBG_INFO(AQH_LOGDOMAIN, "Connecting TTY device");
fd=_openDevice(ep);
if (fd<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", fd);
@@ -152,6 +153,8 @@ int GWEN_TtyEndpoint2_Connect(GWEN_MSG_ENDPOINT2 *ep)
sk=GWEN_Socket_fromFile(fd);
GWEN_MsgEndpoint2_SetSocket(ep, sk);
GWEN_MsgEndpoint2_SetState(ep, GWEN_MSG_ENDPOINT_STATE_CONNECTED);
GWEN_MsgEndpoint2_DiscardInput(ep);
_attnHigh(ep);
return 0;
}
}
@@ -171,8 +174,9 @@ int _getSocketFd(GWEN_MSG_ENDPOINT2 *ep)
GWEN_SOCKET *sk;
sk=GWEN_MsgEndpoint2_GetSocket(ep);
if (sk)
if (sk) {
return GWEN_Socket_GetSocketInt(sk);
}
}
return GWEN_ERROR_GENERIC;
}
@@ -188,11 +192,13 @@ int _openDevice(GWEN_MSG_ENDPOINT2 *ep)
xep=GWEN_INHERIT_GETDATA(GWEN_MSG_ENDPOINT2, AQH_MSG_ENDPOINT2_TTY, ep);
assert(xep);
DBG_INFO(AQH_LOGDOMAIN, "Opening device %s", xep->deviceName);
fd=open(xep->deviceName, O_NOCTTY | O_NDELAY | O_RDWR);
if (fd<0) {
DBG_ERROR(AQH_LOGDOMAIN, "Error on open(%s): %s (%d)", xep->deviceName, strerror(errno), errno);
return GWEN_ERROR_IO;
}
DBG_INFO(AQH_LOGDOMAIN, "Device %s open (socket %d)", xep->deviceName, fd);
rv=tcgetattr(fd, &(xep->previousOptions));
if (rv<0) {
DBG_ERROR(AQH_LOGDOMAIN, "Error on tcgetattr(%s): %s (%d)", xep->deviceName, strerror(errno), errno);
@@ -284,7 +290,7 @@ int _getBytesNeededForMessage(GWEN_UNUSED GWEN_MSG_ENDPOINT2 *ep, GWEN_MSG *msg)
bytesInMsg=GWEN_Msg_GetBytesInBuffer(msg);
if (bytesInMsg<AQH_MSG_OFFS_ALL_DATA_BEGIN) {
DBG_INFO(AQH_LOGDOMAIN, "Header not yet complete");
DBG_INFO(AQH_LOGDOMAIN, "Header not yet complete (%d)", bytesInMsg);
return (int) (AQH_MSG_OFFS_ALL_DATA_BEGIN-bytesInMsg);
}
else {

2
aqhome/msg/endpoint2_tty.h
View File

@@ -18,7 +18,7 @@
#define AQH_MSG_ENDPOINT2_TTY_NAME "tty"
AQHOME_API GWEN_MSG_ENDPOINT *AQH_TtyNodeEndpoint2_new(const char *devicePath, int groupId);
AQHOME_API GWEN_MSG_ENDPOINT2 *AQH_TtyEndpoint2_new(const char *devicePath, int groupId);
AQHOME_API int GWEN_TtyEndpoint2_Connect(GWEN_MSG_ENDPOINT2 *ep);