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 1503 by michael, Tue Aug 14 09:05:58 2012 UTC vs.
ircd-hybrid/trunk/include/conf.h (file contents), Revision 2174 by michael, Mon Jun 3 19:45:38 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"
32 – #include "motd.h"               /* MessageFile */
29   #include "client.h"
30   #include "hook.h"
31 + #include "conf_class.h"
32  
33  
34 < struct Client;
34 > #define CONF_NOREASON "<No reason supplied>"
35  
36 < extern struct Callback *client_check_cb;
36 > #define IsConfOperator(x)       ((x)->type == CONF_OPER)
37 > #define IsConfKill(x)           ((x)->type == CONF_KLINE)
38 > #define IsConfClient(x)         ((x)->type == CONF_CLIENT)
39 > #define IsConfGline(x)          ((x)->type == CONF_GLINE)
40  
41 < 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 < };
112 <
113 < struct AccessItem
114 < {
115 <  dlink_node node;
116 <  unsigned int     dns_failed;
117 <  unsigned int     dns_pending;
118 <  unsigned int     status;   /* If CONF_ILLEGAL, delete when no clients */
119 <  unsigned int     flags;
120 <  unsigned int     modes;
121 <  unsigned int     port;
122 <  int              clients;  /* Number of *LOCAL* clients using this */
123 <  int              bits;
124 <  int              type;
125 <  struct irc_ssaddr bind;  /* ip to bind to for outgoing connect */
126 <  struct irc_ssaddr addr;  /* ip to connect to */
127 <  char *           host;     /* host part of user@host */
128 <  char *           passwd;
129 <  char *           spasswd;  /* Password to send. */
130 <  char *           reason;
131 <  char *           oper_reason;
132 <  char *           user;     /* user part of user@host */
133 <  time_t           hold;     /* Hold action until this time (calendar time) */
134 <  struct ConfItem *class_ptr;  /* Class of connection */
135 <  int              aftype;
136 < #ifdef HAVE_LIBCRYPTO
137 <  /* certs */
138 <  char *cipher_list;
139 <  char *           rsa_public_key_file;
140 <  RSA *            rsa_public_key;
141 < #endif
142 <  void *regexuser;
143 <  void *regexhost;
144 <  dlink_list leaf_list;
145 <  dlink_list hub_list;
146 < };
147 <
148 < struct ClassItem
149 < {
150 <  dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
151 <  dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
152 <  unsigned int max_sendq;
153 <  int con_freq;
154 <  int ping_freq;
155 <  int ping_warning;
156 <  int max_total;
157 <  int max_local;
158 <  int max_global;
159 <  int max_ident;
160 <  int max_perip;
161 <  int curr_user_count;
162 <  int cidr_bitlen_ipv4;
163 <  int cidr_bitlen_ipv6;
164 <  int number_per_cidr;
165 <  int active;
166 < };
167 <
168 < struct CidrItem
169 < {
170 <  dlink_node node;
171 <  struct irc_ssaddr mask;
172 <  int number_on_this_cidr;
173 < };
174 <
175 <
176 < #define CONF_ILLEGAL            0x80000000
177 < #define CONF_RESERVED           0x00000001
178 < #define CONF_CLIENT             0x00000002
179 < #define CONF_SERVER             0x00000004
180 < #define CONF_OPERATOR           0x00000008
181 < #define CONF_KLINE              0x00000010
182 < #define CONF_CLASS              0x00000020
183 < #define CONF_DLINE              0x00000040
184 < #define CONF_XLINE              0x00000080
185 < #define CONF_ULINE              0x00000100
186 < #define CONF_EXEMPTDLINE        0x00000200
187 < #define CONF_GLINE              0x00000400
188 < #define CONF_SERVICE            0x00000800
189 <
190 < #define CONF_SERVER_MASK       CONF_SERVER
191 < #define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
192 <
193 < /* XXX temporary hack */
194 < #define CONF_CRESV              0x80000001
195 < #define CONF_NRESV              0x80000002
196 <
197 < #define IsConfIllegal(x)        ((x)->status & CONF_ILLEGAL)
198 < #define SetConfIllegal(x)       ((x)->status |= CONF_ILLEGAL)
199 < #define IsConfServer(x)         ((x)->status == CONF_SERVER)
200 < #define SetConfServer(x)        ((x)->status = CONF_SERVER)
201 < #define IsConfOperator(x)       ((x)->status & CONF_OPERATOR)
202 < #define IsConfKill(x)           ((x)->status == CONF_KLINE)
203 < #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
204 < #define IsConfUline(x)          ((x)->status & CONF_ULINE)
205 < #define IsConfXline(x)          ((x)->status & CONF_XLINE)
206 < #define IsConfGline(x)          ((x)->status == CONF_GLINE)
207 <
208 < /* AccessItem->flags */
209 <
210 < /* Generic flags... */
211 < /* access flags... */
41 > /* MaskItem->flags */
42   #define CONF_FLAGS_DO_IDENTD            0x00000001
43   #define CONF_FLAGS_LIMIT_IP             0x00000002
44   #define CONF_FLAGS_NO_TILDE             0x00000004
# Line 222 | Line 52 | struct CidrItem
52   #define CONF_FLAGS_EXEMPTGLINE          0x00000400
53   #define CONF_FLAGS_CAN_FLOOD            0x00000800
54   #define CONF_FLAGS_NEED_PASSWORD        0x00001000
225 – /* server flags */
55   #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
56   #define CONF_FLAGS_ENCRYPTED            0x00004000
57 < #define CONF_FLAGS_TEMPORARY            0x00008000
58 < #define CONF_FLAGS_BURST_AWAY           0x00010000
59 < #define CONF_FLAGS_EXEMPTRESV           0x00020000
60 < #define CONF_FLAGS_TOPICBURST           0x00040000
232 < #define CONF_FLAGS_SSL                  0x00080000
57 > #define CONF_FLAGS_IN_DATABASE          0x00008000
58 > #define CONF_FLAGS_EXEMPTRESV           0x00010000
59 > #define CONF_FLAGS_SSL                  0x00020000
60 > #define CONF_FLAGS_WEBIRC               0x00040000
61  
62 < /* Macros for struct AccessItem */
62 > /* Macros for struct MaskItem */
63 > #define IsConfWebIRC(x)         ((x)->flags & CONF_FLAGS_WEBIRC)
64   #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
65   #define IsNoTilde(x)            ((x)->flags & CONF_FLAGS_NO_TILDE)
66   #define IsConfCanFlood(x)       ((x)->flags & CONF_FLAGS_CAN_FLOOD)
# Line 246 | Line 75 | struct CidrItem
75   #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
76   #define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
77   #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
78 < #define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
79 < #define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
78 > #define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
79 > #define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
80   #define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
81 < #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
81 > #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
82   #define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
254 – #define IsConfTemporary(x)      ((x)->flags & CONF_FLAGS_TEMPORARY)
255 – #define SetConfTemporary(x)     ((x)->flags |= CONF_FLAGS_TEMPORARY)
83   #define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
257 – #define IsConfAwayBurst(x)      ((x)->flags & CONF_FLAGS_BURST_AWAY)
258 – #define SetConfAwayBurst(x)     ((x)->flags |= CONF_FLAGS_BURST_AWAY)
259 – #define ClearConfAwayBurst(x)   ((x)->flags &= ~CONF_FLAGS_BURST_AWAY)
260 – #define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
261 – #define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
262 – #define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
84   #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
85   #define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
86   #define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
87 + #define IsConfDatabase(x)      ((x)->flags & CONF_FLAGS_IN_DATABASE)
88 + #define SetConfDatabase(x)     ((x)->flags |= CONF_FLAGS_IN_DATABASE)
89 +
90  
91   /* shared/cluster server entry types
92   * These defines are used for both shared and cluster.
93   */
94 < #define SHARED_KLINE            0x0001
95 < #define SHARED_UNKLINE          0x0002
96 < #define SHARED_XLINE            0x0004
97 < #define SHARED_UNXLINE          0x0008
98 < #define SHARED_RESV             0x0010
99 < #define SHARED_UNRESV           0x0020
94 > #define SHARED_KLINE            0x0001
95 > #define SHARED_UNKLINE          0x0002
96 > #define SHARED_XLINE            0x0004
97 > #define SHARED_UNXLINE          0x0008
98 > #define SHARED_RESV             0x0010
99 > #define SHARED_UNRESV           0x0020
100   #define SHARED_LOCOPS           0x0040
101   #define SHARED_DLINE            0x0080
102   #define SHARED_UNDLINE          0x0100
103 < #define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
104 <                                 SHARED_XLINE | SHARED_UNXLINE |\
105 <                                 SHARED_RESV | SHARED_UNRESV |\
103 > #define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
104 >                                 SHARED_XLINE | SHARED_UNXLINE |\
105 >                                 SHARED_RESV | SHARED_UNRESV |\
106                                   SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
107  
108 +
109 + enum maskitem_type
110 + {
111 +  CONF_RESERVED = 1 <<  0, /* XXX */
112 +  CONF_CLIENT   = 1 <<  1,
113 +  CONF_SERVER   = 1 <<  2,
114 +  CONF_KLINE    = 1 <<  3,
115 +  CONF_DLINE    = 1 <<  4,
116 +  CONF_EXEMPT   = 1 <<  5,
117 +  CONF_CLUSTER  = 1 <<  6,
118 +  CONF_XLINE    = 1 <<  7,
119 +  CONF_ULINE    = 1 <<  8,
120 +  CONF_GLINE    = 1 <<  9,
121 +  CONF_CRESV    = 1 << 10,
122 +  CONF_NRESV    = 1 << 11,
123 +  CONF_SERVICE  = 1 << 12,
124 +  CONF_OPER     = 1 << 13,
125 + };
126 +
127 + struct conf_parser_context
128 + {
129 +  unsigned int boot;
130 +  unsigned int pass;
131 +  FILE *conf_file;
132 + };
133 +
134 + struct split_nuh_item
135 + {
136 +  dlink_node node;
137 +
138 +  char *nuhmask;
139 +  char *nickptr;
140 +  char *userptr;
141 +  char *hostptr;
142 +
143 +  size_t nicksize;
144 +  size_t usersize;
145 +  size_t hostsize;
146 + };
147 +
148 + struct MaskItem
149 + {
150 +  dlink_node         node;
151 +  dlink_list         leaf_list;
152 +  dlink_list         hub_list;
153 +  dlink_list         exempt_list;
154 +  enum maskitem_type type;
155 +  unsigned int       dns_failed;
156 +  unsigned int       dns_pending;
157 +  unsigned int       flags;
158 +  unsigned int       modes;
159 +  unsigned int       port;
160 +  unsigned int       count;
161 +  unsigned int       aftype;
162 +  unsigned int       active;
163 +  unsigned int       htype;
164 +  unsigned int       ref_count;  /* Number of *LOCAL* clients using this */
165 +  int                bits;
166 +  time_t             until;     /* Hold action until this time (calendar time) */
167 +  time_t             setat;
168 +  struct irc_ssaddr  bind;  /* ip to bind to for outgoing connect */
169 +  struct irc_ssaddr  addr;  /* ip to connect to */
170 +  struct ClassItem  *class;  /* Class of connection */
171 +  char              *name;
172 +  char              *user;     /* user part of user@host */
173 +  char              *host;     /* host part of user@host */
174 +  char              *passwd;
175 +  char              *spasswd;  /* Password to send. */
176 +  char              *reason;
177 +  char              *cipher_list;
178 +  void              *rsa_public_key;
179 + };
180 +
181 + struct exempt
182 + {
183 +  dlink_node node;
184 +  char *name;
185 +  char *user;
186 +  char *host;
187 +  size_t len;
188 +  time_t when;
189 +  struct irc_ssaddr addr;
190 +  int bits;
191 +  int type;
192 +  int coid;
193 + };
194 +
195 + struct CidrItem
196 + {
197 +  dlink_node node;
198 +  struct irc_ssaddr mask;
199 +  unsigned int number_on_this_cidr;
200 + };
201 +
202   struct config_file_entry
203   {
204    const char *dpath;          /* DPATH if set from command line */
205    const char *configfile;
206    const char *klinefile;
207 +  const char *glinefile;
208    const char *xlinefile;
290 –  const char *rxlinefile;
291 –  const char *rklinefile;
209    const char *dlinefile;
210 <  const char *cresvfile;
211 <  const char *nresvfile;
210 >  const char *resvfile;
211 >  char *mpath;
212 >  char *rpath;
213  
214    char *egdpool_path;
215    char *service_name;
216  
299 –  MessageFile motd;
300 –  MessageFile linksfile;
301 –
217    int gline_min_cidr;
218    int gline_min_cidr6;
219    int dots_in_ident;
# Line 311 | Line 226 | struct config_file_entry
226    int ts_max_delta;
227    int ts_warn_delta;
228    int anti_nick_flood;
314 –  int kline_with_reason;
229    int warn_no_nline;
230    int invisible_on_connect;
231    int stats_e_disabled;
# Line 325 | Line 239 | struct config_file_entry
239    int oper_pass_resv;
240    int glines;
241    int hide_spoof_ips;
328 –  int burst_away;
329 –  int use_whois_actually;
242    int tkline_expire_notices;
243    int opers_bypass_callerid;
244    int ignore_bogus_ts;
333 –  char *kline_reason;
245    int pace_wait;
246    int pace_wait_simple;
247    int gline_time;
# Line 343 | Line 254 | struct config_file_entry
254    int min_nonwildcard_simple;
255    int kill_chase_time_limit;
256    int default_floodcount;
346 –  int client_flood;
257    /* 0 == don't use throttle... */
258    int throttle_time;
259    int use_egd;
# Line 355 | Line 265 | struct config_file_entry
265   struct config_channel_entry
266   {
267    int disable_fake_channels;
358 –  int restrict_channels;
268    int knock_delay;
269    int knock_delay_channel;
270    unsigned int max_bans;
# Line 363 | Line 272 | struct config_channel_entry
272    unsigned int max_chans_per_oper;
273    int no_create_on_split;
274    int no_join_on_split;
366 –  int quiet_on_ban;
275    int default_split_server_count;
276    int default_split_user_count;
277   };
# Line 373 | Line 281 | struct config_server_hide
281    char *hidden_name;
282    int flatten_links;
283    int hide_servers;
284 +  int hide_services;
285    int links_delay;
286    int links_disabled;
287    int hidden;
# Line 386 | Line 295 | struct server_info
295    char *description;
296    char *network_name;
297    char *network_desc;
389 – #ifdef HAVE_LIBCRYPTO
298    char *rsa_private_key_file;
299 <  RSA *rsa_private_key;
300 <  SSL_CTX *server_ctx;
301 <  SSL_CTX *client_ctx;
394 < #endif
299 >  void *rsa_private_key;
300 >  void *server_ctx;
301 >  void *client_ctx;
302    int hub;
303    struct irc_ssaddr ip;
304    struct irc_ssaddr ip6;
305    unsigned int max_clients;
306 +  unsigned int max_nick_length;
307 +  unsigned int max_topic_length;
308    int specific_ipv4_vhost;
309    int specific_ipv6_vhost;
310    struct sockaddr_in dns_host;
# Line 414 | Line 323 | struct logging_entry
323    unsigned int use_logging;
324   };
325  
326 < extern dlink_list class_items;
326 > extern dlink_list flatten_links;
327   extern dlink_list server_items;
328   extern dlink_list cluster_items;
329 < extern dlink_list hub_items;
330 < extern dlink_list rxconf_items;
331 < extern dlink_list rkconf_items;
423 < extern dlink_list leaf_items;
329 > extern dlink_list xconf_items;
330 > extern dlink_list uconf_items;
331 > extern dlink_list oconf_items;
332   extern dlink_list service_items;
333 < extern dlink_list temporary_xlines;
333 > extern dlink_list nresv_items;
334 > extern dlink_list cresv_items;
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*/
339   extern struct config_server_hide ConfigServerHide; /* defined in s_conf.c */
340   extern struct server_info ServerInfo;       /* defined in ircd.c */
341   extern struct admin_info AdminInfo;        /* defined in ircd.c */
342 + extern int valid_wild_card_simple(const char *);
343   extern int valid_wild_card(struct Client *, int, int, ...);
344   /* End GLOBAL section */
345  
435 – extern unsigned int get_sendq(struct Client *);
436 – extern const char *get_client_class(struct Client *);
437 – extern int get_client_ping(struct Client *, int *);
438 – extern void check_class(void);
439 – extern void init_class(void);
440 – 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);
445 < 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  
450 – 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 *);
464 < 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 *,
467 <                            const char *, time_t);
468 < extern int remove_conf_line(ConfType, struct Client *, const char *,
469 <                            const char *);
470 < extern void add_temp_line(struct ConfItem *);
369 > extern void conf_error_report(const char *);
370   extern void cleanup_tklines(void *);
472 – extern const char *get_conf_name(ConfType);
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  
477 – /* XXX consider moving these into csvlib.h */
478 – extern void parse_csv_file(FILE *, ConfType);
479 – extern int find_and_delete_temporary(const char *, const char *, int);
375   extern const char *get_oper_name(const struct Client *);
376  
482 – extern void *map_to_conf(struct ConfItem *);
483 – 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 */
486 – #define NOUSERLOOKUP 0x2 /* Don't lookup the user@host on /rkline nick */
379   extern int parse_aline(const char *, struct Client *, int, char **,
380                         int, char **, char **, time_t *, char **, char **);
381   extern int valid_comment(struct Client *, char *, int);
# Line 492 | 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 504 | 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 *,...);
507 – 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)