[#145] Created sa folder with both internal and mariadb options;

nasa · Apr 25, 2023 · 296b020 · 296b020
1 parent 49848f0
commit 296b020
Show file tree

Hide file tree

Showing 17 changed files with 597 additions and 591 deletions.
diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
@@ -27,12 +27,12 @@ jobs:
         working-directory: ${{github.workspace}}/build
         #Maybe create a variable for this SQL location
         run: |
-          cd /__w/CryptoLib/CryptoLib/src/crypto_sadb/sadb_mariadb_sql
+          cd /__w/CryptoLib/CryptoLib/src/sa/sadb_mariadb_sql
           echo "----------------"
           /etc/init.d/mysql start
           mysql --host=localhost -uroot -pitc123! < delete_sadb.sql
           mysql --host=localhost -uroot -pitc123! < create_sadb.sql
-          cd /__w/CryptoLib/CryptoLib/src/crypto_sadb/test_sadb_mariadb_sql
+          cd /__w/CryptoLib/CryptoLib/src/sa/test_sadb_mariadb_sql
           mysql --host=localhost -uroot -pitc123! < create_sadb_unit_test_user_grant_permissions.sql
           mysql --host=localhost -uroot -pitc123! < create_sadb_jpl_unit_test_security_associations.sql
           cd /__w/CryptoLib/CryptoLib/build/bin

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,6 +29,8 @@ OPTION(ENCTEST "Encryption-Tests" OFF) # Disabled by default, enable with: -DENC
 OPTION(CODECOV "Code-Coverage" OFF) # Disabled by default, enable with: -DCODECOV=ON
 OPTION(SYSTEM_INSTALL "SystemInstall" OFF) #Disabled by default, enable with: -DSYSTEM_INSTALL=ON
 
+OPTION(SA_INTERNAL "SA Internal" ON) # Enabled by default, disable with: -DSA_INTERNAL=OFF
+
 IF(NOT DEFINED CFE_SYSTEM_PSPNAME)
     # Not cFE / cFS
     set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -19,11 +19,19 @@ include_directories(../include)
 
 aux_source_directory(src_main LIB_SRC_FILES)
 if(MYSQL)
-    aux_source_directory(src_mysql LIB_SRC_MYSQL_FILES)
-    list(APPEND LIB_SRC_FILES ${LIB_SRC_MYSQL_FILES})
+    aux_source_directory(sa/mariadb MARIADB_FILES)
+    list(APPEND LIB_SRC_FILES ${MARIADB_FILES})
 else()
-    aux_source_directory(src_feature_stubs/mysql_stub LIB_SRC_MYSQL_FILES)
-    list(APPEND LIB_SRC_FILES ${LIB_SRC_MYSQL_FILES})
+    aux_source_directory(sa/mariadb_stub MARIADB_FILES)
+    list(APPEND LIB_SRC_FILES ${MARIADB_FILES})
+endif()
+
+if(SA_INTERNAL)
+    aux_source_directory(sa/internal SA_INTERNAL_FILES)
+    list(APPEND LIB_SRC_FILES ${SA_INTERNAL_FILES})
+else()
+    aux_source_directory(sa/internal_stub SA_INTERNAL_FILES)
+    list(APPEND LIB_SRC_FILES ${SA_INTERNAL_FILES})
 endif()
 
 if(LIBGCRYPT)
@@ -92,8 +100,8 @@ ELSE()
 ENDIF()
 
 IF(MYSQL)
-    file(GLOB MYSQL_SCRIPTS crypto_sadb/sadb_mariadb_sql/*.sql)
-    file(GLOB MYSQL_TEST_SCRIPTS crypto_sadb/test_sadb_mariadb_sql/*.sql)
+    file(GLOB MYSQL_SCRIPTS sa/sadb_mariadb_sql/*.sql)
+    file(GLOB MYSQL_TEST_SCRIPTS sa/test_sadb_mariadb_sql/*.sql)
     install(FILES ${MYSQL_SCRIPTS}
             DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/sadb_mariadb_sql)
     install(FILES ${MYSQL_TEST_SCRIPTS}

diff --git a/...src_main/sadb_routine_inmemory.template.c → ...internal/sadb_routine_inmemory.template.c b/...src_main/sadb_routine_inmemory.template.c → ...internal/sadb_routine_inmemory.template.c
diff --git a/src/src_main/sadb_routine.c → ...nternal_stub/sadb_routine_inmemory.stub.c b/src/src_main/sadb_routine.c → ...nternal_stub/sadb_routine_inmemory.stub.c
@@ -13,15 +13,11 @@
  */
 
 #include "sadb_routine.h"
-/**
- * @brief Function: init_parse_sadb_routine
- * @param config: uint8_t*
- * @return SadbRoutine
- **/
-/*
-SadbRoutine init_parse_sadb_routine(uint8_t* config)
+
+static SadbRoutineStruct sadb_routine;
+
+SadbRoutine get_sadb_routine_inmemory(void)
 {
-    SadbRoutine sadb_routine;
-    return sadb_routine;
+    fprintf(stderr,"ERROR: Loading internal stub source code. Rebuild CryptoLib with -DMYSQL=OFF to use proper internal implementation.\n");
+    return &sadb_routine;
 }
-*/