X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ossec-hids.git;a=blobdiff_plain;f=src%2Fheaders%2Fread-agents.h;fp=src%2Fheaders%2Fread-agents.h;h=a89748dda3a3d0f75c0c7d619e359a52ebe2fe6b;hp=a450b729bd06de1b5b5e78be2902a28e2122ce8f;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b

diff --git a/src/headers/read-agents.h b/src/headers/read-agents.h
old mode 100755
new mode 100644
index a450b72..a89748d
--- a/src/headers/read-agents.h
+++ b/src/headers/read-agents.h
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/headers/read-agents.h, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
@@ -10,15 +7,14 @@
  * Foundation
  */
 
-
-
 #ifndef __CRAGENT_H
 #define __CRAGENT_H
 
+#include <external/cJSON/cJSON.h>
 
-/* Unique key for each agent. */
-typedef struct _agent_info
-{
+
+/* Unique key for each agent */
+typedef struct _agent_info {
     char *last_keepalive;
     char *syscheck_time;
     char *syscheck_endtime;
@@ -26,73 +22,70 @@ typedef struct _agent_info
     char *rootcheck_endtime;
     char *os;
     char *version;
-}agent_info;
+} agent_info;
 
+/* Print syscheck db (of modified files) */
+int print_syscheck(const char *sk_name, const char *sk_ip, const char *fname, int print_registry,
+                   int all_files, int csv_output, cJSON *json_output, int update_counter);
 
-/* Print syscheck db (of modified files). */
-int print_syscheck(char *sk_name, char *sk_ip, char *fname, int print_registry,
-                   int all_files, int csv_output, int update_counter);
+/* Print rootcheck db */
+int print_rootcheck(const char *sk_name, const char *sk_ip, const char *fname, int resolved,
+                    int csv_output, cJSON *json_output, int show_last);
 
-/* Print rootcheck db. */
-int print_rootcheck(char *sk_name, char *sk_ip, char *fname, int resolved,
-                    int csv_output, int show_last);
 
 /* Delete syscheck db */
-int delete_syscheck(char *sk_name, char *sk_ip, int full_delete);
+int delete_syscheck(const char *sk_name, const char *sk_ip, int full_delete) __attribute__((nonnull));
 
-/* Delete rootcheck db. */
-int delete_rootcheck(char *sk_name, char *sk_ip, int full_delete);
+/* Delete rootcheck db */
+int delete_rootcheck(const char *sk_name, const char *sk_ip, int full_delete) __attribute__((nonnull));
 
 /* Delete agent information */
-int delete_agentinfo(char *name);
+int delete_agentinfo(const char *name) __attribute__((nonnull));
 
 /* Get all available agents */
 char **get_agents(int flag);
 
+/* Get all available agents with specified timeout */
+char **get_agents_with_timeout(int flag, int timeout);
+
 /* Free the agent list */
 void free_agents(char **agent_list);
 
-/** char *print_agent_status(int status)
- * Prints the text representation of the agent status.
- */
-char *print_agent_status(int status);
-
-/** int get_agent_status(char *agent_name, char *agent_ip)
- * Gets the status of an agent, based on the name/ip.
- */
-int get_agent_status(char *agent_name, char *agent_ip);
+/* Print the text representation of the agent status */
+const char *print_agent_status(int status);
 
-/** agent_info *get_agent_info(char *agent_name, char *agent_ip)
- * Get information from an agent.
- */
-agent_info *get_agent_info(char *agent_name, char *agent_ip);
+/* Gets the status of an agent, based on the name/IP address */
+int get_agent_status(const char *agent_name, const char *agent_ip);
 
+/* Get information from an agent */
+agent_info *get_agent_info(const char *agent_name, const char *agent_ip) __attribute__((nonnull(2)));
 
-/** int connect_to_remoted()
- * Connects to remoted to be able to send messages to the agents.
- * Returns the socket on success or -1 on failure.
+/* Connect to remoted to be able to send messages to the agents
+ * Returns the socket on success or -1 on failure
  */
-int connect_to_remoted();
+int connect_to_remoted(void);
 
-/** int send_msg_to_agent(int socket, char *msg)
- * Sends a message to an agent.
- * returns -1 on error.
+#ifndef WIN32
+/* Return the unix permission string based on the syscheck db perm string
+ * agentless logs octal permissions, local syscheck decimal st_mode
+ * Returns a pointer to a local static array
  */
-int send_msg_to_agent(int msocket, char *msg, char *agt_id, char *exec);
-
-
+const char *agent_file_perm(char *perm);
+#endif
 
+/* Sends a message to an agent
+ * Returns -1 on error
+ */
+int send_msg_to_agent(int msocket, const char *msg, const char *agt_id, const char *exec) __attribute__((nonnull(2)));
 
-#define GA_NOTACTIVE    2
-#define GA_ACTIVE       3
-#define GA_ALL          5
-#define GA_ALL_WSTATUS  7
+#define GA_NOTACTIVE        2
+#define GA_ACTIVE           3
+#define GA_ALL              5
+#define GA_ALL_WSTATUS      7
 
 /* Status */
 #define GA_STATUS_ACTIVE    12
 #define GA_STATUS_NACTIVE   13
 #define GA_STATUS_INV       14
 
-
-
 #endif