X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/40c1fd479952f47b9f3f5c4de660cd94ddd1a89a..9dcb9e16960e48546be5c79d27db28256d71079f:/include/hostmask.h

diff --git a/include/hostmask.h b/include/hostmask.h
index fa219ad3..bb41b6c2 100644
--- a/include/hostmask.h
+++ b/include/hostmask.h
@@ -21,8 +21,6 @@
  *  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
@@ -30,13 +28,11 @@
 enum
 {
 	HM_HOST,
-	HM_IPV4
-#ifdef RB_IPV6
-		, HM_IPV6
-#endif
+	HM_IPV4,
+	HM_IPV6,
 };
 
-int parse_netmask(const char *, struct sockaddr *, int *);
+int parse_netmask(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 *, const char *);
@@ -47,7 +43,7 @@ void delete_one_address_conf(const char *, struct ConfItem *);
 void clear_out_address_conf(void);
 void clear_out_address_conf_bans(void);
 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, char *);
 
@@ -56,13 +52,10 @@ struct ConfItem *find_dline(struct sockaddr *, int);
 #define find_kline(x)	(find_conf_by_address((x)->host, (x)->sockhost, \
 			 (x)->orighost, \
 			 (struct sockaddr *)&(x)->localClient->ip, CONF_KILL,\
-			 (x)->localClient->ip.ss_family, (x)->username, NULL))
+			 GET_SS_FAMILY(&(x)->localClient->ip), (x)->username, NULL))
 
-void report_Klines(struct Client *);
 void report_auth(struct Client *);
-#ifdef RB_IPV6
 int match_ipv6(struct sockaddr *, struct sockaddr *, int);
-#endif
 int match_ipv4(struct sockaddr *, struct sockaddr *, int);
 
 /* Hashtable stuff... */