X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/70c365cb350315dd2146847f05a276938fb042aa..6a0074bfaa195daa621ec6348f2abc2720e65ab0:/include/hostmask.h

diff --git a/include/hostmask.h b/include/hostmask.h
index 1f92b8c4..b8d5feca 100644
--- a/include/hostmask.h
+++ b/include/hostmask.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ *  Solanum: a slightly advanced ircd
  *  hostmask.h: A header for the hostmask code.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@@ -21,52 +21,51 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: hostmask.h 2757 2006-11-10 22:58:15Z jilles $
  */
 
 #ifndef INCLUDE_hostmask_h
 #define INCLUDE_hostmask_h 1
 enum
 {
+	HM_ERROR,
 	HM_HOST,
-	HM_IPV4
-#ifdef IPV6
-		, HM_IPV6
-#endif
+	HM_IPV4,
+	HM_IPV6,
+};
+
+enum aconf_category
+{
+	AC_CONFIG,
+	AC_BANDB,
 };
 
-int parse_netmask(const char *, struct sockaddr *, int *);
+int parse_netmask(const char *, struct rb_sockaddr_storage *, int *);
+int parse_netmask_strict(const char *, struct rb_sockaddr_storage *, int *);
 struct ConfItem *find_conf_by_address(const char *host, const char *sockhost,
 				      const char *orighost, struct sockaddr *,
-				      int, int, const char *);
+				      int, int, const char *, const char *);
 struct ConfItem *find_exact_conf_by_address(const char *address, int type,
 					    const char *username);
-void add_conf_by_address(const char *, int, const char *, struct ConfItem *);
+struct ConfItem *find_exact_conf_by_address_filtered(const char *address, int type,
+		const char *username, bool (*filter)(struct ConfItem *));
+void add_conf_by_address(const char *, int, const char *, const char *, struct ConfItem *);
 void delete_one_address_conf(const char *, struct ConfItem *);
-void clear_out_address_conf(void);
-void clear_out_address_conf_bans(void);
+void clear_out_address_conf(enum aconf_category);
 void init_host_hash(void);
-struct ConfItem *find_address_conf(const char *host, const char *sockhost, 
+struct ConfItem *find_address_conf(const char *host, const char *sockhost,
 				const char *, const char *, struct sockaddr *,
-				int);
+				int, char *);
 
 struct ConfItem *find_dline(struct sockaddr *, int);
 
-#define find_kline(x)	(find_conf_by_address((x)->host, (x)->sockhost, \
-			 (x)->orighost, \
+#define find_kline(x)	((IsConfDoSpoofIp((x)->localClient->att_conf) && IsConfKlineSpoof((x)->localClient->att_conf)) ? \
+		find_conf_by_address((x)->orighost, NULL, NULL, NULL, CONF_KILL, AF_INET, (x)->username, NULL) : \
+		find_conf_by_address((x)->host, (x)->sockhost, (x)->orighost, \
 			 (struct sockaddr *)&(x)->localClient->ip, CONF_KILL,\
-			 (x)->localClient->ip.ss_family, (x)->username))
-#define find_gline(x)	(find_conf_by_address((x)->host, (x)->sockhost, \
-			 (x)->orighost, \
-			 (struct sockaddr *)&(x)->localClient->ip, CONF_GLINE,\
-			 (x)->localClient->ip.ss_family, (x)->username))
+			 GET_SS_FAMILY(&(x)->localClient->ip), (x)->username, NULL))
 
-void report_Klines(struct Client *);
 void report_auth(struct Client *);
-#ifdef IPV6
 int match_ipv6(struct sockaddr *, struct sockaddr *, int);
-#endif
 int match_ipv4(struct sockaddr *, struct sockaddr *, int);
 
 /* Hashtable stuff... */
@@ -103,6 +102,8 @@ struct AddressRec
 
 	/* Only checked if !(type & 1)... */
 	const char *username;
+	/* Only checked if type == CONF_CLIENT */
+	const char *auth_user;
 	struct ConfItem *aconf;
 
 	/* The next record in this hash bucket. */