ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/include/conf.h
(Generate patch)

Comparing ircd-hybrid/trunk/include/conf.h (file contents):
Revision 1622 by michael, Thu Nov 1 13:16:37 2012 UTC vs.
Revision 1946 by michael, Sun May 5 10:21:40 2013 UTC

# Line 25 | Line 25
25   #ifndef INCLUDED_s_conf_h
26   #define INCLUDED_s_conf_h
27   #include "config.h"
28 – #ifdef HAVE_LIBCRYPTO
29 – #include <openssl/rsa.h>
30 – #endif
28   #include "ircd_defs.h"
29   #include "motd.h"               /* MessageFile */
30   #include "client.h"
31   #include "hook.h"
32 + #include "conf_class.h"
33  
34  
35 < struct Client;
35 > #define CONF_NOREASON "<No reason supplied>"
36  
37 < extern struct Callback *client_check_cb;
37 > #define IsConfOperator(x)       ((x)->type == CONF_OPER)
38 > #define IsConfKill(x)           ((x)->type == CONF_KLINE)
39 > #define IsConfClient(x)         ((x)->type == CONF_CLIENT)
40 > #define IsConfGline(x)          ((x)->type == CONF_GLINE)
41  
42 < struct conf_parser_context
42 < {
43 <  unsigned int boot;
44 <  unsigned int pass;
45 <  FILE *conf_file;
46 < };
47 <
48 < extern struct conf_parser_context conf_parser_ctx;
49 <
50 < typedef enum
51 < {  
52 <  CONF_TYPE,
53 <  CLASS_TYPE,
54 <  OPER_TYPE,
55 <  CLIENT_TYPE,
56 <  SERVER_TYPE,
57 <  HUB_TYPE,
58 <  LEAF_TYPE,
59 <  KLINE_TYPE,
60 <  DLINE_TYPE,
61 <  EXEMPTDLINE_TYPE,
62 <  CLUSTER_TYPE,
63 <  RKLINE_TYPE,
64 <  RXLINE_TYPE,
65 <  XLINE_TYPE,    
66 <  ULINE_TYPE,
67 <  GLINE_TYPE,
68 <  CRESV_TYPE,    
69 <  NRESV_TYPE,
70 <  SERVICE_TYPE
71 < } ConfType;
72 <
73 < struct split_nuh_item
74 < {
75 <  dlink_node node;
76 <
77 <  char *nuhmask;
78 <  char *nickptr;
79 <  char *userptr;
80 <  char *hostptr;
81 <
82 <  size_t nicksize;
83 <  size_t usersize;
84 <  size_t hostsize;
85 < };
86 <
87 < struct ConfItem
88 < {
89 <  dlink_node node;      /* link into known ConfItems of this type */
90 <
91 <  char *name;           /* Primary key */
92 <  void *regexpname;
93 <  unsigned int flags;
94 <  ConfType type;
95 < };
96 <
97 < /*
98 < * MatchItem - used for XLINE and ULINE types
99 < */
100 < struct MatchItem
101 < {
102 <  char *user;           /* Used for ULINE only */
103 <  char *host;           /* Used for ULINE only */
104 <  char *reason;
105 <  char *oper_reason;
106 <  int action;           /* used for uline */
107 <  int count;            /* How many times this matchitem has been matched */
108 <  int ref_count;        /* How many times is this matchitem in use */
109 <  int illegal;          /* Should it be deleted when possible? */
110 <  time_t           hold;     /* Hold action until this time (calendar time) */
111 <  time_t setat;
112 < };
113 <
114 < struct AccessItem
115 < {
116 <  dlink_node node;
117 <  unsigned int     dns_failed;
118 <  unsigned int     dns_pending;
119 <  unsigned int     status;   /* If CONF_ILLEGAL, delete when no clients */
120 <  unsigned int     flags;
121 <  unsigned int     modes;
122 <  unsigned int     port;
123 <  int              clients;  /* Number of *LOCAL* clients using this */
124 <  int              bits;
125 <  int              type;
126 <  struct irc_ssaddr bind;  /* ip to bind to for outgoing connect */
127 <  struct irc_ssaddr addr;  /* ip to connect to */
128 <  char *           host;     /* host part of user@host */
129 <  char *           passwd;
130 <  char *           spasswd;  /* Password to send. */
131 <  char *           reason;
132 <  char *           user;     /* user part of user@host */
133 <  time_t           hold;     /* Hold action until this time (calendar time) */
134 <  time_t           setat;
135 <  struct ConfItem *class_ptr;  /* Class of connection */
136 <  int              aftype;
137 < #ifdef HAVE_LIBCRYPTO
138 <  /* certs */
139 <  char *cipher_list;
140 <  char *           rsa_public_key_file;
141 <  RSA *            rsa_public_key;
142 < #endif
143 <  void *regexuser;
144 <  void *regexhost;
145 <  dlink_list leaf_list;
146 <  dlink_list hub_list;
147 < };
148 <
149 < struct ClassItem
150 < {
151 <  dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
152 <  dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
153 <  unsigned int max_sendq;
154 <  unsigned int max_recvq;
155 <  int con_freq;
156 <  int ping_freq;
157 <  int ping_warning;
158 <  int max_total;
159 <  int max_local;
160 <  int max_global;
161 <  int max_ident;
162 <  int max_perip;
163 <  int curr_user_count;
164 <  int cidr_bitlen_ipv4;
165 <  int cidr_bitlen_ipv6;
166 <  int number_per_cidr;
167 <  int active;
168 < };
169 <
170 < struct CidrItem
171 < {
172 <  dlink_node node;
173 <  struct irc_ssaddr mask;
174 <  int number_on_this_cidr;
175 < };
176 <
177 <
178 < #define CONF_ILLEGAL            0x80000000
179 < #define CONF_RESERVED           0x00000001
180 < #define CONF_CLIENT             0x00000002
181 < #define CONF_SERVER             0x00000004
182 < #define CONF_OPERATOR           0x00000008
183 < #define CONF_KLINE              0x00000010
184 < #define CONF_CLASS              0x00000020
185 < #define CONF_DLINE              0x00000040
186 < #define CONF_XLINE              0x00000080
187 < #define CONF_ULINE              0x00000100
188 < #define CONF_EXEMPTDLINE        0x00000200
189 < #define CONF_GLINE              0x00000400
190 < #define CONF_SERVICE            0x00000800
191 <
192 < #define CONF_SERVER_MASK       CONF_SERVER
193 < #define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
194 <
195 < /* XXX temporary hack */
196 < #define CONF_CRESV              0x80000001
197 < #define CONF_NRESV              0x80000002
198 <
199 < #define IsConfIllegal(x)        ((x)->status & CONF_ILLEGAL)
200 < #define SetConfIllegal(x)       ((x)->status |= CONF_ILLEGAL)
201 < #define IsConfServer(x)         ((x)->status == CONF_SERVER)
202 < #define SetConfServer(x)        ((x)->status = CONF_SERVER)
203 < #define IsConfOperator(x)       ((x)->status & CONF_OPERATOR)
204 < #define IsConfKill(x)           ((x)->status == CONF_KLINE)
205 < #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
206 < #define IsConfUline(x)          ((x)->status & CONF_ULINE)
207 < #define IsConfXline(x)          ((x)->status & CONF_XLINE)
208 < #define IsConfGline(x)          ((x)->status == CONF_GLINE)
209 <
210 < /* AccessItem->flags */
211 <
212 < /* Generic flags... */
213 < /* access flags... */
42 > /* MaskItem->flags */
43   #define CONF_FLAGS_DO_IDENTD            0x00000001
44   #define CONF_FLAGS_LIMIT_IP             0x00000002
45   #define CONF_FLAGS_NO_TILDE             0x00000004
# Line 224 | Line 53 | struct CidrItem
53   #define CONF_FLAGS_EXEMPTGLINE          0x00000400
54   #define CONF_FLAGS_CAN_FLOOD            0x00000800
55   #define CONF_FLAGS_NEED_PASSWORD        0x00001000
227 – /* server flags */
56   #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
57   #define CONF_FLAGS_ENCRYPTED            0x00004000
58 < #define CONF_FLAGS_TEMPORARY            0x00008000
58 > #define CONF_FLAGS_IN_DATABASE          0x00008000
59   #define CONF_FLAGS_EXEMPTRESV           0x00010000
60   #define CONF_FLAGS_SSL                  0x00020000
61 < #define CONF_FLAGS_MAINCONF             0x00040000
61 > #define CONF_FLAGS_WEBIRC               0x00040000
62  
63 < /* Macros for struct AccessItem */
63 > /* Macros for struct MaskItem */
64 > #define IsConfWebIRC(x)         ((x)->flags & CONF_FLAGS_WEBIRC)
65   #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
66   #define IsNoTilde(x)            ((x)->flags & CONF_FLAGS_NO_TILDE)
67   #define IsConfCanFlood(x)       ((x)->flags & CONF_FLAGS_CAN_FLOOD)
# Line 247 | Line 76 | struct CidrItem
76   #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
77   #define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
78   #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
79 < #define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
80 < #define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
79 > #define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
80 > #define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
81   #define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
82 < #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
82 > #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
83   #define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
255 – #define IsConfTemporary(x)      ((x)->flags & CONF_FLAGS_TEMPORARY)
256 – #define SetConfTemporary(x)     ((x)->flags |= CONF_FLAGS_TEMPORARY)
84   #define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
85   #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
86   #define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
87   #define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
88 < #define IsConfMain(x)      ((x)->flags & CONF_FLAGS_MAINCONF)
89 < #define SetConfMain(x)     ((x)->flags |= CONF_FLAGS_MAINCONF)
90 < #define ClearConfMain(x)   ((x)->flags &= ~CONF_FLAGS_MAINCONF)
88 > #define IsConfDatabase(x)      ((x)->flags & CONF_FLAGS_IN_DATABASE)
89 > #define SetConfDatabase(x)     ((x)->flags |= CONF_FLAGS_IN_DATABASE)
90 >
91  
92   /* shared/cluster server entry types
93   * These defines are used for both shared and cluster.
94   */
95 < #define SHARED_KLINE            0x0001
96 < #define SHARED_UNKLINE          0x0002
97 < #define SHARED_XLINE            0x0004
98 < #define SHARED_UNXLINE          0x0008
99 < #define SHARED_RESV             0x0010
100 < #define SHARED_UNRESV           0x0020
95 > #define SHARED_KLINE            0x0001
96 > #define SHARED_UNKLINE          0x0002
97 > #define SHARED_XLINE            0x0004
98 > #define SHARED_UNXLINE          0x0008
99 > #define SHARED_RESV             0x0010
100 > #define SHARED_UNRESV           0x0020
101   #define SHARED_LOCOPS           0x0040
102   #define SHARED_DLINE            0x0080
103   #define SHARED_UNDLINE          0x0100
104 < #define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
105 <                                 SHARED_XLINE | SHARED_UNXLINE |\
106 <                                 SHARED_RESV | SHARED_UNRESV |\
104 > #define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
105 >                                 SHARED_XLINE | SHARED_UNXLINE |\
106 >                                 SHARED_RESV | SHARED_UNRESV |\
107                                   SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
108  
109 +
110 + enum maskitem_type
111 + {
112 +  CONF_RESERVED = 1 <<  0, /* XXX */
113 +  CONF_CLIENT   = 1 <<  1,
114 +  CONF_SERVER   = 1 <<  2,
115 +  CONF_KLINE    = 1 <<  3,
116 +  CONF_DLINE    = 1 <<  4,
117 +  CONF_EXEMPT   = 1 <<  5,
118 +  CONF_CLUSTER  = 1 <<  6,
119 +  CONF_XLINE    = 1 <<  7,
120 +  CONF_ULINE    = 1 <<  8,
121 +  CONF_GLINE    = 1 <<  9,
122 +  CONF_CRESV    = 1 << 10,
123 +  CONF_NRESV    = 1 << 11,
124 +  CONF_SERVICE  = 1 << 12,
125 +  CONF_OPER     = 1 << 13,
126 +  CONF_HUB      = 1 << 14, /* XXX There are no separate hub/leaf configs anymore. This is just for /stats h */
127 +  CONF_CLASS    = 1 << 15  /* XXX Same here; just for /stats Y|y */
128 + };
129 +
130 + struct conf_parser_context
131 + {
132 +  unsigned int boot;
133 +  unsigned int pass;
134 +  FILE *conf_file;
135 + };
136 +
137 + struct split_nuh_item
138 + {
139 +  dlink_node node;
140 +
141 +  char *nuhmask;
142 +  char *nickptr;
143 +  char *userptr;
144 +  char *hostptr;
145 +
146 +  size_t nicksize;
147 +  size_t usersize;
148 +  size_t hostsize;
149 + };
150 +
151 + struct MaskItem
152 + {
153 +  dlink_node         node;
154 +  dlink_list         leaf_list;
155 +  dlink_list         hub_list;
156 +  dlink_list         exempt_list;
157 +  enum maskitem_type type;
158 +  unsigned int       dns_failed;
159 +  unsigned int       dns_pending;
160 +  unsigned int       flags;
161 +  unsigned int       modes;
162 +  unsigned int       port;
163 +  unsigned int       count;
164 +  unsigned int       aftype;
165 +  unsigned int       active;
166 +  unsigned int       htype;
167 +  unsigned int       ref_count;  /* Number of *LOCAL* clients using this */
168 +  int                bits;
169 +  time_t             until;     /* Hold action until this time (calendar time) */
170 +  time_t             setat;
171 +  struct irc_ssaddr  bind;  /* ip to bind to for outgoing connect */
172 +  struct irc_ssaddr  addr;  /* ip to connect to */
173 +  struct ClassItem  *class;  /* Class of connection */
174 +  char              *name;
175 +  char              *user;     /* user part of user@host */
176 +  char              *host;     /* host part of user@host */
177 +  char              *passwd;
178 +  char              *spasswd;  /* Password to send. */
179 +  char              *reason;
180 +  char              *cipher_list;
181 +  void              *rsa_public_key;
182 + };
183 +
184 + struct exempt
185 + {
186 +  dlink_node node;
187 +  char *name;
188 +  char *user;
189 +  char *host;
190 +  size_t len;
191 +  time_t when;
192 +  struct irc_ssaddr addr;
193 +  int bits;
194 +  int type;
195 +  int coid;
196 + };
197 +
198 + struct CidrItem
199 + {
200 +  dlink_node node;
201 +  struct irc_ssaddr mask;
202 +  unsigned int number_on_this_cidr;
203 + };
204 +
205   struct config_file_entry
206   {
207    const char *dpath;          /* DPATH if set from command line */
208    const char *configfile;
209    const char *klinefile;
210 +  const char *glinefile;
211    const char *xlinefile;
212    const char *dlinefile;
213 <  const char *cresvfile;
290 <  const char *nresvfile;
213 >  const char *resvfile;
214  
215    char *egdpool_path;
216    char *service_name;
# Line 346 | Line 269 | struct config_file_entry
269   struct config_channel_entry
270   {
271    int disable_fake_channels;
349 –  int restrict_channels;
272    int knock_delay;
273    int knock_delay_channel;
274    unsigned int max_bans;
# Line 354 | Line 276 | struct config_channel_entry
276    unsigned int max_chans_per_oper;
277    int no_create_on_split;
278    int no_join_on_split;
357 –  int quiet_on_ban;
279    int default_split_server_count;
280    int default_split_user_count;
281   };
# Line 364 | Line 285 | struct config_server_hide
285    char *hidden_name;
286    int flatten_links;
287    int hide_servers;
288 +  int hide_services;
289    int links_delay;
290    int links_disabled;
291    int hidden;
# Line 377 | Line 299 | struct server_info
299    char *description;
300    char *network_name;
301    char *network_desc;
380 – #ifdef HAVE_LIBCRYPTO
302    char *rsa_private_key_file;
303 <  RSA *rsa_private_key;
304 <  SSL_CTX *server_ctx;
305 <  SSL_CTX *client_ctx;
385 < #endif
303 >  void *rsa_private_key;
304 >  void *server_ctx;
305 >  void *client_ctx;
306    int hub;
307    struct irc_ssaddr ip;
308    struct irc_ssaddr ip6;
309    unsigned int max_clients;
310 +  unsigned int max_nick_length;
311 +  unsigned int max_topic_length;
312    int specific_ipv4_vhost;
313    int specific_ipv6_vhost;
314    struct sockaddr_in dns_host;
# Line 405 | Line 327 | struct logging_entry
327    unsigned int use_logging;
328   };
329  
408 – extern dlink_list class_items;
330   extern dlink_list server_items;
331   extern dlink_list cluster_items;
411 – extern dlink_list hub_items;
332   extern dlink_list xconf_items;
333 < extern dlink_list rxconf_items;
334 < extern dlink_list rkconf_items;
415 < extern dlink_list leaf_items;
333 > extern dlink_list uconf_items;
334 > extern dlink_list oconf_items;
335   extern dlink_list service_items;
336 < extern dlink_list temporary_xlines;
336 > extern struct conf_parser_context conf_parser_ctx;
337   extern struct logging_entry ConfigLoggingEntry;
338   extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
339   extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
# Line 424 | Line 343 | extern struct admin_info AdminInfo;
343   extern int valid_wild_card(struct Client *, int, int, ...);
344   /* End GLOBAL section */
345  
427 – extern unsigned int get_sendq(struct Client *);
428 – extern unsigned int get_recvq(struct Client *);
429 – extern const char *get_client_class(struct Client *);
430 – extern int get_client_ping(struct Client *, int *);
431 – extern void check_class(void);
432 – extern void init_class(void);
433 – extern struct ConfItem *find_class(const char *);
346   extern void init_ip_hash_table(void);
347   extern void count_ip_hash(unsigned int *, uint64_t *);
348   extern void remove_one_ip(struct irc_ssaddr *);
349 < extern struct ConfItem *make_conf_item(ConfType type);
438 < extern void free_access_item(struct AccessItem *);
349 > extern struct MaskItem *conf_make(enum maskitem_type);
350   extern void read_conf_files(int);
351 < extern int attach_conf(struct Client *, struct ConfItem *);
351 > extern int attach_conf(struct Client *, struct MaskItem *);
352   extern int attach_connect_block(struct Client *, const char *, const char *);
353 + extern int check_client(struct Client *);
354  
443 – extern int detach_conf(struct Client *, ConfType);
355  
356 < extern struct ConfItem *find_conf_name(dlink_list *, const char *, ConfType);
357 < extern struct ConfItem *find_conf_exact(ConfType, const char *, const char *, const char *);
358 < extern struct AccessItem *find_kill(struct Client *);
359 < extern struct AccessItem *find_gline(struct Client *);
356 > extern void detach_conf(struct Client *, enum maskitem_type);
357 > extern struct MaskItem *find_conf_name(dlink_list *, const char *, enum maskitem_type);
358 > extern struct MaskItem *find_kill(struct Client *);
359 > extern struct MaskItem *find_gline(struct Client *);
360   extern int conf_connect_allowed(struct irc_ssaddr *, int);
361   extern char *oper_privs_as_string(const unsigned int);
362   extern void split_nuh(struct split_nuh_item *);
363 < extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
364 <                                                const char *, const char *, int);
365 < extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
363 > extern struct MaskItem *find_matching_name_conf(enum maskitem_type, const char *,
364 >                                                const char *, const char *, unsigned int);
365 > extern struct MaskItem *find_exact_name_conf(enum maskitem_type, const struct Client *, const char *,
366                                               const char *, const char *);
367 < extern void delete_conf_item(struct ConfItem *);
457 < extern void report_confitem_types(struct Client *, ConfType);
367 > extern void conf_free(struct MaskItem *);
368   extern void yyerror(const char *);
369 < extern void write_conf_line(struct Client *, struct ConfItem *,
460 <                            const char *, time_t);
461 < extern int remove_conf_line(ConfType, struct Client *, const char *,
462 <                            const char *);
463 < extern void add_temp_line(struct ConfItem *);
369 > extern void conf_error_report(const char *);
370   extern void cleanup_tklines(void *);
371   extern int rehash(int);
372 < extern int conf_add_server(struct ConfItem *, const char *);
373 < extern void conf_add_class_to_conf(struct ConfItem *, const char *);
372 > extern void lookup_confhost(struct MaskItem *);
373 > extern void conf_add_class_to_conf(struct MaskItem *, const char *);
374  
469 – extern int find_and_delete_temporary(const char *, const char *, int);
375   extern const char *get_oper_name(const struct Client *);
376  
472 – extern void *map_to_conf(struct ConfItem *);
473 – extern struct ConfItem *unmap_conf_item(void *);
377   /* XXX should the parse_aline stuff go into another file ?? */
378   #define AWILD 0x1               /* check wild cards */
379   extern int parse_aline(const char *, struct Client *, int, char **,
# Line 481 | Line 384 | extern int valid_comment(struct Client *
384   #define TK_SECONDS 0
385   #define TK_MINUTES 1
386   extern time_t valid_tkline(const char *, int);
387 < extern int match_conf_password(const char *, const struct AccessItem *);
387 > extern int match_conf_password(const char *, const struct MaskItem *);
388  
389   #define NOT_AUTHORIZED    (-1)
390   #define I_LINE_FULL       (-2)
# Line 493 | Line 396 | extern int match_conf_password(const cha
396  
397   extern void cluster_a_line(struct Client *,
398                             const char *, int, int, const char *,...);
496 – extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
399   #endif /* INCLUDED_s_conf_h */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)