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

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

Comparing:
ircd-hybrid-7.2/src/s_conf.c (property svn:keywords), Revision 896 by michael, Sat Nov 3 08:54:09 2007 UTC vs.
ircd-hybrid/branches/8.2.x/src/conf.c (property svn:keywords), Revision 9109 by michael, Sat Jan 4 15:16:39 2020 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines