Store git version string to a C file, not a header.

[srvx.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 5982512fe3670eda84f87721e133e8193342ed56..c23597c3ff9ac811ede4fb48114bc26555ec0927 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -38,14 +38,7 @@ extern struct tm *localtime_r(const time_t *clock, struct tm *res);
 #define false 0
 #endif
 
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffffL
-#endif
-#ifndef INADDR_LOOPBACK
-#define INADDR_LOOPBACK 0x7f000001L
-#endif
-
-#define ArrayLength(x)         (sizeof(x)/sizeof(x[0]))
+#define ArrayLength(x)      (sizeof(x)/sizeof(x[0]))
 #define safestrncpy(dest, src, len) do { char *d = (dest); const char *s = (src); size_t l = strlen(s)+1;  if ((len) < l) l = (len); memmove(d, s, l); d[l-1] = 0; } while (0)
 
 #ifdef __GNUC__
@@ -102,6 +95,24 @@ extern void srvx_free(const char *, unsigned int, void *);
 extern void verify(const void *ptr);
 #  define verify(x) verify(x)
 # endif
+#elif defined(WITH_MALLOC_SLAB)
+# define malloc(n) slab_malloc(__FILE__, __LINE__, (n))
+# undef calloc
+# define calloc(m,n) slab_malloc(__FILE__, __LINE__, (m)*(n))
+# undef realloc
+# define realloc(p,n) slab_realloc(__FILE__, __LINE__, (p), (n))
+# undef free
+# define free(p) slab_free(__FILE__, __LINE__, (p))
+# undef strdup
+# define strdup(s) slab_strdup(__FILE__, __LINE__, (s))
+extern void *slab_malloc(const char *, unsigned int, size_t);
+extern void *slab_realloc(const char *, unsigned int, void *, size_t);
+extern char *slab_strdup(const char *, unsigned int, const char *);
+extern void slab_free(const char *, unsigned int, void *);
+# if !defined(NDEBUG)
+extern void verify(const void *ptr);
+#  define verify(x) verify(x)
+# endif
 #endif
 
 #ifndef verify
@@ -111,6 +122,39 @@ extern void verify(const void *ptr);
 extern time_t now;
 extern int quit_services;
 extern struct log_type *MAIN_LOG;
+extern const char git_version[];
+
+typedef union irc_in_addr {
+    uint32_t in6_32[4];
+    uint16_t in6[8];
+    uint8_t in6_8[16];
+} irc_in_addr_t;
+
+#define irc_in_addr_is_valid(ADDR) (((ADDR).in6[0] && (ADDR).in6[0] != 65535) \
+                                    || (ADDR).in6[1] != (ADDR).in6[0] \
+                                    || (ADDR).in6[2] != (ADDR).in6[0] \
+                                    || (ADDR).in6[3] != (ADDR).in6[0] \
+                                    || (ADDR).in6[4] != (ADDR).in6[0] \
+                                    || (ADDR).in6[5] != (ADDR).in6[0] \
+                                    || (ADDR).in6[6] != (ADDR).in6[0] \
+                                    || (ADDR).in6[7] != (ADDR).in6[0])
+#define irc_in_addr_is_ipv4(ADDR) (!(ADDR).in6[0] && !(ADDR).in6[1] \
+                                   && !(ADDR).in6[2] && !(ADDR).in6[3] \
+                                   && !(ADDR).in6[4] && (ADDR).in6[6] \
+                                   && (!(ADDR).in6[5] || (ADDR).in6[5] == 65535))
+#define irc_in_addr_is_ipv6(ADDR) !irc_in_addr_is_ipv4(ADDR)
+#define irc_in_addr_is_loopback(ADDR) (irc_in_addr_is_ipv4(ADDR) ? (ADDR).in6_8[12] == 127 \
+                                       : (ADDR).in6[0] == 0 && (ADDR).in6[1] == 0 \
+                                       && (ADDR).in6[2] == 0 && (ADDR).in6[3] == 0 \
+                                       && (ADDR).in6[4] == 0 && (ADDR).in6[5] == 0 \
+                                       && (ADDR).in6[6] == 0 && (ADDR).in6[7] == 1)
+#define IRC_NTOP_MAX_SIZE 40
+unsigned int irc_ntop(char *output, unsigned int out_size, const irc_in_addr_t *addr);
+#define IRC_NTOP_MASK_MAX_SIZE (IRC_NTOP_MAX_SIZE + 4)
+unsigned int irc_ntop_mask(char *output, unsigned int out_size, const irc_in_addr_t *addr, unsigned char bits);
+unsigned int irc_pton(irc_in_addr_t *addr, unsigned char *bits, const char *input);
+unsigned int irc_check_mask(const irc_in_addr_t *check, const irc_in_addr_t *mask, unsigned char bits);
+const char *irc_ntoa(const irc_in_addr_t *addr);
 
 int create_socket_client(struct uplinkNode *target);
 void close_socket(void);
@@ -127,7 +171,9 @@ int split_line(char *line, int irc_colon, int argv_size, char *argv[]);
 #define match_ircglobs !mmatch
 int mmatch(const char *glob, const char *newglob);
 int match_ircglob(const char *text, const char *glob);
-int user_matches_glob(struct userNode *user, const char *glob, int include_nick);
+#define MATCH_USENICK 1
+#define MATCH_VISIBLE 2
+int user_matches_glob(struct userNode *user, const char *glob, int flags);
 
 int is_ircmask(const char *text);
 int is_gline(const char *text);
@@ -136,8 +182,6 @@ char *sanitize_ircmask(char *text);
 
 unsigned long ParseInterval(const char *interval);
 unsigned long ParseVolume(const char *volume);
-int parse_ipmask(const char *str, struct in_addr *addr, unsigned long *mask);
-#define MATCH_IPMASK(test, addr, mask) (((ntohl(test.s_addr) & mask) ^ (ntohl(addr.s_addr) & mask)) == 0)
 
 #define MD5_CRYPT_LENGTH 42
 /* buffer[] must be at least MD5_CRYPT_LENGTH bytes long */
@@ -174,11 +218,11 @@ int STRUCTNAME##_remove(struct STRUCTNAME *list, ITEMTYPE new_item) {\
     unsigned int n, found;\
     verify(list->list);\
     for (found=n=0; n<list->used; n++) {\
-       if (list->list[n] == new_item) {\
-           memmove(list->list+n, list->list+n+1, (list->used-n-1)*sizeof(list->list[n]));\
-           found = 1;\
-           list->used--;\
-       }\
+        if (list->list[n] == new_item) {\
+            memmove(list->list+n, list->list+n+1, (list->used-n-1)*sizeof(list->list[n]));\
+            found = 1;\
+            list->used--;\
+        }\
     }\
     return found;\
 }\
@@ -192,7 +236,7 @@ void STRUCTNAME##_clean(struct STRUCTNAME *list) {\
  * minutes, and 10 seconds" (27 characters).  Other languages will
  * vary, so there's plenty of leeway.
  */
-#define INTERVALLEN    50
+#define INTERVALLEN 50
 
 struct handle_info;
 char *intervalString(char *output, time_t interval, struct handle_info *hi);