Author: Andres Miller <a1kmm@mware.virtualave.net>

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

diff --git a/include/s_conf.h b/include/s_conf.h
index 9e676f921ad35e6579c7e31c3fce91a8813eca3f..6a89ab9142a64386fcc331229190ef1b05594dfb 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -21,7 +21,6 @@
 struct Client;
 struct SLink;
 struct TRecord;
-struct hostent;
 
 
 /*
@@ -38,16 +37,12 @@ struct hostent;
 #define CONF_SERVER             0x0004
 #define CONF_LOCOP              0x0010
 #define CONF_OPERATOR           0x0020
-#define CONF_ME                 0x0040
-#define CONF_KILL               0x0080
 #define CONF_LEAF               0x1000
 #define CONF_HUB                0x4000
 #define CONF_UWORLD             0x8000
-#define CONF_IPKILL             0x00010000
 
 #define CONF_OPS                (CONF_OPERATOR | CONF_LOCOP)
 #define CONF_CLIENT_MASK        (CONF_CLIENT | CONF_OPS | CONF_SERVER)
-#define CONF_KLINE              (CONF_KILL | CONF_IPKILL)
 
 #define IsIllegal(x)    ((x)->status & CONF_ILLEGAL)
 
@@ -56,18 +51,18 @@ struct hostent;
  */
 
 struct ConfItem {
-  struct ConfItem*   next;
-  unsigned int       status;    /* If CONF_ILLEGAL, delete when no clients */
-  unsigned int       clients;   /* Number of *LOCAL* clients using this */
-  struct in_addr     ipnum;     /* ip number of host field */
-  char                      bits;      /* Number of bits for ipkills */
-  char*              host;
-  char*              passwd;
-  char*              name;
-  unsigned short int port;
-  time_t             hold;      /* Hold until this time (calendar time) */
-  int                dns_pending; /* a dns request is pending */
-  struct ConfClass*  confClass; /* Class of connection */
+  struct ConfItem*         next;
+  unsigned int             status;      /* If CONF_ILLEGAL, delete when no clients */
+  unsigned int             clients;     /* Number of *LOCAL* clients using this */
+  struct ConnectionClass*  conn_class;  /* Class of connection */
+  struct in_addr           ipnum;       /* ip number of host field */
+  char*                    host;
+  char*                    passwd;
+  char*                    name;
+  time_t                   hold;        /* Hold until this time (calendar time) */
+  int                      dns_pending; /* a dns request is pending */
+  unsigned short           port;
+  char                            bits;        /* Number of bits for ipkills */
 };
 
 struct ServerConf {
@@ -80,20 +75,34 @@ struct ServerConf {
   int                dns_pending;
   int                connected;
   time_t             hold;
-  struct ConfClass*  confClass;
+  struct ConnectionClass*  conn_class;
+};
+
+struct DenyConf {
+  struct DenyConf*    next;
+  char*               hostmask;
+  char*               message;
+  char*               usermask;
+  unsigned int        address;
+  unsigned int        flags;
+  char                bits;        /* Number of bits for ipkills */
 };
 
+#define DENY_FLAGS_FILE     0x0001 /* Comment is a filename */
+#define DENY_FLAGS_IP       0x0002 /* K-line by IP address */
+#define DENY_FLAGS_REALNAME 0x0004 /* K-line by real name */
+
 /*
  * A line: A:<line 1>:<line 2>:<line 3>
  */
 struct LocalConf {
-  char* server_alias;
-  char* vhost_address;
-  char* description;
-  char* numeric_id;
-  char* location1;
-  char* location2;
-  char* contact;
+  char*          name;
+  char*          description;
+  struct in_addr vhost_address;
+  unsigned int   numeric;
+  char*          location1;
+  char*          location2;
+  char*          contact;
 };
 
 struct MotdItem {
@@ -139,6 +148,7 @@ enum AuthorizationCheckResult {
   ACR_BAD_SOCKET
 };
 
+
 /*
  * GLOBALS
  */
@@ -153,33 +163,33 @@ extern struct TRecord*  tdata;
  * Proto types
  */
 
+extern int init_conf(void);
+
 extern const struct LocalConf* conf_get_local(void);
 extern const struct MotdConf*  conf_get_motd_list(void);
 extern const struct CRuleConf* conf_get_crule_list(void);
+extern const struct DenyConf*  conf_get_deny_list(void);
 
-extern const char* conf_crule_eval(const char* host, int mask);
+extern const char* conf_eval_crule(const char* name, int mask);
 
 extern struct ConfItem* attach_confs_byhost(struct Client* cptr, const char* host, int statmask);
 extern struct ConfItem* find_conf_byhost(struct SLink* lp, const char* host, int statmask);
 extern struct ConfItem* find_conf_byname(struct SLink* lp, const char *name, int statmask);
 extern struct ConfItem* conf_find_server(const char* name);
-const char* conf_eval_crule(const char* name, int mask);
 
 extern void det_confs_butmask(struct Client *cptr, int mask);
-extern int detach_conf(struct Client *cptr, struct ConfItem *aconf);
 extern enum AuthorizationCheckResult attach_conf(struct Client *cptr, struct ConfItem *aconf);
-extern struct ConfItem* find_me(void);
 extern struct ConfItem* find_conf_exact(const char* name, const char* user,
                                         const char* host, 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 int init_conf(void);
 extern void read_tlines(void);
 extern int find_kill(struct Client *cptr);
 extern int find_restrict(struct Client *cptr);
-extern int m_killcomment(struct Client *sptr, char *parv, char *filename);
 extern struct MotdItem* read_motd(const char* motdfile);
 
+extern void yyerror(const char *msg);
+
 #endif /* INCLUDED_s_conf_h */