Remove picviz support.

.travis.yml

@@ -13,7 +13,7 @@ env:
 - DB=pgsql OSSEC_TYPE=server GEOIP=no
 - DB=none OSSEC_TYPE=server GEOIP=yes
 - DB=none OSSEC_TYPE=server GEOIP=no
-- DB=none OSSEC_TYPE=server PRELUDE=yes ZEROMQ=yes PICVIZ=yes
+- DB=none OSSEC_TYPE=server PRELUDE=yes ZEROMQ=yes
 - DB=none OSSEC_TYPE=local GEOIP=no
 - DB=none OSSEC_TYPE=hybrid GEOIP=no
 - DB=none OSSEC_TYPE=agent GEOIP=no
@@ -55,7 +55,6 @@ script:
   && if ! [[ "${DB}" = "none" ]]; then COMMAND="${COMMAND} DATABASE=${DB}"; fi
   && if [[ "${GEOIP}" = "yes" ]]; then COMMAND="${COMMAND} USE_GEOIP=1"; fi
   && if [[ "${PRELUDE}" = "yes" ]]; then COMMAND="${COMMAND} USE_PRELUDE=1"; fi
-  && if [[ "${PICVIZ}" = "yes" ]]; then COMMAND="${COMMAND} USE_PICVIZ=1"; fi
   && if [[ "${ZEROMQ}" = "yes" ]]; then COMMAND="${COMMAND} USE_ZEROMQ=1"; fi
   && ( cd src/ && make --warn-undefined-variables ${COMMAND} settings && make --warn-undefined-variables ${COMMAND} -j )
   && if ! [[ "${OSSEC_TYPE}" = "test" || "${OSSEC_TYPE}" = "winagent" ]]; then ( cd src/ && sudo make --warn-undefined-variables ${COMMAND} install ) fi

etc/ossec.conf

@@ -7,7 +7,6 @@
     <smtp_server>smtp.example.com.</smtp_server>
     <email_from>ossecm@ossec.example.com.</email_from>
     <!-- <email_reply_to>replyto@ossec.example.com.</email_reply_to> -->
-    <picviz_output>no</picviz_output>
   </global>
 
   <rules>

src/Makefile

@@ -23,10 +23,8 @@ USE_GEOIP?=no
 USE_INOTIFY=no
 
 ifneq (${TARGET},winagent)
-	USE_PICVIZ?=yes
 	USE_OPENSSL?=auto
 else
-	USE_PICVIZ?=no
 	USE_OPENSSL?=no
 endif
 
@@ -192,10 +190,6 @@ ifneq (,$(filter ${USE_ZEROMQ},auto yes y Y 1))
 	OSSEC_LDFLAGS+=-lzmq -lczmq -lm
 endif # USE_ZEROMQ
 
-ifneq (,$(filter ${USE_PICVIZ},auto yes y Y 1))
-	DEFINES+=-DPICVIZ_OUTPUT_ENABLED
-endif # USE_PICVIZ
-
 ifneq (,$(filter ${USE_GEOIP},auto yes y Y 1))
 	DEFINES+=-DLIBGEOIP_ENABLED
 	OSSEC_LDFLAGS+=-lGeoIP
@@ -536,7 +530,6 @@ settings:
 	@echo "    USE_GEOIP:        ${USE_GEOIP}"
 	@echo "    USE_PRELUDE:      ${USE_PRELUDE}"
 	@echo "    USE_OPENSSL:      ${USE_OPENSSL}"
-	@echo "    USE_PICVIZ:       ${USE_PICVIZ}"
 	@echo "    USE_INOTIFY:      ${USE_INOTIFY}"
 	@echo "Mysql settings:"
 	@echo "    includes:         ${MI}"

src/analysisd/analysisd.c

@@ -33,10 +33,6 @@
 #include "dodiff.h"
 #include "output/jsonout.h"
 
