Merge pull request #1226 from jan-cerny/seap_move

Move SEAP out of public API

Author: mpreisler

src/OVAL/oval_probe_ext.c

@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <seap.h>
+#include "_seap.h"
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>

src/OVAL/oval_probe_ext.h

@@ -22,7 +22,7 @@
 #ifndef OVAL_PROBE_EXT_H
 #define OVAL_PROBE_EXT_H
 
-#include <seap.h>
+#include "_seap.h"
 #include <pthread.h>
 #include <stdbool.h>
 #include "oval_probe_impl.h"

src/OVAL/oval_probe_impl.h

@@ -32,7 +32,6 @@
 #ifndef OVAL_PROBE_IMPL_H
 #define OVAL_PROBE_IMPL_H
 
-#include <seap-types.h>
 #include "oval_definitions_impl.h"
 #include "oval_agent_api_impl.h"
 #include "oval_parser_impl.h"

src/OVAL/oval_sexp.c

@@ -39,7 +39,7 @@
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
-#include <seap.h>
+#include "_seap.h"
 #include <assert.h>
 
 #include "oval_probe_impl.h"

src/OVAL/oval_sexp.h

@@ -34,7 +34,7 @@
 #ifndef OVAL_SEXP_H
 #define OVAL_SEXP_H
 
-#include <seap.h>
+#include "_seap.h"
 #include "../common/util.h"
 #include "oval_definitions_impl.h"
 

src/OVAL/probes/SEAP/_seap-command.h

@@ -28,13 +28,11 @@
 #include <stddef.h>
 #include <pthread.h>
 
-#include "public/seap-command.h"
 #include "_sexp-types.h"
+#include "_seap-types.h"
 #include "../../../common/util.h"
 
 
-typedef uint8_t SEAP_cmdclass_t;
-
 #define SEAP_CMDCLASS_INT 1
 #define SEAP_CMDCLASS_USR 2
 
@@ -43,6 +41,21 @@ typedef uint8_t SEAP_cmdclass_t;
 #define SEAP_CMDFLAG_REPLY 0x02
 #define SEAP_CMDFLAG_MASK  0xff
 
+#define SEAP_CMDTYPE_SYNC  1
+#define SEAP_CMDTYPE_ASYNC 2
+
+#define SEAP_CMDREG_LOCAL  0x00000001
+#define SEAP_CMDREG_USEARG 0x00000002
+#define SEAP_CMDREG_THREAD 0x00000004
+
+#define SEAP_EXEC_LOCAL  0x01
+#define SEAP_EXEC_LONLY  0x02
+#define SEAP_EXEC_GFIRST 0x04
+#define SEAP_EXEC_THREAD 0x08
+#define SEAP_EXEC_WQUEUE 0x10
+#define SEAP_EXEC_RECV   0x20
+
+
 struct SEAP_cmd {
         SEAP_cmdid_t    id;
         SEAP_cmdid_t    rid;
@@ -51,6 +64,7 @@ struct SEAP_cmd {
         SEAP_cmdcode_t  code;
         SEXP_t         *args;
 };
+typedef struct SEAP_cmd SEAP_cmd_t;
 
 struct SEAP_synchelper {
         SEXP_t         *args;
@@ -62,15 +76,6 @@ struct SEAP_synchelper {
 #define SEAP_CMDTBL_LARGE 0x01
 #define SEAP_CMDTBL_LARGE_TRESHOLD 32
 
-typedef struct {
-        uint8_t  flags;
-        void    *table;
-        size_t   maxcnt;
-#if defined(SEAP_THREAD_SAFE)
-        pthread_rwlock_t lock;
-#endif
-} SEAP_cmdtbl_t;
-
 typedef struct {
         SEAP_cmdcode_t code;
         SEAP_cmdfn_t   func;
@@ -96,8 +101,6 @@ int SEAP_cmdtbl_cmp (SEAP_cmdrec_t *a, SEAP_cmdrec_t *b);
 SEAP_cmdrec_t *SEAP_cmdrec_new (void);
 void SEAP_cmdrec_free (SEAP_cmdrec_t *r);
 
-typedef uint8_t SEAP_cflags_t;
-
 #define SEAP_CFLG_THREAD 0x01
 #define SEAP_CFLG_WATCH  0x02
 
@@ -115,5 +118,15 @@ void SEAP_cmdjob_free (SEAP_cmdjob_t *j);
 
 SEXP_t *SEAP_cmd2sexp (SEAP_cmd_t *cmd);
 
+int SEAP_cmd_register(SEAP_CTX_t *ctx, SEAP_cmdcode_t code, uint32_t flags, SEAP_cmdfn_t func, ...);
+
+SEXP_t *SEAP_cmd_exec(SEAP_CTX_t    *ctx,
+                       int            sd,
+                       uint32_t       flags,
+                       SEAP_cmdcode_t code,
+                       SEXP_t        *args,
+                       SEAP_cmdtype_t type,
+                       SEAP_cmdfn_t   func,
+                       void          *funcarg);
 
 #endif /* _SEAP_COMMAND_H */

src/OVAL/probes/SEAP/_seap-error.h

@@ -26,16 +26,19 @@
 
 #include "public/sexp.h"
 #include "_seap-message.h"
-#include "public/seap-error.h"
 #include "../../../common/util.h"
 
-/*
 struct SEAP_err {
-        SEAP_msgid_t id;
-        uint32_t     code;
-        uint8_t      type;
-        SEXP_t      *data;
+	SEAP_msgid_t id;
+	uint32_t code;
+	uint8_t type;
+	SEXP_t *data;
 };
-*/
+
+typedef struct SEAP_err SEAP_err_t;
+
+SEAP_err_t *SEAP_error_new(void);
+SEAP_err_t *SEAP_error_clone(SEAP_err_t *e);
+void SEAP_error_free(SEAP_err_t *e);
 
 #endif /* _SEAP_ERROR_H */

src/OVAL/probes/SEAP/_seap-message.h

@@ -26,21 +26,41 @@
 
 #include <stdint.h>
 #include "public/sexp-types.h"
-#include "public/seap-message.h"
 #include "../../../common/util.h"
 
+#if SEAP_MSGID_BITS == 64
+typedef uint64_t SEAP_msgid_t;
+#else
+typedef uint32_t SEAP_msgid_t;
+#endif
 
 struct SEAP_attr {
         char   *name;
         SEXP_t *value;
 };
 
+typedef struct SEAP_attr SEAP_attr_t;
+
 struct SEAP_msg {
         SEAP_msgid_t id;
         SEAP_attr_t *attrs;
         uint16_t     attrs_cnt;
         SEXP_t      *sexp;
 };
 
+typedef struct SEAP_msg SEAP_msg_t;
+
+SEAP_msg_t *SEAP_msg_new(void);
+SEAP_msg_t *SEAP_msg_clone(SEAP_msg_t *msg);
+void SEAP_msg_free(SEAP_msg_t *msg);
+
+SEAP_msgid_t SEAP_msg_id(SEAP_msg_t *msg);
+
+int SEAP_msg_set(SEAP_msg_t *msg, SEXP_t *sexp);
+void SEAP_msg_unset(SEAP_msg_t *msg);
+SEXP_t *SEAP_msg_get(SEAP_msg_t *msg);
+
+int SEAP_msgattr_set(SEAP_msg_t *msg, const char *name, SEXP_t *value);
+bool SEAP_msgattr_exists(SEAP_msg_t *msg, const char *name);
 
 #endif /* _SEAP_MESSAGE_H */

src/OVAL/probes/SEAP/_seap-packet.h

@@ -28,7 +28,6 @@
 #include "_seap-message.h"
 #include "_seap-command.h"
 #include "_seap-error.h"
-#include "public/seap-packet.h"
 #include "../../../common/util.h"
 
 
@@ -37,6 +36,12 @@
 #define SEAP_SYM_CMD    SEAP_SYM_PREFIX"cmd"
 #define SEAP_SYM_ERR    SEAP_SYM_PREFIX"err"
 
+#define SEAP_PACKET_INV 0x00 /* Invalid packet */
+#define SEAP_PACKET_MSG 0x01 /* Message packet */
+#define SEAP_PACKET_ERR 0x02 /* Error packet */
+#define SEAP_PACKET_CMD 0x03 /* Command packet */
+#define SEAP_PACKET_RAW 0x04 /* Raw packet */
+
 struct SEAP_packet {
         uint8_t type;
         union {
@@ -45,6 +50,21 @@ struct SEAP_packet {
                 SEAP_cmd_t cmd;
         } data;
 };
+typedef struct SEAP_packet SEAP_packet_t;
+
+SEAP_packet_t *SEAP_packet_new(void);
+void SEAP_packet_free(SEAP_packet_t *packet);
+
+void *SEAP_packet_settype(SEAP_packet_t *packet, uint8_t type);
+uint8_t SEAP_packet_gettype(SEAP_packet_t *packet);
+
+SEAP_msg_t *SEAP_packet_msg(SEAP_packet_t *packet);
+SEAP_cmd_t *SEAP_packet_cmd(SEAP_packet_t *packet);
+SEAP_err_t *SEAP_packet_err(SEAP_packet_t *packet);
 
+int SEAP_packet_recv(SEAP_CTX_t *ctx, int sd, SEAP_packet_t **packet);
+int SEAP_packet_recv_bytype(SEAP_CTX_t *ctx, int sd, SEAP_packet_t **packet, uint8_t type);
+int SEAP_packet_send(SEAP_CTX_t *ctx, int sd, SEAP_packet_t *packet);
+int SEAP_packet_enqueue(SEAP_CTX_t *ctx, int sd, SEAP_packet_t *packet);
 
 #endif /* _SEAP_PACKET_H */

src/OVAL/probes/SEAP/_seap-types.h

@@ -25,12 +25,27 @@
 #define _SEAP_TYPES_H
 
 #include <stdint.h>
-#include "public/seap-types.h"
 #include "_sexp-types.h"
-#include "_seap-command.h"
-#include "seap-descriptor.h"
 #include "../../../common/util.h"
+#include "generic/rbt/rbt_common.h"
+#include "generic/bitmap.h"
+#include "oval_types.h"
 
+typedef uint8_t SEAP_cflags_t;
+
+typedef struct {
+        rbt_t       *tree;
+        bitmap_t    *bmap;
+} SEAP_desctable_t;
+
+typedef struct {
+        uint8_t  flags;
+        void    *table;
+        size_t   maxcnt;
+#if defined(SEAP_THREAD_SAFE)
+        pthread_rwlock_t lock;
+#endif
+} SEAP_cmdtbl_t;
 
 /* SEAP context */
 struct SEAP_CTX {
@@ -44,6 +59,35 @@ struct SEAP_CTX {
         uint16_t send_timeout;
 	oval_subtype_t subtype;
 };
+typedef struct SEAP_CTX SEAP_CTX_t;
+
+typedef uint8_t SEAP_cmdclass_t;
+typedef uint16_t SEAP_cmdcode_t;
+typedef uint16_t SEAP_cmdid_t;
+typedef uint8_t SEAP_cmdtype_t;
+typedef SEXP_t * (*SEAP_cmdfn_t) (SEXP_t *, void *);
+
+#define SEAP_CTX_INITIALIZER { NULL, 0, 0, 0, SEAP_DESCTBL_INITIALIZER, SEAP_CMDTABLE_INITIALIZER }
+
+/* SEAP errors */
+#define SEAP_ETYPE_INT  0 /* Internal error */
+#define SEAP_ETYPE_USER 1 /* User-defined error */
+
+#define SEAP_EUNFIN 1  /* Can't finish parsing */
+#define SEAP_EPARSE 2  /* Parsing error */
+#define SEAP_ECLOSE 3  /* Connection close */
+#define SEAP_EINVAL 4  /* Invalid argument */
+#define SEAP_ENOMEM 5  /* Cannot allocate memory */
+#define SEAP_EMSEXP 6  /* Missing required S-exp/value */
+#define SEAP_EMATTR 7  /* Missing required attribute */
+#define SEAP_EUNEXP 8  /* Unexpected error */
+#define SEAP_EUSER  9  /* User-defined error */
+#define SEAP_ENOCMD 10 /* Unknown cmd */
+#define SEAP_EQFULL 11 /* Queue full */
+#define SEAP_EUNKNOWN 255 /* Unknown/Unexpected error */
 
+/* SEAP I/O flags */
+#define SEAP_IOFL_RECONN   0x00000001 /* Try to reconnect */
+#define SEAP_IOFL_NONBLOCK 0x00000002 /* Non-blocking mode */
 
 #endif /* _SEAP_TYPES_H */