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

Comparing:
ircd-hybrid-7.2/src/s_conf.c (file contents), Revision 201 by adx, Tue Nov 1 11:41:52 2005 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 9638 by michael, Tue Sep 29 12:49:07 2020 UTC

# Line 1 | Line 1
1   /*
2 < *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3 < *  s_conf.c: Configuration file functions.
2 > *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (C) 2002 by the past and present ircd coders, and others.
4 > *  Copyright (c) 1997-2020 ircd-hybrid development team
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 16 | Line 15
15   *
16   *  You should have received a copy of the GNU General Public License
17   *  along with this program; if not, write to the Free Software
18 < *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18 > *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19   *  USA
20 < *
21 < *  $Id$
20 > */
21 >
22 > /*! \file conf.c
23 > * \brief Configuration file functions.
24 > * \version $Id$
25   */
26  
27   #include "stdinc.h"
28 + #include "list.h"
29   #include "ircd_defs.h"
30 < #include "tools.h"
31 < #include "s_conf.h"
32 < #include "s_serv.h"
33 < #include "resv.h"
34 < #include "s_stats.h"
30 > #include "parse.h"
31 > #include "conf.h"
32 > #include "conf_cluster.h"
33 > #include "conf_gecos.h"
34 > #include "conf_pseudo.h"
35 > #include "conf_resv.h"
36 > #include "conf_service.h"
37 > #include "conf_shared.h"
38 > #include "server.h"
39   #include "channel.h"
40   #include "client.h"
34 #include "common.h"
41   #include "event.h"
36 #include "hash.h"
37 #include "hook.h"
42   #include "irc_string.h"
39 #include "sprintf_irc.h"
43   #include "s_bsd.h"
41 #include "irc_getnameinfo.h"
42 #include "irc_getaddrinfo.h"
44   #include "ircd.h"
44 #include "list.h"
45   #include "listener.h"
46   #include "hostmask.h"
47   #include "modules.h"
48   #include "numeric.h"
49   #include "fdlist.h"
50 < #include "s_log.h"
50 > #include "log.h"
51   #include "send.h"
52 #include "s_gline.h"
53 #include "fileio.h"
52   #include "memory.h"
53 < #include "irc_res.h"
54 < #include "userhost.h"
57 < #include "s_user.h"
53 > #include "res.h"
54 > #include "user.h"
55   #include "channel_mode.h"
56 <
57 < struct Callback *client_check_cb = NULL;
58 < struct config_server_hide ConfigServerHide;
56 > #include "misc.h"
57 > #include "conf_db.h"
58 > #include "conf_class.h"
59 > #include "motd.h"
60 > #include "ipcache.h"
61 > #include "isupport.h"
62 > #include "whowas.h"
63 >
64 >
65 > struct config_channel_entry ConfigChannel;
66 > struct config_serverhide_entry ConfigServerHide;
67 > struct config_general_entry ConfigGeneral;
68 > struct config_log_entry ConfigLog = { .use_logging = 1 };
69 > struct config_serverinfo_entry ConfigServerInfo;
70 > struct config_admin_entry ConfigAdminInfo;
71 > struct conf_parser_context conf_parser_ctx;
72  
73   /* general conf items link list root, other than k lines etc. */
74 < dlink_list server_items  = { NULL, NULL, 0 };
75 < dlink_list cluster_items = { NULL, NULL, 0 };
66 < dlink_list hub_items     = { NULL, NULL, 0 };
67 < dlink_list leaf_items    = { NULL, NULL, 0 };
68 < dlink_list oconf_items   = { NULL, NULL, 0 };
69 < dlink_list uconf_items   = { NULL, NULL, 0 };
70 < dlink_list xconf_items   = { NULL, NULL, 0 };
71 < dlink_list rxconf_items  = { NULL, NULL, 0 };
72 < dlink_list rkconf_items  = { NULL, NULL, 0 };
73 < dlink_list nresv_items   = { NULL, NULL, 0 };
74 < dlink_list class_items   = { NULL, NULL, 0 };
75 < dlink_list gdeny_items   = { NULL, NULL, 0 };
76 <
77 < dlink_list temporary_klines  = { NULL, NULL, 0 };
78 < dlink_list temporary_dlines  = { NULL, NULL, 0 };
79 < dlink_list temporary_xlines  = { NULL, NULL, 0 };
80 < dlink_list temporary_rklines = { NULL, NULL, 0 };
81 < dlink_list temporary_glines  = { NULL, NULL, 0 };
82 < dlink_list temporary_rxlines = { NULL, NULL, 0 };
83 < dlink_list temporary_resv = { NULL, NULL, 0 };
74 > dlink_list connect_items;
75 > dlink_list operator_items;
76  
77   extern unsigned int lineno;
78   extern char linebuf[];
79   extern char conffilebuf[IRCD_BUFSIZE];
88 extern char yytext[];
80   extern int yyparse(); /* defined in y.tab.c */
90 unsigned int scount = 0; /* used by yyparse(), etc */
91 int ypass  = 1; /* used by yyparse()      */
92
93 /* internally defined functions */
94 static void lookup_confhost(struct ConfItem *);
95 static void set_default_conf(void);
96 static void validate_conf(void);
97 static void read_conf(FBFILE *);
98 static void clear_out_old_conf(void);
99 static void flush_deleted_I_P(void);
100 static void expire_tklines(dlink_list *);
101 static void garbage_collect_ip_entries(void);
102 static int hash_ip(struct irc_ssaddr *);
103 static int verify_access(struct Client *, const char *);
104 static int attach_iline(struct Client *, struct ConfItem *);
105 static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
106 static void parse_conf_file(int, int);
107 static dlink_list *map_to_list(ConfType);
108 static struct AccessItem *find_regexp_kline(const char *[]);
109 static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
110
111 /*
112 * bit_len
113 */
114 static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
115 static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
116 static void destroy_cidr_class(struct ClassItem *);
117
118 static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
119
120 FBFILE *conf_fbfile_in = NULL;
121
122 /* address of default class conf */
123 static struct ConfItem *class_default;
124
125 /* usually, with hash tables, you use a prime number...
126 * but in this case I am dealing with ip addresses,
127 * not ascii strings.
128 */
129 #define IP_HASH_SIZE 0x1000
130
131 struct ip_entry
132 {
133  struct irc_ssaddr ip;
134  int count;
135  time_t last_attempt;
136  struct ip_entry *next;
137 };
81  
139 static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
140 static BlockHeap *ip_entry_heap = NULL;
141 static int ip_entries_count = 0;
142
143
144 inline void *
145 map_to_conf(struct ConfItem *aconf)
146 {
147  void *conf;
148  conf = (void *)((unsigned long)aconf +
149                  (unsigned long)sizeof(struct ConfItem));
150  return(conf);
151 }
152
153 inline struct ConfItem *
154 unmap_conf_item(void *aconf)
155 {
156  struct ConfItem *conf;
157
158  conf = (struct ConfItem *)((unsigned long)aconf -
159                             (unsigned long)sizeof(struct ConfItem));
160  return(conf);
161 }
82  
83   /* conf_dns_callback()
84   *
85 < * inputs       - pointer to struct AccessItem
85 > * inputs       - pointer to struct MaskItem
86   *              - pointer to DNSReply reply
87   * output       - none
88   * side effects - called when resolver query finishes
# Line 171 | Line 91 | unmap_conf_item(void *aconf)
91   * if successful save hp in the conf item it was called with
92   */
93   static void
94 < conf_dns_callback(void *vptr, struct DNSReply *reply)
94 > conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
95   {
96 <  struct AccessItem *aconf = (struct AccessItem *)vptr;
177 <  struct ConfItem *conf;
96 >  struct MaskItem *const conf = vptr;
97  
98 <  MyFree(aconf->dns_query);
180 <  aconf->dns_query = NULL;
98 >  conf->dns_pending = false;
99  
100 <  if (reply != NULL)
101 <    memcpy(&aconf->ipnum, &reply->addr, sizeof(reply->addr));
102 <  else {
103 <    ilog(L_NOTICE, "Host not found: %s, ignoring connect{} block",
186 <         aconf->host);
187 <    conf = unmap_conf_item(aconf);
188 <    sendto_realops_flags(UMODE_ALL, L_ALL,
189 <                         "Ignoring connect{} block for %s - host not found",
190 <                         conf->name);
191 <    delete_conf_item(conf);
192 <  }
193 < }
194 <
195 < /* conf_dns_lookup()
196 < *
197 < * do a nameserver lookup of the conf host
198 < * if the conf entry is currently doing a ns lookup do nothing, otherwise
199 < * allocate a dns_query and start ns lookup.
200 < */
201 < static void
202 < conf_dns_lookup(struct AccessItem *aconf)
203 < {
204 <  if (aconf->dns_query == NULL)
205 <  {
206 <    aconf->dns_query = MyMalloc(sizeof(struct DNSQuery));
207 <    aconf->dns_query->ptr = aconf;
208 <    aconf->dns_query->callback = conf_dns_callback;
209 <    gethost_byname(aconf->host, aconf->dns_query);
210 <  }
100 >  if (addr)
101 >    *conf->addr = *addr;
102 >  else
103 >    conf->dns_failed = true;
104   }
105  
106 < /* make_conf_item()
106 > /* conf_resolve_host()
107   *
108 < * inputs       - type of item
109 < * output       - pointer to new conf entry
217 < * side effects - none
108 > * start DNS lookups of all hostnames in the conf
109 > * line and convert an IP addresses in a.b.c.d number for to IP#s.
110   */
111 < struct ConfItem *
112 < make_conf_item(ConfType type)
111 > void
112 > conf_dns_lookup(struct MaskItem *conf)
113   {
114 <  struct ConfItem *conf = NULL;
223 <  struct AccessItem *aconf = NULL;
224 <  struct ClassItem *aclass = NULL;
225 <  int status = 0;
226 <
227 <  switch (type)
228 <  {
229 <  case DLINE_TYPE:
230 <  case EXEMPTDLINE_TYPE:
231 <  case GLINE_TYPE:
232 <  case KLINE_TYPE:
233 <  case CLIENT_TYPE:
234 <  case OPER_TYPE:
235 <  case SERVER_TYPE:
236 <    conf = MyMalloc(sizeof(struct ConfItem) +
237 <                    sizeof(struct AccessItem));
238 <    aconf = map_to_conf(conf);
239 <    aconf->aftype = AF_INET;
240 <
241 <    /* Yes, sigh. switch on type again */
242 <    switch (type)
243 <    {
244 <    case EXEMPTDLINE_TYPE:
245 <      status = CONF_EXEMPTDLINE;
246 <      break;
247 <
248 <    case DLINE_TYPE:
249 <      status = CONF_DLINE;
250 <      break;
251 <
252 <    case KLINE_TYPE:
253 <      status = CONF_KLINE;
254 <      break;
114 >  struct addrinfo hints, *res;
115  
116 <    case GLINE_TYPE:
117 <      status = CONF_GLINE;
118 <      break;
116 >  /*
117 >   * Do name lookup now on hostnames given and store the
118 >   * ip numbers in conf structure.
119 >   */
120 >  memset(&hints, 0, sizeof(hints));
121  
122 <    case CLIENT_TYPE:
123 <      status = CONF_CLIENT;
262 <      break;
122 >  hints.ai_family = AF_UNSPEC;
123 >  hints.ai_socktype = SOCK_STREAM;
124  
125 <    case OPER_TYPE:
126 <      status = CONF_OPERATOR;
266 <      dlinkAdd(conf, &conf->node, &oconf_items);
267 <      break;
125 >  /* Get us ready for a bind() and don't bother doing dns lookup */
126 >  hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
127  
128 <    case SERVER_TYPE:
129 <      status = CONF_SERVER;
130 <      dlinkAdd(conf, &conf->node, &server_items);
131 <      break;
128 >  if (getaddrinfo(conf->host, NULL, &hints, &res))
129 >  {
130 >    /*
131 >     * By this point conf->host possibly is not a numerical network address. Do a nameserver
132 >     * lookup of the conf host. If the conf entry is currently doing a ns lookup do nothing.
133 >     */
134 >    if (conf->dns_pending == true)
135 >      return;
136  
137 <    default:
275 <      break;
276 <    }
277 <    aconf->status = status;
278 <    break;
137 >    conf->dns_pending = true;
138  
139 <  case LEAF_TYPE:
140 <    conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
141 <                                       sizeof(struct MatchItem));
142 <    dlinkAdd(conf, &conf->node, &leaf_items);
143 <    break;
285 <
286 <  case HUB_TYPE:
287 <    conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
288 <                                       sizeof(struct MatchItem));
289 <    dlinkAdd(conf, &conf->node, &hub_items);
290 <    break;
291 <
292 <  case ULINE_TYPE:
293 <    conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
294 <                                       sizeof(struct MatchItem));
295 <    dlinkAdd(conf, &conf->node, &uconf_items);
296 <    break;
297 <
298 <  case GDENY_TYPE:
299 <    conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
300 <                                       sizeof(struct AccessItem));
301 <    dlinkAdd(conf, &conf->node, &gdeny_items);
302 <    break;
303 <
304 <  case XLINE_TYPE:
305 <    conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
306 <                                       sizeof(struct MatchItem));
307 <    dlinkAdd(conf, &conf->node, &xconf_items);
308 <    break;
309 <
310 <  case RXLINE_TYPE:
311 <    conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
312 <                                       sizeof(struct MatchItem));
313 <    dlinkAdd(conf, &conf->node, &rxconf_items);
314 <    break;
315 <
316 <  case RKLINE_TYPE:
317 <    conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
318 <                                       sizeof(struct AccessItem));
319 <    aconf = map_to_conf(conf);
320 <    aconf->status = CONF_KLINE;
321 <    dlinkAdd(conf, &conf->node, &rkconf_items);
322 <    break;
323 <
324 <  case CLUSTER_TYPE:
325 <    conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
326 <    dlinkAdd(conf, &conf->node, &cluster_items);
327 <    break;
328 <
329 <  case CRESV_TYPE:
330 <    conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
331 <                                       sizeof(struct ResvChannel));
332 <    break;
333 <
334 <  case NRESV_TYPE:
335 <    conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
336 <                                       sizeof(struct MatchItem));
337 <    dlinkAdd(conf, &conf->node, &nresv_items);
338 <    break;
339 <
340 <  case CLASS_TYPE:
341 <    conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
342 <                                       sizeof(struct ClassItem));
343 <    dlinkAdd(conf, &conf->node, &class_items);
344 <    aclass = (struct ClassItem *)map_to_conf(conf);
345 <    ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
346 <    PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
347 <    MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
348 <    MaxSendq(aclass) = DEFAULT_SENDQ;
349 <    CurrUserCount(aclass) = 0;
350 <    break;
351 <
352 <  default:
353 <    conf = NULL;
354 <    break;
139 >    if (conf->aftype == AF_INET)
140 >      gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
141 >    else
142 >      gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
143 >    return;
144    }
145  
146 <  /* XXX Yes, this will core if default is hit. I want it to for now - db */
147 <  conf->type = type;
146 >  assert(res);
147 >
148 >  memcpy(conf->addr, res->ai_addr, res->ai_addrlen);
149 >  conf->addr->ss_len = res->ai_addrlen;
150  
151 <  return(conf);
151 >  freeaddrinfo(res);
152   }
153  
154 < void
155 < delete_conf_item(struct ConfItem *conf)
154 > /* map_to_list()
155 > *
156 > * inputs       - ConfType conf
157 > * output       - pointer to dlink_list to use
158 > * side effects - none
159 > */
160 > static dlink_list *
161 > map_to_list(enum maskitem_type type)
162   {
163 <  struct MatchItem *match_item;
164 <  struct AccessItem *aconf;
165 <  ConfType type = conf->type;
166 <
370 <  MyFree(conf->name);
371 <  conf->name = NULL;
372 <
373 <  switch(type)
374 <  {
375 <  case DLINE_TYPE:
376 <  case EXEMPTDLINE_TYPE:
377 <  case GLINE_TYPE:
378 <  case KLINE_TYPE:
379 <  case CLIENT_TYPE:
380 <  case OPER_TYPE:
381 <  case SERVER_TYPE:
382 <    aconf = map_to_conf(conf);
383 <
384 <    if (aconf->dns_query != NULL)
385 <    {
386 <      delete_resolver_queries(aconf->dns_query);
387 <      MyFree(aconf->dns_query);
388 <    }
389 <    if (aconf->passwd != NULL)
390 <      memset(aconf->passwd, 0, strlen(aconf->passwd));
391 <    if (aconf->spasswd != NULL)
392 <      memset(aconf->spasswd, 0, strlen(aconf->spasswd));
393 <    aconf->class_ptr = NULL;
394 <
395 <    MyFree(aconf->passwd);
396 <    MyFree(aconf->spasswd);
397 <    MyFree(aconf->reason);
398 <    MyFree(aconf->oper_reason);
399 <    MyFree(aconf->user);
400 <    MyFree(aconf->host);
401 <    MyFree(aconf->fakename);
402 < #ifdef HAVE_LIBCRYPTO
403 <    if (aconf->rsa_public_key)
404 <      RSA_free(aconf->rsa_public_key);
405 <    MyFree(aconf->rsa_public_key_file);
406 < #endif
407 <
408 <    /* Yes, sigh. switch on type again */
409 <    switch(type)
410 <    {
411 <    case EXEMPTDLINE_TYPE:
412 <    case DLINE_TYPE:
413 <    case GLINE_TYPE:
414 <    case KLINE_TYPE:
415 <    case CLIENT_TYPE:
416 <      MyFree(conf);
417 <      break;
418 <
419 <    case OPER_TYPE:
420 <      aconf = map_to_conf(conf);
421 <      if (!IsConfIllegal(aconf))
422 <        dlinkDelete(&conf->node, &oconf_items);
423 <      MyFree(conf);
163 >  switch (type)
164 >  {
165 >    case CONF_OPER:
166 >      return &operator_items;
167        break;
168 <
169 <    case SERVER_TYPE:
427 <      aconf = map_to_conf(conf);
428 <      if (!IsConfIllegal(aconf))
429 <        dlinkDelete(&conf->node, &server_items);
430 <      MyFree(conf);
168 >    case CONF_SERVER:
169 >      return &connect_items;
170        break;
432
171      default:
172 <      break;
435 <    }
436 <    break;
437 <
438 <  case HUB_TYPE:
439 <    match_item = map_to_conf(conf);
440 <    MyFree(match_item->user);
441 <    MyFree(match_item->host);
442 <    MyFree(match_item->reason);
443 <    MyFree(match_item->oper_reason);
444 <    /* If marked illegal, its already been pulled off of the hub_items list */
445 <    if (!match_item->illegal)
446 <      dlinkDelete(&conf->node, &hub_items);
447 <    MyFree(conf);
448 <    break;
449 <
450 <  case LEAF_TYPE:
451 <    match_item = map_to_conf(conf);
452 <    MyFree(match_item->user);
453 <    MyFree(match_item->host);
454 <    MyFree(match_item->reason);
455 <    MyFree(match_item->oper_reason);
456 <    /* If marked illegal, its already been pulled off of the leaf_items list */
457 <    if (!match_item->illegal)
458 <      dlinkDelete(&conf->node, &leaf_items);
459 <    MyFree(conf);
460 <    break;
461 <
462 <  case ULINE_TYPE:
463 <    match_item = map_to_conf(conf);
464 <    MyFree(match_item->user);
465 <    MyFree(match_item->host);
466 <    MyFree(match_item->reason);
467 <    MyFree(match_item->oper_reason);
468 <    dlinkDelete(&conf->node, &uconf_items);
469 <    MyFree(conf);
470 <    break;
471 <
472 <  case XLINE_TYPE:
473 <    match_item = map_to_conf(conf);
474 <    MyFree(match_item->user);
475 <    MyFree(match_item->host);
476 <    MyFree(match_item->reason);
477 <    MyFree(match_item->oper_reason);
478 <    dlinkDelete(&conf->node, &xconf_items);
479 <    MyFree(conf);
480 <    break;
481 <
482 <  case RKLINE_TYPE:
483 <    aconf = map_to_conf(conf);
484 <    MyFree(aconf->regexuser);
485 <    MyFree(aconf->regexhost);
486 <    MyFree(aconf->user);
487 <    MyFree(aconf->host);
488 <    MyFree(aconf->reason);
489 <    MyFree(aconf->oper_reason);
490 <    dlinkDelete(&conf->node, &rkconf_items);
491 <    MyFree(conf);
492 <    break;
493 <
494 <  case RXLINE_TYPE:
495 <    MyFree(conf->regexpname);
496 <    match_item = map_to_conf(conf);
497 <    MyFree(match_item->user);
498 <    MyFree(match_item->host);
499 <    MyFree(match_item->reason);
500 <    MyFree(match_item->oper_reason);
501 <    dlinkDelete(&conf->node, &rxconf_items);
502 <    MyFree(conf);
503 <    break;
504 <
505 <  case NRESV_TYPE:
506 <    match_item = map_to_conf(conf);
507 <    MyFree(match_item->user);
508 <    MyFree(match_item->host);
509 <    MyFree(match_item->reason);
510 <    MyFree(match_item->oper_reason);
511 <    dlinkDelete(&conf->node, &nresv_items);
512 <    MyFree(conf);
513 <    break;
514 <
515 <  case GDENY_TYPE:
516 <    aconf = map_to_conf(conf);
517 <    MyFree(aconf->user);
518 <    MyFree(aconf->host);
519 <    dlinkDelete(&conf->node, &gdeny_items);
520 <    MyFree(conf);
521 <    break;
522 <
523 <  case CLUSTER_TYPE:
524 <    dlinkDelete(&conf->node, &cluster_items);
525 <    MyFree(conf);
526 <    break;
527 <
528 <  case CRESV_TYPE:
529 <    MyFree(conf);
530 <    break;
531 <
532 <  case CLASS_TYPE:
533 <    dlinkDelete(&conf->node, &class_items);
534 <    MyFree(conf);
535 <    break;
536 <
537 <  default:
538 <    break;
172 >      return NULL;
173    }
174   }
175  
176 < /* free_access_item()
177 < *
544 < * inputs       - pointer to conf to free
545 < * output       - none
546 < * side effects - crucial password fields are zeroed, conf is freed
547 < */
548 < void
549 < free_access_item(struct AccessItem *aconf)
176 > struct MaskItem *
177 > conf_make(enum maskitem_type type)
178   {
179 <  struct ConfItem *conf;
179 >  struct MaskItem *const conf = xcalloc(sizeof(*conf));
180 >  dlink_list *list = NULL;
181  
182 <  if (aconf == NULL)
183 <    return;
184 <  conf = unmap_conf_item(aconf);
556 <  delete_conf_item(conf);
557 < }
182 >  conf->type   = type;
183 >  conf->active = true;
184 >  conf->aftype = AF_INET;
185  
186 < static const unsigned int shared_bit_table[] =
187 <  { 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
186 >  if ((list = map_to_list(type)))
187 >    dlinkAdd(conf, &conf->node, list);
188 >  return conf;
189 > }
190  
562 /* report_confitem_types()
563 *
564 * inputs       - pointer to client requesting confitem report
565 *              - ConfType to report
566 * output       - none
567 * side effects -
568 */
191   void
192 < report_confitem_types(struct Client *source_p, ConfType type, int temp)
192 > conf_free(struct MaskItem *conf)
193   {
194 <  dlink_node *ptr = NULL;
195 <  struct ConfItem *conf = NULL;
574 <  struct AccessItem *aconf = NULL;
575 <  struct MatchItem *matchitem = NULL;
576 <  struct ClassItem *classitem = NULL;
577 <  char buf[12];
578 <  char *p = NULL;
194 >  dlink_node *node = NULL, *node_next = NULL;
195 >  dlink_list *list = NULL;
196  
197 <  switch (type)
198 <  {
582 <  case GDENY_TYPE:
583 <    DLINK_FOREACH(ptr, gdeny_items.head)
584 <    {
585 <      conf = ptr->data;
586 <      aconf = map_to_conf(conf);
197 >  if ((list = map_to_list(conf->type)))
198 >    dlinkFindDelete(list, conf);
199  
200 <      p = buf;
200 >  xfree(conf->name);
201  
202 <      if (aconf->flags & GDENY_BLOCK)
203 <        *p++ = 'B';
204 <      else
205 <        *p++ = 'b';
202 >  if (conf->dns_pending == true)
203 >    delete_resolver_queries(conf);
204 >  if (conf->passwd)
205 >    memset(conf->passwd, 0, strlen(conf->passwd));
206 >  if (conf->spasswd)
207 >    memset(conf->spasswd, 0, strlen(conf->spasswd));
208  
209 <      if (aconf->flags & GDENY_REJECT)
596 <        *p++ = 'R';
597 <      else
598 <        *p++ = 'r';
209 >  conf->class = NULL;
210  
211 <      *p = '\0';
212 <
213 <      sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
214 <                 me.name, RPL_STATSDEBUG, source_p->name,
215 <                 aconf->user, aconf->host, conf->name, buf);
216 <    }
217 <    break;
218 <
219 <  case XLINE_TYPE:
220 <    DLINK_FOREACH(ptr, xconf_items.head)
610 <    {
611 <      conf = ptr->data;
612 <      matchitem = map_to_conf(conf);
211 >  xfree(conf->passwd);
212 >  xfree(conf->spasswd);
213 >  xfree(conf->reason);
214 >  xfree(conf->certfp);
215 >  xfree(conf->whois);
216 >  xfree(conf->user);
217 >  xfree(conf->host);
218 >  xfree(conf->addr);
219 >  xfree(conf->bind);
220 >  xfree(conf->cipher_list);
221  
222 <      sendto_one(source_p, form_str(RPL_STATSXLINE),
223 <                 me.name, source_p->name,
224 <                 matchitem->hold ? "x": "X", matchitem->count,
225 <                 conf->name, matchitem->reason);
226 <    }
227 <    break;
620 <
621 <  case RXLINE_TYPE:
622 <    DLINK_FOREACH(ptr, rxconf_items.head)
623 <    {
624 <      conf = ptr->data;
625 <      matchitem = map_to_conf(conf);
626 <
627 <      sendto_one(source_p, form_str(RPL_STATSXLINE),
628 <                 me.name, source_p->name,
629 <                 matchitem->hold ? "xR": "XR", matchitem->count,
630 <                 conf->name, matchitem->reason);
631 <    }
632 <    break;
633 <
634 <  case RKLINE_TYPE:
635 <    p = temp ? "Rk" : "RK";
636 <
637 <    DLINK_FOREACH(ptr, rkconf_items.head)
638 <    {
639 <      aconf = map_to_conf((conf = ptr->data));
640 <
641 <      if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
642 <        continue;
643 <
644 <      sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
645 <                 source_p->name, p, aconf->host, aconf->user,
646 <                 aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
647 <    }
648 <    break;
649 <
650 <  case ULINE_TYPE:
651 <    DLINK_FOREACH(ptr, uconf_items.head)
652 <    {
653 <      conf = ptr->data;
654 <      matchitem = map_to_conf(conf);
222 >  DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
223 >  {
224 >    xfree(node->data);
225 >    dlinkDelete(node, &conf->hub_list);
226 >    free_dlink_node(node);
227 >  }
228  
229 <      p = buf;
229 >  DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
230 >  {
231 >    xfree(node->data);
232 >    dlinkDelete(node, &conf->leaf_list);
233 >    free_dlink_node(node);
234 >  }
235  
236 <      /* some of these are redundant for the sake of
237 <       * consistency with cluster{} flags
660 <       */
661 <      *p++ = 'c';
662 <      flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
663 <
664 <      sendto_one(source_p, form_str(RPL_STATSULINE),
665 <                 me.name, source_p->name, conf->name,
666 <                 matchitem->user?matchitem->user: "*",
667 <                 matchitem->host?matchitem->host: "*", buf);
668 <    }
236 >  xfree(conf);
237 > }
238  
239 <    DLINK_FOREACH(ptr, cluster_items.head)
240 <    {
241 <      conf = ptr->data;
239 > /* attach_iline()
240 > *
241 > * inputs       - client pointer
242 > *              - conf pointer
243 > * output       -
244 > * side effects - do actual attach
245 > */
246 > static int
247 > attach_iline(struct Client *client, struct MaskItem *conf)
248 > {
249 >  const struct ClassItem *const class = conf->class;
250 >  bool a_limit_reached = false;
251  
252 <      p = buf;
252 >  struct ip_entry *ipcache = ipcache_record_find_or_add(&client->ip);
253 >  ++ipcache->count_local;
254 >  AddFlag(client, FLAGS_IPHASH);
255  
256 <      *p++ = 'C';
257 <      flags_to_ascii(conf->flags, shared_bit_table, p, 0);
256 >  if (class->max_total && class->ref_count >= class->max_total)
257 >    a_limit_reached = true;
258 >  else if (class->max_perip_local && ipcache->count_local > class->max_perip_local)
259 >    a_limit_reached = true;
260 >  else if (class->max_perip_global &&
261 >           (ipcache->count_local + ipcache->count_remote) > class->max_perip_global)
262 >    a_limit_reached = true;
263  
264 <      sendto_one(source_p, form_str(RPL_STATSULINE),
265 <                 me.name, source_p->name, conf->name,
266 <                 "*", "*", buf);
267 <    }
264 >  if (a_limit_reached == true)
265 >  {
266 >    if (!IsConfExemptLimits(conf))
267 >      return TOO_MANY;   /* Already at maximum allowed */
268  
269 <    break;
269 >    sendto_one_notice(client, &me, ":*** Your connection class is full, "
270 >                      "but you have exceed_limit = yes;");
271 >  }
272  
273 <  case OPER_TYPE:
274 <    DLINK_FOREACH(ptr, oconf_items.head)
688 <    {
689 <      conf = ptr->data;
690 <      aconf = map_to_conf(conf);
273 >  return conf_attach(client, conf);
274 > }
275  
276 <      /* Don't allow non opers to see oper privs */
277 <      if (IsOper(source_p))
278 <        sendto_one(source_p, form_str(RPL_STATSOLINE),
279 <                   me.name, source_p->name, 'O', aconf->user, aconf->host,
280 <                   conf->name, oper_privs_as_string(aconf->port),
281 <                   aconf->class_ptr ? aconf->class_ptr->name : "<default>");
282 <      else
283 <        sendto_one(source_p, form_str(RPL_STATSOLINE),
284 <                   me.name, source_p->name, 'O', aconf->user, aconf->host,
285 <                   conf->name, "0",
702 <                   aconf->class_ptr ? aconf->class_ptr->name : "<default>");
703 <    }
704 <    break;
276 > /* verify_access()
277 > *
278 > * inputs       - pointer to client to verify
279 > * output       - 0 if success -'ve if not
280 > * side effect  - find the first (best) I line to attach.
281 > */
282 > static int
283 > verify_access(struct Client *client)
284 > {
285 >  struct MaskItem *conf;
286  
287 <  case CLASS_TYPE:
288 <    DLINK_FOREACH(ptr, class_items.head)
289 <    {
290 <      conf = ptr->data;
291 <      classitem = map_to_conf(conf);
292 <      sendto_one(source_p, form_str(RPL_STATSYLINE),
712 <                 me.name, source_p->name, 'Y',
713 <                 conf->name, PingFreq(classitem),
714 <                 ConFreq(classitem),
715 <                 MaxTotal(classitem), MaxSendq(classitem));
716 <    }
717 <    break;
287 >  if (HasFlag(client, FLAGS_GOTID))
288 >    conf = find_address_conf(client->host, client->username, &client->ip,
289 >                             client->connection->password);
290 >  else
291 >  {
292 >    char non_ident[USERLEN + 1] = "~";
293  
294 <  case CONF_TYPE:
295 <  case CLIENT_TYPE:
296 <    break;
294 >    strlcpy(non_ident + 1, client->username, sizeof(non_ident) - 1);
295 >    conf = find_address_conf(client->host, non_ident, &client->ip,
296 >                             client->connection->password);
297 >  }
298  
299 <  case SERVER_TYPE:
300 <    DLINK_FOREACH(ptr, server_items.head)
725 <    {
726 <      p = buf;
299 >  if (conf == NULL)
300 >    return NOT_AUTHORIZED;
301  
302 <      conf = ptr->data;
729 <      aconf = map_to_conf(conf);
302 >  assert(IsConfClient(conf) || IsConfKill(conf));
303  
304 <      buf[0] = '\0';
304 >  if (IsConfKill(conf))
305 >  {
306 >    sendto_one_notice(client, &me, ":*** Banned: %s", conf->reason);
307 >    return BANNED_CLIENT;
308 >  }
309  
310 <      if (IsConfAllowAutoConn(aconf))
311 <        *p++ = 'A';
312 <      if (IsConfCryptLink(aconf))
313 <        *p++ = 'C';
314 <      if (IsConfLazyLink(aconf))
315 <        *p++ = 'L';
316 <      if (aconf->fakename)
740 <        *p++ = 'M';
741 <      if (IsConfTopicBurst(aconf))
742 <        *p++ = 'T';
743 <      if (IsConfCompressed(aconf))
744 <        *p++ = 'Z';
745 <      if (buf[0] == '\0')
746 <        *p++ = '*';
747 <
748 <      *p = '\0';
749 <
750 <      /* Allow admins to see actual ips
751 <       * unless hide_server_ips is enabled
752 <       */
753 <      if (!ConfigServerHide.hide_server_ips && IsAdmin(source_p))
754 <        sendto_one(source_p, form_str(RPL_STATSCLINE),
755 <                   me.name, source_p->name, 'C', aconf->host,
756 <                   buf, conf->name, aconf->port,
757 <                   aconf->class_ptr ? aconf->class_ptr->name : "<default>");
758 <        else
759 <          sendto_one(source_p, form_str(RPL_STATSCLINE),
760 <                     me.name, source_p->name, 'C',
761 <                     "*@127.0.0.1", buf, conf->name, aconf->port,
762 <                     aconf->class_ptr ? aconf->class_ptr->name : "<default>");
763 <    }
764 <    break;
310 >  if (IsConfRedir(conf))
311 >  {
312 >    sendto_one_numeric(client, &me, RPL_REDIR,
313 >                       conf->name ? conf->name : "",
314 >                       conf->port);
315 >    return NOT_AUTHORIZED;
316 >  }
317  
318 <  case HUB_TYPE:
319 <    DLINK_FOREACH(ptr, hub_items.head)
768 <    {
769 <      conf = ptr->data;
770 <      matchitem = map_to_conf(conf);
771 <      sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
772 <                 source_p->name, 'H', matchitem->host, conf->name, 0, "*");
773 <    }
774 <    break;
318 >  /* Preserve x->host in x->realhost before it gets overwritten. */
319 >  strlcpy(client->realhost, client->host, sizeof(client->realhost));
320  
321 <  case LEAF_TYPE:
322 <    DLINK_FOREACH(ptr, leaf_items.head)
778 <    {
779 <      conf = ptr->data;
780 <      matchitem = map_to_conf(conf);
781 <      sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
782 <                 source_p->name, 'L', matchitem->host, conf->name, 0, "*");
783 <    }
784 <    break;
321 >  if (IsConfDoSpoofIp(conf))
322 >    strlcpy(client->host, conf->name, sizeof(client->host));
323  
324 <  case GLINE_TYPE:
787 <  case KLINE_TYPE:
788 <  case DLINE_TYPE:
789 <  case EXEMPTDLINE_TYPE:
790 <  case CRESV_TYPE:
791 <  case NRESV_TYPE:
792 <  case CLUSTER_TYPE:
793 <    break;
794 <  }
324 >  return attach_iline(client, conf);
325   }
326  
327   /* check_client()
# Line 807 | Line 337 | report_confitem_types(struct Client *sou
337   *                Look for conf lines which have the same
338   *                status as the flags passed.
339   */
340 < static void *
341 < check_client(va_list args)
340 > bool
341 > conf_check_client(struct Client *client)
342   {
813  struct Client *source_p = va_arg(args, struct Client *);
814  const char *username = va_arg(args, const char *);
343    int i;
344 <
345 <  /* I'm already in big trouble if source_p->localClient is NULL -db */
346 <  if ((i = verify_access(source_p, username)))
347 <  {
820 <    ilog(L_INFO, "Access denied: %s[%s]",
821 <         source_p->name, source_p->sockhost);
822 <  }
344 >
345 >  if ((i = verify_access(client)))
346 >    ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
347 >         client->name, client->sockhost);
348  
349    switch (i)
350    {
826    case IRCD_SOCKET_ERROR:
827      exit_client(source_p, &me, "Socket Error");
828      break;
829
351      case TOO_MANY:
352 <      sendto_realops_flags(UMODE_FULL, L_ALL,
352 >      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
353                             "Too many on IP for %s (%s).",
354 <                           get_client_name(source_p, SHOW_IP),
355 <                           source_p->sockhost);
356 <      ilog(L_INFO,"Too many connections on IP from %s.",
357 <           get_client_name(source_p, SHOW_IP));
358 <      ServerStats->is_ref++;
359 <      exit_client(source_p, &me, "No more connections allowed on that IP");
354 >                           client_get_name(client, SHOW_IP),
355 >                           client->sockhost);
356 >      ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
357 >           client_get_name(client, SHOW_IP));
358 >      ++ServerStats.is_ref;
359 >      exit_client(client, "No more connections allowed on that IP");
360        break;
361  
362      case I_LINE_FULL:
363 <      sendto_realops_flags(UMODE_FULL, L_ALL,
364 <                           "I-line is full for %s (%s).",
365 <                           get_client_name(source_p, SHOW_IP),
366 <                           source_p->sockhost);
367 <      ilog(L_INFO,"Too many connections from %s.",
368 <           get_client_name(source_p, SHOW_IP));
369 <       ServerStats->is_ref++;
370 <      exit_client(source_p, &me,
850 <                "No more connections allowed in your connection class");
363 >      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
364 >                           "auth {} block is full for %s (%s).",
365 >                           client_get_name(client, SHOW_IP),
366 >                           client->sockhost);
367 >      ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
368 >           client_get_name(client, SHOW_IP));
369 >      ++ServerStats.is_ref;
370 >      exit_client(client, "No more connections allowed in your connection class");
371        break;
372  
373      case NOT_AUTHORIZED:
374 <    {
375 <      static char ipaddr[HOSTIPLEN];
376 <      ServerStats->is_ref++;
377 <      /* jdc - lists server name & port connections are on */
378 <      /*       a purely cosmetical change */
379 <      irc_getnameinfo((struct sockaddr*)&source_p->localClient->ip,
380 <            source_p->localClient->ip.ss_len, ipaddr, HOSTIPLEN, NULL, 0,
861 <            NI_NUMERICHOST);
862 <      sendto_realops_flags(UMODE_UNAUTH, L_ALL,
863 <                           "Unauthorized client connection from %s [%s] on [%s/%u].",
864 <                           get_client_name(source_p, SHOW_IP),
865 <                           ipaddr,
866 <                           source_p->localClient->listener->name,
867 <                           source_p->localClient->listener->port);
868 <      ilog(L_INFO,
869 <          "Unauthorized client connection from %s on [%s/%u].",
870 <          get_client_name(source_p, SHOW_IP),
871 <          source_p->localClient->listener->name,
872 <          source_p->localClient->listener->port);
873 <
874 <      /* XXX It is prolematical whether it is better to use the
875 <       * capture reject code here or rely on the connecting too fast code.
876 <       * - Dianora
877 <       */
878 <      if(REJECT_HOLD_TIME > 0)
879 <      {
880 <        sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
881 <                   me.name, source_p->name);
882 <        source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
883 <        SetCaptured(source_p);
884 <      }
885 <      else
886 <        exit_client(source_p, &me, "You are not authorized to use this server");
374 >      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
375 >                           "Unauthorized client connection from %s.",
376 >                           client_get_name(client, SHOW_IP));
377 >      ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s.",
378 >           client_get_name(client, SHOW_IP));
379 >      ++ServerStats.is_ref;
380 >      exit_client(client, "You are not authorized to use this server");
381        break;
888    }
889
890   case BANNED_CLIENT:
891     /*
892      * Don't exit them immediately, play with them a bit.
893      * - Dianora
894      */
895     if (REJECT_HOLD_TIME > 0)
896     {
897       source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
898       SetCaptured(source_p);
899     }
900     else
901       exit_client(source_p, &me, "Banned");
902     ServerStats->is_ref++;
903     break;
904
905   case 0:
906   default:
907     break;
908  }
909
910  return (i < 0 ? NULL : source_p);
911 }
912
913 /* verify_access()
914 *
915 * inputs       - pointer to client to verify
916 *              - pointer to proposed username
917 * output       - 0 if success -'ve if not
918 * side effect  - find the first (best) I line to attach.
919 */
920 static int
921 verify_access(struct Client *client_p, const char *username)
922 {
923  struct AccessItem *aconf = NULL, *rkconf = NULL;
924  struct ConfItem *conf = NULL;
925  char non_ident[USERLEN + 1] = { '~', '\0' };
926  const char *uhi[3];
927
928  if (IsGotId(client_p))
929  {
930    aconf = find_address_conf(client_p->host, client_p->username,
931                             &client_p->localClient->ip,
932                             client_p->localClient->aftype,
933                             client_p->localClient->passwd);
934  }
935  else
936  {
937    strlcpy(non_ident+1, username, sizeof(non_ident)-1);
938    aconf = find_address_conf(client_p->host,non_ident,
939                             &client_p->localClient->ip,
940                             client_p->localClient->aftype,
941                             client_p->localClient->passwd);
942  }
943
944  uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
945  uhi[1] = client_p->host;
946  uhi[2] = client_p->sockhost;
947
948  rkconf = find_regexp_kline(uhi);
382  
383 <  if (aconf != NULL)
384 <  {
385 <    if (IsConfClient(aconf) && !rkconf)
386 <    {
954 <      conf = unmap_conf_item(aconf);
955 <
956 <      if (IsConfRedir(aconf))
957 <      {
958 <        sendto_one(client_p, form_str(RPL_REDIR),
959 <                   me.name, client_p->name,
960 <                   conf->name ? conf->name : "",
961 <                   aconf->port);
962 <        return(NOT_AUTHORIZED);
963 <      }
964 <
965 <      if (IsConfDoIdentd(aconf))
966 <        SetNeedId(client_p);
967 <
968 <      /* Thanks for spoof idea amm */
969 <      if (IsConfDoSpoofIp(aconf))
970 <      {
971 <        conf = unmap_conf_item(aconf);
972 <
973 <        if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
974 <          sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
975 <                               client_p->name, client_p->host, conf->name);
976 <        strlcpy(client_p->host, conf->name, sizeof(client_p->host));
977 <        SetIPSpoof(client_p);
978 <      }
979 <
980 <      return(attach_iline(client_p, conf));
981 <    }
982 <    else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
983 <    {
984 <      /* XXX */
985 <      aconf = rkconf ? rkconf : aconf;
986 <      if (IsConfGline(aconf))
987 <        sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
988 <                   client_p->name);
989 <      if (ConfigFileEntry.kline_with_reason)
990 <        sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
991 <                  me.name, client_p->name, aconf->reason);
992 <      return(BANNED_CLIENT);
993 <    }
994 <  }
995 <
996 <  return(NOT_AUTHORIZED);
997 < }
998 <
999 < /* attach_iline()
1000 < *
1001 < * inputs       - client pointer
1002 < *              - conf pointer
1003 < * output       -
1004 < * side effects - do actual attach
1005 < */
1006 < static int
1007 < attach_iline(struct Client *client_p, struct ConfItem *conf)
1008 < {
1009 <  struct AccessItem *aconf;
1010 <  struct ClassItem *aclass;
1011 <  struct ip_entry *ip_found;
1012 <  int a_limit_reached = 0;
1013 <  int local = 0, global = 0, ident = 0;
1014 <
1015 <  ip_found = find_or_add_ip(&client_p->localClient->ip);
1016 <  ip_found->count++;
1017 <  SetIpHash(client_p);
1018 <
1019 <  aconf = (struct AccessItem *)map_to_conf(conf);
1020 <  if (aconf->class_ptr == NULL)
1021 <    return NOT_AUTHORIZED;  /* If class is missing, this is best */
1022 <
1023 <  aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
1024 <
1025 <  count_user_host(client_p->username, client_p->host,
1026 <                  &global, &local, &ident);
1027 <
1028 <  /* XXX blah. go down checking the various silly limits
1029 <   * setting a_limit_reached if any limit is reached.
1030 <   * - Dianora
1031 <   */
1032 <  if (MaxTotal(aclass) != 0 && CurrUserCount(aclass) >= MaxTotal(aclass))
1033 <    a_limit_reached = 1;
1034 <  else if (MaxPerIp(aclass) != 0 && ip_found->count >= MaxPerIp(aclass))
1035 <    a_limit_reached = 1;
1036 <  else if (MaxLocal(aclass) != 0 && local >= MaxLocal(aclass))
1037 <    a_limit_reached = 1;
1038 <  else if (MaxGlobal(aclass) != 0 && global >= MaxGlobal(aclass))
1039 <    a_limit_reached = 1;
1040 <  else if (MaxIdent(aclass) != 0 && ident >= MaxIdent(aclass) &&
1041 <           client_p->username[0] != '~')
1042 <    a_limit_reached = 1;
1043 <
1044 <  if (a_limit_reached)
1045 <  {
1046 <    if (!IsConfExemptLimits(aconf))
1047 <      return TOO_MANY;  /* Already at maximum allowed */
383 >    case BANNED_CLIENT:
384 >      ++ServerStats.is_ref;
385 >      exit_client(client, "Banned");
386 >      break;
387  
388 <    sendto_one(client_p,
389 <               ":%s NOTICE %s :*** Your connection class is full, "
390 <               "but you have exceed_limit = yes;", me.name, client_p->name);
388 >    case 0:
389 >    default:
390 >      break;
391    }
392  
393 <  return attach_conf(client_p, conf);
393 >  if (i < 0)
394 >    return false;
395 >  return true;
396   }
397  
398 < /* init_ip_hash_table()
399 < *
400 < * inputs               - NONE
401 < * output               - NONE
1061 < * side effects         - allocate memory for ip_entry(s)
1062 < *                      - clear the ip hash table
398 > /*! \brief Disassociate configuration from the client. Also removes a class
399 > *         from the list if marked for deleting.
400 > * \param client Client to operate on
401 > * \param type     Type of conf to detach
402   */
403   void
404 < init_ip_hash_table(void)
404 > conf_detach(struct Client *client, enum maskitem_type type)
405   {
406 <  ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1068 <    2 * hard_fdlimit);
1069 <  memset(ip_hash_table, 0, sizeof(ip_hash_table));
1070 < }
406 >  dlink_node *node, *node_next;
407  
408 < /* find_or_add_ip()
1073 < *
1074 < * inputs       - pointer to struct irc_ssaddr
1075 < * output       - pointer to a struct ip_entry
1076 < * side effects -
1077 < *
1078 < * If the ip # was not found, a new struct ip_entry is created, and the ip
1079 < * count set to 0.
1080 < */
1081 < static struct ip_entry *
1082 < find_or_add_ip(struct irc_ssaddr *ip_in)
1083 < {
1084 <  struct ip_entry *ptr, *newptr;
1085 <  int hash_index = hash_ip(ip_in), res;
1086 <  struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1087 < #ifdef IPV6
1088 <  struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1089 < #endif
1090 <
1091 <  for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
408 >  DLINK_FOREACH_SAFE(node, node_next, client->connection->confs.head)
409    {
410 < #ifdef IPV6
1094 <    if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1095 <      continue;
1096 <    if (ip_in->ss.ss_family == AF_INET6)
1097 <    {
1098 <      ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1099 <      res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1100 <    }
1101 <    else
1102 < #endif
1103 <    {
1104 <      ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1105 <      res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1106 <    }
1107 <    if (res == 0)
1108 <    {
1109 <      /* Found entry already in hash, return it. */
1110 <      return ptr;
1111 <    }
1112 <  }
1113 <
1114 <  if (ip_entries_count >= 2 * hard_fdlimit)
1115 <    garbage_collect_ip_entries();
410 >    struct MaskItem *conf = node->data;
411  
412 <  newptr = BlockHeapAlloc(ip_entry_heap);
413 <  ip_entries_count++;
414 <  memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
412 >    assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
413 >    assert(conf->ref_count > 0);
414 >    assert(conf->class->ref_count > 0);
415  
416 <  newptr->next = ip_hash_table[hash_index];
1122 <  ip_hash_table[hash_index] = newptr;
1123 <
1124 <  return newptr;
1125 < }
1126 <
1127 < /* remove_one_ip()
1128 < *
1129 < * inputs        - unsigned long IP address value
1130 < * output        - NONE
1131 < * side effects  - The ip address given, is looked up in ip hash table
1132 < *                 and number of ip#'s for that ip decremented.
1133 < *                 If ip # count reaches 0 and has expired,
1134 < *                 the struct ip_entry is returned to the ip_entry_heap
1135 < */
1136 < void
1137 < remove_one_ip(struct irc_ssaddr *ip_in)
1138 < {
1139 <  struct ip_entry *ptr;
1140 <  struct ip_entry *last_ptr = NULL;
1141 <  int hash_index = hash_ip(ip_in), res;
1142 <  struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1143 < #ifdef IPV6
1144 <  struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1145 < #endif
1146 <
1147 <  for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
1148 <  {
1149 < #ifdef IPV6
1150 <    if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
416 >    if (!(conf->type & type))
417        continue;
1152    if (ip_in->ss.ss_family == AF_INET6)
1153    {
1154      ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1155      res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1156    }
1157    else
1158 #endif
1159    {
1160      ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1161      res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1162    }
1163    if (res)
1164      continue;
1165    if (ptr->count > 0)
1166      ptr->count--;
1167    if (ptr->count == 0 &&
1168        (CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
1169    {
1170      if (last_ptr != NULL)
1171        last_ptr->next = ptr->next;
1172      else
1173        ip_hash_table[hash_index] = ptr->next;
418  
419 <      BlockHeapFree(ip_entry_heap, ptr);
420 <      ip_entries_count--;
1177 <      return;
1178 <    }
1179 <    last_ptr = ptr;
1180 <  }
1181 < }
1182 <
1183 < /* hash_ip()
1184 < *
1185 < * input        - pointer to an irc_inaddr
1186 < * output       - integer value used as index into hash table
1187 < * side effects - hopefully, none
1188 < */
1189 < static int
1190 < hash_ip(struct irc_ssaddr *addr)
1191 < {
1192 <  if (addr->ss.ss_family == AF_INET)
1193 <  {
1194 <    struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1195 <    int hash;
1196 <    u_int32_t ip;
419 >    dlinkDelete(node, &client->connection->confs);
420 >    free_dlink_node(node);
421  
422 <    ip   = ntohl(v4->sin_addr.s_addr);
423 <    hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1200 <    return hash;
1201 <  }
1202 < #ifdef IPV6
1203 <  else
1204 <  {
1205 <    int hash;
1206 <    struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1207 <    u_int32_t *ip = (u_int32_t *)&v6->sin6_addr.s6_addr;
1208 <
1209 <    hash  = ip[0] ^ ip[3];
1210 <    hash ^= hash >> 16;  
1211 <    hash ^= hash >> 8;  
1212 <    hash  = hash & (IP_HASH_SIZE - 1);
1213 <    return hash;
1214 <  }
1215 < #else
1216 <  return 0;
1217 < #endif
1218 < }
422 >    if (conf->type == CONF_CLIENT)
423 >      class_ip_limit_remove(conf->class, &client->ip);
424  
425 < /* count_ip_hash()
1221 < *
1222 < * inputs        - pointer to counter of number of ips hashed
1223 < *               - pointer to memory used for ip hash
1224 < * output        - returned via pointers input
1225 < * side effects  - NONE
1226 < *
1227 < * number of hashed ip #'s is counted up, plus the amount of memory
1228 < * used in the hash.
1229 < */
1230 < void
1231 < count_ip_hash(int *number_ips_stored, unsigned long *mem_ips_stored)
1232 < {
1233 <  struct ip_entry *ptr;
1234 <  int i;
1235 <
1236 <  *number_ips_stored = 0;
1237 <  *mem_ips_stored    = 0;
1238 <
1239 <  for (i = 0; i < IP_HASH_SIZE; i++)
1240 <  {
1241 <    for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
1242 <    {
1243 <      *number_ips_stored += 1;
1244 <      *mem_ips_stored += sizeof(struct ip_entry);
1245 <    }
1246 <  }
1247 < }
1248 <
1249 < /* garbage_collect_ip_entries()
1250 < *
1251 < * input        - NONE
1252 < * output       - NONE
1253 < * side effects - free up all ip entries with no connections
1254 < */
1255 < static void
1256 < garbage_collect_ip_entries(void)
1257 < {
1258 <  struct ip_entry *ptr;
1259 <  struct ip_entry *last_ptr;
1260 <  struct ip_entry *next_ptr;
1261 <  int i;
1262 <
1263 <  for (i = 0; i < IP_HASH_SIZE; i++)
1264 <  {
1265 <    last_ptr = NULL;
1266 <
1267 <    for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
425 >    if (--conf->class->ref_count == 0 && conf->class->active == false)
426      {
427 <      next_ptr = ptr->next;
428 <
1271 <      if (ptr->count == 0 &&
1272 <          (CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
1273 <      {
1274 <        if (last_ptr != NULL)
1275 <          last_ptr->next = ptr->next;
1276 <        else
1277 <          ip_hash_table[i] = ptr->next;
1278 <        BlockHeapFree(ip_entry_heap, ptr);
1279 <        ip_entries_count--;
1280 <      }
1281 <      else
1282 <        last_ptr = ptr;
427 >      class_free(conf->class);
428 >      conf->class = NULL;
429      }
1284  }
1285 }
1286
1287 /* detach_conf()
1288 *
1289 * inputs       - pointer to client to detach
1290 *              - type of conf to detach
1291 * output       - 0 for success, -1 for failure
1292 * side effects - Disassociate configuration from the client.
1293 *                Also removes a class from the list if marked for deleting.
1294 */
1295 int
1296 detach_conf(struct Client *client_p, ConfType type)
1297 {
1298  dlink_node *ptr, *next_ptr;
1299  struct ConfItem *conf;
1300  struct ClassItem *aclass;
1301  struct AccessItem *aconf;
1302  struct ConfItem *aclass_conf;
1303  struct MatchItem *match_item;
430  
431 <  DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
432 <  {
1307 <    conf = ptr->data;
1308 <
1309 <    if (type == CONF_TYPE || conf->type == type)
1310 <    {
1311 <      dlinkDelete(ptr, &client_p->localClient->confs);
1312 <      free_dlink_node(ptr);
1313 <
1314 <      switch (conf->type)
1315 <      {
1316 <      case CLIENT_TYPE:
1317 <      case OPER_TYPE:
1318 <      case SERVER_TYPE:
1319 <        aconf = (struct AccessItem *)map_to_conf(conf);
1320 <        if ((aclass_conf = ClassPtr(aconf)) != NULL)
1321 <        {
1322 <          aclass = (struct ClassItem *)map_to_conf(aclass_conf);
1323 <
1324 <          if (conf->type == CLIENT_TYPE)
1325 <            remove_from_cidr_check(&client_p->localClient->ip, aclass);
1326 <
1327 <          if (CurrUserCount(aclass) > 0)
1328 <            aclass->curr_user_count--;
1329 <          if (MaxTotal(aclass) < 0 && CurrUserCount(aclass) <= 0)
1330 <            delete_conf_item(aclass_conf);
1331 <        }
1332 <
1333 <        /* Please, no ioccc entries - Dianora */
1334 <        if (aconf->clients > 0)
1335 <          --aconf->clients;
1336 <        if (aconf->clients == 0 && IsConfIllegal(aconf))
1337 <          delete_conf_item(conf);
1338 <        break;
1339 <      case LEAF_TYPE:
1340 <      case HUB_TYPE:
1341 <        match_item = (struct MatchItem *)map_to_conf(conf);
1342 <        if (match_item->ref_count == 0 && match_item->illegal)
1343 <          delete_conf_item(conf);
1344 <        break;
1345 <      default:
1346 <        break;
1347 <      }
1348 <
1349 <      if (type != CONF_TYPE)
1350 <        return 0;
1351 <    }
431 >    if (--conf->ref_count == 0 && conf->active == false)
432 >      conf_free(conf);
433    }
1353
1354  return -1;
434   }
435  
436 < /* attach_conf()
437 < *
438 < * inputs       - client pointer
439 < *              - conf pointer
440 < * output       -
1362 < * side effects - Associate a specific configuration entry to a *local*
1363 < *                client (this is the one which used in accepting the
1364 < *                connection). Note, that this automatically changes the
1365 < *                attachment if there was an old one...
436 > /*! \brief Associate a specific configuration entry to a *local* client (this
437 > *         is the one which used in accepting the connection). Note, that this
438 > *         automatically changes the attachment if there was an old one.
439 > * \param client Client to attach the conf to
440 > * \param conf Configuration record to attach
441   */
442   int
443 < attach_conf(struct Client *client_p, struct ConfItem *conf)
443 > conf_attach(struct Client *client, struct MaskItem *conf)
444   {
445 <  struct AccessItem *aconf;
1371 <  struct MatchItem *match_item;
1372 <
1373 <  if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
445 >  if (dlinkFind(&client->connection->confs, conf))
446      return 1;
447  
448 <  if (conf->type == CLIENT_TYPE ||
449 <      conf->type == SERVER_TYPE ||
450 <      conf->type == OPER_TYPE)
1379 <  {
1380 <    aconf = (struct AccessItem *)map_to_conf(conf);
1381 <
1382 <    if (IsConfIllegal(aconf))
1383 <      return NOT_AUTHORIZED;
1384 <
1385 <    if (conf->type == CLIENT_TYPE)
1386 <    {
1387 <      struct ClassItem *aclass;
1388 <      aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
448 >  if (conf->type == CONF_CLIENT)
449 >    if (class_ip_limit_add(conf->class, &client->ip, IsConfExemptLimits(conf)) == true)
450 >      return TOO_MANY;    /* Already at maximum allowed */
451  
452 <      if (cidr_limit_reached(IsConfExemptLimits(aconf),
453 <                             &client_p->localClient->ip, aclass))
1392 <        return TOO_MANY;  /* Already at maximum allowed */
1393 <
1394 <      CurrUserCount(aclass)++;
1395 <    }
1396 <
1397 <    aconf->clients++;
1398 <  }
1399 <  else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1400 <  {
1401 <    match_item = (struct MatchItem *)map_to_conf(conf);
1402 <    match_item->ref_count++;
1403 <  }
452 >  conf->class->ref_count++;
453 >  conf->ref_count++;
454  
455 <  dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
455 >  dlinkAdd(conf, make_dlink_node(), &client->connection->confs);
456  
457    return 0;
458   }
459  
1410 /* attach_connect_block()
1411 *
1412 * inputs       - pointer to server to attach
1413 *              - name of server
1414 *              - hostname of server
1415 * output       - true (1) if both are found, otherwise return false (0)
1416 * side effects - find connect block and attach them to connecting client
1417 */
1418 int
1419 attach_connect_block(struct Client *client_p, const char *name,
1420                     const char *host)
1421 {
1422  dlink_node *ptr;
1423  struct ConfItem *conf;
1424  struct AccessItem *aconf;
1425
1426  assert(client_p != NULL);
1427  assert(host != NULL);
1428
1429  if (client_p == NULL || host == NULL)
1430    return 0;
1431
1432  DLINK_FOREACH(ptr, server_items.head)
1433  {
1434    conf = ptr->data;
1435    aconf = (struct AccessItem *)map_to_conf(conf);
1436
1437    if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
1438      continue;
1439
1440    attach_conf(client_p, conf);
1441    return -1;
1442  }
1443
1444  return 0;
1445 }
1446
1447 /* find_conf_exact()
1448 *
1449 * inputs       - type of ConfItem
1450 *              - pointer to name to find
1451 *              - pointer to username to find
1452 *              - pointer to host to find
1453 * output       - NULL or pointer to conf found
1454 * side effects - find a conf entry which matches the hostname
1455 *                and has the same name.
1456 */
1457 struct ConfItem *
1458 find_conf_exact(ConfType type, const char *name, const char *user,
1459                const char *host)
1460 {
1461  dlink_node *ptr;
1462  dlink_list *list_p;
1463  struct ConfItem *conf = NULL;
1464  struct AccessItem *aconf;
1465
1466  /* Only valid for OPER_TYPE and ...? */
1467  list_p = map_to_list(type);
1468
1469  DLINK_FOREACH(ptr, (*list_p).head)
1470  {
1471    conf = ptr->data;
1472
1473    if (conf->name == NULL)
1474      continue;
1475    aconf = (struct AccessItem *)map_to_conf(conf);
1476    if (aconf->host == NULL)
1477      continue;
1478    if (irccmp(conf->name, name) != 0)
1479      continue;
1480
1481    /*
1482    ** Accept if the *real* hostname (usually sockethost)
1483    ** socket host) matches *either* host or name field
1484    ** of the configuration.
1485    */
1486    if (!match(aconf->host, host) || !match(aconf->user,user)
1487        || irccmp(conf->name, name) )
1488      continue;
1489    if (type == OPER_TYPE)
1490    {
1491      struct ClassItem *aclass;
1492
1493      aclass = (struct ClassItem *)aconf->class_ptr;
1494      if (aconf->clients < MaxTotal(aclass))
1495        return conf;
1496      else
1497        continue;
1498    }
1499    else
1500      return conf;
1501  }
1502  return NULL;
1503 }
1504
460   /* find_conf_name()
461   *
462   * inputs       - pointer to conf link list to search
# Line 1511 | Line 466 | find_conf_exact(ConfType type, const cha
466   * side effects - find a conf entry which matches the name
467   *                and has the given mask.
468   */
469 < struct ConfItem *
470 < find_conf_name(dlink_list *list, const char *name, ConfType type)
469 > struct MaskItem *
470 > find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
471   {
472 <  dlink_node *ptr;
1518 <  struct ConfItem* conf;
472 >  dlink_node *node = NULL;
473  
474 <  DLINK_FOREACH(ptr, list->head)
474 >  DLINK_FOREACH(node, list->head)
475    {
476 <    conf = ptr->data;
477 <    
476 >    struct MaskItem *conf = node->data;
477 >
478      if (conf->type == type)
479      {
480 <      if (conf->name && (irccmp(conf->name, name) == 0 ||
481 <                         match(conf->name, name)))
1528 <      return conf;
480 >      if (conf->name && !irccmp(conf->name, name))
481 >        return conf;
482      }
483    }
484  
485    return NULL;
486   }
487  
488 < /* map_to_list()
489 < *
490 < * inputs       - ConfType conf
1538 < * output       - pointer to dlink_list to use
1539 < * side effects - none
488 > /*! \brief Find a connect {} conf that has a name that matches \a name.
489 > * \param name Name to match
490 > * \param compare Pointer to function to be used for string matching
491   */
492 < static dlink_list *
493 < map_to_list(ConfType type)
492 > struct MaskItem *
493 > connect_find(const char *name, int (*compare)(const char *, const char *))
494   {
495 <  switch(type)
1545 <  {
1546 <  case RXLINE_TYPE:
1547 <    return(&rxconf_items);
1548 <    break;
1549 <  case XLINE_TYPE:
1550 <    return(&xconf_items);
1551 <    break;
1552 <  case ULINE_TYPE:
1553 <    return(&uconf_items);
1554 <    break;
1555 <  case NRESV_TYPE:
1556 <    return(&nresv_items);
1557 <    break;
1558 <  case OPER_TYPE:
1559 <    return(&oconf_items);
1560 <    break;
1561 <  case CLASS_TYPE:
1562 <    return(&class_items);
1563 <    break;
1564 <  case SERVER_TYPE:
1565 <    return(&server_items);
1566 <    break;
1567 <  case CLUSTER_TYPE:
1568 <    return(&cluster_items);
1569 <    break;
1570 <  case CONF_TYPE:
1571 <  case GLINE_TYPE:
1572 <  case KLINE_TYPE:
1573 <  case DLINE_TYPE:
1574 <  case CRESV_TYPE:
1575 <  default:
1576 <    return NULL;
1577 <  }
1578 < }
495 >  dlink_node *node;
496  
497 < /* find_matching_name_conf()
1581 < *
1582 < * inputs       - type of link list to look in
1583 < *              - pointer to name string to find
1584 < *              - pointer to user
1585 < *              - pointer to host
1586 < *              - optional action to match on as well
1587 < * output       - NULL or pointer to found struct MatchItem
1588 < * side effects - looks for a match on name field
1589 < */
1590 < struct ConfItem *
1591 < find_matching_name_conf(ConfType type, const char *name, const char *user,
1592 <                        const char *host, int action)
1593 < {
1594 <  dlink_node *ptr=NULL;
1595 <  struct ConfItem *conf=NULL;
1596 <  struct AccessItem *aconf=NULL;
1597 <  struct MatchItem *match_item=NULL;
1598 <  dlink_list *list_p = map_to_list(type);
1599 <
1600 <  switch (type)
497 >  DLINK_FOREACH(node, connect_items.head)
498    {
499 <    case RXLINE_TYPE:
1603 <      DLINK_FOREACH(ptr, list_p->head)
1604 <      {
1605 <        conf = ptr->data;
1606 <        assert(conf->regexpname);
499 >    struct MaskItem *conf = node->data;
500  
501 <        if (!ircd_pcre_exec(conf->regexpname, name))
502 <          return conf;
1610 <      }
1611 <      break;
1612 <
1613 <  case XLINE_TYPE:
1614 <  case ULINE_TYPE:
1615 <  case NRESV_TYPE:
1616 <    DLINK_FOREACH(ptr, list_p->head)
1617 <    {
1618 <      conf = ptr->data;
1619 <
1620 <      match_item = map_to_conf(conf);
1621 <      if (EmptyString(conf->name))
1622 <        continue;
1623 <      if ((name != NULL) && match_esc(conf->name, name))
1624 <      {
1625 <        if ((user == NULL && (host == NULL)))
1626 <          return conf;
1627 <        if ((match_item->action & action) != action)
1628 <          continue;
1629 <        if (EmptyString(match_item->user) || EmptyString(match_item->host))
1630 <          return conf;
1631 <        if (match(match_item->user, user) && match(match_item->host, host))
1632 <          return conf;
1633 <      }
1634 <    }
1635 <      break;
1636 <
1637 <  case SERVER_TYPE:
1638 <    DLINK_FOREACH(ptr, list_p->head)
1639 <    {
1640 <      conf = ptr->data;
1641 <      aconf = map_to_conf(conf);
1642 <
1643 <      if ((name != NULL) && match_esc(name, conf->name))
1644 <        return conf;
1645 <      else if ((host != NULL) && match_esc(host, aconf->host))
1646 <        return conf;
1647 <    }
1648 <    break;
1649 <  
1650 <  default:
1651 <    break;
501 >    if (compare(name, conf->name) == 0)
502 >      return conf;
503    }
504 +
505    return NULL;
506   }
507  
# Line 1659 | Line 511 | find_matching_name_conf(ConfType type, c
511   *              - pointer to name string to find
512   *              - pointer to user
513   *              - pointer to host
514 < * output       - NULL or pointer to found struct MatchItem
514 > * output       - NULL or pointer to found struct MaskItem
515   * side effects - looks for an exact match on name field
516   */
517 < struct ConfItem *
518 < find_exact_name_conf(ConfType type, const char *name,
519 <                     const char *user, const char *host)
520 < {
1669 <  dlink_node *ptr = NULL;
1670 <  struct AccessItem *aconf;
1671 <  struct ConfItem *conf;
1672 <  struct MatchItem *match_item;
1673 <  dlink_list *list_p;
1674 <
1675 <  list_p = map_to_list(type);
1676 <
1677 <  switch(type)
1678 <  {
1679 <  case RXLINE_TYPE:
1680 <  case XLINE_TYPE:
1681 <  case ULINE_TYPE:
1682 <  case NRESV_TYPE:
517 > struct MaskItem *
518 > operator_find(const struct Client *client, const char *name)
519 > {
520 >  dlink_node *node;
521  
522 <    DLINK_FOREACH(ptr, list_p->head)
523 <    {
524 <      conf = ptr->data;
1687 <      match_item = (struct MatchItem *)map_to_conf(conf);
1688 <      if (EmptyString(conf->name))
1689 <        continue;
1690 <    
1691 <      if (irccmp(conf->name, name) == 0)
1692 <      {
1693 <        if ((user == NULL && (host == NULL)))
1694 <          return (conf);
1695 <        if (EmptyString(match_item->user) || EmptyString(match_item->host))
1696 <          return (conf);
1697 <        if (match(match_item->user, user) && match(match_item->host, host))
1698 <          return (conf);
1699 <      }
1700 <    }
1701 <    break;
522 >  DLINK_FOREACH(node, operator_items.head)
523 >  {
524 >    struct MaskItem *conf = node->data;
525  
526 <  case OPER_TYPE:
1704 <    DLINK_FOREACH(ptr, list_p->head)
526 >    if (irccmp(conf->name, name) == 0)
527      {
528 <      conf = ptr->data;
529 <      aconf = (struct AccessItem *)map_to_conf(conf);
1708 <      if (EmptyString(conf->name))
1709 <        continue;
1710 <    
1711 <      if (irccmp(conf->name, name) == 0)
1712 <      {
1713 <        if ((user == NULL && (host == NULL)))
1714 <          return (conf);
1715 <        if (EmptyString(aconf->user) || EmptyString(aconf->host))
1716 <          return (conf);
1717 <        if (match(aconf->user, user) && match(aconf->host, host))
1718 <          return (conf);
1719 <      }
1720 <    }
1721 <    break;
528 >      if (client == NULL)
529 >        return conf;
530  
531 <  case SERVER_TYPE:
532 <    DLINK_FOREACH(ptr, list_p->head)
533 <    {
534 <      conf = ptr->data;
535 <      aconf = (struct AccessItem *)map_to_conf(conf);
1728 <      if (EmptyString(conf->name))
1729 <        continue;
1730 <    
1731 <      if (name == NULL)
1732 <      {
1733 <        if (EmptyString(aconf->host))
1734 <          continue;
1735 <        if (irccmp(aconf->host, host) == 0)
1736 <          return(conf);
1737 <      }
1738 <      else if (irccmp(conf->name, name) == 0)
531 >      if (conf->class->max_total &&
532 >          conf->class->max_total <= conf->class->ref_count)
533 >        continue;
534 >
535 >      if (match(conf->user, client->username) == 0)
536        {
537 <          return (conf);
537 >        switch (conf->htype)
538 >        {
539 >          case HM_HOST:
540 >            if (match(conf->host, client->realhost) == 0 ||
541 >                match(conf->host, client->sockhost) == 0 || match(conf->host, client->host) == 0)
542 >              return conf;
543 >            break;
544 >          case HM_IPV6:
545 >          case HM_IPV4:
546 >            if (address_compare(&client->ip, conf->addr, false, false, conf->bits) == true)
547 >              return conf;
548 >            break;
549 >          default:
550 >            assert(0);
551 >        }
552        }
553      }
1743    break;
1744
1745  case CLASS_TYPE:
1746    DLINK_FOREACH(ptr, list_p->head)
1747    {
1748      conf = ptr->data;
1749      if (EmptyString(conf->name))
1750        continue;
1751    
1752      if (irccmp(conf->name, name) == 0)
1753        return (conf);
1754    }
1755    break;
1756
1757  default:
1758    break;
554    }
1760  return(NULL);
1761 }
555  
556 < /* rehash()
1764 < *
1765 < * Actual REHASH service routine. Called with sig == 0 if it has been called
1766 < * as a result of an operator issuing this command, else assume it has been
1767 < * called as a result of the server receiving a HUP signal.
1768 < */
1769 < int
1770 < rehash(int sig)
1771 < {
1772 <  if (sig != 0)
1773 <    sendto_realops_flags(UMODE_ALL, L_ALL,
1774 <                         "Got signal SIGHUP, reloading ircd.conf file");
1775 <
1776 < #ifndef _WIN32
1777 <  restart_resolver();
1778 < #endif
1779 <  /* don't close listeners until we know we can go ahead with the rehash */
1780 <
1781 <  /* Check to see if we magically got(or lost) IPv6 support */
1782 <  check_can_use_v6();
1783 <
1784 <  read_conf_files(0);
1785 <
1786 <  if (ServerInfo.description != NULL)
1787 <    strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1788 <
1789 < #ifndef STATIC_MODULES
1790 <  load_conf_modules();
1791 < #endif
1792 <
1793 <  flush_deleted_I_P();
1794 <
1795 <  rehashed_klines = 1;
1796 <
1797 <  if (ConfigLoggingEntry.use_logging)
1798 <    reopen_log(logFileName);
1799 <
1800 <  return(0);
556 >  return NULL;
557   }
558  
559 < /* set_default_conf()
559 > /* conf_set_defaults()
560   *
561   * inputs       - NONE
562   * output       - NONE
# Line 1810 | Line 566 | rehash(int sig)
566   *                of values later, put them in validate_conf().
567   */
568   static void
569 < set_default_conf(void)
569 > conf_set_defaults(void)
570   {
571 <  /* verify init_class() ran, this should be an unnecessary check
572 <   * but its not much work.
571 >  /*
572 >   * Verify init_class() ran, this should be an unnecessary check
573 >   * but it's not much work.
574     */
575 <  assert(class_default == (struct ConfItem *) class_items.tail->data);
575 >  assert(class_default == class_get_list()->tail->data);
576  
577 < #ifdef HAVE_LIBCRYPTO
578 <  ServerInfo.rsa_private_key = NULL;
579 <  ServerInfo.rsa_private_key_file = NULL;
580 < #endif
581 <
582 <  /* ServerInfo.name is not rehashable */
583 <  /* ServerInfo.name = ServerInfo.name; */
584 <  ServerInfo.description = NULL;
585 <  DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
586 <  DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
587 <
588 <  memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
589 <  ServerInfo.specific_ipv4_vhost = 0;
590 <  memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
591 <  ServerInfo.specific_ipv6_vhost = 0;
592 <
593 <  ServerInfo.max_clients = MAXCLIENTS_MAX;
594 <  /* Don't reset hub, as that will break lazylinks */
595 <  /* ServerInfo.hub = NO; */
1839 <  ServerInfo.dns_host.sin_addr.s_addr = 0;
1840 <  ServerInfo.dns_host.sin_port = 0;
1841 <  AdminInfo.name = NULL;
1842 <  AdminInfo.email = NULL;
1843 <  AdminInfo.description = NULL;
1844 <
1845 <  set_log_level(L_NOTICE);
1846 <  ConfigLoggingEntry.use_logging = 1;
1847 <  ConfigLoggingEntry.operlog[0] = '\0';
1848 <  ConfigLoggingEntry.userlog[0] = '\0';
1849 <  ConfigLoggingEntry.klinelog[0] = '\0';
1850 <  ConfigLoggingEntry.glinelog[0] = '\0';
1851 <  ConfigLoggingEntry.killlog[0] = '\0';
1852 <  ConfigLoggingEntry.operspylog[0] = '\0';
1853 <  ConfigLoggingEntry.ioerrlog[0] = '\0';
1854 <  ConfigLoggingEntry.failed_operlog[0] = '\0';
1855 <
1856 <  ConfigChannel.restrict_channels = NO;
1857 <  ConfigChannel.disable_local_channels = NO;
1858 <  ConfigChannel.use_invex = YES;
1859 <  ConfigChannel.use_except = YES;
1860 <  ConfigChannel.use_knock = YES;
1861 <  ConfigChannel.knock_delay = 300;
577 >  ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
578 >  ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
579 >  ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
580 >  ConfigServerInfo.max_nick_length = 9;
581 >  ConfigServerInfo.max_topic_length = 80;
582 >  ConfigServerInfo.hub = 0;
583 >
584 >  log_iterate(log_free);
585 >
586 >  ConfigLog.use_logging = 1;
587 >
588 >  ConfigChannel.enable_extbans = 0;
589 >  ConfigChannel.disable_fake_channels = 0;
590 >  ConfigChannel.invite_client_count = 10;
591 >  ConfigChannel.invite_client_time = 300;
592 >  ConfigChannel.invite_delay_channel = 5;
593 >  ConfigChannel.invite_expire_time = 1800;
594 >  ConfigChannel.knock_client_count = 1;
595 >  ConfigChannel.knock_client_time = 300;
596    ConfigChannel.knock_delay_channel = 60;
597 <  ConfigChannel.max_chans_per_user = 15;
598 <  ConfigChannel.quiet_on_ban = YES;
599 <  ConfigChannel.max_bans = 25;
600 <  ConfigChannel.default_split_user_count = 0;
601 <  ConfigChannel.default_split_server_count = 0;
602 <  ConfigChannel.no_join_on_split = NO;
603 <  ConfigChannel.no_create_on_split = NO;
604 <  ConfigChannel.burst_topicwho = YES;
605 <
606 <  ConfigServerHide.flatten_links = NO;
607 <  ConfigServerHide.links_delay = 300;
608 <  ConfigServerHide.hidden = NO;
609 <  ConfigServerHide.disable_hidden = NO;
610 <  ConfigServerHide.hide_servers = NO;
611 <  DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
612 <  ConfigServerHide.hide_server_ips = NO;
613 <
614 <  ConfigFileEntry.gline_min_cidr = 16;
615 <  ConfigFileEntry.gline_min_cidr6 = 48;
616 <  ConfigFileEntry.invisible_on_connect = YES;
617 <  ConfigFileEntry.burst_away = NO;
618 <  ConfigFileEntry.use_whois_actually = YES;
619 <  ConfigFileEntry.tkline_expire_notices = YES;
620 <  ConfigFileEntry.hide_spoof_ips = YES;
621 <  ConfigFileEntry.ignore_bogus_ts = NO;
622 <  ConfigFileEntry.disable_auth = NO;
623 <  ConfigFileEntry.disable_remote = NO;
624 <  ConfigFileEntry.kill_chase_time_limit = 90;
625 <  ConfigFileEntry.default_floodcount = 8; /* XXX */
626 <  ConfigFileEntry.failed_oper_notice = YES;
627 <  ConfigFileEntry.dots_in_ident = 0;      /* XXX */
628 <  ConfigFileEntry.dot_in_ip6_addr = YES;
629 <  ConfigFileEntry.min_nonwildcard = 4;
630 <  ConfigFileEntry.min_nonwildcard_simple = 3;
631 <  ConfigFileEntry.max_accept = 20;
632 <  ConfigFileEntry.anti_nick_flood = NO;   /* XXX */
633 <  ConfigFileEntry.max_nick_time = 20;
634 <  ConfigFileEntry.max_nick_changes = 5;
635 <  ConfigFileEntry.anti_spam_exit_message_time = 0;  /* XXX */
636 <  ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
637 <  ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;  /* XXX */
638 <  ConfigFileEntry.kline_with_reason = YES;
639 <  ConfigFileEntry.kline_reason = NULL;
640 <  ConfigFileEntry.warn_no_nline = YES;
641 <  ConfigFileEntry.stats_o_oper_only = NO; /* XXX */
642 <  ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
643 <  ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
644 <  ConfigFileEntry.stats_P_oper_only = NO;
645 <  ConfigFileEntry.caller_id_wait = 60;
646 <  ConfigFileEntry.opers_bypass_callerid = NO;
647 <  ConfigFileEntry.pace_wait = 10;
648 <  ConfigFileEntry.pace_wait_simple = 1;
649 <  ConfigFileEntry.short_motd = NO;
650 <  ConfigFileEntry.ping_cookie = NO;
651 <  ConfigFileEntry.no_oper_flood = NO;     /* XXX */
652 <  ConfigFileEntry.true_no_oper_flood = NO;  /* XXX */
653 <  ConfigFileEntry.oper_pass_resv = YES;
654 <  ConfigFileEntry.glines = NO;            /* XXX */
655 <  ConfigFileEntry.gline_time = 12 * 3600; /* XXX */
656 <  ConfigFileEntry.idletime = 0;
657 <  ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
658 <  ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
659 <  ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;  /* XXX */
1926 <  ConfigFileEntry.oper_umodes = UMODE_LOCOPS | UMODE_SERVNOTICE |
1927 <    UMODE_OPERWALL | UMODE_WALLOP;        /* XXX */
1928 <  DupString(ConfigFileEntry.servlink_path, SLPATH);
1929 < #ifdef HAVE_LIBCRYPTO
1930 <  /* jdc -- This is our default value for a cipher.  According to the
1931 <   *        CRYPTLINK document (doc/cryptlink.txt), BF/128 must be supported
1932 <   *        under all circumstances if cryptlinks are enabled.  So,
1933 <   *        this will be our default.
1934 <   *
1935 <   *        NOTE: I apologise for the hard-coded value of "1" (BF/128).
1936 <   *              This should be moved into a find_cipher() routine.
1937 <   */
1938 <  ConfigFileEntry.default_cipher_preference = &CipherTable[1];
1939 < #endif
1940 <  ConfigFileEntry.use_egd = NO;
1941 <  ConfigFileEntry.egdpool_path = NULL;
1942 < #ifdef HAVE_LIBZ
1943 <  ConfigFileEntry.compression_level = 0;
1944 < #endif
1945 <  ConfigFileEntry.throttle_time = 10;
597 >  ConfigChannel.max_channels = 25;
598 >  ConfigChannel.max_invites = 20;
599 >  ConfigChannel.max_bans = 100;
600 >  ConfigChannel.max_bans_large = 500;
601 >  ConfigChannel.default_join_flood_count = 18;
602 >  ConfigChannel.default_join_flood_time = 6;
603 >
604 >  ConfigServerHide.flatten_links = 0;
605 >  ConfigServerHide.flatten_links_delay = 300;
606 >  ConfigServerHide.hidden = 0;
607 >  ConfigServerHide.hide_servers = 0;
608 >  ConfigServerHide.hide_services = 0;
609 >  ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
610 >  ConfigServerHide.hide_server_ips = 0;
611 >  ConfigServerHide.disable_remote_commands = 0;
612 >
613 >  ConfigGeneral.away_count = 2;
614 >  ConfigGeneral.away_time = 10;
615 >  ConfigGeneral.max_watch = 50;
616 >  ConfigGeneral.whowas_history_length = 15000;
617 >  ConfigGeneral.cycle_on_host_change = 1;
618 >  ConfigGeneral.dline_min_cidr = 16;
619 >  ConfigGeneral.dline_min_cidr6 = 48;
620 >  ConfigGeneral.kline_min_cidr = 16;
621 >  ConfigGeneral.kline_min_cidr6 = 48;
622 >  ConfigGeneral.invisible_on_connect = 1;
623 >  ConfigGeneral.disable_auth = 0;
624 >  ConfigGeneral.kill_chase_time_limit = 90;
625 >  ConfigGeneral.default_floodcount = 8;
626 >  ConfigGeneral.default_floodtime = 1;
627 >  ConfigGeneral.failed_oper_notice = 1;
628 >  ConfigGeneral.dots_in_ident = 0;
629 >  ConfigGeneral.min_nonwildcard = 4;
630 >  ConfigGeneral.min_nonwildcard_simple = 3;
631 >  ConfigGeneral.max_accept = 50;
632 >  ConfigGeneral.anti_nick_flood = 0;
633 >  ConfigGeneral.max_nick_time = 20;
634 >  ConfigGeneral.max_nick_changes = 5;
635 >  ConfigGeneral.anti_spam_exit_message_time = 0;
636 >  ConfigGeneral.ts_warn_delta = 30;
637 >  ConfigGeneral.ts_max_delta = 600;
638 >  ConfigGeneral.warn_no_connect_block = 1;
639 >  ConfigGeneral.stats_e_disabled = 0;
640 >  ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
641 >  ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
642 >  ConfigGeneral.stats_o_oper_only = 1;
643 >  ConfigGeneral.stats_m_oper_only = 1;
644 >  ConfigGeneral.stats_P_oper_only = 0;
645 >  ConfigGeneral.stats_u_oper_only = 0;
646 >  ConfigGeneral.caller_id_wait = 60;
647 >  ConfigGeneral.opers_bypass_callerid = 1;
648 >  ConfigGeneral.pace_wait = 10;
649 >  ConfigGeneral.pace_wait_simple = 1;
650 >  ConfigGeneral.short_motd = 0;
651 >  ConfigGeneral.ping_cookie = 0;
652 >  ConfigGeneral.no_oper_flood = 0;
653 >  ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
654 >  ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
655 >                                   UMODE_EXTERNAL | UMODE_FLOOD | UMODE_NCHANGE |
656 >                                   UMODE_SPY | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
657 >  ConfigGeneral.oper_umodes = UMODE_FLOOD | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
658 >  ConfigGeneral.throttle_count = 1;
659 >  ConfigGeneral.throttle_time = 1;
660   }
661  
1948 /* read_conf()
1949 *
1950 * inputs       - file descriptor pointing to config file to use
1951 * output       - None
1952 * side effects - Read configuration file.
1953 */
662   static void
663 < read_conf(FBFILE *file)
663 > conf_validate(void)
664   {
665 <  scount = lineno = 0;
666 <
1959 <  set_default_conf(); /* Set default values prior to conf parsing */
1960 <  ypass = 1;
1961 <  yyparse();          /* pick up the classes first */
665 >  if (EmptyString(ConfigServerInfo.network_name))
666 >    ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
667  
668 <  fbrewind(file);
669 <
1965 <  ypass = 2;
1966 <  yyparse();          /* Load the values from the conf */
1967 <  validate_conf();    /* Check to make sure some values are still okay. */
1968 <                      /* Some global values are also loaded here. */
1969 <  check_class();      /* Make sure classes are valid */
668 >  if (EmptyString(ConfigServerInfo.network_desc))
669 >    ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
670   }
671  
672 + /* conf_read()
673 + *
674 + * inputs       - file descriptor pointing to config file to use
675 + * output       - None
676 + * side effects - Read configuration file.
677 + */
678   static void
679 < validate_conf(void)
679 > conf_read(FILE *file)
680   {
681 <  if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
1976 <    ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
681 >  lineno = 1;
682  
683 <  if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
684 <    ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
683 >  conf_set_defaults();  /* Set default values prior to conf parsing */
684 >  conf_parser_ctx.pass = 1;
685 >  yyparse();  /* Pick up the classes first */
686  
687 <  if (ConfigFileEntry.servlink_path == NULL)
1982 <    DupString(ConfigFileEntry.servlink_path, SLPATH);
687 >  rewind(file);
688  
689 <  if (ServerInfo.network_name == NULL)
690 <    DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
691 <
692 <  if (ServerInfo.network_desc == NULL)
693 <    DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
694 <
1990 <  if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
1991 <      (ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
1992 <    ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
689 >  conf_parser_ctx.pass = 2;
690 >  yyparse();  /* Load the values from the conf */
691 >  conf_validate();  /* Check to make sure some values are still okay. */
692 >                    /* Some global values are also loaded here. */
693 >  whowas_trim();  /* Attempt to trim whowas list if necessary */
694 >  class_delete_marked();  /* Delete unused classes that are marked for deletion */
695   }
696  
697 < /* lookup_confhost()
697 > /* conf_rehash()
698   *
699 < * start DNS lookups of all hostnames in the conf
700 < * line and convert an IP addresses in a.b.c.d number for to IP#s.
699 > * Actual REHASH service routine. Called with sig == 0 if it has been called
700 > * as a result of an operator issuing this command, else assume it has been
701 > * called as a result of the server receiving a HUP signal.
702   */
703 < static void
704 < lookup_confhost(struct ConfItem *conf)
703 > void
704 > conf_rehash(bool sig)
705   {
706 <  struct AccessItem *aconf;
2004 <  struct addrinfo hints, *res;
2005 <
2006 <  aconf = map_to_conf(conf);
2007 <
2008 <  if (EmptyString(aconf->host) ||
2009 <      EmptyString(aconf->user))
706 >  if (sig == true)
707    {
708 <    ilog(L_ERROR, "Host/server name error: (%s) (%s)",
709 <         aconf->host, conf->name);
710 <    return;
708 >    sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
709 >                         "Got signal SIGHUP, reloading configuration file(s)");
710 >    ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
711    }
712  
713 <  if (strchr(aconf->host, '*') ||
2017 <      strchr(aconf->host, '?'))
2018 <    return;
2019 <
2020 <  /* Do name lookup now on hostnames given and store the
2021 <   * ip numbers in conf structure.
2022 <   */
2023 <  memset(&hints, 0, sizeof(hints));
2024 <
2025 <  hints.ai_family   = AF_UNSPEC;
2026 <  hints.ai_socktype = SOCK_STREAM;
2027 <
2028 <  /* Get us ready for a bind() and don't bother doing dns lookup */
2029 <  hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
713 >  restart_resolver();
714  
715 <  if (irc_getaddrinfo(aconf->host, NULL, &hints, &res))
2032 <  {
2033 <    conf_dns_lookup(aconf);
2034 <    return;
2035 <  }
715 >  /* don't close listeners until we know we can go ahead with the rehash */
716  
717 <  assert(res != NULL);
717 >  conf_read_files(false);
718  
719 <  memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
720 <  aconf->ipnum.ss_len = res->ai_addrlen;
2041 <  aconf->ipnum.ss.ss_family = res->ai_family;
2042 <  irc_freeaddrinfo(res);
719 >  load_conf_modules();
720 >  check_conf_klines();
721   }
722  
723   /* conf_connect_allowed()
# Line 2050 | Line 728 | lookup_confhost(struct ConfItem *conf)
728   * side effects - none
729   */
730   int
731 < conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
731 > conf_connect_allowed(struct irc_ssaddr *addr)
732   {
733 <  struct ip_entry *ip_found;
2056 <  struct AccessItem *aconf = find_dline_conf(addr, aftype);
2057 <
2058 <  /* DLINE exempt also gets you out of static limits/pacing... */
2059 <  if (aconf && (aconf->status & CONF_EXEMPTDLINE))
2060 <    return 0;
733 >  const struct MaskItem *conf = find_dline_conf(addr);
734  
735 <  if (aconf != NULL)
2063 <    return BANNED_CLIENT;
2064 <
2065 <  ip_found = find_or_add_ip(addr);
2066 <
2067 <  if ((CurrentTime - ip_found->last_attempt) <
2068 <      ConfigFileEntry.throttle_time)
735 >  if (conf)
736    {
737 <    ip_found->last_attempt = CurrentTime;
738 <    return TOO_FAST;
737 >    /* DLINE exempt also gets you out of static limits/pacing... */
738 >    if (conf->type == CONF_EXEMPT)
739 >      return 0;
740 >    return BANNED_CLIENT;
741    }
742  
743 <  ip_found->last_attempt = CurrentTime;
744 <  return 0;
2076 < }
2077 <
2078 < static struct AccessItem *
2079 < find_regexp_kline(const char *uhi[])
2080 < {
2081 <  const dlink_node *ptr = NULL;
2082 <
2083 <  DLINK_FOREACH(ptr, rkconf_items.head)
743 >  struct ip_entry *ip_found = ipcache_record_find_or_add(addr);
744 >  if ((event_base->time.sec_monotonic - ip_found->last_attempt) < ConfigGeneral.throttle_time)
745    {
746 <    struct AccessItem *aptr = map_to_conf(ptr->data);
746 >    if (ip_found->connection_count >= ConfigGeneral.throttle_count)
747 >      return TOO_FAST;
748  
749 <    assert(aptr->regexuser);
2088 <    assert(aptr->regexhost);
2089 <
2090 <    if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2091 <        (!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2092 <         !ircd_pcre_exec(aptr->regexhost, uhi[2])))
2093 <      return aptr;
749 >    ++ip_found->connection_count;
750    }
751 +  else
752 +    ip_found->connection_count = 1;
753  
754 <  return NULL;
755 < }
2098 <
2099 < /* find_kill()
2100 < *
2101 < * inputs       - pointer to client structure
2102 < * output       - pointer to struct AccessItem if found
2103 < * side effects - See if this user is klined already,
2104 < *                and if so, return struct AccessItem pointer
2105 < */
2106 < struct AccessItem *
2107 < find_kill(struct Client *client_p)
2108 < {
2109 <  struct AccessItem *aconf = NULL;
2110 <  const char *uhi[3];
2111 <
2112 <  uhi[0] = client_p->username;
2113 <  uhi[1] = client_p->host;
2114 <  uhi[2] = client_p->sockhost;
2115 <
2116 <  assert(client_p != NULL);
2117 <
2118 <  aconf = find_kline_conf(client_p->host, client_p->username,
2119 <                          &client_p->localClient->ip,
2120 <                          client_p->localClient->aftype);
2121 <  if (aconf == NULL)
2122 <    aconf = find_regexp_kline(uhi);
2123 <
2124 <  if (aconf && (aconf->status & CONF_KLINE))
2125 <    return aconf;
2126 <
2127 <  return NULL;
2128 < }
2129 <
2130 < struct AccessItem *
2131 < find_gline(struct Client *client_p)
2132 < {
2133 <  struct AccessItem *aconf;
2134 <
2135 <  assert(client_p != NULL);
2136 <
2137 <  aconf = find_gline_conf(client_p->host, client_p->username,
2138 <                          &client_p->localClient->ip,
2139 <                          client_p->localClient->aftype);
2140 <
2141 <  if (aconf && (aconf->status & CONF_GLINE))
2142 <    return aconf;
2143 <
2144 <  return NULL;
2145 < }
2146 <
2147 < /* add_temp_line()
2148 < *
2149 < * inputs        - pointer to struct ConfItem
2150 < * output        - none
2151 < * Side effects  - links in given struct ConfItem into
2152 < *                 temporary *line link list
2153 < */
2154 < void
2155 < add_temp_line(struct ConfItem *conf)
2156 < {
2157 <  struct AccessItem *aconf;
2158 <
2159 <  if (conf->type == DLINE_TYPE)
2160 <  {
2161 <    aconf = map_to_conf(conf);
2162 <    SetConfTemporary(aconf);
2163 <    dlinkAdd(conf, &conf->node, &temporary_dlines);
2164 <    MyFree(aconf->user);
2165 <    aconf->user = NULL;
2166 <    add_conf_by_address(CONF_DLINE, aconf);
2167 <  }
2168 <  else if (conf->type == KLINE_TYPE)
2169 <  {
2170 <    aconf = map_to_conf(conf);
2171 <    SetConfTemporary(aconf);
2172 <    dlinkAdd(conf, &conf->node, &temporary_klines);
2173 <    add_conf_by_address(CONF_KILL, aconf);
2174 <  }
2175 <  else if (conf->type == GLINE_TYPE)
2176 <  {
2177 <    aconf = map_to_conf(conf);
2178 <    SetConfTemporary(aconf);
2179 <    dlinkAdd(conf, &conf->node, &temporary_glines);
2180 <    add_conf_by_address(CONF_GLINE, aconf);
2181 <  }
2182 <  else if (conf->type == XLINE_TYPE)
2183 <  {
2184 <    conf->flags |= CONF_FLAGS_TEMPORARY;
2185 <    dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2186 <  }
2187 <  else if (conf->type == RXLINE_TYPE)
2188 <  {
2189 <    conf->flags |= CONF_FLAGS_TEMPORARY;
2190 <    dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2191 <  }
2192 <  else if (conf->type == RKLINE_TYPE)
2193 <  {
2194 <    conf->flags |= CONF_FLAGS_TEMPORARY;
2195 <    dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2196 <  }
2197 <  else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2198 <  {
2199 <    conf->flags |= CONF_FLAGS_TEMPORARY;
2200 <    dlinkAdd(conf, make_dlink_node(), &temporary_resv);
2201 <  }
754 >  ip_found->last_attempt = event_base->time.sec_monotonic;
755 >  return 0;
756   }
757  
758   /* cleanup_tklines()
# Line 2209 | Line 763 | add_temp_line(struct ConfItem *conf)
763   *                This is an event started off in ircd.c
764   */
765   void
766 < cleanup_tklines(void *notused)
766 > cleanup_tklines(void *unused)
767   {
768 <  expire_tklines(&temporary_glines);
769 <  expire_tklines(&temporary_klines);
770 <  expire_tklines(&temporary_dlines);
2217 <  expire_tklines(&temporary_xlines);
2218 <  expire_tklines(&temporary_rxlines);
2219 <  expire_tklines(&temporary_rklines);
2220 <  expire_tklines(&temporary_resv);
2221 < }
2222 <
2223 < /* expire_tklines()
2224 < *
2225 < * inputs       - tkline list pointer
2226 < * output       - NONE
2227 < * side effects - expire tklines
2228 < */
2229 < static void
2230 < expire_tklines(dlink_list *tklist)
2231 < {
2232 <  dlink_node *ptr;
2233 <  dlink_node *next_ptr;
2234 <  struct ConfItem *conf;
2235 <  struct MatchItem *xconf;
2236 <  struct MatchItem *nconf;
2237 <  struct AccessItem *aconf;
2238 <  struct ResvChannel *cconf;
2239 <
2240 <  DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2241 <  {
2242 <    conf = ptr->data;
2243 <    if (conf->type == GLINE_TYPE ||
2244 <        conf->type == KLINE_TYPE ||
2245 <        conf->type == DLINE_TYPE)
2246 <    {
2247 <      aconf = (struct AccessItem *)map_to_conf(conf);
2248 <      if (aconf->hold <= CurrentTime)
2249 <      {
2250 <        /* XXX - Do we want GLINE expiry notices?? */
2251 <        /* Alert opers that a TKline expired - Hwy */
2252 <        if (ConfigFileEntry.tkline_expire_notices)
2253 <        {
2254 <          if (aconf->status & CONF_KILL)
2255 <          {
2256 <            sendto_realops_flags(UMODE_ALL, L_ALL,
2257 <                                 "Temporary K-line for [%s@%s] expired",
2258 <                                 (aconf->user) ? aconf->user : "*",
2259 <                                 (aconf->host) ? aconf->host : "*");
2260 <          }
2261 <          else if (conf->type == DLINE_TYPE)
2262 <          {
2263 <            sendto_realops_flags(UMODE_ALL, L_ALL,
2264 <                                 "Temporary D-line for [%s] expired",
2265 <                                 (aconf->host) ? aconf->host : "*");
2266 <          }
2267 <        }
2268 <
2269 <        delete_one_address_conf(aconf->host, aconf);
2270 <        dlinkDelete(ptr, tklist);
2271 <      }
2272 <    }
2273 <    else if (conf->type == XLINE_TYPE ||
2274 <             conf->type == RXLINE_TYPE)
2275 <    {
2276 <      xconf = (struct MatchItem *)map_to_conf(conf);
2277 <      if (xconf->hold <= CurrentTime)
2278 <      {
2279 <        if (ConfigFileEntry.tkline_expire_notices)
2280 <          sendto_realops_flags(UMODE_ALL, L_ALL,
2281 <                               "Temporary X-line for [%s] %sexpired", conf->name,
2282 <                               conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2283 <        dlinkDelete(ptr, tklist);
2284 <        free_dlink_node(ptr);
2285 <        delete_conf_item(conf);
2286 <      }
2287 <    }
2288 <    else if (conf->type == RKLINE_TYPE)
2289 <    {
2290 <      aconf = map_to_conf(conf);
2291 <      if (aconf->hold <= CurrentTime)
2292 <      {
2293 <        if (ConfigFileEntry.tkline_expire_notices)
2294 <           sendto_realops_flags(UMODE_ALL, L_ALL,
2295 <                                "Temporary K-line for [%s@%s] (REGEX) expired",
2296 <                                (aconf->user) ? aconf->user : "*",
2297 <                                (aconf->host) ? aconf->host : "*");
2298 <        dlinkDelete(ptr, tklist);
2299 <        free_dlink_node(ptr);
2300 <        delete_conf_item(conf);
2301 <      }
2302 <    }
2303 <    else if (conf->type == NRESV_TYPE)
2304 <    {
2305 <      nconf = (struct MatchItem *)map_to_conf(conf);
2306 <      if (nconf->hold <= CurrentTime)
2307 <      {
2308 <        if (ConfigFileEntry.tkline_expire_notices)
2309 <          sendto_realops_flags(UMODE_ALL, L_ALL,
2310 <                               "Temporary RESV for [%s] expired", conf->name);
2311 <        dlinkDelete(ptr, tklist);
2312 <        free_dlink_node(ptr);
2313 <        delete_conf_item(conf);
2314 <      }
2315 <    }
2316 <    else if (conf->type == CRESV_TYPE)
2317 <    {
2318 <      cconf = (struct ResvChannel *)map_to_conf(conf);
2319 <      if (cconf->hold <= CurrentTime)
2320 <      {
2321 <        if (ConfigFileEntry.tkline_expire_notices)
2322 <          sendto_realops_flags(UMODE_ALL, L_ALL,
2323 <                               "Temporary RESV for [%s] expired", cconf->name);
2324 <        dlinkDelete(ptr, tklist);
2325 <        free_dlink_node(ptr);
2326 <        delete_conf_item(conf);
2327 <      }
2328 <    }
2329 <  }
2330 < }
2331 <
2332 < /* oper_privs_as_string()
2333 < *
2334 < * inputs        - pointer to client_p
2335 < * output        - pointer to static string showing oper privs
2336 < * side effects  - return as string, the oper privs as derived from port
2337 < */
2338 < static const struct oper_privs
2339 < {
2340 <  const unsigned int oprivs;
2341 <  const unsigned int hidden;
2342 <  const unsigned char c;
2343 < } flag_list[] = {
2344 <  { OPER_FLAG_ADMIN,       OPER_FLAG_HIDDEN_ADMIN,  'A' },
2345 <  { OPER_FLAG_REMOTEBAN,   0,                       'B' },
2346 <  { OPER_FLAG_DIE,         0,                       'D' },
2347 <  { OPER_FLAG_GLINE,       0,                       'G' },
2348 <  { OPER_FLAG_REHASH,      0,                       'H' },
2349 <  { OPER_FLAG_K,           0,                       'K' },
2350 <  { OPER_FLAG_OPERWALL,    0,                       'L' },
2351 <  { OPER_FLAG_N,           0,                       'N' },
2352 <  { OPER_FLAG_GLOBAL_KILL, 0,                       'O' },
2353 <  { OPER_FLAG_REMOTE,      0,                       'R' },
2354 <  { OPER_FLAG_OPER_SPY,    0,                       'S' },
2355 <  { OPER_FLAG_UNKLINE,     0,                       'U' },
2356 <  { OPER_FLAG_X,           0,                       'X' },
2357 <  { 0, 0, '\0' }
2358 < };
2359 <
2360 < char *
2361 < oper_privs_as_string(const unsigned int port)
2362 < {
2363 <  static char privs_out[16];
2364 <  char *privs_ptr = privs_out;
2365 <  unsigned int i = 0;
2366 <
2367 <  for (; flag_list[i].oprivs; ++i)
2368 <  {
2369 <    if ((port & flag_list[i].oprivs) &&
2370 <        (port & flag_list[i].hidden) == 0)
2371 <      *privs_ptr++ = flag_list[i].c;
2372 <    else
2373 <      *privs_ptr++ = ToLowerTab[flag_list[i].c];
2374 <  }
2375 <
2376 <  *privs_ptr = '\0';
2377 <
2378 <  return privs_out;
768 >  hostmask_expire_temporary();
769 >  gecos_expire();
770 >  resv_expire();
771   }
772  
773   /*
774 < * Input: A client to find the active oper{} name for.
774 > * Input: A client to find the active operator {} name for.
775   * Output: The nick!user@host{oper} of the oper.
776   *         "oper" is server name for remote opers
777   * Side effects: None.
778   */
779 < char *
780 < get_oper_name(const struct Client *client_p)
779 > const char *
780 > get_oper_name(const struct Client *client)
781   {
782 <  dlink_node *cnode;
2391 <  struct ConfItem *conf;
2392 <  struct AccessItem *aconf;
782 >  static char buffer[IRCD_BUFSIZE];
783  
784 <  /* +5 for !,@,{,} and null */
785 <  static char buffer[NICKLEN+USERLEN+HOSTLEN+HOSTLEN+5];
784 >  if (IsServer(client))
785 >    return client->name;
786  
787 <  if (MyConnect(client_p))
787 >  if (MyConnect(client))
788    {
789 <    DLINK_FOREACH(cnode, client_p->localClient->confs.head)
789 >    const dlink_node *const node = client->connection->confs.head;
790 >
791 >    if (node)
792      {
793 <      conf = cnode->data;
2402 <      aconf = map_to_conf(conf);
793 >      const struct MaskItem *const conf = node->data;
794  
795 <      if (IsConfOperator(aconf))
795 >      if (conf->type == CONF_OPER)
796        {
797 <        ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
798 <                   client_p->username, client_p->host,
799 <                   conf->name);
2409 <        return buffer;
797 >        snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client->name,
798 >                 client->username, client->host, conf->name);
799 >        return buffer;
800        }
801      }
802  
803 <    /* Probably should assert here for now. If there is an oper out there
804 <     * with no oper{} conf attached, it would be good for us to know...
803 >    /*
804 >     * Probably should assert here for now. If there is an oper out there
805 >     * with no operator {} conf attached, it would be good for us to know...
806       */
807 <    assert(0); /* Oper without oper conf! */
807 >    assert(0);  /* Oper without oper conf! */
808    }
809  
810 <  ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
811 <             client_p->username, client_p->host, client_p->servptr->name);
810 >  snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client->name,
811 >           client->username, client->host, client->servptr->name);
812    return buffer;
813   }
814  
815 < /* read_conf_files()
2425 < *
2426 < * inputs       - cold start YES or NO
2427 < * output       - none
2428 < * side effects - read all conf files needed, ircd.conf kline.conf etc.
2429 < */
2430 < void
2431 < read_conf_files(int cold)
2432 < {
2433 <  const char *filename;
2434 <  char chanmodes[32];
2435 <  char chanlimit[32];
2436 <
2437 <  filename = get_conf_name(CONF_TYPE);
2438 <
2439 <  /* We need to know the initial filename for the yyerror() to report
2440 <     FIXME: The full path is in conffilenamebuf first time since we
2441 <             dont know anything else
2442 <
2443 <     - Gozem 2002-07-21
2444 <  */
2445 <  strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2446 <
2447 <  if ((conf_fbfile_in = fbopen(filename, "r")) == NULL)
2448 <  {
2449 <    if (cold)
2450 <    {
2451 <      ilog(L_CRIT, "Unable to read configuration file '%s': %s",
2452 <           filename, strerror(errno));
2453 <      exit(-1);
2454 <    }
2455 <    else
2456 <    {
2457 <      sendto_realops_flags(UMODE_ALL, L_ALL,
2458 <                           "Unable to read configuration file '%s': %s",
2459 <                           filename, strerror(errno));
2460 <      return;
2461 <    }
2462 <  }
2463 <
2464 <  if (!cold)
2465 <    clear_out_old_conf();
2466 <
2467 <  read_conf(conf_fbfile_in);
2468 <  fbclose(conf_fbfile_in);
2469 <
2470 <  add_isupport("NETWORK", ServerInfo.network_name, -1);
2471 <  ircsprintf(chanmodes, "b%s%s:%d", ConfigChannel.use_except ? "e" : "",
2472 <             ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2473 <  add_isupport("MAXLIST", chanmodes, -1);
2474 <  add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2475 <  if (ConfigChannel.disable_local_channels)
2476 <    add_isupport("CHANTYPES", "#", -1);
2477 <  else
2478 <    add_isupport("CHANTYPES", "#&", -1);
2479 <  ircsprintf(chanlimit, "%s:%d", ConfigChannel.disable_local_channels ? "#" : "#&",
2480 <             ConfigChannel.max_chans_per_user);
2481 <  add_isupport("CHANLIMIT", chanlimit, -1);
2482 <  ircsprintf(chanmodes, "%s%s%s", ConfigChannel.use_except ? "e" : "",
2483 <             ConfigChannel.use_invex ? "I" : "", "b,k,l,imnpst");
2484 <  add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2485 <  if (ConfigChannel.use_except)
2486 <    add_isupport("EXCEPTS", "e", -1);
2487 <  if (ConfigChannel.use_invex)
2488 <    add_isupport("INVEX", "I", -1);
2489 <  add_isupport("CHANMODES", chanmodes, -1);
2490 <
2491 <  /*
2492 <   * message_locale may have changed.  rebuild isupport since it relies
2493 <   * on strlen(form_str(RPL_ISUPPORT))
2494 <   */
2495 <  rebuild_isupport_message_line();
2496 <
2497 <  parse_conf_file(KLINE_TYPE, cold);
2498 <  parse_conf_file(RKLINE_TYPE, cold);
2499 <  parse_conf_file(DLINE_TYPE, cold);
2500 <  parse_conf_file(XLINE_TYPE, cold);
2501 <  parse_conf_file(RXLINE_TYPE, cold);
2502 <  parse_conf_file(NRESV_TYPE, cold);
2503 <  parse_conf_file(CRESV_TYPE, cold);
2504 < }
2505 <
2506 < /* parse_conf_file()
2507 < *
2508 < * inputs       - type of conf file to parse
2509 < * output       - none
2510 < * side effects - conf file for givenconf type is opened and read then parsed
2511 < */
2512 < static void
2513 < parse_conf_file(int type, int cold)
2514 < {
2515 <  FBFILE *file = NULL;
2516 <  const char *filename = get_conf_name(type);
2517 <
2518 <  if ((file = fbopen(filename, "r")) == NULL)
2519 <  {
2520 <    if (cold)
2521 <      ilog(L_ERROR, "Unable to read configuration file '%s': %s",
2522 <           filename, strerror(errno));
2523 <    else
2524 <      sendto_realops_flags(UMODE_ALL, L_ALL,
2525 <                    "Unable to read configuration file '%s': %s",
2526 <                           filename, strerror(errno));
2527 <  }
2528 <  else
2529 <  {
2530 <    parse_csv_file(file, type);
2531 <    fbclose(file);
2532 <  }
2533 < }
2534 <
2535 < /* clear_out_old_conf()
815 > /* conf_clear()
816   *
817   * inputs       - none
818   * output       - none
819   * side effects - Clear out the old configuration
820   */
821   static void
822 < clear_out_old_conf(void)
822 > conf_clear(void)
823   {
824 <  dlink_node *ptr = NULL, *next_ptr = NULL;
2545 <  struct ConfItem *conf;
2546 <  struct AccessItem *aconf;
2547 <  struct ClassItem *cltmp;
2548 <  struct MatchItem *match_item;
824 >  dlink_node *node = NULL, *node_next = NULL;
825    dlink_list *free_items [] = {
826 <    &server_items,   &oconf_items,    &hub_items, &leaf_items,
2551 <     &uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
2552 <     &nresv_items, &cluster_items,  &gdeny_items, NULL
826 >    &connect_items, &operator_items, NULL
827    };
828  
829    dlink_list ** iterator = free_items; /* C is dumb */
830  
831    /* We only need to free anything allocated by yyparse() here.
832 <   * Resetting structs, etc, is taken care of by set_default_conf().
832 >   * Resetting structs, etc, is taken care of by conf_set_defaults().
833     */
834 <  
835 <  for (; *iterator != NULL; iterator++)
834 >
835 >  for (; *iterator; iterator++)
836    {
837 <    DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
837 >    DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
838      {
839 <      conf = ptr->data;
2566 <      /* XXX This is less than pretty */
2567 <      if (conf->type == SERVER_TYPE)
2568 <      {
2569 <        aconf = (struct AccessItem *)map_to_conf(conf);
2570 <        if (aconf->clients != 0)
2571 <        {
2572 <          SetConfIllegal(aconf);
2573 <          dlinkDelete(&conf->node, &server_items);
2574 <        }
2575 <        else
2576 <        {
2577 <          delete_conf_item(conf);
2578 <        }
2579 <      }
2580 <      else if (conf->type == OPER_TYPE)
2581 <      {
2582 <        aconf = (struct AccessItem *)map_to_conf(conf);
2583 <        if (aconf->clients != 0)
2584 <        {
2585 <          SetConfIllegal(aconf);
2586 <          dlinkDelete(&conf->node, &oconf_items);
2587 <        }
2588 <        else
2589 <        {
2590 <          delete_conf_item(conf);
2591 <        }
2592 <      }
2593 <      else if (conf->type == CLIENT_TYPE)
2594 <      {
2595 <        aconf = (struct AccessItem *)map_to_conf(conf);
2596 <        if (aconf->clients != 0)
2597 <        {
2598 <          SetConfIllegal(aconf);
2599 <        }
2600 <        else
2601 <        {
2602 <          delete_conf_item(conf);
2603 <        }
2604 <      }
2605 <      else if (conf->type == XLINE_TYPE  ||
2606 <               conf->type == RXLINE_TYPE ||
2607 <               conf->type == RKLINE_TYPE)
2608 <      {
2609 <        /* temporary (r)xlines are also on
2610 <         * the (r)xconf items list */
2611 <        if (conf->flags & CONF_FLAGS_TEMPORARY)
2612 <          continue;
839 >      struct MaskItem *conf = node->data;
840  
841 <        delete_conf_item(conf);
842 <      }
843 <      else
844 <      {
845 <        if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2619 <        {
2620 <          match_item = (struct MatchItem *)map_to_conf(conf);
2621 <          if ((match_item->ref_count <= 0))
2622 <            delete_conf_item(conf);
2623 <          else
2624 <          {
2625 <            match_item->illegal = 1;
2626 <            dlinkDelete(&conf->node, *iterator);
2627 <          }
2628 <        }
2629 <        else
2630 <          delete_conf_item(conf);
2631 <      }
841 >      conf->active = false;
842 >      dlinkDelete(&conf->node, *iterator);
843 >
844 >      if (!conf->ref_count)
845 >        conf_free(conf);
846      }
847    }
848  
849 <  /* don't delete the class table, rather mark all entries
850 <   * for deletion. The table is cleaned up by check_class. - avalon
849 >  /*
850 >   * Don't delete the class table, rather mark all entries for deletion.
851 >   * The table is cleaned up by class_delete_marked. - avalon
852     */
853 <  DLINK_FOREACH(ptr, class_items.head)
2639 <  {
2640 <    conf = ptr->data;
2641 <    cltmp = (struct ClassItem *)map_to_conf(conf);
2642 <    if (ptr != class_items.tail)  /* never mark the "default" class */
2643 <      MaxTotal(cltmp) = -1;
2644 <  }
853 >  class_mark_for_deletion();
854  
855    clear_out_address_conf();
856  
857 <  /* clean out module paths */
2649 < #ifndef STATIC_MODULES
2650 <  mod_clear_paths();
2651 < #endif
2652 <
2653 <  /* clean out ServerInfo */
2654 <  MyFree(ServerInfo.description);
2655 <  ServerInfo.description = NULL;
2656 <  MyFree(ServerInfo.network_name);
2657 <  ServerInfo.network_name = NULL;
2658 <  MyFree(ServerInfo.network_desc);
2659 <  ServerInfo.network_desc = NULL;
2660 <  MyFree(ConfigFileEntry.egdpool_path);
2661 <  ConfigFileEntry.egdpool_path = NULL;
2662 < #ifdef HAVE_LIBCRYPTO
2663 <  if (ServerInfo.rsa_private_key != NULL)
2664 <  {
2665 <    RSA_free(ServerInfo.rsa_private_key);
2666 <    ServerInfo.rsa_private_key = NULL;
2667 <  }
2668 <
2669 <  MyFree(ServerInfo.rsa_private_key_file);
2670 <  ServerInfo.rsa_private_key_file = NULL;
2671 < #endif
2672 <
2673 <  /* clean out old resvs from the conf */
2674 <  clear_conf_resv();
2675 <
2676 <  /* clean out AdminInfo */
2677 <  MyFree(AdminInfo.name);
2678 <  AdminInfo.name = NULL;
2679 <  MyFree(AdminInfo.email);
2680 <  AdminInfo.email = NULL;
2681 <  MyFree(AdminInfo.description);
2682 <  AdminInfo.description = NULL;
2683 <
2684 <  /* operator{} and class{} blocks are freed above */
2685 <  /* clean out listeners */
2686 <  close_listeners();
2687 <
2688 <  /* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2689 <   * exempt{} and gecos{} blocks are freed above too
2690 <   */
2691 <
2692 <  /* clean out general */
2693 <  MyFree(ConfigFileEntry.servlink_path);
2694 <  ConfigFileEntry.servlink_path = NULL;
2695 < #ifdef HAVE_LIBCRYPTO
2696 <  ConfigFileEntry.default_cipher_preference = NULL;
2697 < #endif /* HAVE_LIBCRYPTO */
2698 <  delete_isupport("INVEX");
2699 <  delete_isupport("EXCEPTS");
2700 < }
2701 <
2702 < /* flush_deleted_I_P()
2703 < *
2704 < * inputs       - none
2705 < * output       - none
2706 < * side effects - This function removes I/P conf items
2707 < */
2708 < static void
2709 < flush_deleted_I_P(void)
2710 < {
2711 <  dlink_node *ptr;
2712 <  dlink_node *next_ptr;
2713 <  struct ConfItem *conf;
2714 <  struct AccessItem *aconf;
2715 <  dlink_list * free_items [] = {
2716 <    &server_items, &oconf_items, NULL
2717 <  };
2718 <  dlink_list ** iterator = free_items; /* C is dumb */
2719 <
2720 <  /* flush out deleted I and P lines
2721 <   * although still in use.
2722 <   */
2723 <  for (; *iterator != NULL; iterator++)
2724 <  {
2725 <    DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2726 <    {
2727 <      conf = ptr->data;
2728 <      aconf = (struct AccessItem *)map_to_conf(conf);
2729 <
2730 <      if (IsConfIllegal(aconf))
2731 <      {
2732 <        dlinkDelete(ptr, *iterator);
2733 <
2734 <        if (aconf->clients == 0)
2735 <          delete_conf_item(conf);
2736 <      }
2737 <    }
2738 <  }
2739 < }
2740 <
2741 < /* get_conf_name()
2742 < *
2743 < * inputs       - type of conf file to return name of file for
2744 < * output       - pointer to filename for type of conf
2745 < * side effects - none
2746 < */
2747 < const char *
2748 < get_conf_name(ConfType type)
2749 < {
2750 <  switch (type)
2751 <  {
2752 <    case CONF_TYPE:
2753 <      return ConfigFileEntry.configfile;
2754 <      break;
2755 <    case KLINE_TYPE:
2756 <      return ConfigFileEntry.klinefile;
2757 <      break;
2758 <    case RKLINE_TYPE:
2759 <      return ConfigFileEntry.rklinefile;
2760 <      break;
2761 <    case DLINE_TYPE:
2762 <      return ConfigFileEntry.dlinefile;
2763 <      break;
2764 <    case XLINE_TYPE:
2765 <      return ConfigFileEntry.xlinefile;
2766 <      break;
2767 <    case RXLINE_TYPE:
2768 <      return ConfigFileEntry.rxlinefile;
2769 <      break;
2770 <    case CRESV_TYPE:
2771 <      return ConfigFileEntry.cresvfile;
2772 <      break;
2773 <    case NRESV_TYPE:
2774 <      return ConfigFileEntry.nresvfile;
2775 <      break;
2776 <    case GLINE_TYPE:
2777 <      return ConfigFileEntry.glinefile;
2778 <      break;
857 >  modules_conf_clear();  /* Clear modules {} items */
858  
859 <    default:
2781 <      return NULL;  /* This should NEVER HAPPEN since we call this function
2782 <                       only with the above values, this will cause us to core
2783 <                       at some point if this happens so we know where it was */
2784 <  }
2785 < }
859 >  motd_clear();  /* Clear motd {} items and re-cache default motd */
860  
861 < #define BAD_PING (-1)
861 >  cluster_clear();  /* Clear cluster {} items */
862  
863 < /* get_conf_ping()
2790 < *
2791 < * inputs       - pointer to struct AccessItem
2792 < *              - pointer to a variable that receives ping warning time
2793 < * output       - ping frequency
2794 < * side effects - NONE
2795 < */
2796 < static int
2797 < get_conf_ping(struct ConfItem *conf, int *pingwarn)
2798 < {
2799 <  struct ClassItem *aclass;
2800 <  struct AccessItem *aconf;
863 >  gecos_clear();  /* Clear gecos {} items */
864  
865 <  if (conf != NULL)
866 <  {
867 <    aconf = (struct AccessItem *)map_to_conf(conf);
868 <    if (aconf->class_ptr != NULL)
869 <    {
870 <      aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
871 <      *pingwarn = PingWarning(aclass);
872 <      return PingFreq(aclass);
873 <    }
874 <  }
865 >  resv_clear();  /* Clear resv {} items */
866 >
867 >  service_clear();  /* Clear service {} items */
868 >
869 >  shared_clear();  /* Clear shared {} items */
870 >
871 >  pseudo_clear();  /* Clear pseudo {} items */
872 >
873 >  /* Clean out ConfigServerInfo */
874 >  xfree(ConfigServerInfo.description);
875 >  ConfigServerInfo.description = NULL;
876 >  xfree(ConfigServerInfo.network_name);
877 >  ConfigServerInfo.network_name = NULL;
878 >  xfree(ConfigServerInfo.network_desc);
879 >  ConfigServerInfo.network_desc = NULL;
880 >  xfree(ConfigServerInfo.rsa_private_key_file);
881 >  ConfigServerInfo.rsa_private_key_file = NULL;
882 >  xfree(ConfigServerInfo.tls_certificate_file);
883 >  ConfigServerInfo.tls_certificate_file = NULL;
884 >  xfree(ConfigServerInfo.tls_dh_param_file);
885 >  ConfigServerInfo.tls_dh_param_file = NULL;
886 >  xfree(ConfigServerInfo.tls_supported_groups);
887 >  ConfigServerInfo.tls_supported_groups = NULL;
888 >  xfree(ConfigServerInfo.tls_cipher_list);
889 >  ConfigServerInfo.tls_cipher_list = NULL;
890 >  xfree(ConfigServerInfo.tls_cipher_suites);
891 >  ConfigServerInfo.tls_cipher_suites = NULL;
892 >  xfree(ConfigServerInfo.tls_message_digest_algorithm);
893 >  ConfigServerInfo.tls_message_digest_algorithm = NULL;
894 >
895 >  /* Clean out ConfigAdminInfo */
896 >  xfree(ConfigAdminInfo.name);
897 >  ConfigAdminInfo.name = NULL;
898 >  xfree(ConfigAdminInfo.email);
899 >  ConfigAdminInfo.email = NULL;
900 >  xfree(ConfigAdminInfo.description);
901 >  ConfigAdminInfo.description = NULL;
902 >
903 >  /* Clean out ConfigServerHide */
904 >  xfree(ConfigServerHide.flatten_links_file);
905 >  ConfigServerHide.flatten_links_file = NULL;
906 >  xfree(ConfigServerHide.hidden_name);
907 >  ConfigServerHide.hidden_name = NULL;
908  
909 <  return BAD_PING;
909 >  /* Clean out listeners */
910 >  listener_close_marked();
911   }
912  
913 < /* get_client_class()
914 < *
2818 < * inputs       - pointer to client struct
2819 < * output       - pointer to name of class
2820 < * side effects - NONE
2821 < */
2822 < const char *
2823 < get_client_class(struct Client *target_p)
913 > static void
914 > conf_handle_tls(bool cold)
915   {
916 <  dlink_node *ptr;
2826 <  struct ConfItem *conf;
2827 <  struct AccessItem *aconf;
2828 <
2829 <  if (target_p != NULL && !IsMe(target_p) &&
2830 <      target_p->localClient->confs.head != NULL)
916 >  if (tls_new_credentials() == false)
917    {
918 <    DLINK_FOREACH(ptr, target_p->localClient->confs.head)
918 >    if (cold == true)
919      {
920 <      conf = ptr->data;
921 <
2836 <      if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
2837 <          conf->type == OPER_TYPE)
2838 <      {
2839 <        aconf = (struct AccessItem *) map_to_conf(conf);
2840 <        if (aconf->class_ptr != NULL)
2841 <          return aconf->class_ptr->name;
2842 <      }
2843 <    }
2844 <  }
2845 <
2846 <  return "default";
2847 < }
2848 <
2849 < /* get_client_ping()
2850 < *
2851 < * inputs       - pointer to client struct
2852 < *              - pointer to a variable that receives ping warning time
2853 < * output       - ping frequency
2854 < * side effects - NONE
2855 < */
2856 < int
2857 < get_client_ping(struct Client *target_p, int *pingwarn)
2858 < {
2859 <  int ping;
2860 <  struct ConfItem *conf;
2861 <  dlink_node *nlink;
2862 <
2863 <  if (target_p->localClient->confs.head != NULL)
2864 <    DLINK_FOREACH(nlink, target_p->localClient->confs.head)
2865 <    {
2866 <      conf = nlink->data;
2867 <
2868 <      if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2869 <          (conf->type == OPER_TYPE))
2870 <      {
2871 <        ping = get_conf_ping(conf, pingwarn);
2872 <        if (ping > 0)
2873 <          return ping;
2874 <      }
920 >      ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
921 >      exit(EXIT_FAILURE);
922      }
923 <
2877 <  *pingwarn = 0;
2878 <  return DEFAULT_PINGFREQUENCY;
2879 < }
2880 <
2881 < /* find_class()
2882 < *
2883 < * inputs       - string name of class
2884 < * output       - corresponding Class pointer
2885 < * side effects - NONE
2886 < */
2887 < struct ConfItem *
2888 < find_class(const char *classname)
2889 < {
2890 <  struct ConfItem *conf;
2891 <
2892 <  if ((conf = find_exact_name_conf(CLASS_TYPE, classname, NULL, NULL)) != NULL)
2893 <    return(conf);
2894 <
2895 <  return class_default;
2896 < }
2897 <
2898 < /* check_class()
2899 < *
2900 < * inputs       - NONE
2901 < * output       - NONE
2902 < * side effects -
2903 < */
2904 < void
2905 < check_class(void)
2906 < {
2907 <  dlink_node *ptr;
2908 <  dlink_node *next_ptr;
2909 <  struct ConfItem *conf;
2910 <  struct ClassItem *aclass;
2911 <
2912 <  DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2913 <  {
2914 <    conf = ptr->data;
2915 <    aclass = (struct ClassItem *)map_to_conf(conf);
2916 <
2917 <    if (MaxTotal(aclass) < 0)
923 >    else
924      {
925 <      destroy_cidr_class(aclass);
926 <      if (CurrUserCount(aclass) > 0)
927 <        dlinkDelete(&conf->node, &class_items);
2922 <      else
2923 <        delete_conf_item(conf);
925 >      /* Failed to load new settings/certs, old ones remain active */
926 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
927 >                           "Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
928      }
929    }
930   }
931  
932 < /* init_class()
932 > /* read_conf_files()
933   *
934 < * inputs       - NONE
935 < * output       - NONE
936 < * side effects -
934 > * inputs       - cold start YES or NO
935 > * output       - none
936 > * side effects - read all conf files needed, ircd.conf kline.conf etc.
937   */
938   void
939 < init_class(void)
939 > conf_read_files(bool cold)
940   {
941 <  struct ClassItem *aclass;
2938 <
2939 <  class_default = make_conf_item(CLASS_TYPE);
2940 <  aclass = (struct ClassItem *)map_to_conf(class_default);
2941 <  DupString(class_default->name, "default");
2942 <  ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2943 <  PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2944 <  MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2945 <  MaxSendq(aclass) = DEFAULT_SENDQ;
2946 <
2947 <  client_check_cb = register_callback("check_client", check_client);
2948 < }
941 >  char buf[IRCD_BUFSIZE];
942  
943 < /* get_sendq()
944 < *
2952 < * inputs       - pointer to client
2953 < * output       - sendq for this client as found from its class
2954 < * side effects - NONE
2955 < */
2956 < unsigned long
2957 < get_sendq(struct Client *client_p)
2958 < {
2959 <  unsigned long sendq = DEFAULT_SENDQ;
2960 <  dlink_node *ptr;
2961 <  struct ConfItem *conf;
2962 <  struct ConfItem *class_conf;
2963 <  struct ClassItem *aclass;
2964 <  struct AccessItem *aconf;
943 >  conf_parser_ctx.boot = cold;
944 >  conf_parser_ctx.conf_file = fopen(ConfigGeneral.configfile, "r");
945  
946 <  if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
946 >  if (conf_parser_ctx.conf_file == NULL)
947    {
948 <    DLINK_FOREACH(ptr, client_p->localClient->confs.head)
948 >    if (cold == true)
949      {
950 <      conf = ptr->data;
951 <      if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
952 <          || (conf->type == CLIENT_TYPE))
2973 <      {
2974 <        aconf = (struct AccessItem *)map_to_conf(conf);
2975 <        if ((class_conf = aconf->class_ptr) == NULL)
2976 <          continue;
2977 <        aclass = (struct ClassItem *)map_to_conf(class_conf);
2978 <        sendq = MaxSendq(aclass);
2979 <        return sendq;
2980 <      }
950 >      ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
951 >           ConfigGeneral.configfile, strerror(errno));
952 >      exit(EXIT_FAILURE);
953      }
2982  }
2983  /* XXX return a default?
2984   * if here, then there wasn't an attached conf with a sendq
2985   * that is very bad -Dianora
2986   */
2987  return DEFAULT_SENDQ;
2988 }
2989
2990 /* conf_add_class_to_conf()
2991 *
2992 * inputs       - pointer to config item
2993 * output       - NONE
2994 * side effects - Add a class pointer to a conf
2995 */
2996 void
2997 conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
2998 {
2999  struct AccessItem *aconf;
3000  struct ClassItem *aclass;
3001
3002  aconf = (struct AccessItem *)map_to_conf(conf);
3003
3004  if (class_name == NULL)
3005  {
3006    aconf->class_ptr = class_default;
3007    if (conf->type == CLIENT_TYPE)
3008      sendto_realops_flags(UMODE_ALL, L_ALL,
3009                           "Warning *** Defaulting to default class for %s@%s",
3010                           aconf->user, aconf->host);
954      else
3012      sendto_realops_flags(UMODE_ALL, L_ALL,
3013                           "Warning *** Defaulting to default class for %s",
3014                           conf->name);
3015  }
3016  else
3017  {
3018    aconf->class_ptr = find_class(class_name);
3019  }
3020
3021  if (aconf->class_ptr == NULL)
3022  {
3023    if (conf->type == CLIENT_TYPE)
3024      sendto_realops_flags(UMODE_ALL, L_ALL,
3025                           "Warning *** Defaulting to default class for %s@%s",
3026                           aconf->user, aconf->host);
3027    else
3028      sendto_realops_flags(UMODE_ALL, L_ALL,
3029                           "Warning *** Defaulting to default class for %s",
3030                           conf->name);
3031    aconf->class_ptr = class_default;
3032  }
3033  else
3034  {
3035    aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
3036    if (MaxTotal(aclass) < 0)
955      {
956 <      aconf->class_ptr = class_default;
956 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
957 >                           "Unable to read configuration file '%s': %s",
958 >                           ConfigGeneral.configfile, strerror(errno));
959 >      return;
960      }
961    }
3041 }
962  
963 < #define MAXCONFLINKS 150
963 >  /*
964 >   * We need to know the initial filename for the yyerror() to report
965 >   *
966 >   *  FIXME: The full path is in conffilenamebuf first time since we
967 >   *          don't know anything else
968 >   *
969 >   *  - Gozem 2002-07-21
970 >   */
971 >  strlcpy(conffilebuf, ConfigGeneral.configfile, sizeof(conffilebuf));
972  
973 < /* conf_add_server()
974 < *
3047 < * inputs       - pointer to config item
3048 < *              - pointer to link count already on this conf
3049 < * output       - NONE
3050 < * side effects - Add a connect block
3051 < */
3052 < int
3053 < conf_add_server(struct ConfItem *conf, unsigned int lcount, const char *class_name)
3054 < {
3055 <  struct AccessItem *aconf;
3056 <  char *orig_host;
973 >  if (cold == false)
974 >    conf_clear();
975  
976 <  aconf = map_to_conf(conf);
976 >  conf_read(conf_parser_ctx.conf_file);
977 >  fclose(conf_parser_ctx.conf_file);
978  
979 <  conf_add_class_to_conf(conf, class_name);
979 >  log_iterate(log_reopen);
980 >  conf_handle_tls(cold);
981  
982 <  if (lcount > MAXCONFLINKS || !aconf->host || !conf->name)
983 <  {
3064 <    sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3065 <    ilog(L_WARN, "Bad connect block");
3066 <    return -1;
3067 <  }
982 >  isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
983 >  isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
984  
985 <  if (EmptyString(aconf->passwd) && !IsConfCryptLink(aconf))
986 <  {
3071 <    sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
3072 <                         conf->name);
3073 <    ilog(L_WARN, "Bad connect block, host %s", conf->name);
3074 <    return -1;
3075 <  }
985 >  snprintf(buf, sizeof(buf), "beI:%u", ConfigChannel.max_bans);
986 >  isupport_add("MAXLIST", buf, -1);
987  
988 <  orig_host = aconf->host;
989 <  split_nuh(orig_host, NULL, &aconf->user, &aconf->host);
3079 <  MyFree(orig_host);
3080 <  lookup_confhost(conf);
988 >  isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
989 >  isupport_add("CHANTYPES", "#", -1);
990  
991 <  return 0;
991 >  snprintf(buf, sizeof(buf), "#:%u", ConfigChannel.max_channels);
992 >  isupport_add("CHANLIMIT", buf, -1);
993 >
994 >  isupport_add("CHANNELLEN", NULL, CHANNELLEN);
995 >  isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
996 >
997 >  snprintf(buf, sizeof(buf), "%s", "beI,k,l,cimnprstuCKLMNORST");
998 >  isupport_add("CHANMODES", buf, -1);
999   }
1000  
1001 < /* conf_add_d_conf()
1001 > /* conf_add_class_to_conf()
1002   *
1003   * inputs       - pointer to config item
1004   * output       - NONE
1005 < * side effects - Add a d/D line
1005 > * side effects - Add a class pointer to a conf
1006   */
1007   void
1008 < conf_add_d_conf(struct AccessItem *aconf)
1008 > conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1009   {
1010 <  if (aconf->host == NULL)
3095 <    return;
3096 <
3097 <  aconf->user = NULL;
3098 <
3099 <  /* XXX - Should 'd' ever be in the old conf? For new conf we don't
3100 <   *       need this anyway, so I will disable it for now... -A1kmm
3101 <   */
3102 <  if (parse_netmask(aconf->host, NULL, NULL) == HM_HOST)
1010 >  if (EmptyString(name) || (conf->class = class_find(name, true)) == NULL)
1011    {
1012 <    ilog(L_WARN, "Invalid Dline %s ignored", aconf->host);
1013 <    free_access_item(aconf);
1014 <  }
1015 <  else
1016 <  {
1017 <    /* XXX ensure user is NULL */
1018 <    MyFree(aconf->user);
1019 <    aconf->user = NULL;
1020 <    add_conf_by_address(CONF_DLINE, aconf);
1012 >    conf->class = class_default;
1013 >
1014 >    if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1015 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1016 >                           "Warning *** Defaulting to default class for %s@%s",
1017 >                           conf->user, conf->host);
1018 >    else
1019 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1020 >                           "Warning *** Defaulting to default class for %s",
1021 >                           conf->name);
1022    }
1023   }
1024  
# Line 3122 | Line 1031 | conf_add_d_conf(struct AccessItem *aconf
1031   void
1032   yyerror(const char *msg)
1033   {
1034 <  char newlinebuf[IRCD_BUFSIZE];
3126 <
3127 <  if (ypass != 1)
1034 >  if (conf_parser_ctx.pass != 1)
1035      return;
1036  
1037 <  strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1038 <  sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1039 <                       conffilebuf, lineno + 1, msg, newlinebuf);
1040 <  ilog(L_WARN, "\"%s\", line %u: %s: %s",
1041 <       conffilebuf, lineno + 1, msg, newlinebuf);
1037 >  const char *p = stripws(linebuf);
1038 >  sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1039 >                       "\"%s\", line %u: %s: %s",
1040 >                       conffilebuf, lineno, msg, p);
1041 >  ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1042 >       conffilebuf, lineno, msg, p);
1043   }
1044  
1045 < int
1046 < conf_fbgets(char *lbuf, unsigned int max_size, FBFILE *fb)
3139 < {
3140 <  if (fbgets(lbuf, max_size, fb) == NULL)
3141 <    return 0;
3142 <
3143 <  return strlen(lbuf);
3144 < }
3145 <
3146 < int
3147 < conf_yy_fatal_error(const char *msg)
1045 > void
1046 > conf_error_report(const char *msg)
1047   {
1048 <  return 0;
1048 >  const char *p = stripws(linebuf);
1049 >  sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1050 >                       "\"%s\", line %u: %s: %s",
1051 >                       conffilebuf, lineno, msg, p);
1052 >  ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1053 >       conffilebuf, lineno, msg, p);
1054   }
1055  
1056   /*
1057   * valid_tkline()
1058 < *
1058 > *
1059   * inputs       - pointer to ascii string to check
1060   *              - whether the specified time is in seconds or minutes
1061   * output       - -1 not enough parameters
# Line 3159 | Line 1063 | conf_yy_fatal_error(const char *msg)
1063   * side effects - none
1064   * Originally written by Dianora (Diane, db@db.net)
1065   */
1066 < time_t
1067 < valid_tkline(char *p, int minutes)
1066 > uintmax_t
1067 > valid_tkline(const char *data, const int minutes)
1068   {
1069 <  time_t result = 0;
1069 >  const unsigned char *p = (const unsigned char *)data;
1070 >  unsigned char tmpch = '\0';
1071 >  uintmax_t result = 0;
1072  
1073 <  while (*p)
1073 >  while ((tmpch = *p++))
1074    {
1075 <    if (IsDigit(*p))
3170 <    {
3171 <      result *= 10;
3172 <      result += ((*p) & 0xF);
3173 <      p++;
3174 <    }
3175 <    else
1075 >    if (!IsDigit(tmpch))
1076        return 0;
1077 +
1078 +    result *= 10;
1079 +    result += (tmpch & 0xF);
1080    }
1081  
1082 <  /* in the degenerate case where oper does a /quote kline 0 user@host :reason
1083 <   * i.e. they specifically use 0, I am going to return 1 instead
1084 <   * as a return value of non-zero is used to flag it as a temporary kline
1082 >  /*
1083 >   * In the degenerate case where oper does a /quote kline 0 user@host :reason
1084 >   * i.e. they specifically use 0, I am going to return 1 instead as a return
1085 >   * value of non-zero is used to flag it as a temporary kline
1086     */
3183
1087    if (result == 0)
1088      result = 1;
1089  
1090 <  /*
1090 >  /*
1091     * If the incoming time is in seconds convert it to minutes for the purpose
1092     * of this calculation
1093     */
1094 <  if (!minutes)
1095 <    result = result / (time_t)60;
1094 >  if (minutes == 0)
1095 >    result = result / 60;
1096  
1097    if (result > MAX_TDKLINE_TIME)
1098      result = MAX_TDKLINE_TIME;
1099  
1100 <  result = result * (time_t)60;  /* turn it into seconds */
1100 >  result = result * 60;  /* Turn it into seconds */
1101  
1102    return result;
1103   }
1104  
1105 + /* valid_wild_card_simple()
1106 + *
1107 + * inputs       - data to check for sufficient non-wildcard characters
1108 + * outputs      - 1 if valid, else 0
1109 + * side effects - none
1110 + */
1111 + bool
1112 + valid_wild_card_simple(const char *data)
1113 + {
1114 +  const unsigned char *p = (const unsigned char *)data;
1115 +  unsigned char tmpch = '\0';
1116 +  unsigned int nonwild = 0, wild = 0;
1117 +
1118 +  while ((tmpch = *p++))
1119 +  {
1120 +    if (tmpch == '\\' && *p)
1121 +    {
1122 +      ++p;
1123 +      if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1124 +        return true;
1125 +    }
1126 +    else if (!IsMWildChar(tmpch))
1127 +    {
1128 +      if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1129 +        return true;
1130 +    }
1131 +    else
1132 +      ++wild;
1133 +  }
1134 +
1135 +  return wild == 0;
1136 + }
1137 +
1138   /* valid_wild_card()
1139   *
1140   * input        - pointer to client
1141   *              - int flag, 0 for no warning oper 1 for warning oper
1142   *              - count of following varargs to check
1143   * output       - 0 if not valid, 1 if valid
1144 < * side effects - NOTICE is given to source_p if warn is 1
1144 > * side effects - NOTICE is given to client if warn is 1
1145   */
1146 < int
1147 < valid_wild_card(struct Client *source_p, int warn, int count, ...)
1146 > bool
1147 > valid_wild_card(int count, ...)
1148   {
1149 <  char *p;
1150 <  char tmpch;
3215 <  int nonwild = 0;
1149 >  unsigned char tmpch = '\0';
1150 >  unsigned int nonwild = 0;
1151    va_list args;
1152  
1153    /*
# Line 3231 | Line 1166 | valid_wild_card(struct Client *source_p,
1166  
1167    while (count--)
1168    {
1169 <    p = va_arg(args, char *);
1169 >    const unsigned char *p = va_arg(args, const unsigned char *);
1170      if (p == NULL)
1171        continue;
1172  
# Line 3243 | Line 1178 | valid_wild_card(struct Client *source_p,
1178           * If we find enough non-wild characters, we can
1179           * break - no point in searching further.
1180           */
1181 <        if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1182 <          return 1;
1181 >        if (++nonwild >= ConfigGeneral.min_nonwildcard)
1182 >        {
1183 >          va_end(args);
1184 >          return true;
1185 >        }
1186        }
1187      }
1188    }
1189  
1190 <  if (warn)
1191 <    sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
3254 <               me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
3255 <  return 0;
1190 >  va_end(args);
1191 >  return false;
1192   }
1193  
1194   /* XXX should this go into a separate file ? -Dianora */
# Line 3265 | Line 1201 | valid_wild_card(struct Client *source_p,
1201   *              - parse_flags bit map of things to test
1202   *              - pointer to user or string to parse into
1203   *              - pointer to host or NULL to parse into if non NULL
1204 < *              - pointer to optional tkline time or NULL
1204 > *              - pointer to optional tkline time or NULL
1205   *              - pointer to target_server to parse into if non NULL
1206   *              - pointer to reason to parse into
1207   *
1208 < * output       - 1 if valid, -1 if not valid
1208 > * output       - 1 if valid, 0 if not valid
1209   * side effects - A generalised k/d/x etc. line parser,
1210   *               "ALINE [time] user@host|string [ON] target :reason"
1211   *                will parse returning a parsed user, host if
# Line 3281 | Line 1217 | valid_wild_card(struct Client *source_p,
1217   *                if target_server is NULL and an "ON" is found error
1218   *                is reported.
1219   *                if reason pointer is NULL ignore pointer,
1220 < *                this allows usee of parse_a_line in unkline etc.
1220 > *                this allows use of parse_a_line in unkline etc.
1221   *
1222   * - Dianora
1223   */
1224 < int
1225 < parse_aline(const char *cmd, struct Client *source_p,
3290 <            int parc, char **parv,
3291 <            int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
3292 <            char **target_server, char **reason)
1224 > bool
1225 > parse_aline(const char *cmd, struct Client *client, int parc, char **parv, struct aline_ctx *aline)
1226   {
1227 <  int found_tkline_time=0;
1228 <  static char def_reason[] = "No Reason";
1229 <  static char user[USERLEN*4+1];
3297 <  static char host[HOSTLEN*4+1];
1227 >  static char default_reason[] = CONF_NOREASON;
1228 >  static char user[USERLEN * 2 + 1];
1229 >  static char host[HOSTLEN * 2 + 1];
1230  
1231 <  parv++;
1232 <  parc--;
1231 >  ++parv;
1232 >  --parc;
1233  
1234 <  found_tkline_time = valid_tkline(*parv, TK_MINUTES);
3303 <
3304 <  if (found_tkline_time != 0)
1234 >  if (aline->add == true && (aline->duration = valid_tkline(*parv, TK_MINUTES)))
1235    {
1236 <    parv++;
1237 <    parc--;
3308 <
3309 <    if (tkline_time != NULL)
3310 <      *tkline_time = found_tkline_time;
3311 <    else
3312 <    {
3313 <      sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
3314 <                 me.name, source_p->name, cmd);
3315 <      return -1;
3316 <    }
1236 >    ++parv;
1237 >    --parc;
1238    }
1239  
1240    if (parc == 0)
1241    {
1242 <    sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1243 <               me.name, source_p->name, cmd);
3323 <    return -1;
1242 >    sendto_one_numeric(client, &me, ERR_NEEDMOREPARAMS, cmd);
1243 >    return false;
1244    }
1245  
1246 <  if (h_p == NULL)
1247 <    *up_p = *parv;
1246 >  if (aline->simple_mask == true)
1247 >  {
1248 >    aline->mask = *parv;
1249 >    aline->user = NULL;
1250 >    aline->host = NULL;
1251 >  }
1252    else
1253    {
1254 <    if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1255 <      return -1;
1254 >    struct split_nuh_item nuh;
1255 >
1256 >    nuh.nuhmask  = *parv;
1257 >    nuh.nickptr  = NULL;
1258 >    nuh.userptr  = user;
1259 >    nuh.hostptr  = host;
1260  
1261 <    *up_p = user;
1262 <    *h_p = host;
1261 >    nuh.nicksize = 0;
1262 >    nuh.usersize = sizeof(user);
1263 >    nuh.hostsize = sizeof(host);
1264 >
1265 >    split_nuh(&nuh);
1266 >
1267 >    aline->mask = NULL;
1268 >    aline->user = user;
1269 >    aline->host = host;
1270    }
3336
3337  parc--;
3338  parv++;
1271  
1272 <  if (parc != 0)
1272 >  ++parv;
1273 >  --parc;
1274 >
1275 >  if (parc)
1276    {
1277      if (irccmp(*parv, "ON") == 0)
1278      {
1279 <      parc--;
1280 <      parv++;
1279 >      ++parv;
1280 >      --parc;
1281  
1282 <      if (target_server == NULL)
1282 >      if (!HasOFlag(client, OPER_FLAG_REMOTEBAN))
1283        {
1284 <        sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1285 <                   me.name, source_p->name, cmd);
3351 <        return -1;
3352 <      }
3353 <
3354 <      if (!IsOperRemoteBan(source_p))
3355 <      {
3356 <        sendto_one(source_p, form_str(ERR_NOPRIVS),
3357 <                   me.name, source_p->name, "remoteban");
3358 <        return -1;
1284 >        sendto_one_numeric(client, &me, ERR_NOPRIVS, "remoteban");
1285 >        return false;
1286        }
1287  
1288        if (parc == 0 || EmptyString(*parv))
1289        {
1290 <        sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1291 <                   me.name, source_p->name, cmd);
3365 <        return -1;
1290 >        sendto_one_numeric(client, &me, ERR_NEEDMOREPARAMS, cmd);
1291 >        return false;
1292        }
1293  
1294 <      *target_server = *parv;
1295 <      parc--;
1296 <      parv++;
1294 >      aline->server = *parv;
1295 >      ++parv;
1296 >      --parc;
1297      }
1298      else
1299 <    {
3374 <      /* Make sure target_server *is* NULL if no ON server found
3375 <       * caller probably NULL'd it first, but no harm to do it again -db
3376 <       */
3377 <      if (target_server != NULL)
3378 <        *target_server = NULL;
3379 <    }
1299 >      aline->server = NULL;
1300    }
1301  
1302 <  if (h_p != NULL)
1302 >  if (aline->add == true)
1303    {
1304 <    if (strchr(user, '!') != NULL)
1305 <    {
3386 <      sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
3387 <                 me.name, source_p->name);
3388 <      return -1;
3389 <    }
3390 <
3391 <    if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 2, *up_p, *h_p))
3392 <      return -1;
3393 <  }
3394 <  else
3395 <    if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 1, *up_p))
3396 <      return -1;
3397 <
3398 <  if (reason != NULL)
3399 <  {
3400 <    if (parc != 0)
3401 <    {
3402 <      *reason = *parv;
3403 <      if (!valid_comment(source_p, *reason, YES))
3404 <        return -1;
3405 <    }
1304 >    if (parc == 0 || EmptyString(*parv))
1305 >      aline->reason = default_reason;
1306      else
1307 <      *reason = def_reason;
1307 >      aline->reason = *parv;
1308    }
1309  
1310 <  return 1;
3411 < }
3412 <
3413 < /* find_user_host()
3414 < *
3415 < * inputs       - pointer to client placing kline
3416 < *              - pointer to user_host_or_nick
3417 < *              - pointer to user buffer
3418 < *              - pointer to host buffer
3419 < * output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3420 < * side effects -
3421 < */
3422 < static int
3423 < find_user_host(struct Client *source_p, char *user_host_or_nick,
3424 <               char *luser, char *lhost, unsigned int flags)
3425 < {
3426 <  struct Client *target_p = NULL;
3427 <  char *hostp = NULL;
3428 <
3429 <  if (lhost == NULL)
3430 <  {
3431 <    strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3432 <    return 1;
3433 <  }
3434 <
3435 <  if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3436 <  {
3437 <    /* Explicit user@host mask given */
3438 <
3439 <    if(hostp != NULL)                            /* I'm a little user@host */
3440 <    {
3441 <      *(hostp++) = '\0';                       /* short and squat */
3442 <      if (*user_host_or_nick)
3443 <        strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3444 <      else
3445 <        strcpy(luser, "*");
3446 <      if (*hostp)
3447 <        strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3448 <      else
3449 <        strcpy(lhost, "*");
3450 <    }
3451 <    else
3452 <    {
3453 <      luser[0] = '*';             /* no @ found, assume its *@somehost */
3454 <      luser[1] = '\0';    
3455 <      strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3456 <    }
3457 <    
3458 <    return 1;
3459 <  }
3460 <  else if (!(flags & NOUSERLOOKUP))
3461 <  {
3462 <    /* Try to find user@host mask from nick */
3463 <    /* Okay to use source_p as the first param, because source_p == client_p */
3464 <    if ((target_p =
3465 <        find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3466 <      return 0;
3467 <
3468 <    if (IsExemptKline(target_p))
3469 <    {
3470 <      if (!IsServer(source_p))
3471 <        sendto_one(source_p,
3472 <                   ":%s NOTICE %s :%s is E-lined",
3473 <                   me.name, source_p->name, target_p->name);
3474 <      return 0;
3475 <    }
3476 <
3477 <    /*
3478 <     * turn the "user" bit into "*user", blow away '~'
3479 <     * if found in original user name (non-idented)
3480 <     */
3481 <    strlcpy(luser, target_p->username, USERLEN*4 + 1);
3482 <
3483 <    if (target_p->username[0] == '~')
3484 <      luser[0] = '*';
3485 <
3486 <    if (target_p->sockhost[0] == '\0' ||
3487 <        (target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3488 <      strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
3489 <    else
3490 <      strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3491 <    return 1;
3492 <  }
3493 <
3494 <  return 0;
3495 < }
3496 <
3497 < /* valid_comment()
3498 < *
3499 < * inputs       - pointer to client
3500 < *              - pointer to comment
3501 < * output       - 0 if no valid comment,
3502 < *              - 1 if valid
3503 < * side effects - truncates reason where necessary
3504 < */
3505 < int
3506 < valid_comment(struct Client *source_p, char *comment, int warn)
3507 < {
3508 <  if (strchr(comment, '"'))
3509 <  {
3510 <    if (warn)
3511 <      sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3512 <                 me.name, source_p->name);
3513 <    return 0;
3514 <  }
3515 <
3516 <  if (strlen(comment) > REASONLEN)
3517 <    comment[REASONLEN-1] = '\0';
3518 <
3519 <  return 1;
1310 >  return true;
1311   }
1312  
1313   /* match_conf_password()
# Line 3526 | Line 1317 | valid_comment(struct Client *source_p, c
1317   * output       - 1 or 0 if match
1318   * side effects - none
1319   */
1320 < int
1321 < match_conf_password(const char *password, const struct AccessItem *aconf)
1320 > bool
1321 > match_conf_password(const char *password, const struct MaskItem *conf)
1322   {
1323    const char *encr = NULL;
1324  
1325 <  if (password == NULL || aconf->passwd == NULL)
1326 <    return 0;
1325 >  if (EmptyString(password) || EmptyString(conf->passwd))
1326 >    return false;
1327  
1328 <  if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1329 <  {
3539 <    /* use first two chars of the password they send in as salt */
3540 <    /* If the password in the conf is MD5, and ircd is linked
3541 <     * to scrypt on FreeBSD, or the standard crypt library on
3542 <     * glibc Linux, then this code will work fine on generating
3543 <     * the proper encrypted hash for comparison.
3544 <     */
3545 <    if (*aconf->passwd)
3546 <      encr = crypt(password, aconf->passwd);
3547 <    else
3548 <      encr = "";
3549 <  }
1328 >  if (conf->flags & CONF_FLAGS_ENCRYPTED)
1329 >    encr = crypt(password, conf->passwd);
1330    else
1331      encr = password;
1332  
1333 <  return !strcmp(encr, aconf->passwd);
3554 < }
3555 <
3556 < /*
3557 < * cluster_a_line
3558 < *
3559 < * inputs       - client sending the cluster
3560 < *              - command name "KLINE" "XLINE" etc.
3561 < *              - capab -- CAP_KLN etc. from s_serv.h
3562 < *              - cluster type -- CLUSTER_KLINE etc. from s_conf.h
3563 < *              - pattern and args to send along
3564 < * output       - none
3565 < * side effects - Take source_p send the pattern with args given
3566 < *                along to all servers that match capab and cluster type
3567 < */
3568 < void
3569 < cluster_a_line(struct Client *source_p, const char *command,
3570 <               int capab, int cluster_type, const char *pattern, ...)
3571 < {
3572 <  va_list args;
3573 <  char buffer[IRCD_BUFSIZE];
3574 <  struct ConfItem *conf;
3575 <  dlink_node *ptr;
3576 <
3577 <  va_start(args, pattern);
3578 <  vsnprintf(buffer, sizeof(buffer), pattern, args);
3579 <  va_end(args);
3580 <
3581 <  DLINK_FOREACH(ptr, cluster_items.head)
3582 <  {
3583 <    conf = ptr->data;
3584 <
3585 <    if (conf->flags & cluster_type)
3586 <    {
3587 <      sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
3588 <                         "%s %s %s", command, conf->name, buffer);
3589 <    }
3590 <  }
1333 >  return encr && strcmp(encr, conf->passwd) == 0;
1334   }
1335  
1336   /*
# Line 3618 | Line 1361 | cluster_a_line(struct Client *source_p,
1361   * @                            *       *       *
1362   * !                            *       *       *
1363   */
3621
1364   void
1365 < split_nuh(char *mask, char **nick, char **user, char **host)
1365 > split_nuh(struct split_nuh_item *const iptr)
1366   {
1367    char *p = NULL, *q = NULL;
1368  
1369 <  if ((p = strchr(mask, '!')) != NULL)
1370 <  {
3629 <    *p = '\0';
3630 <    if (nick != NULL)
3631 <    {
3632 <      if (*mask != '\0')
3633 <        *nick = xstrldup(mask, NICKLEN);
3634 <      else
3635 <        DupString(*nick, "*");
3636 <    }
1369 >  if (iptr->nickptr)
1370 >    strlcpy(iptr->nickptr, "*", iptr->nicksize);
1371  
1372 <    if ((q = strchr(++p, '@')) != NULL)
1373 <    {
3640 <      *q = '\0';
3641 <
3642 <      if (*p != '\0')
3643 <        *user = xstrldup(p, USERLEN+1);
3644 <      else
3645 <        DupString(*user, "*");
1372 >  if (iptr->userptr)
1373 >    strlcpy(iptr->userptr, "*", iptr->usersize);
1374  
1375 <      if (*++q != '\0')
1376 <        *host = xstrldup(q, HOSTLEN+1);
3649 <      else
3650 <        DupString(*host, "*");
3651 <    }
3652 <    else
3653 <    {
3654 <      if (*p != '\0')
3655 <        *user = xstrldup(p, USERLEN+1);
3656 <      else
3657 <        DupString(*user, "*");
1375 >  if (iptr->hostptr)
1376 >    strlcpy(iptr->hostptr, "*", iptr->hostsize);
1377  
1378 <      DupString(*host, "*");
3660 <    }
3661 <  }
3662 <  else  /* No ! found so lets look for a user@host */
1378 >  if ((p = strchr(iptr->nuhmask, '!')))
1379    {
1380 <    if ((p = strchr(mask, '@')) != NULL)        /* if found a @ */
3665 <    {
3666 <      if (nick != NULL)
3667 <        DupString(*nick, "*");
3668 <      *p = '\0';
1380 >    *p = '\0';
1381  
1382 <      if (*mask != '\0')
1383 <        *user = xstrldup(mask, USERLEN+1);
3672 <      else
3673 <        DupString(*user, "*");
1382 >    if (iptr->nickptr && *iptr->nuhmask)
1383 >      strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1384  
1385 <      if (*++p != '\0')
3676 <        *host = xstrldup(p, HOSTLEN+1);
3677 <      else
3678 <        DupString(*host, "*");
3679 <    }
3680 <    else                                        /* no @ found */
1385 >    if ((q = strchr(++p, '@')))
1386      {
1387 <      if (nick != NULL)
3683 <      {
3684 <        if (strpbrk(mask, ".:"))
3685 <        {
3686 <          DupString(*nick, "*");
3687 <          *host = xstrldup(mask, HOSTLEN+1);
3688 <        }
3689 <        else
3690 <        {
3691 <          *nick = xstrldup(mask, NICKLEN);
3692 <          DupString(*host, "*");
3693 <        }
1387 >      *q++ = '\0';
1388  
1389 <        DupString(*user, "*");
1390 <      }
3697 <      else
3698 <      {
3699 <        DupString(*user, "*");
3700 <        *host = xstrldup(mask, HOSTLEN+1);
3701 <      }
3702 <    }
3703 <  }
3704 < }
3705 <
3706 < /*
3707 < * flags_to_ascii
3708 < *
3709 < * inputs       - flags is a bitmask
3710 < *              - pointer to table of ascii letters corresponding
3711 < *                to each bit
3712 < *              - flag 1 for convert ToLower if bit missing
3713 < *                0 if ignore.
3714 < * output       - none
3715 < * side effects - string pointed to by p has bitmap chars written to it
3716 < */
3717 < static void
3718 < flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3719 <               int lowerit)
3720 < {
3721 <  unsigned int mask = 1;
3722 <  int i = 0;
1389 >      if (*p)
1390 >        strlcpy(iptr->userptr, p, iptr->usersize);
1391  
1392 <  for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
1393 <  {
3726 <    if (flags & mask)
3727 <      *p++ = bit_table[i];
3728 <    else if(lowerit)
3729 <      *p++ = ToLower(bit_table[i]);
3730 <  }
3731 <  *p = '\0';
3732 < }
3733 <
3734 < /*
3735 < * cidr_limit_reached
3736 < *
3737 < * inputs       - int flag allowing over_rule of limits
3738 < *              - pointer to the ip to be added
3739 < *              - pointer to the class
3740 < * output       - non zero if limit reached
3741 < *                0 if limit not reached
3742 < * side effects -
3743 < */
3744 < static int
3745 < cidr_limit_reached(int over_rule,
3746 <                   struct irc_ssaddr *ip, struct ClassItem *aclass)
3747 < {
3748 <  dlink_node *ptr = NULL;
3749 <  struct CidrItem *cidr;
3750 <
3751 <  if (NumberPerCidr(aclass) <= 0)
3752 <    return 0;
3753 <
3754 <  if (ip->ss.ss_family == AF_INET)
3755 <  {
3756 <    if (CidrBitlenIPV4(aclass) <= 0)
3757 <      return 0;
3758 <
3759 <    DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3760 <    {
3761 <      cidr = ptr->data;
3762 <      if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3763 <      {
3764 <        if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3765 <          return -1;
3766 <        cidr->number_on_this_cidr++;
3767 <        return 0;
3768 <      }
3769 <    }
3770 <    cidr = MyMalloc(sizeof(struct CidrItem));
3771 <    cidr->number_on_this_cidr = 1;
3772 <    cidr->mask = *ip;
3773 <    mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3774 <    dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3775 <  }
3776 < #ifdef IPV6
3777 <  else if (CidrBitlenIPV6(aclass) > 0)
3778 <  {
3779 <    DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3780 <    {
3781 <      cidr = ptr->data;
3782 <      if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3783 <      {
3784 <        if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3785 <          return -1;
3786 <        cidr->number_on_this_cidr++;
3787 <        return 0;
3788 <      }
1392 >      if (*q)
1393 >        strlcpy(iptr->hostptr, q, iptr->hostsize);
1394      }
1395 <    cidr = MyMalloc(sizeof(struct CidrItem));
3791 <    cidr->number_on_this_cidr = 1;
3792 <    cidr->mask = *ip;
3793 <    mask_addr(&cidr->mask, CidrBitlenIPV6(aclass));
3794 <    dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3795 <  }
3796 < #endif
3797 <  return 0;
3798 < }
3799 <
3800 < /*
3801 < * remove_from_cidr_check
3802 < *
3803 < * inputs       - pointer to the ip to be removed
3804 < *              - pointer to the class
3805 < * output       - NONE
3806 < * side effects -
3807 < */
3808 < static void
3809 < remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3810 < {
3811 <  dlink_node *ptr = NULL;
3812 <  dlink_node *next_ptr = NULL;
3813 <  struct CidrItem *cidr;
3814 <
3815 <  if (NumberPerCidr(aclass) == 0)
3816 <    return;
3817 <
3818 <  if (ip->ss.ss_family == AF_INET)
3819 <  {
3820 <    if (CidrBitlenIPV4(aclass) <= 0)
3821 <      return;
3822 <
3823 <    DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
1395 >    else
1396      {
1397 <      cidr = ptr->data;
1398 <      if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3827 <      {
3828 <        cidr->number_on_this_cidr--;
3829 <        if (cidr->number_on_this_cidr == 0)
3830 <        {
3831 <          dlinkDelete(ptr, &aclass->list_ipv4);
3832 <          MyFree(cidr);
3833 <          return;
3834 <        }
3835 <      }
1397 >      if (*p)
1398 >        strlcpy(iptr->userptr, p, iptr->usersize);
1399      }
1400    }
1401 < #ifdef IPV6
3839 <  else if (CidrBitlenIPV6(aclass) > 0)
1401 >  else
1402    {
1403 <    DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
1403 >    /* No ! found so lets look for a user@host */
1404 >    if ((p = strchr(iptr->nuhmask, '@')))
1405      {
1406 <      cidr = ptr->data;
1407 <      if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3845 <      {
3846 <        cidr->number_on_this_cidr--;
3847 <        if (cidr->number_on_this_cidr == 0)
3848 <        {
3849 <          dlinkDelete(ptr, &aclass->list_ipv6);
3850 <          MyFree(cidr);
3851 <          return;
3852 <        }
3853 <      }
3854 <    }
3855 <  }
3856 < #endif
3857 < }
1406 >      /* if found a @ */
1407 >      *p++ = '\0';
1408  
1409 < static void
1410 < rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3861 <                  dlink_list *old_list, dlink_list *new_list, int changed)
3862 < {
3863 <  dlink_node *ptr;
3864 <  struct Client *client_p;
3865 <  struct ConfItem *conf;
3866 <  struct AccessItem *aconf;
3867 <
3868 <  if (!changed)
3869 <  {
3870 <    *new_list = *old_list;
3871 <    old_list->head = old_list->tail = NULL;
3872 <    old_list->length = 0;
3873 <    return;
3874 <  }
3875 <
3876 <  DLINK_FOREACH(ptr, local_client_list.head)
3877 <  {
3878 <    client_p = ptr->data;
3879 <    if (client_p->localClient->aftype != aftype)
3880 <      continue;
3881 <    if (dlink_list_length(&client_p->localClient->confs) == 0)
3882 <      continue;
1409 >      if (*iptr->nuhmask)
1410 >        strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1411  
1412 <    conf = client_p->localClient->confs.tail->data;
1413 <    if (conf->type == CLIENT_TYPE)
1412 >      if (*p)
1413 >        strlcpy(iptr->hostptr, p, iptr->hostsize);
1414 >    }
1415 >    else
1416      {
1417 <      aconf = map_to_conf(conf);
1418 <      if (aconf->class_ptr == oldcl)
1419 <        cidr_limit_reached(1, &client_p->localClient->ip, newcl);
1417 >      /* No @ found */
1418 >      if (iptr->nickptr == NULL || strpbrk(iptr->nuhmask, ".:"))
1419 >        strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1420 >      else
1421 >        strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1422      }
1423    }
1424   }
3893
3894 /*
3895 * rebuild_cidr_class
3896 *
3897 * inputs       - pointer to old conf
3898 *              - pointer to new_class
3899 * output       - none
3900 * side effects - rebuilds the class link list of cidr blocks
3901 */
3902 void
3903 rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3904 {
3905  struct ClassItem *old_class = map_to_conf(conf);
3906
3907  if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3908  {
3909    if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3910      rebuild_cidr_list(AF_INET, conf, new_class,
3911                        &old_class->list_ipv4, &new_class->list_ipv4,
3912                        CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3913
3914 #ifdef IPV6
3915    if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3916      rebuild_cidr_list(AF_INET6, conf, new_class,
3917                        &old_class->list_ipv6, &new_class->list_ipv6,
3918                        CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3919 #endif
3920  }
3921
3922  destroy_cidr_class(old_class);
3923 }
3924
3925 /*
3926 * destroy_cidr_list
3927 *
3928 * inputs       - pointer to class dlink list of cidr blocks
3929 * output       - none
3930 * side effects - completely destroys the class link list of cidr blocks
3931 */
3932 static void
3933 destroy_cidr_list(dlink_list *list)
3934 {
3935  dlink_node *ptr = NULL;
3936  dlink_node *next_ptr = NULL;
3937  struct CidrItem *cidr;
3938
3939  DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3940  {
3941    cidr = ptr->data;
3942    dlinkDelete(ptr, list);
3943    MyFree(cidr);
3944  }
3945 }
3946
3947 /*
3948 * destroy_cidr_class
3949 *
3950 * inputs       - pointer to class
3951 * output       - none
3952 * side effects - completely destroys the class link list of cidr blocks
3953 */
3954 static void
3955 destroy_cidr_class(struct ClassItem *aclass)
3956 {
3957  destroy_cidr_list(&aclass->list_ipv4);
3958  destroy_cidr_list(&aclass->list_ipv6);
3959 }

Comparing:
ircd-hybrid-7.2/src/s_conf.c (property svn:keywords), Revision 201 by adx, Tue Nov 1 11:41:52 2005 UTC vs.
ircd-hybrid/trunk/src/conf.c (property svn:keywords), Revision 9638 by michael, Tue Sep 29 12:49:07 2020 UTC

# Line 1 | Line 1
1 < Id Revision
1 > Id

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines