Drop seap-types.h

It was not possible to just put everything in _seap-types.h. Instead,
we had to move some type definitions between the headers to prevent
circular dpendencies of header files.

Author: jan-cerny

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/probes/SEAP/_seap-command.h

@@ -29,16 +29,10 @@
 #include <pthread.h>
 
 #include "_sexp-types.h"
-#include "public/seap-types.h"
+#include "_seap-types.h"
 #include "../../../common/util.h"
 
 
-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_CMDCLASS_INT 1
 #define SEAP_CMDCLASS_USR 2
 
@@ -70,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;
@@ -81,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;
@@ -115,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
 

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 */

src/OVAL/probes/SEAP/_seap.h

@@ -27,6 +27,7 @@
 #include "_seap-message.h"
 #include "sch_queue.h"
 #include "../../../common/util.h"
+#include "_seap-types.h"
 
 #ifndef EOPNOTSUPP
 # define EOPNOTSUPP 1001

src/OVAL/probes/SEAP/public/seap-types.h

@@ -66,11 +66,6 @@ typedef struct {
 #define SEAP_DESC_FDOUT 0x00000002
 #define SEAP_DESC_SELF  -1
 
-typedef struct {
-        rbt_t       *tree;
-        bitmap_t    *bmap;
-} SEAP_desctable_t;
-
 #define SEAP_DESCTBL_INITIALIZER { NULL, NULL }
 
 #define SEAP_BUFFER_SIZE 2*4096

src/OVAL/probes/SEAP/seap-descriptor.h

@@ -29,6 +29,7 @@
 #include "_sexp-types.h"
 #include "_seap-types.h"
 #include "_seap-message.h"
+#include "_sexp-manip.h"
 #include "debug_priv.h"
 
 SEAP_msg_t *SEAP_msg_new (void)