X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=include%2Fircd_string.h;h=df774c5e52b52f6a47b03c4af17c8896a2b61c27;hb=refs%2Fheads%2Fupstream;hp=888cfb33de36e43d4ae89861ca014f6b674167f6;hpb=350337e260ea64da83cf35febe8c52d888830156;p=ircu2.10.12-pk.git diff --git a/include/ircd_string.h b/include/ircd_string.h index 888cfb3..df774c5 100644 --- a/include/ircd_string.h +++ b/include/ircd_string.h @@ -4,6 +4,9 @@ */ #ifndef INCLUDED_ircd_string_h #define INCLUDED_ircd_string_h + +#include /* for DupString()'s strcpy, strlen */ + #ifndef INCLUDED_ircd_chattr_h #include "ircd_chattr.h" #endif @@ -27,7 +30,8 @@ extern int token_vector(char* names, char token, char** vector, int size); extern const char* ircd_ntoa(const struct irc_in_addr* addr); extern const char* ircd_ntoa_r(char* buf, const struct irc_in_addr* addr); -extern int ircd_aton(struct irc_in_addr *addr, const char *str); +#define ircd_aton(ADDR, STR) ipmask_parse((STR), (ADDR), NULL) +extern int ipmask_parse(const char *in, struct irc_in_addr *mask, unsigned char *bits_ptr); extern char* host_from_uh(char* buf, const char* userhost, size_t len); extern char* ircd_strtok(char** save, char* str, char* fs);