Remove public header file seap-command.h

The symbols and definitions are moved in _seap-command.h,
which is private. The functions are dropped from public API.

Author: jan-cerny

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

@@ -28,12 +28,16 @@
 #include <stddef.h>
 #include <pthread.h>
 
-#include "public/seap-command.h"
 #include "_sexp-types.h"
+#include "public/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
@@ -43,6 +47,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;
@@ -115,5 +134,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/public/seap-command.h

@@ -36,7 +36,6 @@ extern "C" {
 #include <errno.h>
 #include <sexp.h>
 #include <seap-types.h>
-#include <seap-command.h>
 #include <seap-error.h>
 #include "oscap_export.h"
 #include "sch_queue.h"

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

@@ -34,7 +34,6 @@
 #include "_seap-packetq.h"
 #include "_sexp-output.h"
 #include "_seap-command.h"
-#include "public/seap-command.h"
 #include "public/seap-error.h"
 #include "../../../common/util.h"
 

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

@@ -34,7 +34,6 @@
 #include "_seap-packet.h"
 #include "_seap-types.h"
 #include "seap-descriptor.h"
-#include "public/seap-command.h"
 #include "public/seap-error.h"
 #include "sch_queue.h"
 #include "debug_priv.h"