X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ossec-hids.git;a=blobdiff_plain;f=src%2Fconfig%2Fglobal-config.h;h=774466335dc1c20d6e838cf05d95f70330b695ff;hp=dc5b783e435ca02da882d43f8a5238835b69c472;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b

diff --git a/src/config/global-config.h b/src/config/global-config.h
old mode 100755
new mode 100644
index dc5b783..7744663
--- a/src/config/global-config.h
+++ b/src/config/global-config.h
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/config/global-config.h, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
@@ -10,17 +7,15 @@
  * Foundation
  */
 
-
-
 #ifndef _CCONFIG__H
 #define _CCONFIG__H
-#include "shared.h"
 
+#include "shared.h"
 
 /* Configuration structure */
-typedef struct __Config
-{
+typedef struct __Config {
     u_int8_t logall;
+    u_int8_t logall_json;
     u_int8_t stats;
     u_int8_t integrity;
     u_int8_t syscheck_auto_ignore;
@@ -30,6 +25,8 @@ typedef struct __Config
     u_int8_t mailbylevel;
     u_int8_t logbylevel;
     u_int8_t logfw;
+    int decoder_order_size;
+
 
     /* Prelude support */
     u_int8_t prelude;
@@ -38,13 +35,17 @@ typedef struct __Config
     /* prelude profile name */
     char *prelude_profile;
 
+    /* GeoIP DB */
+    char *geoipdb_file;
+
     /* ZEROMQ Export */
-    u_int8_t zeromq_output; 
+    u_int8_t zeromq_output;
     char *zeromq_output_uri;
+    char *zeromq_output_server_cert;
+    char *zeromq_output_client_cert;
 
-    /* Picviz support */
-    u_int8_t picviz;
-    char *picviz_socket;
+    /* JSONOUT Export */
+    u_int8_t jsonout_output;
 
     /* Not currently used */
     u_int8_t keeplogdate;
@@ -54,7 +55,7 @@ typedef struct __Config
 
     /* Custom Alert output*/
     short int custom_alert_output;
-    char * custom_alert_output_format;
+    char *custom_alert_output_format;
 
     /* For the active response */
     int ar;
@@ -66,10 +67,10 @@ typedef struct __Config
     char **syscheck_ignore;
 
     /* List of ips to never block */
-    os_ip **white_list;
+    os_ip **allow_list;
 
     /* List of hostnames to never block */
-    OSMatch **hostname_white_list;
+    char **hostname_allow_list;
 
     /* List of rules */
     char **includes;
@@ -80,17 +81,21 @@ typedef struct __Config
     /* List of decoders */
     char **decoders;
 
-    /* Global rule hash. */
-    void *g_rules_hash;
+    /* Global rule hash */
+    OSHash *g_rules_hash;
 
-#ifdef GEOIP
+#ifdef LIBGEOIP_ENABLED
     /* GeoIP support */
     u_int8_t loggeoip;
     char *geoip_db_path;
     char *geoip6_db_path;
+    int geoip_jsonout;
 #endif
 
-}_Config;
+    /* MD5 DB support */
+    char *md5_allowlist;
 
+} _Config;
+
+#endif /* _CCONFIG__H */
 
-#endif