Add option to debug Client block selections. Fix related buglet in

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

diff --git a/include/s_conf.h b/include/s_conf.h
index 3d48e8cbc75070466959dba659ef30ada3590edf..377542701c4e076cda91db10018b17e932ed6b17 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -30,8 +30,6 @@ struct Message;
 #define CONF_CLIENT             0x0002     /**< ConfItem describes a Client block */
 #define CONF_SERVER             0x0004     /**< ConfItem describes a Connect block */
 #define CONF_OPERATOR           0x0020     /**< ConfItem describes an Operator block */
-#define CONF_LEAF               0x1000     /**< ConfItem describes a Server leaf */
-#define CONF_HUB                0x4000     /**< ConfItem describes a Server hub */
 #define CONF_UWORLD             0x8000     /**< ConfItem describes a Uworld server */
 
 /** Indicates ConfItem types that count associated clients. */
@@ -50,17 +48,23 @@ struct ConfItem
   struct ConfItem *next;    /**< Next ConfItem in #GlobalConfList */
   unsigned int status;      /**< Set of CONF_* bits. */
   unsigned int clients;     /**< Number of *LOCAL* clients using this */
+  unsigned int maximum;     /**< For CONF_SERVER, max hops.
+                               For CONF_CLIENT, max connects per IP. */
   struct ConnectionClass *conn_class;  /**< Class of connection */
-  struct irc_sockaddr origin;  /**< local address for outbound connections */
-  struct irc_sockaddr address; /**< ip and port */
-  char *host; /**< peer hostname */
-  char *origin_name; /**< text form of origin address */
-  char *passwd; /**< password field */
-  char *name; /**< name of peer */
-  time_t hold; /**< Earliest time to attempt an outbound connect on this ConfItem. */
-  int dns_pending; /**< a dns request is pending */
-  unsigned char bits; /**< Number of bits for ipkills. */
-  struct Privs privs; /**< Priviledges for opers. */
+  struct irc_sockaddr origin;  /**< Local address for outbound connections */
+  struct irc_sockaddr address; /**< IP and port */
+  char *username;     /**< For CONF_CLIENT and CONF_OPERATOR, username mask. */
+  char *host;         /**< Peer hostname */
+  char *origin_name;  /**< Text form of origin address */
+  char *passwd;       /**< Password field */
+  char *name;         /**< Name of peer */
+  char *hub_limit;    /**< Mask that limits servers allowed behind
+                         this one. */
+  time_t hold;        /**< Earliest time to attempt an outbound
+                         connect on this ConfItem. */
+  int dns_pending;    /**< A dns request is pending. */
+  int addrbits;       /**< Number of bits valid in ConfItem::address. */
+  struct Privs privs; /**< Privileges for opers. */
   /** Used to detect if a privilege has been set by this ConfItem. */
   struct Privs privs_dirty;
 };
@@ -130,6 +134,8 @@ struct nick_host {
   char nick[1];           /**< start of nick\@server string */
 };
 
+#define SMAP_FAST 1           /**< Command does not have MFLG_SLOW. */
+
 /** Target set for a service pseudo-command. */
 struct s_map {
   struct s_map *next;         /**< Next element in #GlobalServiceMapList. */
@@ -137,6 +143,7 @@ struct s_map {
   char *name;                 /**< Text name of the mapping. */
   char *command;              /**< Command name to use. */
   char *prepend;              /**< Extra text to prepend to user's text. */
+  unsigned int flags;         /**< Bitwise map of SMAP_* flags. */
   struct nick_host *services; /**< Linked list of possible targets. */
 };
 
@@ -168,17 +175,15 @@ extern struct ConfItem* conf_find_server(const char* name);
 
 extern void det_confs_butmask(struct Client *cptr, int mask);
 extern enum AuthorizationCheckResult attach_conf(struct Client *cptr, struct ConfItem *aconf);
-extern struct ConfItem* find_conf_exact(const char* name, const char* user,
-                                        const char* host, int statmask);
+extern struct ConfItem* find_conf_exact(const char* name, struct Client *cptr, int statmask);
 extern enum AuthorizationCheckResult conf_check_client(struct Client *cptr);
 extern int  conf_check_server(struct Client *cptr);
-extern struct ConfItem* find_conf_name(const char* name, int statmask);
 extern int rehash(struct Client *cptr, int sig);
-extern void read_tlines(void);
 extern int find_kill(struct Client *cptr);
-extern int find_restrict(struct Client *cptr);
 extern const char *find_quarantine(const char* chname);
 extern void lookup_confhost(struct ConfItem *aconf);
+extern void conf_parse_userhost(struct ConfItem *aconf, char *host);
+extern struct ConfItem *conf_debug_iline(const char *client);
 
 extern void yyerror(const char *msg);