Author: Kev <klmitch@mit.edu>

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

diff --git a/include/querycmds.h b/include/querycmds.h
index d982463eb34e132e292117a009a6878db7960e19..3ebdaa568f570b36b230b7d2d731543cec4c69b9 100644 (file)
--- a/include/querycmds.h
+++ b/include/querycmds.h
@@ -6,6 +6,10 @@
 #ifndef INCLUDED_querycmds_h
 #define INCLUDED_querycmds_h
 
+#ifndef INCLUDED_ircd_features_h
+#include "ircd_features.h"     /* feature_str() */
+#endif
+
 struct Client;
 
 /*
@@ -39,9 +43,6 @@ extern struct UserStatistics UserStats;
 /* Macros for remote connections: */
 #define Count_newremoteclient(UserStats, cptr)  (++UserStats.clients, ++(cli_serv(cptr)->clients))
 #define Count_newremoteserver(UserStats)  (++UserStats.servers)
-#if 0
-#define Count_remoteclientquits(UserStats)      (--UserStats.clients)
-#endif
 
 #define Count_remoteclientquits(UserStats,cptr)                \
   do { \
@@ -57,7 +58,7 @@ extern struct UserStatistics UserStats;
 #define Count_unknownbecomesclient(cptr, UserStats) \
   do { \
     --UserStats.unknowns; ++UserStats.local_clients; ++UserStats.clients; \
-    if (match("*" DOMAINNAME, cli_sockhost(cptr)) == 0) \
+    if (match(feature_str(FEAT_DOMAINNAME), cli_sockhost(cptr)) == 0) \
       ++current_load.local_count; \
     if (UserStats.local_clients > max_client_count) \
       max_client_count = UserStats.local_clients; \
@@ -74,7 +75,7 @@ extern struct UserStatistics UserStats;
   do \
   { \
     --UserStats.local_clients; --UserStats.clients; \
-    if (match("*" DOMAINNAME, cli_sockhost(cptr)) == 0) \
+    if (match(feature_str(FEAT_DOMAINNAME), cli_sockhost(cptr)) == 0) \
       --current_load.local_count; \
   } while(0)
 #define Count_serverdisconnects(UserStats)              do { --UserStats.local_servers; --UserStats.servers; } while(0)