Fix includes.

diff --git a/src/filter.h b/src/filter.h
index b06dbeef12421bdf31a7820f4e655c90ce40c5cb..258bd9447f5b069afd72c1a3b6b3fa592b01109c 100644 (file)
--- a/src/filter.h
+++ b/src/filter.h
@@ -8,6 +8,7 @@
 
 #include "config.h"
 #include "symbols_cache.h"
+#include "task.h"
 
 struct rspamd_task;
 struct rspamd_settings;

diff --git a/src/protocol.h b/src/protocol.h
index 912b8744cea11625fc7ecc99e733304d17b83804..8d2efe118cd56e31c252e21b4ba4af3667207780 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -9,6 +9,7 @@
 #include "config.h"
 #include "filter.h"
 #include "http.h"
+#include "task.h"
 
 #define RSPAMD_BASE_ERROR 500
 #define RSPAMD_FILTER_ERROR RSPAMD_BASE_ERROR + 1
@@ -17,7 +18,6 @@
 #define RSPAMD_LENGTH_ERROR RSPAMD_BASE_ERROR + 4
 #define RSPAMD_STATFILE_ERROR RSPAMD_BASE_ERROR + 5
 
-struct rspamd_task;
 struct metric;
 
 /**

diff --git a/src/util.c b/src/util.c
index cba37f110624497d6cf37e6d7914e5ef25df29d4..03b38e087f306177967e186161b0fa55240adaf6 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -2083,21 +2083,23 @@ restart:
 }
 
 gboolean
-rspamd_ip_is_valid (void *ptr, int af)
+rspamd_ip_is_valid (rspamd_inet_addr_t *addr)
 {
        const struct in_addr ip4_any = { INADDR_ANY }, ip4_none = { INADDR_NONE };
        const struct in6_addr ip6_any = IN6ADDR_ANY_INIT;
 
        gboolean ret = FALSE;
 
-       if (G_LIKELY (af == AF_INET)) {
-               if (memcmp (ptr, &ip4_any, sizeof (struct in_addr)) != 0 &&
-                               memcmp (ptr, &ip4_none, sizeof (struct in_addr)) != 0) {
+       if (G_LIKELY (addr->af == AF_INET)) {
+               if (memcmp (&addr->addr.s4.sin_addr, &ip4_any, sizeof (struct in_addr)) != 0 &&
+                               memcmp (&addr->addr.s4.sin_addr, &ip4_none,
+                                               sizeof (struct in_addr)) != 0) {
                        ret = TRUE;
                }
        }
-       else if (G_UNLIKELY (af == AF_INET6)) {
-               if (memcmp (ptr, &ip6_any, sizeof (struct in6_addr)) != 0) {
+       else if (G_UNLIKELY (addr->af == AF_INET6)) {
+               if (memcmp (&addr->addr.s6.sin6_addr, &ip6_any,
+                               sizeof (struct in6_addr)) != 0) {
                        ret = TRUE;
                }
        }
@@ -2264,9 +2266,9 @@ rspamd_inet_address_get_port (rspamd_inet_addr_t *addr)
 {
        switch (addr->af) {
        case AF_INET:
-               return addr->addr.s4.sin_port;
+               return ntohs (addr->addr.s4.sin_port);
        case AF_INET6:
-               return addr->addr.s6.sin6_port;
+               return ntohs (addr->addr.s6.sin6_port);
        }
 
        return 0;

diff --git a/src/util.h b/src/util.h
index 00b3f1f7d34b5c6accf7293328620c25dd32340e..0605fe87d8c48a76998c70847a69c274af2fe511 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -448,7 +448,7 @@ gint rspamd_read_passphrase (gchar *buf, gint size, gint rwflag, gpointer key);
  * @param af address family (AF_INET or AF_INET6)
  * @return TRUE if the address is valid
  */
-gboolean rspamd_ip_is_valid (void *ptr, int af);
+gboolean rspamd_ip_is_valid (rspamd_inet_addr_t *addr);
 
 /**
  * Emit UCL object to gstring