aqhome: started rewriting message code, start using new event2 lib.

aqhome/events2/fdobject.c

@@ -1,6 +1,6 @@
 /****************************************************************************
  * This file is part of the project Gwenhywfar.
- * Gwenhywfar (c) by 2023 Martin Preuss, all rights reserved.
+ * Gwenhywfar (c) by 2025 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.
@@ -15,10 +15,10 @@
 #include <gwenhywfar/inherit.h>
 #include <gwenhywfar/debug.h>
 
-#include <sys/socket.h>
+//#include <sys/socket.h>
 #include <errno.h>
 #include <string.h>
-
+#include <unistd.h>
 
 
 GWEN_INHERIT(AQH_OBJECT, AQH_FDOBJECT)
@@ -71,6 +71,40 @@ void GWENHYWFAR_CB _freeData(GWEN_UNUSED void *bp, void *p)
 
 
 
+AQH_FDOBJECT_STARTMSG_FN AQH_FdObject_SetStartMsgFn(AQH_OBJECT *o, AQH_FDOBJECT_STARTMSG_FN f)
+{
+  AQH_FDOBJECT *xo;
+
+  xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_FDOBJECT, o);
+  if (xo) {
+    AQH_FDOBJECT_STARTMSG_FN oldFn;
+
+    oldFn=xo->startMsgFn;
+    xo->startMsgFn=f;
+    return oldFn;
+  }
+  return NULL;
+}
+
+
+
+AQH_FDOBJECT_ENDMSG_FN AQH_FdObject_SetEndMsgFn(AQH_OBJECT *o, AQH_FDOBJECT_ENDMSG_FN f)
+{
+  AQH_FDOBJECT *xo;
+
+  xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_FDOBJECT, o);
+  if (xo) {
+    AQH_FDOBJECT_ENDMSG_FN oldFn;
+
+    oldFn=xo->endMsgFn;
+    xo->endMsgFn=f;
+    return oldFn;
+  }
+  return NULL;
+}
+
+
+
 int AQH_FdObject_GetFdMode(const AQH_OBJECT *o)
 {
   if (o) {
@@ -124,17 +158,18 @@ int AQH_FdObject_Read(AQH_OBJECT *o, uint8_t *ptrBuffer, uint32_t lenBuffer)
       if (xo->fd!=-1) {
         ssize_t rv;
 
-        rv=recv(xo->fd, ptrBuffer, lenBuffer, MSG_DONTWAIT);
+        rv=read(xo->fd, ptrBuffer, lenBuffer);
         if (rv==0) {
           DBG_INFO(AQH_LOGDOMAIN, "EOF met");
           return 0;
         }
         else if (rv>0) {
           /* data received */
+          DBG_ERROR(AQH_LOGDOMAIN, "Received %d bytes", (int) rv);
           return (int) rv;
         }
         else {
-          if (rv==EINTR || errno==EWOULDBLOCK || errno==EAGAIN) {
+          if (errno==EINTR || errno==EWOULDBLOCK || errno==EAGAIN) {
             /* temporarily no data, try again */
             return GWEN_ERROR_TRY_AGAIN;
           }
@@ -157,6 +192,115 @@ int AQH_FdObject_Read(AQH_OBJECT *o, uint8_t *ptrBuffer, uint32_t lenBuffer)
 
 
 
+int AQH_FdObject_FlushInput(AQH_OBJECT *o)
+{
+  if (o) {
+    AQH_FDOBJECT *xo;
+
+    xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_FDOBJECT, o);
+    if (xo) {
+      if (xo->fd!=-1) {
+        ssize_t rv;
+        ssize_t bytesRead=0;
+        uint8_t tbuf[16];
+
+        do {
+          rv=read(xo->fd, tbuf, sizeof(tbuf));
+          if (rv>0)
+            bytesRead+=rv;
+        } while(rv>=0);
+
+        if (rv==0) {
+          DBG_INFO(AQH_LOGDOMAIN, "EOF met");
+          return GWEN_ERROR_EOF;
+        }
+        else if (rv<0) {
+          if (errno!=EINTR && errno!=EWOULDBLOCK && errno!=EAGAIN) {
+            DBG_ERROR(AQH_LOGDOMAIN, "Error on read: %s (%d)", strerror(errno), errno);
+            xo->fd=-1;
+            return GWEN_ERROR_IO;
+          }
+        }
+        return (bytesRead>0)?1:0;
+      }
+      else {
+        DBG_ERROR(AQH_LOGDOMAIN, "Previous error, not reading.");
+        return GWEN_ERROR_IO;
+      }
+    }
+  }
+
+  return GWEN_ERROR_INVALID;
+}
+
+
+
+int AQH_FdObject_Write(AQH_OBJECT *o, const uint8_t *ptrBuffer, uint32_t lenBuffer)
+{
+  if (o && ptrBuffer && lenBuffer) {
+    AQH_FDOBJECT *xo;
+
+    xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_FDOBJECT, o);
+    if (xo) {
+      if (xo->fd!=-1) {
+        ssize_t rv;
+
+        rv=write(xo->fd, ptrBuffer, lenBuffer);
+        if (rv<0) {
+          if (errno==EINTR || errno==EWOULDBLOCK || errno==EAGAIN) {
+            /* temporarily no data, try again */
+            return GWEN_ERROR_TRY_AGAIN;
+          }
+          else {
+            DBG_ERROR(AQH_LOGDOMAIN, "Error on write: %s (%d)", strerror(errno), errno);
+            xo->fd=-1;
+            return GWEN_ERROR_IO;
+          }
+        }
+        else {
+          /* data received */
+          return (int) rv;
+        }
+      }
+      else {
+        DBG_ERROR(AQH_LOGDOMAIN, "Previous error, not writing.");
+        return GWEN_ERROR_IO;
+      }
+    }
+  }
+
+  return GWEN_ERROR_INVALID;
+}
+
+
+
+int AQH_FdObject_StartMsg(AQH_OBJECT *o)
+{
+  if (o) {
+    AQH_FDOBJECT *xo;
+
+    xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_FDOBJECT, o);
+    if (xo && xo->startMsgFn)
+      return xo->startMsgFn(o);
+  }
+  return 0;
+}
+
+
+
+void AQH_FdObject_EndMsg(AQH_OBJECT *o)
+{
+  if (o) {
+    AQH_FDOBJECT *xo;
+
+    xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_FDOBJECT, o);
+    if (xo && xo->endMsgFn)
+      xo->endMsgFn(o);
+  }
+}
+
+
+
 void _cbEnable(AQH_OBJECT *o)
 {
   if (o && !(AQH_Object_GetFlags(o) & AQH_OBJECT_FLAGS_ENABLED)) {