all: remove compilation warnings

Signed-off-by: nevola <laura.garcia@zevenet.com>

config.c

@@ -301,7 +301,7 @@ unsigned char **get_subjectaltnames(X509 * x509, unsigned int *count)
     switch (name->type) {
       case GEN_DNS:
         temp[local_count] =
-          strndup(ASN1_STRING_data(name->d.dNSName),
+          strndup(ASN1_STRING_get0_data(name->d.dNSName),
                   ASN1_STRING_length(name->d.dNSName)
                   + 1);
         if (temp[local_count] == NULL)
@@ -737,7 +737,7 @@ static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *)
  * Forms a composite pattern of all URLs within
  * of the form ((url1)|(url2)|(url3)) (and so on)
  */
-static char *parse_orurls()
+static char *parse_orurls(void)
 {
   char lin[MAXBUF];
   char *pattern;

http.c

@@ -1196,7 +1196,7 @@ void do_http(thr_arg * arg)
       msc_process_connection(modsec_transaction, ip_ori, port_ori, ip_dst,
                              port_dst);
 
-      waf_add_req_head(modsec_transaction, headers, headers_num);
+      waf_add_req_head(modsec_transaction, (const char **) headers, headers_num);
 
       // logmsg(LOG_DEBUG, "%s (%lx) read REQ_BODY? max_body (%d) > cont (%lld), chunked (%d), is_rpc (%d) ",
       //   buf_log_tag, pthread_self(), body_max_size, cont, chunked, is_rpc);
@@ -1962,7 +1962,7 @@ void do_http(thr_arg * arg)
       //waf response
       if (waf_rules) {
 
-        waf_add_resp_head(modsec_transaction, headers, headers_num);
+        waf_add_resp_head(modsec_transaction, (const char **) headers, headers_num);
 
         //  logmsg(LOG_DEBUG, "%s (%lx) read RESPONSE_BODY? max_body (%d) > cont (%lld), chunked (%d), is_rpc (%d) ",
         //    buf_log_tag, pthread_self(), body_max_size, cont, chunked, is_rpc);

pound.h

@@ -307,11 +307,13 @@ void waf_del_transaction(Transaction **transac);
 void waf_create_transaction(Transaction **t, ModSecurity *ms, Rules *rules);
 int waf_reload_rules(void);
 int waf_body_enabled(int bodybuf, const char *logtag, LONG body_size, int chunked, int rpc, int no_cont);
-int waf_add_http_info(Transaction *t, const char *header);
-int waf_add_req_head(Transaction *t, char const **headers, int num_headers);
-int waf_add_resp_head(Transaction * t, char const **headers, int num_headers);
+int waf_add_req_head(Transaction *t, const char **headers, int num_headers);
+int waf_add_resp_head(Transaction * t, const char **headers, int num_headers);
 int read_body(BIO *sock, char **buff, int size);
 int waf_resolution(Transaction *t,int *int_code, char *url, char *);
+int waf_check_rule(char *rule_str);
+int waf_check_set(char *file);
+
 #endif
 
 extern char *user, /* user to run as */

pound_sync.c

@@ -186,7 +186,7 @@ int send_action(POUND_ACTION * action)
   unsigned int size = 0;
   char *buffer = serialize(action, &size);
   if (size > 0) {
-    pthread_mutex_lock(&send_lock);
+    pthread_mutex_lock((pthread_mutex_t *) &send_lock);
     while (sent < size) {
       count = send(conn_sock, buffer + sent, size - sent, MSG_NOSIGNAL);
       if ((count == -1) && (errno == EWOULDBLOCK || errno == EAGAIN)) {
@@ -213,11 +213,11 @@ int send_action(POUND_ACTION * action)
     }
   }
   free(buffer);
-  pthread_mutex_unlock(&send_lock);
+  pthread_mutex_unlock((pthread_mutex_t *)&send_lock);
   return res;
 }
 
-void receive_task()
+void receive_task(void)
 {
   char buffer[65555 * 100];
   int buffer_size = 0;
@@ -354,7 +354,7 @@ void receive_task()
 void start_sync_thr(void)
 {
   int rc;
-  rc = pthread_create(&receive_thread, NULL, receive_task, NULL);
+  rc = pthread_create(&receive_thread, NULL, (void * (*)(void *))receive_task, NULL);
   rc = pthread_detach(receive_thread);
 }
 
@@ -528,7 +528,7 @@ void notify(ACTION_TYPE action, int listener, int service,
   send_action(&to_send);
 }
 
-void set_objects_key_id()
+void set_objects_key_id(void)
 {
   LISTENER *lstn;
   SERVICE *svc;

pound_sync.h

@@ -27,12 +27,12 @@ void free_action(POUND_ACTION *action);
 int process_action(POUND_ACTION *action);
 int init_pound_sync(void);
 int send_action(POUND_ACTION *action);
-void set_objects_key_id();
+void set_objects_key_id(void);
 static void t_send_arg(TABNODE *t, SERVICE *srv);
 void handle_sync_request(int fd);
 void notify(ACTION_TYPE action, int listener, int service, char *key,
             void *content, unsigned int last_access);
-void receive_task();
+void receive_task(void);
 void start_sync_thr(void);
 void stop_session_sync(void);
 #endif

svc.c

@@ -26,6 +26,7 @@
  */
 
 #include "svc.h"
+#include "pound_sync.h"
 
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
 #define TABNODE_GET_DOWN_LOAD(t) lh_TABNODE_get_down_load(t)
@@ -992,7 +993,7 @@ void kill_be(SERVICE * const svc, const BACKEND * be, const int disable_mode)
   char buf_log_tag[MAXBUF];
 
   /* get a tag for logs with backend and service */
-  get_bk_and_srv_string(buf_log_tag, svc, be);
+  get_bk_and_srv_string(buf_log_tag, svc, (BACKEND *)be);
 
   if (ret_val = pthread_mutex_lock(&svc->mut))
     logmsg(LOG_WARNING, "kill_be() lock: %s", strerror(ret_val));

waf.c

@@ -24,7 +24,7 @@ int waf_check_rule(char *rule_str)
 
   rule = msc_create_rules_set();
   //msc_rules_add
-  msc_rules_add(rule, rule_str, &err_msg);
+  msc_rules_add(rule, rule_str, (const char **) &err_msg);
 
   if (err_msg) {
     err_rul = 1;
@@ -47,7 +47,7 @@ int waf_check_set(char *file)
 
   rule = msc_create_rules_set();
   //msc_rules_add
-  msc_rules_add_file(rule, file, &err_msg);
+  msc_rules_add_file(rule, file, (const char **) &err_msg);
 
   if (err_msg) {
     err_rul = 1;
@@ -81,7 +81,7 @@ int waf_memo_create(WAF_RULESET_MEMO ** waf_rules)
 
     for (it = waf_rules_file; it != NULL; it = it->next) {
       //msc_rules_add
-      msc_rules_add_file(tmp_set, it->file, &err);
+      msc_rules_add_file(tmp_set, it->file, (const char **)&err);
 
       if (err) {
         err_flag++;
@@ -114,6 +114,35 @@ int waf_memo_create(WAF_RULESET_MEMO ** waf_rules)
   return err_flag;
 }
 
+static int waf_memo_lock(WAF_RULESET_MEMO * waf_rules)
+{
+  int err;
+  if (err = pthread_mutex_lock(&waf_rules->mut)) {
+    logmsg(LOG_WARNING, "waf_memo_lock(): %s", strerror(err));
+  }
+  return err;
+}
+
+static int waf_memo_unlock(WAF_RULESET_MEMO * waf_rules)
+{
+  int err;
+  if (err = pthread_mutex_unlock(&waf_rules->mut)) {
+    logmsg(LOG_WARNING, "waf_memo_unlock(): %s", strerror(err));
+  }
+  return err;
+}
+
+/* */
+static int waf_memo_get_counter(WAF_RULESET_MEMO * waf_rules)
+{
+  int counter = 0;
+
+  waf_memo_lock(waf_rules);
+  counter = (waf_rules->counter);
+  waf_memo_unlock(waf_rules);
+
+  return counter;
+}
 
 /* It uses the waf memo global struct "waf_rules_memo" */
 int waf_reload_rules(void)
@@ -144,36 +173,6 @@ int waf_reload_rules(void)
   return err;
 }
 
-int waf_memo_lock(WAF_RULESET_MEMO * waf_rules)
-{
-  int err;
-  if (err = pthread_mutex_lock(&waf_rules->mut)) {
-    logmsg(LOG_WARNING, "waf_memo_lock(): %s", strerror(err));
-  }
-  return err;
-}
-
-int waf_memo_unlock(WAF_RULESET_MEMO * waf_rules)
-{
-  int err;
-  if (err = pthread_mutex_unlock(&waf_rules->mut)) {
-    logmsg(LOG_WARNING, "waf_memo_unlock(): %s", strerror(err));
-  }
-  return err;
-}
-
-/* */
-int waf_memo_get_counter(WAF_RULESET_MEMO * waf_rules)
-{
-  int counter = 0;
-
-  waf_memo_lock(waf_rules);
-  counter = (waf_rules->counter);
-  waf_memo_unlock(waf_rules);
-
-  return counter;
-}
-
 int waf_memo_increase(WAF_RULESET_MEMO * waf_rules)
 {
   waf_memo_lock(waf_rules);
@@ -235,7 +234,8 @@ parse_headers(const char *header, char **key, int *key_size, char **value,
   int fin = 0;
   int parsing_value = 0;
   int i;
-  *key = header;
+
+  *key = (char *)header;
   *key_size = 0;
   *value_size = 0;
 
@@ -256,7 +256,7 @@ parse_headers(const char *header, char **key, int *key_size, char **value,
   if (fin == 1) {
     i--;
     *key_size = i;
-    *value = header + i + 2;
+    *value = (char *) header + i + 2;
     *value_size = strlen(header) - 2 - *key_size;       // rest size of " :
   }
 
@@ -264,7 +264,7 @@ parse_headers(const char *header, char **key, int *key_size, char **value,
 }
 
 
-int waf_add_http_info(Transaction * t, const char *header)
+static int waf_add_http_info(Transaction * t, const char *header)
 {
   int ret = 0;
   int version_str_size = 10;
@@ -315,7 +315,7 @@ int waf_add_http_info(Transaction * t, const char *header)
 }
 
 
-int waf_add_req_head(Transaction * t, char const **headers, int num_headers)
+int waf_add_req_head(Transaction * t, const char **headers, int num_headers)
 {
   char *key;
   int key_size;
@@ -330,8 +330,9 @@ int waf_add_req_head(Transaction * t, char const **headers, int num_headers)
   // skip first header, it is the VERB, URI and VERSION
   for (i = 1; cont == 1 && i < num_headers; i++) {
     cont = parse_headers(headers[i], &key, &key_size, &value, &value_size);
-    if (cont == 1)
+    if (cont == 1) {
       msc_add_n_request_header(t, key, key_size, value, value_size);
+    }
     else {
       ret = 0;
     }
@@ -343,7 +344,7 @@ int waf_add_req_head(Transaction * t, char const **headers, int num_headers)
 }
 
 
-int waf_add_resp_head(Transaction * t, char const **headers, int num_headers)
+int waf_add_resp_head(Transaction * t, const char **headers, int num_headers)
 {
   char *key;
   int key_size;
@@ -369,9 +370,9 @@ int waf_add_resp_head(Transaction * t, char const **headers, int num_headers)
     if (aux == ' ')
       aux = '\0';
 
-    if (param == 0)
+    if (param == 0) {
       http_version[ic] = aux;
-    else if (param == 1)
+    } else if (param == 1)
       http_code_str[ic] = aux;
 
     if (aux == '\0') {