poc: removing links and usage of os_xml

Author: LucioDonda

src/common/CMakeLists.txt

@@ -4,7 +4,6 @@ add_subdirectory(time_op)
 add_subdirectory(file_op)
 add_subdirectory(privsep_op)
 add_subdirectory(pthreads_op)
-add_subdirectory(os_xml)
 add_subdirectory(error_messages)
 add_subdirectory(mem_op)
 add_subdirectory(binaries_op)

src/common/debug_op/CMakeLists.txt

@@ -11,7 +11,6 @@ target_link_libraries(debug_op
     mem_op
     privsep_op
     pthreads_op
-    os_xml
     error_messages
     os_net
     binaries_op

src/common/debug_op/src/debug_op.c

@@ -278,31 +278,36 @@ void w_logging_init(){
 }
 
 void os_logging_config(){
-  OS_XML xml;
+//   OS_XML xml;
   const char * xmlf[] = {"ossec_config", "logging", "log_format", NULL};
   char * logformat;
   char ** parts = NULL;
   int i;
 
   pid = (int)getpid();
 
-  if (OS_ReadXML(OSSECCONF, &xml) < 0){
-    flags.log_plain = 1;
-    flags.log_json = 0;
-    OS_ClearXML(&xml);
-    mlerror_exit(LOGLEVEL_ERROR, XML_ERROR, OSSECCONF, xml.err, xml.err_line);
-  }
-
-  logformat = OS_GetOneContentforElement(&xml, xmlf);
+//   TODO: replace function OS_ReadXML
+//   if (OS_ReadXML(OSSECCONF, &xml) < 0){
+//     flags.log_plain = 1;
+//     flags.log_json = 0;
+//     TODO: replace function OS_ClearXML
+//     OS_ClearXML(&xml);
+//     TODO: replace XML_ERROR
+//     mlerror_exit(LOGLEVEL_ERROR, XML_ERROR, OSSECCONF, xml.err, xml.err_line);
+//   }
+//   TODO: replace function OS_GetOneContentforElement
+//   logformat = OS_GetOneContentforElement(&xml, xmlf);
 
   if (!logformat || logformat[0] == '\0'){
 
     flags.log_plain = 1;
     flags.log_json = 0;
 
     free(logformat);
-    OS_ClearXML(&xml);
-    mdebug1(XML_NO_ELEM, "log_format");
+    // TODO: replace function OS_ClearXML
+    // OS_ClearXML(&xml);
+    // TODO: replace XML_NO_ELEM
+    // mdebug1(XML_NO_ELEM, "log_format");
 
   }else{
 
@@ -320,7 +325,8 @@ void os_logging_config(){
         }else{
           flags.log_plain = 1;
           flags.log_json = 0;
-          mlerror_exit(LOGLEVEL_ERROR, XML_VALUEERR, "log_format", part);
+          // TODO: replace XML_VALUEERR
+        //   mlerror_exit(LOGLEVEL_ERROR, XML_VALUEERR, "log_format", part);
         }
       }
       for (i=0; parts[i]; i++){
@@ -330,7 +336,8 @@ void os_logging_config(){
     }
 
     free(logformat);
-    OS_ClearXML(&xml);
+    // TODO: replace function OS_ClearXML
+    // OS_ClearXML(&xml);
   }
 }
 

src/common/utils/include/shared.h

@@ -119,7 +119,6 @@
 #include "mem_op.h"
 #include "privsep_op.h"
 #include "pthreads_op.h"
-#include "os_xml.h"
 #include "error_messages.h"
 #include "binaries_op.h"
 #include "os_ip.h"

src/modules/inventory/CMakeLists.txt

@@ -24,7 +24,6 @@ target_include_directories(inventory PUBLIC
     ${COMMON_FOLDER}/file_op/include
     ${COMMON_FOLDER}/hashHelper/include
     ${COMMON_FOLDER}/logging_helper/include
-    ${COMMON_FOLDER}/os_xml/include
     ${COMMON_FOLDER}/privsep_op/include
     ${COMMON_FOLDER}/pthreads_op/include
     ${COMMON_FOLDER}/stringHelper/include