X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/921592dd1adaed54948c030be0daceb7e0c9d5b7..26d745b2a04a97f84d065085ab371cdff6f627d9:/src/common.h diff --git a/src/common.h b/src/common.h index a053131..0d93315 100644 --- a/src/common.h +++ b/src/common.h @@ -3,9 +3,9 @@ * * This file is part of x3. * - * srvx is free software; you can redistribute it and/or modify + * x3 is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -38,17 +38,10 @@ 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 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__ +#if __GNUC__ #define PRINTF_LIKE(M,N) __attribute__((format (printf, M, N))) #else #define PRINTF_LIKE(M,N) @@ -63,6 +56,12 @@ extern struct tm *localtime_r(const time_t *clock, struct tm *res); #define UNUSED_ARG(ARG) ARG #endif +#if defined(__GNUC__) && (__GNUC__ < 3) +# define GCC_VARMACROS 1 +#elif !defined(S_SPLINT_S) +# define C99_VARMACROS 1 +#endif + #if defined(WITH_MALLOC_DMALLOC) # define DMALLOC_FUNC_CHECK 1 # include @@ -102,6 +101,7 @@ extern void x3_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 @@ -126,10 +126,45 @@ extern void verify(const void *ptr); # define verify(ptr) (void)(ptr) #endif +extern char *x3_msnprintf(const int size, const char *format, ...); +#define msnprintf x3_msnprintf + extern time_t now; extern int quit_services; extern struct log_type *MAIN_LOG; +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); @@ -146,17 +181,20 @@ 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 shared); +int is_overmask(char *mask); + int is_ircmask(const char *text); int is_gline(const char *text); +int is_shun(const char *text); 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 */ @@ -165,6 +203,9 @@ int checkpass(const char *pass, const char *crypt); int split_ircmask(char *text, char **nick, char **ident, char **host); char *unsplit_string(char *set[], unsigned int max, char *dest); +extern char* x3_strtok(char** save, char* str, char* fs); + +int valid_email(const char *email); #define DECLARE_LIST(STRUCTNAME,ITEMTYPE) struct STRUCTNAME {\ unsigned int used, size;\ @@ -219,6 +260,7 @@ int getipbyname(const char *name, unsigned long *ip); int set_policer_param(const char *param, void *data, void *extra); const char *strtab(unsigned int ii); char *time2str(time_t thetime); +extern char *pretty_mask(char *mask); void tools_init(void); void tools_cleanup(void); @@ -226,6 +268,7 @@ void tools_cleanup(void); int irccasecmp(const char *stra, const char *strb); int ircncasecmp(const char *stra, const char *strb, unsigned int len); const char *irccasestr(const char *haystack, const char *needle); +char *ircstrlower(char *str); DECLARE_LIST(string_buffer, char); void string_buffer_append_string(struct string_buffer *buf, const char *tail); @@ -233,7 +276,10 @@ void string_buffer_append_substring(struct string_buffer *buf, const char *tail, void string_buffer_append_vprintf(struct string_buffer *buf, const char *fmt, va_list args); void string_buffer_append_printf(struct string_buffer *buf, const char *fmt, ...); void string_buffer_replace(struct string_buffer *buf, unsigned int from, unsigned int len, const char *repl); +void +irc_strtolower(char *str); +int str_is_number(const char *str); #define enabled_string(string) (!irccasecmp((string), "on") || !strcmp((string), "1") || !irccasecmp((string), "enabled")) #define disabled_string(string) (!irccasecmp((string), "off") || !strcmp((string), "0") || !irccasecmp((string), "disabled")) #define true_string(string) (!irccasecmp((string), "true") || !strcmp((string), "1") || !irccasecmp((string), "yes"))