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-8/include/conf.h (file contents), Revision 1383 by michael, Tue May 1 11:18:22 2012 UTC vs.
ircd-hybrid/trunk/include/conf.h (file contents), Revision 2116 by michael, Sun May 26 11:44:01 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 <  GDENY_TYPE,
71 <  SERVICE_TYPE
72 < } ConfType;
73 <
74 < struct split_nuh_item
75 < {
76 <  dlink_node node;
77 <
78 <  char *nuhmask;
79 <  char *nickptr;
80 <  char *userptr;
81 <  char *hostptr;
82 <
83 <  size_t nicksize;
84 <  size_t usersize;
85 <  size_t hostsize;
86 < };
87 <
88 < struct ConfItem
89 < {
90 <  dlink_node node;      /* link into known ConfItems of this type */
91 <
92 <  char *name;           /* Primary key */
93 <  void *regexpname;
94 <  unsigned int flags;
95 <  ConfType type;
96 < };
97 <
98 < /*
99 < * MatchItem - used for XLINE and ULINE types
100 < */
101 < struct MatchItem
102 < {
103 <  char *user;           /* Used for ULINE only */
104 <  char *host;           /* Used for ULINE only */
105 <  char *reason;
106 <  char *oper_reason;
107 <  int action;           /* used for uline */
108 <  int count;            /* How many times this matchitem has been matched */
109 <  int ref_count;        /* How many times is this matchitem in use */
110 <  int illegal;          /* Should it be deleted when possible? */
111 <  time_t           hold;     /* Hold action until this time (calendar time) */
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 my_ipnum; /* ip to bind to for outgoing connect */
127 <  struct irc_ssaddr ipnum;      /* 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 *           oper_reason;
133 <  char *           user;     /* user part of user@host */
134 <  time_t           hold;     /* Hold action until this time (calendar time) */
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 <  int con_freq;
155 <  int ping_freq;
156 <  int ping_warning;
157 <  int max_total;
158 <  int max_local;
159 <  int max_global;
160 <  int max_ident;
161 <  int max_perip;
162 <  int curr_user_count;
163 <  int cidr_bitlen_ipv4;
164 <  int cidr_bitlen_ipv6;
165 <  int number_per_cidr;
166 <  int active;
167 < };
168 <
169 < struct CidrItem
170 < {
171 <  dlink_node node;
172 <  struct irc_ssaddr mask;
173 <  int number_on_this_cidr;
174 < };
175 <
176 <
177 < #define CONF_ILLEGAL            0x80000000
178 < #define CONF_RESERVED           0x00000001
179 < #define CONF_CLIENT             0x00000002
180 < #define CONF_SERVER             0x00000004
181 < #define CONF_OPERATOR           0x00000008
182 < #define CONF_KLINE              0x00000010
183 < #define CONF_CLASS              0x00000020
184 < #define CONF_LISTEN_PORT        0x00000040
185 < #define CONF_EXEMPTKLINE        0x00000080
186 < #define CONF_DLINE              0x00000100
187 < #define CONF_XLINE              0x00000200
188 < #define CONF_ULINE              0x00000400
189 < #define CONF_EXEMPTDLINE        0x00000800
190 < #define CONF_GLINE              0x00001000
191 < #define CONF_SERVICE            0x00002000
192 <
193 < #define CONF_SERVER_MASK       CONF_SERVER
194 < #define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
195 <
196 < /* XXX temporary hack */
197 < #define CONF_CRESV              0x80000001
198 < #define CONF_NRESV              0x80000002
199 <
200 < #define IsConfIllegal(x)        ((x)->status & CONF_ILLEGAL)
201 < #define SetConfIllegal(x)       ((x)->status |= CONF_ILLEGAL)
202 < #define IsConfServer(x)         ((x)->status == CONF_SERVER)
203 < #define SetConfServer(x)        ((x)->status = CONF_SERVER)
204 < #define IsConfOperator(x)       ((x)->status & CONF_OPERATOR)
205 < #define IsConfKill(x)           ((x)->status == CONF_KLINE)
206 < #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
207 < #define IsConfTypeOfClient(x)   ((x)->status & CONF_CLIENT_MASK)
208 < #define IsConfUline(x)          ((x)->status & CONF_ULINE)
209 < #define IsConfXline(x)          ((x)->status & CONF_XLINE)
210 < #define IsConfGline(x)          ((x)->status == CONF_GLINE)
211 <
212 < /* AccessItem->flags */
213 <
214 < /* Generic flags... */
215 < /* 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 226 | Line 53 | struct CidrItem
53   #define CONF_FLAGS_EXEMPTGLINE          0x00000400
54   #define CONF_FLAGS_CAN_FLOOD            0x00000800
55   #define CONF_FLAGS_NEED_PASSWORD        0x00001000
229 – /* server flags */
56   #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
57   #define CONF_FLAGS_ENCRYPTED            0x00004000
58 < #define CONF_FLAGS_TEMPORARY            0x00008000
59 < #define CONF_FLAGS_BURST_AWAY           0x00010000
60 < #define CONF_FLAGS_EXEMPTRESV           0x00020000
61 < #define CONF_FLAGS_TOPICBURST           0x00040000
236 < #define CONF_FLAGS_SSL                  0x00080000
58 > #define CONF_FLAGS_IN_DATABASE          0x00008000
59 > #define CONF_FLAGS_EXEMPTRESV           0x00010000
60 > #define CONF_FLAGS_SSL                  0x00020000
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 250 | 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)
258 – #define IsConfTemporary(x)      ((x)->flags & CONF_FLAGS_TEMPORARY)
259 – #define SetConfTemporary(x)     ((x)->flags |= CONF_FLAGS_TEMPORARY)
84   #define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
261 – #define IsConfAwayBurst(x)      ((x)->flags & CONF_FLAGS_BURST_AWAY)
262 – #define SetConfAwayBurst(x)     ((x)->flags |= CONF_FLAGS_BURST_AWAY)
263 – #define ClearConfAwayBurst(x)   ((x)->flags &= ~CONF_FLAGS_BURST_AWAY)
264 – #define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
265 – #define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
266 – #define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
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 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 < /* gline acl entry actions */
110 < #define GDENY_BLOCK             0x1
111 < #define GDENY_REJECT            0x2
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 > };
128 >
129 > struct conf_parser_context
130 > {
131 >  unsigned int boot;
132 >  unsigned int pass;
133 >  FILE *conf_file;
134 > };
135 >
136 > struct split_nuh_item
137 > {
138 >  dlink_node node;
139 >
140 >  char *nuhmask;
141 >  char *nickptr;
142 >  char *userptr;
143 >  char *hostptr;
144 >
145 >  size_t nicksize;
146 >  size_t usersize;
147 >  size_t hostsize;
148 > };
149 >
150 > struct MaskItem
151 > {
152 >  dlink_node         node;
153 >  dlink_list         leaf_list;
154 >  dlink_list         hub_list;
155 >  dlink_list         exempt_list;
156 >  enum maskitem_type type;
157 >  unsigned int       dns_failed;
158 >  unsigned int       dns_pending;
159 >  unsigned int       flags;
160 >  unsigned int       modes;
161 >  unsigned int       port;
162 >  unsigned int       count;
163 >  unsigned int       aftype;
164 >  unsigned int       active;
165 >  unsigned int       htype;
166 >  unsigned int       ref_count;  /* Number of *LOCAL* clients using this */
167 >  int                bits;
168 >  time_t             until;     /* Hold action until this time (calendar time) */
169 >  time_t             setat;
170 >  struct irc_ssaddr  bind;  /* ip to bind to for outgoing connect */
171 >  struct irc_ssaddr  addr;  /* ip to connect to */
172 >  struct ClassItem  *class;  /* Class of connection */
173 >  char              *name;
174 >  char              *user;     /* user part of user@host */
175 >  char              *host;     /* host part of user@host */
176 >  char              *passwd;
177 >  char              *spasswd;  /* Password to send. */
178 >  char              *reason;
179 >  char              *cipher_list;
180 >  void              *rsa_public_key;
181 > };
182 >
183 > struct exempt
184 > {
185 >  dlink_node node;
186 >  char *name;
187 >  char *user;
188 >  char *host;
189 >  size_t len;
190 >  time_t when;
191 >  struct irc_ssaddr addr;
192 >  int bits;
193 >  int type;
194 >  int coid;
195 > };
196 >
197 > struct CidrItem
198 > {
199 >  dlink_node node;
200 >  struct irc_ssaddr mask;
201 >  unsigned int number_on_this_cidr;
202 > };
203  
204   struct config_file_entry
205   {
206    const char *dpath;          /* DPATH if set from command line */
207    const char *configfile;
208    const char *klinefile;
209 +  const char *glinefile;
210    const char *xlinefile;
298 –  const char *rxlinefile;
299 –  const char *rklinefile;
211    const char *dlinefile;
212 <  const char *glinefile;
302 <  const char *cresvfile;
303 <  const char *nresvfile;
212 >  const char *resvfile;
213  
214    char *egdpool_path;
215    char *service_name;
216  
217    MessageFile motd;
309 –  MessageFile opermotd;
218    MessageFile linksfile;
219  
220    int gline_min_cidr;
# Line 321 | Line 229 | struct config_file_entry
229    int ts_max_delta;
230    int ts_warn_delta;
231    int anti_nick_flood;
324 –  int kline_with_reason;
232    int warn_no_nline;
233    int invisible_on_connect;
234    int stats_e_disabled;
# Line 335 | Line 242 | struct config_file_entry
242    int oper_pass_resv;
243    int glines;
244    int hide_spoof_ips;
338 –  int burst_away;
339 –  int use_whois_actually;
245    int tkline_expire_notices;
246    int opers_bypass_callerid;
247    int ignore_bogus_ts;
343 –  char *kline_reason;
248    int pace_wait;
249    int pace_wait_simple;
250    int gline_time;
251 <  int gline_logging;
251 >  int gline_request_time;
252    int oper_only_umodes;
253    int oper_umodes;
254    int max_targets;
# Line 353 | Line 257 | struct config_file_entry
257    int min_nonwildcard_simple;
258    int kill_chase_time_limit;
259    int default_floodcount;
356 –  int client_flood;
260    /* 0 == don't use throttle... */
261    int throttle_time;
262    int use_egd;
# Line 365 | Line 268 | struct config_file_entry
268   struct config_channel_entry
269   {
270    int disable_fake_channels;
368 –  int restrict_channels;
369 –  int disable_local_channels;
370 –  int use_except;
371 –  int use_invex;
372 –  int use_knock;
271    int knock_delay;
272    int knock_delay_channel;
273    unsigned int max_bans;
274    unsigned int max_chans_per_user;
275 +  unsigned int max_chans_per_oper;
276    int no_create_on_split;
277    int no_join_on_split;
379 –  int quiet_on_ban;
380 –  int burst_topicwho;
278    int default_split_server_count;
279    int default_split_user_count;
280   };
# Line 387 | Line 284 | struct config_server_hide
284    char *hidden_name;
285    int flatten_links;
286    int hide_servers;
287 +  int hide_services;
288    int links_delay;
289    int links_disabled;
290    int hidden;
393 –  int disable_hidden;
291    int hide_server_ips;
292   };
293  
# Line 401 | Line 298 | struct server_info
298    char *description;
299    char *network_name;
300    char *network_desc;
404 – #ifdef HAVE_LIBCRYPTO
301    char *rsa_private_key_file;
302 <  RSA *rsa_private_key;
303 <  SSL_CTX *server_ctx;
304 <  SSL_CTX *client_ctx;
409 < #endif
302 >  void *rsa_private_key;
303 >  void *server_ctx;
304 >  void *client_ctx;
305    int hub;
306    struct irc_ssaddr ip;
307    struct irc_ssaddr ip6;
308    unsigned int max_clients;
309 +  unsigned int max_nick_length;
310 +  unsigned int max_topic_length;
311    int specific_ipv4_vhost;
312    int specific_ipv6_vhost;
313    struct sockaddr_in dns_host;
# Line 429 | Line 326 | struct logging_entry
326    unsigned int use_logging;
327   };
328  
432 – extern dlink_list gdeny_items;
433 – extern dlink_list class_items;
329   extern dlink_list server_items;
330   extern dlink_list cluster_items;
331 < extern dlink_list hub_items;
332 < extern dlink_list rxconf_items;
333 < extern dlink_list rkconf_items;
439 < extern dlink_list leaf_items;
331 > extern dlink_list xconf_items;
332 > extern dlink_list uconf_items;
333 > extern dlink_list oconf_items;
334   extern dlink_list service_items;
335 < extern dlink_list temporary_xlines;
335 > extern struct conf_parser_context conf_parser_ctx;
336   extern struct logging_entry ConfigLoggingEntry;
337   extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
338   extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
# Line 448 | Line 342 | extern struct admin_info AdminInfo;
342   extern int valid_wild_card(struct Client *, int, int, ...);
343   /* End GLOBAL section */
344  
451 – extern unsigned int get_sendq(struct Client *);
452 – extern const char *get_client_class(struct Client *);
453 – extern int get_client_ping(struct Client *, int *);
454 – extern void check_class(void);
455 – extern void init_class(void);
456 – extern struct ConfItem *find_class(const char *);
345   extern void init_ip_hash_table(void);
346   extern void count_ip_hash(unsigned int *, uint64_t *);
347   extern void remove_one_ip(struct irc_ssaddr *);
348 < extern struct ConfItem *make_conf_item(ConfType type);
461 < extern void free_access_item(struct AccessItem *);
348 > extern struct MaskItem *conf_make(enum maskitem_type);
349   extern void read_conf_files(int);
350 < extern int attach_conf(struct Client *, struct ConfItem *);
350 > extern int attach_conf(struct Client *, struct MaskItem *);
351   extern int attach_connect_block(struct Client *, const char *, const char *);
352 + extern int check_client(struct Client *);
353  
466 – extern int detach_conf(struct Client *, ConfType);
354  
355 < extern struct ConfItem *find_conf_name(dlink_list *, const char *, ConfType);
356 < extern struct ConfItem *find_conf_exact(ConfType, const char *, const char *, const char *);
357 < extern struct AccessItem *find_kill(struct Client *);
358 < extern struct AccessItem *find_gline(struct Client *);
355 > extern void detach_conf(struct Client *, enum maskitem_type);
356 > extern struct MaskItem *find_conf_name(dlink_list *, const char *, enum maskitem_type);
357 > extern struct MaskItem *find_kill(struct Client *);
358 > extern struct MaskItem *find_gline(struct Client *);
359   extern int conf_connect_allowed(struct irc_ssaddr *, int);
360   extern char *oper_privs_as_string(const unsigned int);
361   extern void split_nuh(struct split_nuh_item *);
362 < extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
363 <                                                const char *, const char *, int);
364 < extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
362 > extern struct MaskItem *find_matching_name_conf(enum maskitem_type, const char *,
363 >                                                const char *, const char *, unsigned int);
364 > extern struct MaskItem *find_exact_name_conf(enum maskitem_type, const struct Client *, const char *,
365                                               const char *, const char *);
366 < extern void delete_conf_item(struct ConfItem *);
480 < extern void report_confitem_types(struct Client *, ConfType);
366 > extern void conf_free(struct MaskItem *);
367   extern void yyerror(const char *);
368 < extern void write_conf_line(struct Client *, struct ConfItem *,
483 <                            const char *, time_t);
484 < extern int remove_conf_line(ConfType, struct Client *, const char *,
485 <                            const char *);
486 < extern void add_temp_line(struct ConfItem *);
368 > extern void conf_error_report(const char *);
369   extern void cleanup_tklines(void *);
488 – extern const char *get_conf_name(ConfType);
370   extern int rehash(int);
371 < extern int conf_add_server(struct ConfItem *, const char *);
372 < extern void conf_add_class_to_conf(struct ConfItem *, const char *);
371 > extern void lookup_confhost(struct MaskItem *);
372 > extern void conf_add_class_to_conf(struct MaskItem *, const char *);
373  
493 – /* XXX consider moving these into csvlib.h */
494 – extern void parse_csv_file(FILE *, ConfType);
495 – extern int find_and_delete_temporary(const char *, const char *, int);
374   extern const char *get_oper_name(const struct Client *);
375  
498 – extern void *map_to_conf(struct ConfItem *);
499 – extern struct ConfItem *unmap_conf_item(void *);
376   /* XXX should the parse_aline stuff go into another file ?? */
377   #define AWILD 0x1               /* check wild cards */
502 – #define NOUSERLOOKUP 0x2 /* Don't lookup the user@host on /rkline nick */
378   extern int parse_aline(const char *, struct Client *, int, char **,
379                         int, char **, char **, time_t *, char **, char **);
380   extern int valid_comment(struct Client *, char *, int);
# Line 508 | Line 383 | extern int valid_comment(struct Client *
383   #define TK_SECONDS 0
384   #define TK_MINUTES 1
385   extern time_t valid_tkline(const char *, int);
386 < extern int match_conf_password(const char *, const struct AccessItem *);
386 > extern int match_conf_password(const char *, const struct MaskItem *);
387  
388   #define NOT_AUTHORIZED    (-1)
389   #define I_LINE_FULL       (-2)
# Line 520 | Line 395 | extern int match_conf_password(const cha
395  
396   extern void cluster_a_line(struct Client *,
397                             const char *, int, int, const char *,...);
523 – extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
398   #endif /* INCLUDED_s_conf_h */

Diff Legend

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