libcorset: renaming members of 'struct _corset'

7 files changed, 289 insertions, 45 deletions

diff --git a/include/corset.h b/include/corset.h
index 231dab2..3d6b5ff 100644
--- a/include/corset.h
+++ b/include/corset.h
@@ -77,16 +77,16 @@
 
 struct _corset
 {
-   int                  cnf_verbose;
-   unsigned             cnf_flags;
-   unsigned             cnf_ctx_cnt;
-   unsigned             cnf_mods_cnt;
-   char *               cnf_conffile;
-   char *               cnf_moddir;
-   char *               cnf_pidfile;
-   char *               cnf_sockfile;
-   corset_mod_t **      cnf_mods;
-   corset_ctx_t **      cnf_ctx;
+   int                  cor_verbose;
+   unsigned             cor_flags;
+   unsigned             cor_ctx_cnt;
+   unsigned             cor_mods_cnt;
+   char *               cor_conffile;
+   char *               cor_moddir;
+   char *               cor_pidfile;
+   char *               cor_sockfile;
+   corset_mod_t **      cor_mods;
+   corset_ctx_t **      cor_ctx;
 };
 
 
diff --git a/lib/libcorset/largs.c b/lib/libcorset/largs.c
index 5250cdf..91d54f4 100644
--- a/lib/libcorset/largs.c
+++ b/lib/libcorset/largs.c
@@ -106,7 +106,7 @@ corset_getopt(
          break;
 
          case 'f':
-         cnf->cnf_flags |= CORSET_FLG_FOREGROUND;
+         cnf->cor_flags |= CORSET_FLG_FOREGROUND;
          break;
 
          case 'h':
@@ -122,7 +122,7 @@ corset_getopt(
          break;
 
          case 'q':
-         cnf->cnf_flags |= CORSET_FLG_QUIET;
+         cnf->cor_flags |= CORSET_FLG_QUIET;
          break;
 
          case 'V':
@@ -130,7 +130,7 @@ corset_getopt(
          return(2);
 
          case 'v':
-         cnf->cnf_verbose++;
+         cnf->cor_verbose++;
          break;
 
          case '?':
@@ -144,7 +144,7 @@ corset_getopt(
       };
    };
 
-   if ( ((cnf->cnf_flags & CORSET_FLG_QUIET)) && ((cnf->cnf_verbose)) )
+   if ( ((cnf->cor_flags & CORSET_FLG_QUIET)) && ((cnf->cor_verbose)) )
    {
       fprintf(stderr, "%s: incompatible options `-q' and `-v'\n", corset_prog_name_ptr);
       fprintf(stderr, "Try `%s --help' for more information.\n", corset_prog_name_ptr);
diff --git a/lib/libcorset/ldebug.c b/lib/libcorset/ldebug.c
index ca531d6..db85e0e 100644
--- a/lib/libcorset/ldebug.c
+++ b/lib/libcorset/ldebug.c
@@ -90,13 +90,13 @@ corset_debug_config(
    corset_debug_print_section(fs, 0, NULL);
 
    corset_debug_print_section(fs, 0, "General Options:");
-   corset_debug_print_str(fs, 0, "Quiet Mode:",             (((cnf->cnf_flags & CORSET_FLG_QUIET)) ? "yes" : "no"));
-   corset_debug_print_str(fs, 0, "Verbose Mode:",           (((cnf->cnf_verbose)) ? "yes" : "no"));
-   corset_debug_print_str(fs, 0, "Run in Foreground:",      (((cnf->cnf_flags & CORSET_FLG_FOREGROUND)) ? "yes" : "no"));
-   corset_debug_print_str(fs, 0, "Configuration File:",     cnf->cnf_conffile);
-   corset_debug_print_str(fs, 0, "PID File:",               cnf->cnf_pidfile);
-   corset_debug_print_str(fs, 0, "Control Socket:",         cnf->cnf_sockfile);
-   corset_debug_print_str(fs, 0, "Module Directory:",       cnf->cnf_moddir);
+   corset_debug_print_str(fs, 0, "Quiet Mode:",             (((cnf->cor_flags & CORSET_FLG_QUIET)) ? "yes" : "no"));
+   corset_debug_print_str(fs, 0, "Verbose Mode:",           (((cnf->cor_verbose)) ? "yes" : "no"));
+   corset_debug_print_str(fs, 0, "Run in Foreground:",      (((cnf->cor_flags & CORSET_FLG_FOREGROUND)) ? "yes" : "no"));
+   corset_debug_print_str(fs, 0, "Configuration File:",     cnf->cor_conffile);
+   corset_debug_print_str(fs, 0, "PID File:",               cnf->cor_pidfile);
+   corset_debug_print_str(fs, 0, "Control Socket:",         cnf->cor_sockfile);
+   corset_debug_print_str(fs, 0, "Module Directory:",       cnf->cor_moddir);
    corset_debug_print_section(fs, 0, NULL);
 
    return;
diff --git a/lib/libcorset/lmemory.c b/lib/libcorset/lmemory.c
index d73bbe3..b8080c3 100644
--- a/lib/libcorset/lmemory.c
+++ b/lib/libcorset/lmemory.c
@@ -123,8 +123,8 @@ corset_destroy(
    if (!(cnf))
       return;
 
-   if ((cnf->cnf_pidfile))
-      free(cnf->cnf_pidfile);
+   if ((cnf->cor_pidfile))
+      free(cnf->cor_pidfile);
    free(cnf);
 
    return;
@@ -142,39 +142,39 @@ corset_get_param(
    switch(option)
    {
       case CORSET_OPT_CONFFILE:
-      if ((str = bindle_strdup(cnf->cnf_conffile)) == NULL)
+      if ((str = bindle_strdup(cnf->cor_conffile)) == NULL)
          return(-1);
       *((char **)outvalue) = str;
       return(0);
 
       case CORSET_OPT_FOREGROUND:
-      *((int *)outvalue) = ((cnf->cnf_flags & CORSET_FLG_FOREGROUND)) ? 1 : 0;
+      *((int *)outvalue) = ((cnf->cor_flags & CORSET_FLG_FOREGROUND)) ? 1 : 0;
       return(0);
 
       case CORSET_OPT_MODDIR:
-      if ((str = bindle_strdup(cnf->cnf_moddir)) == NULL)
+      if ((str = bindle_strdup(cnf->cor_moddir)) == NULL)
          return(-1);
       *((char **)outvalue) = str;
       return(0);
 
       case CORSET_OPT_PIDFILE:
-      if ((str = bindle_strdup(cnf->cnf_pidfile)) == NULL)
+      if ((str = bindle_strdup(cnf->cor_pidfile)) == NULL)
          return(-1);
       *((char **)outvalue) = str;
       return(0);
 
       case CORSET_OPT_QUIET:
-      *((int *)outvalue) = ((cnf->cnf_flags & CORSET_FLG_QUIET)) ? 1 : 0;
+      *((int *)outvalue) = ((cnf->cor_flags & CORSET_FLG_QUIET)) ? 1 : 0;
       return(0);
 
       case CORSET_OPT_SOCKET:
-      if ((str = bindle_strdup(cnf->cnf_sockfile)) == NULL)
+      if ((str = bindle_strdup(cnf->cor_sockfile)) == NULL)
          return(-1);
       *((char **)outvalue) = str;
       return(0);
 
       case CORSET_OPT_VERBOSE:
-      *((int *)outvalue) = cnf->cnf_verbose;
+      *((int *)outvalue) = cnf->cor_verbose;
       return(0);
 
       default:
@@ -220,9 +220,9 @@ corset_set_param(
       invalue = ((invalue)) ? invalue : CORSET_DFLT_CONFFILE;
       if ((str = bindle_strdup(invalue)) == NULL)
          return(-1);
-      if ((cnf->cnf_conffile))
-         free(cnf->cnf_conffile);
-      cnf->cnf_conffile = str;
+      if ((cnf->cor_conffile))
+         free(cnf->cor_conffile);
+      cnf->cor_conffile = str;
       return(0);
 
       case CORSET_OPT_FOREGROUND:
@@ -233,18 +233,18 @@ corset_set_param(
       invalue = ((invalue)) ? invalue : CORSET_DFLT_MODDIR;
       if ((str = bindle_strdup(invalue)) == NULL)
          return(-1);
-      if ((cnf->cnf_moddir))
-         free(cnf->cnf_moddir);
-      cnf->cnf_moddir = str;
+      if ((cnf->cor_moddir))
+         free(cnf->cor_moddir);
+      cnf->cor_moddir = str;
       return(0);
 
       case CORSET_OPT_PIDFILE:
       invalue = ((invalue)) ? invalue : CORSET_DFLT_PIDFILE;
       if ((str = bindle_strdup(invalue)) == NULL)
          return(-1);
-      if ((cnf->cnf_pidfile))
-         free(cnf->cnf_pidfile);
-      cnf->cnf_pidfile = str;
+      if ((cnf->cor_pidfile))
+         free(cnf->cor_pidfile);
+      cnf->cor_pidfile = str;
       return(0);
 
       case CORSET_OPT_QUIET:
@@ -255,13 +255,13 @@ corset_set_param(
       invalue = ((invalue)) ? invalue : CORSET_DFLT_SOCKET;
       if ((str = bindle_strdup(invalue)) == NULL)
          return(-1);
-      if ((cnf->cnf_sockfile))
-         free(cnf->cnf_sockfile);
-      cnf->cnf_sockfile = str;
+      if ((cnf->cor_sockfile))
+         free(cnf->cor_sockfile);
+      cnf->cor_sockfile = str;
       return(0);
 
       case CORSET_OPT_VERBOSE:
-      cnf->cnf_verbose = ((invalue)) ? *((const int *)invalue) : CORSET_DFLT_VERBOSE;
+      cnf->cor_verbose = ((invalue)) ? *((const int *)invalue) : CORSET_DFLT_VERBOSE;
       return(0);
 
       default:
@@ -290,9 +290,9 @@ corset_set_param_flag(
    };
 
    if ((*valp))
-      ch->cnf_flags |= flag;
+      ch->cor_flags |= flag;
    else
-      ch->cnf_flags &= ~flag;
+      ch->cor_flags &= ~flag;
 
    return;
 }
diff --git a/lib/mod_dummy/mod_dummy.c b/lib/mod_dummy/mod_dummy.c
new file mode 100644
index 0000000..1c92c8d
--- /dev/null
+++ b/lib/mod_dummy/mod_dummy.c
@@ -0,0 +1,101 @@
+/*
+ *  Corset Firewall
+ *  Copyright (C) 2023 David M. Syzdek <david@syzdek.net>.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of David M. Syzdek nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M SYZDEK BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ *  SUCH DAMAGE.
+ */
+#define _LIB_MOD_DUMMY_MOD_DUMMY_C 1
+#include "mod_dummy.h"
+
+///////////////
+//           //
+//  Headers  //
+//           //
+///////////////
+// MARK: - Headers
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <string.h>
+#include <strings.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/stat.h>
+
+
+//////////////////
+//              //
+//  Prototypes  //
+//              //
+//////////////////
+// MARK: - Prototypes
+
+
+/////////////////
+//             //
+//  Variables  //
+//             //
+/////////////////
+// MARK: - Variables
+
+const corset_mod_t mod_dummy =
+{
+   .mod_api             = CORSET_API,
+   .mod_usage           = CORSET_USE_TRIGGER | CORSET_USE_CACHE,
+   .mod_flags           = CORSET_MOD_SINGLE,
+   .mod_load            = mod_dummy_load,
+   .mod_unload          = mod_dummy_unload,
+};
+
+
+/////////////////
+//             //
+//  Functions  //
+//             //
+/////////////////
+// MARK: - Functions
+
+int
+mod_dummy_load(
+         corset_t *                    cnf )
+{
+   assert(cnf != NULL);
+   return(0);
+}
+
+
+int
+mod_dummy_unload(
+         corset_t *                    cnf )
+{
+   assert(cnf != NULL);
+   return(0);
+}
+
+
+/* end of source file */
diff --git a/lib/mod_dummy/mod_dummy.h b/lib/mod_dummy/mod_dummy.h
new file mode 100644
index 0000000..879f8f8
--- /dev/null
+++ b/lib/mod_dummy/mod_dummy.h
@@ -0,0 +1,111 @@
+/*
+ *  Corset Firewall
+ *  Copyright (C) 2023 David M. Syzdek <david@syzdek.net>.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of David M. Syzdek nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M SYZDEK BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ *  SUCH DAMAGE.
+ */
+/*
+ *  @file lib/libcorset/libcorset.h
+ */
+#ifndef _LIB_MOD_DUMMY_MOD_DUMMY_H
+#define _LIB_MOD_DUMMY_MOD_DUMMY_H 1
+
+
+///////////////
+//           //
+//  Headers  //
+//           //
+///////////////
+// MARK: - Headers
+
+#include <corset_compat.h>
+
+#ifdef HAVE_CONFIG_H
+#   include <config.h>
+#endif
+
+#include <assert.h>
+#include <time.h>
+
+#include <corset_module.h>
+
+#ifdef HAVE_BINDLE_PREFIX_H
+#   include <bindle_prefix.h>
+#else
+#   include <bindle.h>
+#endif
+
+
+///////////////////
+//               //
+//  Definitions  //
+//               //
+///////////////////
+// MARK: - Definitions
+
+
+/////////////////
+//             //
+//  Datatypes  //
+//             //
+/////////////////
+// MARK: - Datatypes
+
+struct corset_module_data
+{
+   int                     dat_num1;
+   int                     dat_num2;
+};
+
+
+/////////////////
+//             //
+//  Variables  //
+//             //
+/////////////////
+// MARK: - Variables
+
+extern const corset_mod_t mod_dummy;
+
+
+//////////////////
+//              //
+//  Prototypes  //
+//              //
+//////////////////
+// MARK: - Prototypes
+
+extern int
+mod_dummy_load(
+         corset_t *                    cnf );
+
+
+extern int
+mod_dummy_unload(
+         corset_t *                    cnf );
+
+
+#endif /* end of header file */
diff --git a/lib/mod_dummy/mod_dummy.sym b/lib/mod_dummy/mod_dummy.sym
new file mode 100644
index 0000000..60d6152
--- /dev/null
+++ b/lib/mod_dummy/mod_dummy.sym
@@ -0,0 +1,32 @@
+#
+#   Corset Firewall
+#   Copyright (C) 2023 David M. Syzdek <david@syzdek.net>.
+#
+#   Redistribution and use in source and binary forms, with or without
+#   modification, are permitted provided that the following conditions are
+#   met:
+#
+#      * Redistributions of source code must retain the above copyright
+#        notice, this list of conditions and the following disclaimer.
+#      * Redistributions in binary form must reproduce the above copyright
+#        notice, this list of conditions and the following disclaimer in the
+#        documentation and/or other materials provided with the distribution.
+#      * Neither the name of David M. Syzdek nor the
+#        names of its contributors may be used to endorse or promote products
+#        derived from this software without specific prior written permission.
+#
+#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+#   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+#   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M SYZDEK BE LIABLE FOR
+#   ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+#   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+#   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+#   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+#
+#   lib/libcorset/libcorset.sym - list of symbols to export
+#
+# end of symbol export file