-#ifdef PICVIZ_OUTPUT_ENABLED
-#include "output/picviz.h"
-#endif
-
 #ifdef PRELUDE_OUTPUT_ENABLED
 #include "output/prelude.h"
 #endif
@@ -286,17 +282,6 @@ int main_analysisd(int argc, char **argv)
     }
 #endif
 
-#ifdef PICVIZ_OUTPUT_ENABLED
-    /* Open the Picviz socket */
-    if (Config.picviz) {
-        OS_PicvizOpen(Config.picviz_socket);
-
-        if (chown(Config.picviz_socket, uid, gid) == -1) {
-            ErrorExit(CHOWN_ERROR, ARGV0, Config.picviz_socket, errno, strerror(errno));
-        }
-    }
-#endif
-
     /* Set the group */
     if (Privsep_SetGroup(gid) < 0) {
         ErrorExit(SETGID_ERROR, ARGV0, group, errno, strerror(errno));
@@ -531,12 +516,6 @@ int main_analysisd(int argc, char **argv)
     /* Going to main loop */
     OS_ReadMSG(m_queue);
 
-#ifdef PICVIZ_OUTPUT_ENABLED
-    if (Config.picviz) {
-        OS_PicvizClose();
-    }
-#endif
-
     exit(0);
 }
 
@@ -962,13 +941,6 @@ void OS_ReadMSG_analysisd(int m_queue)
 #endif
 
 
-#ifdef PICVIZ_OUTPUT_ENABLED
-                /* Log to Picviz */
-                if (Config.picviz) {
-                    OS_PicvizLog(lf);
-                }
-#endif
-
                 /* Execute an active response */
                 if (currently_rule->ar) {
                     int do_ar;

src/analysisd/config.c

@@ -28,7 +28,6 @@ int GlobalConf(const char *cfgfile)
     Config.integrity = 8;
     Config.rootcheck = 8;
     Config.hostinfo = 8;
-    Config.picviz = 0;
     Config.prelude = 0;
     Config.zeromq_output = 0;
     Config.zeromq_output_uri = NULL;

src/config/global-config.c

@@ -98,8 +98,6 @@ int Read_Global(XML_NODE node, void *configp, void *mailp)
     const char *xml_integrity = "integrity_checking";
     const char *xml_rootcheckd = "rootkit_detection";
     const char *xml_hostinfo = "host_information";
-    const char *xml_picviz = "picviz_output";
-    const char *xml_picviz_socket = "picviz_socket";
     const char *xml_prelude = "prelude_output";
     const char *xml_prelude_profile = "prelude_profile";
     const char *xml_prelude_log_level = "prelude_log_level";
@@ -200,25 +198,6 @@ int Read_Global(XML_NODE node, void *configp, void *mailp)
                 return (OS_INVALID);
             }
         }
-        /* Picviz support */
-        else if (strcmp(node[i]->element, xml_picviz) == 0) {
-            if (strcmp(node[i]->content, "yes") == 0) {
-                if (Config) {
-                    Config->picviz = 1;
-                }
-            } else if (strcmp(node[i]->content, "no") == 0) {
-                if (Config) {
-                    Config->picviz = 0;
-                }
-            } else {
-                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
-                return (OS_INVALID);
-            }
-        } else if (strcmp(node[i]->element, xml_picviz_socket) == 0) {
-            if (Config) {
-                os_strdup(node[i]->content, Config->picviz_socket);
-            }
-        }
         /* Prelude support */
         else if (strcmp(node[i]->element, xml_prelude) == 0) {
             if (strcmp(node[i]->content, "yes") == 0) {

src/config/global-config.h

@@ -44,10 +44,6 @@ typedef struct __Config {
     /* JSONOUT Export */
     u_int8_t jsonout_output;
 
-    /* Picviz support */
-    u_int8_t picviz;
-    char *picviz_socket;
-
     /* Not currently used */
     u_int8_t keeplogdate;