added gnutls backend and moved backend code into new files

[ircu2.10.12-pk.git] / include / ircd_string.h

diff --git a/include/ircd_string.h b/include/ircd_string.h
index 2cd1d1c5ed9de4df97316d012e0c710a4e822cba..df774c5e52b52f6a47b03c4af17c8896a2b61c27 100644 (file)
--- 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 <string.h> /* for DupString()'s strcpy, strlen */
+
 #ifndef INCLUDED_ircd_chattr_h
 #include "ircd_chattr.h"
 #endif
@@ -16,13 +19,6 @@ struct irc_in_addr;
 /** Check whether \a x is a NULL or empty string. */
 #define EmptyString(x) (!(x) || !(*x))
 
-/*
- * initialize recognizers
- */
-extern int init_string(void);
-
-extern int string_is_hostname(const char* str);
-extern int string_is_address(const char* str);
 extern int string_has_wildcards(const char* str);
 
 extern char*       ircd_strncpy(char* dest, const char* src, size_t len);
@@ -34,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);
 
@@ -117,10 +114,5 @@ static __inline__ NTL_HDR_strCasediff { NTL_SRC_strCasediff }
 #endif
 #endif /* FORCEINLINE */
 
-/*
- * Proto types of other externally visible functions
- */
-extern int strnChattr(const char *s, const size_t n);
-
 #endif /* INCLUDED_ircd_string_h */