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 9595 by michael, Fri Sep 4 16:48:45 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 >    *conf->addr = *addr;
102 >  else
103 >    conf->dns_failed = true;
104   }
105  
106 < /* conf_dns_lookup()
106 > /* conf_resolve_host()
107   *
108 < * do a nameserver lookup of the conf host
109 < * if the conf entry is currently doing a ns lookup do nothing, otherwise
196 < * allocate a dns_query and start ns lookup.
108 > * start DNS lookups of all hostnames in the conf
109 > * line and convert an IP addresses in a.b.c.d number for to IP#s.
110   */
111 < static void
112 < conf_dns_lookup(struct AccessItem *aconf)
111 > void
112 > conf_dns_lookup(struct MaskItem *conf)
113   {
114 <  if (aconf->dns_query == NULL)
202 <  {
203 <    aconf->dns_query = MyMalloc(sizeof(struct DNSQuery));
204 <    aconf->dns_query->ptr = aconf;
205 <    aconf->dns_query->callback = conf_dns_callback;
206 <    gethost_byname(aconf->host, aconf->dns_query);
207 <  }
208 < }
114 >  struct addrinfo hints, *res;
115  
116 < /* make_conf_item()
117 < *
118 < * inputs       - type of item
119 < * output       - pointer to new conf entry
120 < * side effects - none
215 < */
216 < struct ConfItem *
217 < make_conf_item(ConfType type)
218 < {
219 <  struct ConfItem *conf = NULL;
220 <  struct AccessItem *aconf = NULL;
221 <  struct ClassItem *aclass = NULL;
222 <  int status = 0;
116 >  /*
117 >   * Do name lookup now on hostnames given and store the
118 >   * ip numbers in conf structure.
119 >   */
120 >  memset(&hints, 0, sizeof(hints));
121  
122 <  switch (type)
122 >  hints.ai_family = AF_UNSPEC;
123 >  hints.ai_socktype = SOCK_STREAM;
124 >
125 >  /* Get us ready for a bind() and don't bother doing dns lookup */
126 >  hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
127 >
128 >  if (getaddrinfo(conf->host, NULL, &hints, &res))
129    {
130 <  case DLINE_TYPE:
131 <  case EXEMPTDLINE_TYPE:
132 <  case GLINE_TYPE:
133 <  case KLINE_TYPE:
134 <  case CLIENT_TYPE:
135 <  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;
130 >    /*
131 >     * By this point conf->host possibly is not a numerical network address. Do a nameserver
132 >     * lookup of the conf host. If the conf entry is currently doing a ns lookup do nothing.
133 >     */
134 >    if (conf->dns_pending == true)
135 >      return;
136  
137 <    /* Yes, sigh. switch on type again */
239 <    switch (type)
240 <    {
241 <    case EXEMPTDLINE_TYPE:
242 <      status = CONF_EXEMPTDLINE;
243 <      break;
137 >    conf->dns_pending = true;
138  
139 <    case DLINE_TYPE:
140 <      status = CONF_DLINE;
141 <      break;
139 >    if (conf->aftype == AF_INET)
140 >      gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
141 >    else
142 >      gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
143 >    return;
144 >  }
145  
146 <    case KLINE_TYPE:
250 <      status = CONF_KLINE;
251 <      break;
146 >  assert(res);
147  
148 <    case GLINE_TYPE:
149 <      status = CONF_GLINE;
255 <      break;
148 >  memcpy(conf->addr, res->ai_addr, res->ai_addrlen);
149 >  conf->addr->ss_len = res->ai_addrlen;
150  
151 <    case CLIENT_TYPE:
152 <      status = CONF_CLIENT;
259 <      break;
151 >  freeaddrinfo(res);
152 > }
153  
154 <    case OPER_TYPE:
155 <      status = CONF_OPERATOR;
156 <      dlinkAdd(conf, &conf->node, &oconf_items);
154 > /* map_to_list()
155 > *
156 > * inputs       - ConfType conf
157 > * output       - pointer to dlink_list to use
158 > * side effects - none
159 > */
160 > static dlink_list *
161 > map_to_list(enum maskitem_type type)
162 > {
163 >  switch (type)
164 >  {
165 >    case CONF_OPER:
166 >      return &operator_items;
167        break;
168 <
169 <    case SERVER_TYPE:
267 <      status = CONF_SERVER;
268 <      dlinkAdd(conf, &conf->node, &server_items);
168 >    case CONF_SERVER:
169 >      return &connect_items;
170        break;
270
171      default:
172 <      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;
172 >      return NULL;
173    }
174 + }
175 +
176 + struct MaskItem *
177 + conf_make(enum maskitem_type type)
178 + {
179 +  struct MaskItem *const conf = xcalloc(sizeof(*conf));
180 +  dlink_list *list = NULL;
181  
182 <  /* XXX Yes, this will core if default is hit. I want it to for now - db */
183 <  conf->type = type;
182 >  conf->type   = type;
183 >  conf->active = true;
184 >  conf->aftype = AF_INET;
185  
186 +  if ((list = map_to_list(type)))
187 +    dlinkAdd(conf, &conf->node, list);
188    return conf;
189   }
190  
191   void
192 < delete_conf_item(struct ConfItem *conf)
192 > conf_free(struct MaskItem *conf)
193   {
194 <  dlink_node *m = NULL;
195 <  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);
194 >  dlink_node *node = NULL, *node_next = NULL;
195 >  dlink_list *list = NULL;
196  
197 <    if (aconf->dns_query != NULL)
198 <    {
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
197 >  if ((list = map_to_list(conf->type)))
198 >    dlinkFindDelete(list, conf);
199  
200 <    /* 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;
200 >  xfree(conf->name);
201  
202 <    case OPER_TYPE:
203 <      aconf = map_to_conf(conf);
204 <      if (!IsConfIllegal(aconf))
205 <        dlinkDelete(&conf->node, &oconf_items);
206 <      MyFree(conf);
207 <      break;
202 >  if (conf->dns_pending == true)
203 >    delete_resolver_queries(conf);
204 >  if (conf->passwd)
205 >    memset(conf->passwd, 0, strlen(conf->passwd));
206 >  if (conf->spasswd)
207 >    memset(conf->spasswd, 0, strlen(conf->spasswd));
208  
209 <    case SERVER_TYPE:
427 <      aconf = map_to_conf(conf);
428 <      if (!IsConfIllegal(aconf))
429 <        dlinkDelete(&conf->node, &server_items);
430 <      MyFree(conf);
431 <      break;
209 >  conf->class = NULL;
210  
211 <    default:
212 <      break;
213 <    }
214 <    break;
211 >  xfree(conf->passwd);
212 >  xfree(conf->spasswd);
213 >  xfree(conf->reason);
214 >  xfree(conf->certfp);
215 >  xfree(conf->whois);
216 >  xfree(conf->user);
217 >  xfree(conf->host);
218 >  xfree(conf->addr);
219 >  xfree(conf->bind);
220 >  xfree(conf->cipher_list);
221  
222 <  case HUB_TYPE:
223 <    match_item = map_to_conf(conf);
224 <    MyFree(match_item->user);
225 <    MyFree(match_item->host);
226 <    MyFree(match_item->reason);
227 <    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;
222 >  DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
223 >  {
224 >    xfree(node->data);
225 >    dlinkDelete(node, &conf->hub_list);
226 >    free_dlink_node(node);
227 >  }
228  
229 <  default:
230 <    break;
229 >  DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
230 >  {
231 >    xfree(node->data);
232 >    dlinkDelete(node, &conf->leaf_list);
233 >    free_dlink_node(node);
234    }
235 +
236 +  xfree(conf);
237   }
238  
239 < /* free_access_item()
239 > /* attach_iline()
240   *
241 < * inputs       - pointer to conf to free
242 < * output       - none
243 < * side effects - crucial password fields are zeroed, conf is freed
241 > * inputs       - client pointer
242 > *              - conf pointer
243 > * output       -
244 > * side effects - do actual attach
245   */
246 < void
247 < free_access_item(struct AccessItem *aconf)
246 > static int
247 > attach_iline(struct Client *client, struct MaskItem *conf)
248   {
249 <  struct ConfItem *conf;
249 >  const struct ClassItem *const class = conf->class;
250 >  bool a_limit_reached = false;
251  
252 <  if (aconf == NULL)
253 <    return;
254 <  conf = unmap_conf_item(aconf);
255 <  delete_conf_item(conf);
256 < }
252 >  struct ip_entry *ipcache = ipcache_record_find_or_add(&client->ip);
253 >  ++ipcache->count_local;
254 >  AddFlag(client, FLAGS_IPHASH);
255 >
256 >  if (class->max_total && class->ref_count >= class->max_total)
257 >    a_limit_reached = true;
258 >  else if (class->max_perip_local && ipcache->count_local > class->max_perip_local)
259 >    a_limit_reached = true;
260 >  else if (class->max_perip_global &&
261 >           (ipcache->count_local + ipcache->count_remote) > class->max_perip_global)
262 >    a_limit_reached = true;
263 >
264 >  if (a_limit_reached == true)
265 >  {
266 >    if (!IsConfExemptLimits(conf))
267 >      return TOO_MANY;   /* Already at maximum allowed */
268  
269 < static const unsigned int shared_bit_table[] =
270 <  { 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
269 >    sendto_one_notice(client, &me, ":*** Your connection class is full, "
270 >                      "but you have exceed_limit = yes;");
271 >  }
272  
273 < /* report_confitem_types()
273 >  return conf_attach(client, conf);
274 > }
275 >
276 > /* verify_access()
277   *
278 < * inputs       - pointer to client requesting confitem report
279 < *              - ConfType to report
280 < * output       - none
576 < * side effects -
278 > * inputs       - pointer to client to verify
279 > * output       - 0 if success -'ve if not
280 > * side effect  - find the first (best) I line to attach.
281   */
282 < void
283 < report_confitem_types(struct Client *source_p, ConfType type, int temp)
282 > static int
283 > verify_access(struct Client *client)
284   {
285 <  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;
285 >  struct MaskItem *conf;
286  
287 <  switch (type)
287 >  if (HasFlag(client, FLAGS_GOTID))
288 >    conf = find_address_conf(client->host, client->username, &client->ip,
289 >                             client->connection->password);
290 >  else
291    {
292 <  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';
292 >    char non_ident[USERLEN + 1] = "~";
293  
294 <      sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
295 <                 me.name, RPL_STATSDEBUG, source_p->name,
296 <                 aconf->user, aconf->host, conf->name, buf);
297 <    }
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;
715 <
716 <  case CLASS_TYPE:
717 <    DLINK_FOREACH(ptr, class_items.head)
718 <    {
719 <      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;
294 >    strlcpy(non_ident + 1, client->username, sizeof(non_ident) - 1);
295 >    conf = find_address_conf(client->host, non_ident, &client->ip,
296 >                             client->connection->password);
297 >  }
298  
299 <  case SERVER_TYPE:
300 <    DLINK_FOREACH(ptr, server_items.head)
737 <    {
738 <      p = buf;
299 >  if (conf == NULL)
300 >    return NOT_AUTHORIZED;
301  
302 <      conf = ptr->data;
741 <      aconf = map_to_conf(conf);
302 >  assert(IsConfClient(conf) || IsConfKill(conf));
303  
304 <      buf[0] = '\0';
304 >  if (IsConfKill(conf))
305 >  {
306 >    sendto_one_notice(client, &me, ":*** Banned: %s", conf->reason);
307 >    return BANNED_CLIENT;
308 >  }
309  
310 <      if (IsConfAllowAutoConn(aconf))
311 <        *p++ = 'A';
312 <      if (IsConfCryptLink(aconf))
313 <        *p++ = 'C';
314 <      if (aconf->fakename)
315 <        *p++ = 'M';
316 <      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;
310 >  if (IsConfRedir(conf))
311 >  {
312 >    sendto_one_numeric(client, &me, RPL_REDIR,
313 >                       conf->name ? conf->name : "",
314 >                       conf->port);
315 >    return NOT_AUTHORIZED;
316 >  }
317  
318 <  case HUB_TYPE:
319 <    DLINK_FOREACH(ptr, hub_items.head)
778 <    {
779 <      conf = ptr->data;
780 <      matchitem = map_to_conf(conf);
781 <      sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
782 <                 source_p->name, 'H', matchitem->host, conf->name, 0, "*");
783 <    }
784 <    break;
318 >  /* Preserve x->host in x->realhost before it gets overwritten. */
319 >  strlcpy(client->realhost, client->host, sizeof(client->realhost));
320  
321 <  case LEAF_TYPE:
322 <    DLINK_FOREACH(ptr, leaf_items.head)
788 <    {
789 <      conf = ptr->data;
790 <      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;
321 >  if (IsConfDoSpoofIp(conf))
322 >    strlcpy(client->host, conf->name, sizeof(client->host));
323  
324 <  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;
804 <  }
324 >  return attach_iline(client, conf);
325   }
326  
327   /* check_client()
# Line 817 | Line 337 | report_confitem_types(struct Client *sou
337   *                Look for conf lines which have the same
338   *                status as the flags passed.
339   */
340 < static void *
341 < check_client(va_list args)
340 > bool
341 > conf_check_client(struct Client *client)
342   {
823  struct Client *source_p = va_arg(args, struct Client *);
824  const char *username = va_arg(args, const char *);
343    int i;
344 <
345 <  /* I'm already in big trouble if source_p->localClient is NULL -db */
346 <  if ((i = verify_access(source_p, username)))
347 <    ilog(L_INFO, "Access denied: %s[%s]",
830 <         source_p->name, source_p->sockhost);
344 >
345 >  if ((i = verify_access(client)))
346 >    ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
347 >         client->name, client->sockhost);
348  
349    switch (i)
350    {
351      case TOO_MANY:
352 <      sendto_realops_flags(UMODE_FULL, L_ALL,
352 >      sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
353                             "Too many on IP for %s (%s).",
354 <                           get_client_name(source_p, SHOW_IP),
355 <                           source_p->sockhost);
356 <      ilog(L_INFO,"Too many connections on IP from %s.",
357 <           get_client_name(source_p, SHOW_IP));
354 >                           client_get_name(client, SHOW_IP),
355 >                           client->sockhost);
356 >      ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
357 >           client_get_name(client, SHOW_IP));
358        ++ServerStats.is_ref;
359 <      exit_client(source_p, &me, "No more connections allowed on that IP");
359 >      exit_client(client, "No more connections allowed on that IP");
360        break;
361  
362      case I_LINE_FULL:
363 <      sendto_realops_flags(UMODE_FULL, L_ALL,
364 <                           "I-line is full for %s (%s).",
365 <                           get_client_name(source_p, SHOW_IP),
366 <                           source_p->sockhost);
367 <      ilog(L_INFO,"Too many connections from %s.",
368 <           get_client_name(source_p, SHOW_IP));
363 >      sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
364 >                           "auth {} block is full for %s (%s).",
365 >                           client_get_name(client, SHOW_IP),
366 >                           client->sockhost);
367 >      ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
368 >           client_get_name(client, SHOW_IP));
369        ++ServerStats.is_ref;
370 <      exit_client(source_p, &me,
854 <                "No more connections allowed in your connection class");
370 >      exit_client(client, "No more connections allowed in your connection class");
371        break;
372  
373      case NOT_AUTHORIZED:
858      ++ServerStats.is_ref;
374        /* jdc - lists server name & port connections are on */
375        /*       a purely cosmetical change */
376 <      sendto_realops_flags(UMODE_UNAUTH, L_ALL,
377 <                           "Unauthorized client connection from %s [%s] on [%s/%u].",
378 <                           get_client_name(source_p, SHOW_IP),
379 <                           source_p->sockhost,
380 <                           source_p->localClient->listener->name,
381 <                           source_p->localClient->listener->port);
382 <      ilog(L_INFO,
383 <          "Unauthorized client connection from %s on [%s/%u].",
384 <          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 <  }
376 >      sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
377 >                           "Unauthorized client connection from %s on [%s/%u].",
378 >                           client_get_name(client, SHOW_IP),
379 >                           client->connection->listener->name,
380 >                           client->connection->listener->port);
381 >      ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
382 >           client_get_name(client, SHOW_IP),
383 >           client->connection->listener->name,
384 >           client->connection->listener->port);
385  
386 <  return (i < 0 ? NULL : source_p);
387 < }
388 <
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 <  }
993 <
994 <  return(NOT_AUTHORIZED);
995 < }
996 <
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;
386 >      ++ServerStats.is_ref;
387 >      exit_client(client, "You are not authorized to use this server");
388 >      break;
389  
390 <  if (a_limit_reached)
391 <  {
392 <    if (!IsConfExemptLimits(aconf))
393 <      return TOO_MANY;   /* Already at maximum allowed */
390 >    case BANNED_CLIENT:
391 >      ++ServerStats.is_ref;
392 >      exit_client(client, "Banned");
393 >      break;
394  
395 <    sendto_one(client_p,
396 <               ":%s NOTICE %s :*** Your connection class is full, "
397 <               "but you have exceed_limit = yes;", me.name, client_p->name);
395 >    case 0:
396 >    default:
397 >      break;
398    }
399  
400 <  return attach_conf(client_p, conf);
400 >  if (i < 0)
401 >    return false;
402 >  return true;
403   }
404  
405 < /* init_ip_hash_table()
406 < *
407 < * inputs               - NONE
408 < * output               - NONE
1059 < * side effects         - allocate memory for ip_entry(s)
1060 < *                      - clear the ip hash table
405 > /*! \brief Disassociate configuration from the client. Also removes a class
406 > *         from the list if marked for deleting.
407 > * \param client Client to operate on
408 > * \param type     Type of conf to detach
409   */
410   void
411 < 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)
411 > conf_detach(struct Client *client, enum maskitem_type type)
412   {
413 <  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
413 >  dlink_node *node, *node_next;
414  
415 <  for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
415 >  DLINK_FOREACH_SAFE(node, node_next, client->connection->confs.head)
416    {
417 < #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 <  }
1111 <
1112 <  if (ip_entries_count >= 2 * hard_fdlimit)
1113 <    garbage_collect_ip_entries();
1114 <
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;
417 >    struct MaskItem *conf = node->data;
418  
419 <  return newptr;
420 < }
421 <
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
419 >    assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
420 >    assert(conf->ref_count > 0);
421 >    assert(conf->class->ref_count > 0);
422  
423 <  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)
423 >    if (!(conf->type & type))
424        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 }
1180
1181 /* hash_ip()
1182 *
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;
425  
426 <    ip   = ntohl(v4->sin_addr.s_addr);
427 <    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 < }
426 >    dlinkDelete(node, &client->connection->confs);
427 >    free_dlink_node(node);
428  
429 < /* count_ip_hash()
430 < *
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;
429 >    if (conf->type == CONF_CLIENT)
430 >      class_ip_limit_remove(conf->class, &client->ip);
431  
432 <  for (i = 0; i < IP_HASH_SIZE; i++)
1238 <  {
1239 <    for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
432 >    if (--conf->class->ref_count == 0 && conf->class->active == false)
433      {
434 <      *number_ips_stored += 1;
435 <      *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)
1266 <    {
1267 <      next_ptr = ptr->next;
1268 <
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;
434 >      class_free(conf->class);
435 >      conf->class = NULL;
436      }
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);
1311
1312      switch (conf->type)
1313      {
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);
437  
438 <          assert(aclass->curr_user_count > 0);
439 <
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 <    }
438 >    if (--conf->ref_count == 0 && conf->active == false)
439 >      conf_free(conf);
440    }
1352
1353  return -1;
441   }
442  
443 < /* attach_conf()
444 < *
445 < * inputs       - client pointer
446 < *              - conf pointer
447 < * 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...
443 > /*! \brief Associate a specific configuration entry to a *local* client (this
444 > *         is the one which used in accepting the connection). Note, that this
445 > *         automatically changes the attachment if there was an old one.
446 > * \param client Client to attach the conf to
447 > * \param conf Configuration record to attach
448   */
449   int
450 < attach_conf(struct Client *client_p, struct ConfItem *conf)
450 > conf_attach(struct Client *client, struct MaskItem *conf)
451   {
452 <  if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
452 >  if (dlinkFind(&client->connection->confs, conf))
453      return 1;
454  
455 <  if (conf->type == CLIENT_TYPE ||
456 <      conf->type == SERVER_TYPE ||
457 <      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 < }
455 >  if (conf->type == CONF_CLIENT)
456 >    if (class_ip_limit_add(conf->class, &client->ip, IsConfExemptLimits(conf)) == true)
457 >      return TOO_MANY;    /* Already at maximum allowed */
458  
459 < /* attach_connect_block()
460 < *
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;
459 >  conf->class->ref_count++;
460 >  conf->ref_count++;
461  
462 <  assert(client_p != NULL);
1418 <  assert(host != NULL);
1419 <
1420 <  if (client_p == NULL || host == NULL)
1421 <    return 0;
1422 <
1423 <  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 <  }
462 >  dlinkAdd(conf, make_dlink_node(), &client->connection->confs);
463  
464    return 0;
465   }
466  
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
467   /* find_conf_name()
468   *
469   * inputs       - pointer to conf link list to search
# Line 1499 | Line 473 | find_conf_exact(ConfType type, const cha
473   * side effects - find a conf entry which matches the name
474   *                and has the given mask.
475   */
476 < struct ConfItem *
477 < find_conf_name(dlink_list *list, const char *name, ConfType type)
476 > struct MaskItem *
477 > find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
478   {
479 <  dlink_node *ptr;
1506 <  struct ConfItem* conf;
479 >  dlink_node *node = NULL;
480  
481 <  DLINK_FOREACH(ptr, list->head)
481 >  DLINK_FOREACH(node, list->head)
482    {
483 <    conf = ptr->data;
484 <    
483 >    struct MaskItem *conf = node->data;
484 >
485      if (conf->type == type)
486      {
487 <      if (conf->name && (irccmp(conf->name, name) == 0 ||
488 <                         match(conf->name, name)))
1516 <      return conf;
487 >      if (conf->name && !irccmp(conf->name, name))
488 >        return conf;
489      }
490    }
491  
492    return NULL;
493   }
494  
495 < /* map_to_list()
496 < *
497 < * inputs       - ConfType conf
1526 < * output       - pointer to dlink_list to use
1527 < * side effects - none
495 > /*! \brief Find a connect {} conf that has a name that matches \a name.
496 > * \param name Name to match
497 > * \param compare Pointer to function to be used for string matching
498   */
499 < static dlink_list *
500 < map_to_list(ConfType type)
499 > struct MaskItem *
500 > connect_find(const char *name, int (*compare)(const char *, const char *))
501   {
502 <  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 < }
502 >  dlink_node *node;
503  
504 < /* 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);
1587 <
1588 <  switch (type)
504 >  DLINK_FOREACH(node, connect_items.head)
505    {
506 <    case RXLINE_TYPE:
1591 <      DLINK_FOREACH(ptr, list_p->head)
1592 <      {
1593 <        conf = ptr->data;
1594 <        assert(conf->regexpname);
506 >    struct MaskItem *conf = node->data;
507  
508 <        if (!ircd_pcre_exec(conf->regexpname, name))
509 <          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);
1630 <
1631 <      if ((name != NULL) && match_esc(name, conf->name))
1632 <        return conf;
1633 <      else if ((host != NULL) && match_esc(host, aconf->host))
1634 <        return conf;
1635 <    }
1636 <    break;
1637 <  
1638 <  default:
1639 <    break;
508 >    if (compare(name, conf->name) == 0)
509 >      return conf;
510    }
511 +
512    return NULL;
513   }
514  
# Line 1647 | Line 518 | find_matching_name_conf(ConfType type, c
518   *              - pointer to name string to find
519   *              - pointer to user
520   *              - pointer to host
521 < * output       - NULL or pointer to found struct MatchItem
521 > * output       - NULL or pointer to found struct MaskItem
522   * side effects - looks for an exact match on name field
523   */
524 < struct ConfItem *
525 < find_exact_name_conf(ConfType type, const char *name,
526 <                     const char *user, const char *host)
527 < {
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:
524 > struct MaskItem *
525 > operator_find(const struct Client *client, const char *name)
526 > {
527 >  dlink_node *node;
528  
529 <    DLINK_FOREACH(ptr, list_p->head)
530 <    {
531 <      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;
529 >  DLINK_FOREACH(node, operator_items.head)
530 >  {
531 >    struct MaskItem *conf = node->data;
532  
533 <  case OPER_TYPE:
1692 <    DLINK_FOREACH(ptr, list_p->head)
533 >    if (irccmp(conf->name, name) == 0)
534      {
535 <      conf = ptr->data;
536 <      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;
535 >      if (client == NULL)
536 >        return conf;
537  
538 <  case SERVER_TYPE:
539 <    DLINK_FOREACH(ptr, list_p->head)
540 <    {
541 <      conf = ptr->data;
542 <      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)
538 >      if (conf->class->max_total &&
539 >          conf->class->max_total <= conf->class->ref_count)
540 >        continue;
541 >
542 >      if (match(conf->user, client->username) == 0)
543        {
544 <          return (conf);
544 >        switch (conf->htype)
545 >        {
546 >          case HM_HOST:
547 >            if (match(conf->host, client->realhost) == 0 ||
548 >                match(conf->host, client->sockhost) == 0 || match(conf->host, client->host) == 0)
549 >              return conf;
550 >            break;
551 >          case HM_IPV6:
552 >          case HM_IPV4:
553 >            if (address_compare(&client->ip, conf->addr, false, false, conf->bits))
554 >              return conf;
555 >            break;
556 >          default:
557 >            assert(0);
558 >        }
559        }
560      }
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;
561    }
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();
1771
1772  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;
562  
563 <  if (ConfigLoggingEntry.use_logging)
1786 <    reopen_log(logFileName);
1787 <
1788 <  return(0);
563 >  return NULL;
564   }
565  
566 < /* set_default_conf()
566 > /* conf_set_defaults()
567   *
568   * inputs       - NONE
569   * output       - NONE
# Line 1798 | Line 573 | rehash(int sig)
573   *                of values later, put them in validate_conf().
574   */
575   static void
576 < set_default_conf(void)
576 > conf_set_defaults(void)
577   {
578 <  /* verify init_class() ran, this should be an unnecessary check
579 <   * but its not much work.
578 >  /*
579 >   * Verify init_class() ran, this should be an unnecessary check
580 >   * but it's not much work.
581     */
582 <  assert(class_default == (struct ConfItem *) class_items.tail->data);
582 >  assert(class_default == class_get_list()->tail->data);
583  
584 < #ifdef HAVE_LIBCRYPTO
585 <  ServerInfo.rsa_private_key = NULL;
586 <  ServerInfo.rsa_private_key_file = NULL;
587 < #endif
588 <
589 <  /* ServerInfo.name is not rehashable */
590 <  /* ServerInfo.name = ServerInfo.name; */
591 <  ServerInfo.description = NULL;
592 <  DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
593 <  DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
594 <
595 <  memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
596 <  ServerInfo.specific_ipv4_vhost = 0;
597 <  memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
598 <  ServerInfo.specific_ipv6_vhost = 0;
599 <
600 <  ServerInfo.max_clients = MAXCLIENTS_MAX;
601 <  /* Don't reset hub, as that will break lazylinks */
602 <  /* 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;
584 >  ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
585 >  ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
586 >  ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
587 >  ConfigServerInfo.max_nick_length = 9;
588 >  ConfigServerInfo.max_topic_length = 80;
589 >  ConfigServerInfo.hub = 0;
590 >
591 >  log_iterate(log_free);
592 >
593 >  ConfigLog.use_logging = 1;
594 >
595 >  ConfigChannel.enable_extbans = 0;
596 >  ConfigChannel.disable_fake_channels = 0;
597 >  ConfigChannel.invite_client_count = 10;
598 >  ConfigChannel.invite_client_time = 300;
599 >  ConfigChannel.invite_delay_channel = 5;
600 >  ConfigChannel.invite_expire_time = 1800;
601 >  ConfigChannel.knock_client_count = 1;
602 >  ConfigChannel.knock_client_time = 300;
603    ConfigChannel.knock_delay_channel = 60;
604 <  ConfigChannel.max_chans_per_user = 15;
605 <  ConfigChannel.quiet_on_ban = YES;
606 <  ConfigChannel.max_bans = 25;
607 <  ConfigChannel.default_split_user_count = 0;
608 <  ConfigChannel.default_split_server_count = 0;
609 <  ConfigChannel.no_join_on_split = NO;
610 <  ConfigChannel.no_create_on_split = NO;
611 <  ConfigChannel.burst_topicwho = YES;
612 <
613 <  ConfigServerHide.flatten_links = NO;
614 <  ConfigServerHide.links_delay = 300;
615 <  ConfigServerHide.hidden = NO;
616 <  ConfigServerHide.disable_hidden = NO;
617 <  ConfigServerHide.hide_servers = NO;
618 <  DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
619 <  ConfigServerHide.hide_server_ips = NO;
620 <
621 <  
622 <  ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
623 <  ConfigFileEntry.gline_min_cidr = 16;
624 <  ConfigFileEntry.gline_min_cidr6 = 48;
625 <  ConfigFileEntry.invisible_on_connect = YES;
626 <  ConfigFileEntry.burst_away = NO;
627 <  ConfigFileEntry.use_whois_actually = YES;
628 <  ConfigFileEntry.tkline_expire_notices = YES;
629 <  ConfigFileEntry.hide_spoof_ips = YES;
630 <  ConfigFileEntry.ignore_bogus_ts = NO;
631 <  ConfigFileEntry.disable_auth = NO;
632 <  ConfigFileEntry.disable_remote = NO;
633 <  ConfigFileEntry.kill_chase_time_limit = 90;
634 <  ConfigFileEntry.default_floodcount = 8; /* XXX */
635 <  ConfigFileEntry.failed_oper_notice = YES;
636 <  ConfigFileEntry.dots_in_ident = 0;      /* XXX */
637 <  ConfigFileEntry.dot_in_ip6_addr = YES;
638 <  ConfigFileEntry.min_nonwildcard = 4;
639 <  ConfigFileEntry.min_nonwildcard_simple = 3;
640 <  ConfigFileEntry.max_accept = 20;
641 <  ConfigFileEntry.anti_nick_flood = NO;   /* XXX */
642 <  ConfigFileEntry.max_nick_time = 20;
643 <  ConfigFileEntry.max_nick_changes = 5;
644 <  ConfigFileEntry.anti_spam_exit_message_time = 0;  /* XXX */
645 <  ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
646 <  ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;  /* XXX */
647 <  ConfigFileEntry.kline_with_reason = YES;
648 <  ConfigFileEntry.kline_reason = NULL;
649 <  ConfigFileEntry.warn_no_nline = YES;
650 <  ConfigFileEntry.stats_o_oper_only = NO; /* XXX */
651 <  ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
652 <  ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
653 <  ConfigFileEntry.stats_P_oper_only = NO;
654 <  ConfigFileEntry.caller_id_wait = 60;
655 <  ConfigFileEntry.opers_bypass_callerid = NO;
656 <  ConfigFileEntry.pace_wait = 10;
657 <  ConfigFileEntry.pace_wait_simple = 1;
658 <  ConfigFileEntry.short_motd = NO;
659 <  ConfigFileEntry.ping_cookie = NO;
660 <  ConfigFileEntry.no_oper_flood = NO;     /* XXX */
661 <  ConfigFileEntry.true_no_oper_flood = NO;  /* XXX */
662 <  ConfigFileEntry.oper_pass_resv = YES;
663 <  ConfigFileEntry.glines = NO;            /* XXX */
664 <  ConfigFileEntry.gline_time = 12 * 3600; /* XXX */
665 <  ConfigFileEntry.idletime = 0;
666 <  ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
1915 <  ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
1916 <  ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;  /* XXX */
1917 <  ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1918 <    UMODE_OPERWALL | UMODE_WALLOP;        /* XXX */
1919 <  DupString(ConfigFileEntry.servlink_path, SLPATH);
1920 < #ifdef HAVE_LIBCRYPTO
1921 <  /* jdc -- This is our default value for a cipher.  According to the
1922 <   *        CRYPTLINK document (doc/cryptlink.txt), BF/128 must be supported
1923 <   *        under all circumstances if cryptlinks are enabled.  So,
1924 <   *        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;
604 >  ConfigChannel.max_channels = 25;
605 >  ConfigChannel.max_invites = 20;
606 >  ConfigChannel.max_bans = 100;
607 >  ConfigChannel.max_bans_large = 500;
608 >  ConfigChannel.default_join_flood_count = 18;
609 >  ConfigChannel.default_join_flood_time = 6;
610 >
611 >  ConfigServerHide.flatten_links = 0;
612 >  ConfigServerHide.flatten_links_delay = 300;
613 >  ConfigServerHide.hidden = 0;
614 >  ConfigServerHide.hide_servers = 0;
615 >  ConfigServerHide.hide_services = 0;
616 >  ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
617 >  ConfigServerHide.hide_server_ips = 0;
618 >  ConfigServerHide.disable_remote_commands = 0;
619 >
620 >  ConfigGeneral.away_count = 2;
621 >  ConfigGeneral.away_time = 10;
622 >  ConfigGeneral.max_watch = 50;
623 >  ConfigGeneral.whowas_history_length = 15000;
624 >  ConfigGeneral.cycle_on_host_change = 1;
625 >  ConfigGeneral.dline_min_cidr = 16;
626 >  ConfigGeneral.dline_min_cidr6 = 48;
627 >  ConfigGeneral.kline_min_cidr = 16;
628 >  ConfigGeneral.kline_min_cidr6 = 48;
629 >  ConfigGeneral.invisible_on_connect = 1;
630 >  ConfigGeneral.disable_auth = 0;
631 >  ConfigGeneral.kill_chase_time_limit = 90;
632 >  ConfigGeneral.default_floodcount = 8;
633 >  ConfigGeneral.default_floodtime = 1;
634 >  ConfigGeneral.failed_oper_notice = 1;
635 >  ConfigGeneral.dots_in_ident = 0;
636 >  ConfigGeneral.min_nonwildcard = 4;
637 >  ConfigGeneral.min_nonwildcard_simple = 3;
638 >  ConfigGeneral.max_accept = 50;
639 >  ConfigGeneral.anti_nick_flood = 0;
640 >  ConfigGeneral.max_nick_time = 20;
641 >  ConfigGeneral.max_nick_changes = 5;
642 >  ConfigGeneral.anti_spam_exit_message_time = 0;
643 >  ConfigGeneral.ts_warn_delta = 30;
644 >  ConfigGeneral.ts_max_delta = 600;
645 >  ConfigGeneral.warn_no_connect_block = 1;
646 >  ConfigGeneral.stats_e_disabled = 0;
647 >  ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
648 >  ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
649 >  ConfigGeneral.stats_o_oper_only = 1;
650 >  ConfigGeneral.stats_m_oper_only = 1;
651 >  ConfigGeneral.stats_P_oper_only = 0;
652 >  ConfigGeneral.stats_u_oper_only = 0;
653 >  ConfigGeneral.caller_id_wait = 60;
654 >  ConfigGeneral.opers_bypass_callerid = 1;
655 >  ConfigGeneral.pace_wait = 10;
656 >  ConfigGeneral.pace_wait_simple = 1;
657 >  ConfigGeneral.short_motd = 0;
658 >  ConfigGeneral.ping_cookie = 0;
659 >  ConfigGeneral.no_oper_flood = 0;
660 >  ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
661 >  ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
662 >                                   UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
663 >                                   UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
664 >  ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
665 >  ConfigGeneral.throttle_count = 1;
666 >  ConfigGeneral.throttle_time = 1;
667   }
668  
1939 /* read_conf()
1940 *
1941 * inputs       - file descriptor pointing to config file to use
1942 * output       - None
1943 * side effects - Read configuration file.
1944 */
669   static void
670 < read_conf(FBFILE *file)
670 > conf_validate(void)
671   {
672 <  lineno = 0;
673 <
1950 <  set_default_conf(); /* Set default values prior to conf parsing */
1951 <  ypass = 1;
1952 <  yyparse();          /* pick up the classes first */
1953 <
1954 <  fbrewind(file);
672 >  if (EmptyString(ConfigServerInfo.network_name))
673 >    ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
674  
675 <  ypass = 2;
676 <  yyparse();          /* Load the values from the conf */
1958 <  validate_conf();    /* Check to make sure some values are still okay. */
1959 <                      /* Some global values are also loaded here. */
1960 <  check_class();      /* Make sure classes are valid */
675 >  if (EmptyString(ConfigServerInfo.network_desc))
676 >    ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
677   }
678  
679 + /* conf_read()
680 + *
681 + * inputs       - file descriptor pointing to config file to use
682 + * output       - None
683 + * side effects - Read configuration file.
684 + */
685   static void
686 < validate_conf(void)
686 > conf_read(FILE *file)
687   {
688 <  if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
1967 <    ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1968 <
1969 <  if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1970 <    ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1971 <
1972 <  if (ConfigFileEntry.servlink_path == NULL)
1973 <    DupString(ConfigFileEntry.servlink_path, SLPATH);
688 >  lineno = 1;
689  
690 <  if (ServerInfo.network_name == NULL)
691 <    DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
690 >  conf_set_defaults();  /* Set default values prior to conf parsing */
691 >  conf_parser_ctx.pass = 1;
692 >  yyparse();  /* Pick up the classes first */
693  
694 <  if (ServerInfo.network_desc == NULL)
1979 <    DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
694 >  rewind(file);
695  
696 <  if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
697 <      (ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
698 <    ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
699 <
700 <  ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
696 >  conf_parser_ctx.pass = 2;
697 >  yyparse();  /* Load the values from the conf */
698 >  conf_validate();  /* Check to make sure some values are still okay. */
699 >                    /* Some global values are also loaded here. */
700 >  whowas_trim();  /* Attempt to trim whowas list if necessary */
701 >  class_delete_marked();  /* Delete unused classes that are marked for deletion */
702   }
703  
704 < /* lookup_confhost()
704 > /* conf_rehash()
705   *
706 < * start DNS lookups of all hostnames in the conf
707 < * line and convert an IP addresses in a.b.c.d number for to IP#s.
706 > * Actual REHASH service routine. Called with sig == 0 if it has been called
707 > * as a result of an operator issuing this command, else assume it has been
708 > * called as a result of the server receiving a HUP signal.
709   */
710 < static void
711 < lookup_confhost(struct ConfItem *conf)
710 > void
711 > conf_rehash(bool sig)
712   {
713 <  struct AccessItem *aconf;
1997 <  struct addrinfo hints, *res;
1998 <
1999 <  aconf = map_to_conf(conf);
2000 <
2001 <  if (EmptyString(aconf->host) ||
2002 <      EmptyString(aconf->user))
713 >  if (sig == true)
714    {
715 <    ilog(L_ERROR, "Host/server name error: (%s) (%s)",
716 <         aconf->host, conf->name);
717 <    return;
715 >    sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
716 >                         "Got signal SIGHUP, reloading configuration file(s)");
717 >    ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
718    }
719  
720 <  if (strchr(aconf->host, '*') ||
2010 <      strchr(aconf->host, '?'))
2011 <    return;
2012 <
2013 <  /* Do name lookup now on hostnames given and store the
2014 <   * ip numbers in conf structure.
2015 <   */
2016 <  memset(&hints, 0, sizeof(hints));
2017 <
2018 <  hints.ai_family   = AF_UNSPEC;
2019 <  hints.ai_socktype = SOCK_STREAM;
2020 <
2021 <  /* Get us ready for a bind() and don't bother doing dns lookup */
2022 <  hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
720 >  restart_resolver();
721  
722 <  if (irc_getaddrinfo(aconf->host, NULL, &hints, &res))
2025 <  {
2026 <    conf_dns_lookup(aconf);
2027 <    return;
2028 <  }
722 >  /* don't close listeners until we know we can go ahead with the rehash */
723  
724 <  assert(res != NULL);
724 >  conf_read_files(false);
725  
726 <  memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
727 <  aconf->ipnum.ss_len = res->ai_addrlen;
2034 <  aconf->ipnum.ss.ss_family = res->ai_family;
2035 <  irc_freeaddrinfo(res);
726 >  load_conf_modules();
727 >  check_conf_klines();
728   }
729  
730   /* conf_connect_allowed()
# Line 2043 | Line 735 | lookup_confhost(struct ConfItem *conf)
735   * side effects - none
736   */
737   int
738 < conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
738 > conf_connect_allowed(struct irc_ssaddr *addr)
739   {
740 <  struct ip_entry *ip_found;
2049 <  struct AccessItem *aconf = find_dline_conf(addr, aftype);
740 >  const struct MaskItem *conf = find_dline_conf(addr);
741  
742 <  /* DLINE exempt also gets you out of static limits/pacing... */
2052 <  if (aconf && (aconf->status & CONF_EXEMPTDLINE))
2053 <    return 0;
2054 <
2055 <  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)
742 >  if (conf)
743    {
744 <    ip_found->last_attempt = CurrentTime;
745 <    return TOO_FAST;
744 >    /* DLINE exempt also gets you out of static limits/pacing... */
745 >    if (conf->type == CONF_EXEMPT)
746 >      return 0;
747 >    return BANNED_CLIENT;
748    }
749  
750 <  ip_found->last_attempt = CurrentTime;
751 <  return 0;
2069 < }
2070 <
2071 < static struct AccessItem *
2072 < find_regexp_kline(const char *uhi[])
2073 < {
2074 <  const dlink_node *ptr = NULL;
2075 <
2076 <  DLINK_FOREACH(ptr, rkconf_items.head)
750 >  struct ip_entry *ip_found = ipcache_record_find_or_add(addr);
751 >  if ((event_base->time.sec_monotonic - ip_found->last_attempt) < ConfigGeneral.throttle_time)
752    {
753 <    struct AccessItem *aptr = map_to_conf(ptr->data);
754 <
2080 <    assert(aptr->regexuser);
2081 <    assert(aptr->regexhost);
753 >    if (ip_found->connection_count >= ConfigGeneral.throttle_count)
754 >      return TOO_FAST;
755  
756 <    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;
756 >    ++ip_found->connection_count;
757    }
758 +  else
759 +    ip_found->connection_count = 1;
760  
761 <  return NULL;
762 < }
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 <  }
761 >  ip_found->last_attempt = event_base->time.sec_monotonic;
762 >  return 0;
763   }
764  
765   /* cleanup_tklines()
# Line 2202 | Line 770 | add_temp_line(struct ConfItem *conf)
770   *                This is an event started off in ircd.c
771   */
772   void
773 < 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)
773 > cleanup_tklines(void *unused)
774   {
775 <  dlink_node *ptr;
776 <  dlink_node *next_ptr;
777 <  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;
775 >  hostmask_expire_temporary();
776 >  gecos_expire();
777 >  resv_expire();
778   }
779  
780   /*
781 < * Input: A client to find the active oper{} name for.
781 > * Input: A client to find the active operator {} name for.
782   * Output: The nick!user@host{oper} of the oper.
783   *         "oper" is server name for remote opers
784   * Side effects: None.
785   */
786 < char *
787 < get_oper_name(const struct Client *client_p)
786 > const char *
787 > get_oper_name(const struct Client *client)
788   {
789 <  dlink_node *cnode;
2382 <  struct ConfItem *conf;
2383 <  struct AccessItem *aconf;
789 >  static char buffer[IRCD_BUFSIZE];
790  
791 <  /* +5 for !,@,{,} and null */
792 <  static char buffer[NICKLEN+USERLEN+HOSTLEN+HOSTLEN+5];
791 >  if (IsServer(client))
792 >    return client->name;
793  
794 <  if (MyConnect(client_p))
794 >  if (MyConnect(client))
795    {
796 <    DLINK_FOREACH(cnode, client_p->localClient->confs.head)
796 >    const dlink_node *const node = client->connection->confs.head;
797 >
798 >    if (node)
799      {
800 <      conf = cnode->data;
2393 <      aconf = map_to_conf(conf);
800 >      const struct MaskItem *const conf = node->data;
801  
802 <      if (IsConfOperator(aconf))
802 >      if (conf->type == CONF_OPER)
803        {
804 <        ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
805 <                   client_p->username, client_p->host,
806 <                   conf->name);
2400 <        return buffer;
804 >        snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client->name,
805 >                 client->username, client->host, conf->name);
806 >        return buffer;
807        }
808      }
809  
810 <    /* Probably should assert here for now. If there is an oper out there
811 <     * with no oper{} conf attached, it would be good for us to know...
810 >    /*
811 >     * Probably should assert here for now. If there is an oper out there
812 >     * with no operator {} conf attached, it would be good for us to know...
813       */
814 <    assert(0); /* Oper without oper conf! */
814 >    assert(0);  /* Oper without oper conf! */
815    }
816  
817 <  ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
818 <             client_p->username, client_p->host, client_p->servptr->name);
817 >  snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client->name,
818 >           client->username, client->host, client->servptr->name);
819    return buffer;
820   }
821  
822 < /* 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()
822 > /* conf_clear()
823   *
824   * inputs       - none
825   * output       - none
826   * side effects - Clear out the old configuration
827   */
828   static void
829 < clear_out_old_conf(void)
829 > conf_clear(void)
830   {
831 <  dlink_node *ptr = NULL, *next_ptr = NULL;
2536 <  struct ConfItem *conf;
2537 <  struct AccessItem *aconf;
2538 <  struct ClassItem *cltmp;
2539 <  struct MatchItem *match_item;
831 >  dlink_node *node = NULL, *node_next = NULL;
832    dlink_list *free_items [] = {
833 <    &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
833 >    &connect_items, &operator_items, NULL
834    };
835  
836    dlink_list ** iterator = free_items; /* C is dumb */
837  
838    /* We only need to free anything allocated by yyparse() here.
839 <   * Resetting structs, etc, is taken care of by set_default_conf().
839 >   * Resetting structs, etc, is taken care of by conf_set_defaults().
840     */
841 <  
842 <  for (; *iterator != NULL; iterator++)
841 >
842 >  for (; *iterator; iterator++)
843    {
844 <    DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
844 >    DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
845      {
846 <      conf = ptr->data;
2557 <      /* XXX This is less than pretty */
2558 <      if (conf->type == SERVER_TYPE)
2559 <      {
2560 <        aconf = map_to_conf(conf);
846 >      struct MaskItem *conf = node->data;
847  
848 <        if (aconf->clients != 0)
849 <        {
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);
848 >      conf->active = false;
849 >      dlinkDelete(&conf->node, *iterator);
850  
851 <        if (aconf->clients != 0)
852 <        {
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;
2607 <
2608 <        delete_conf_item(conf);
2609 <      }
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 <      }
851 >      if (!conf->ref_count)
852 >        conf_free(conf);
853      }
854    }
855  
856    /*
857 <   * don't delete the class table, rather mark all entries
858 <   * for deletion. The table is cleaned up by check_class. - avalon
857 >   * Don't delete the class table, rather mark all entries for deletion.
858 >   * The table is cleaned up by class_delete_marked. - avalon
859     */
860 <  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 <  }
860 >  class_mark_for_deletion();
861  
862    clear_out_address_conf();
863  
864 <  /* 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();
864 >  modules_conf_clear();  /* Clear modules {} items */
865  
866 <  /* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2684 <   * exempt{} and gecos{} blocks are freed above too
2685 <   */
866 >  motd_clear();  /* Clear motd {} items and re-cache default motd */
867  
868 <  /* 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 < }
868 >  cluster_clear();  /* Clear cluster {} items */
869  
870 < /* 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 */
2714 <
2715 <  /* 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);
2724 <
2725 <      if (IsConfIllegal(aconf))
2726 <      {
2727 <        dlinkDelete(ptr, *iterator);
2728 <
2729 <        if (aconf->clients == 0)
2730 <          delete_conf_item(conf);
2731 <      }
2732 <    }
2733 <  }
2734 < }
2735 <
2736 < /* get_conf_name()
2737 < *
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 < }
870 >  gecos_clear();  /* Clear gecos {} items */
871  
872 < #define BAD_PING (-1)
872 >  resv_clear();  /* Clear resv {} items */
873 >
874 >  service_clear();  /* Clear service {} items */
875 >
876 >  shared_clear();  /* Clear shared {} items */
877 >
878 >  pseudo_clear();  /* Clear pseudo {} items */
879 >
880 >  /* Clean out ConfigServerInfo */
881 >  xfree(ConfigServerInfo.description);
882 >  ConfigServerInfo.description = NULL;
883 >  xfree(ConfigServerInfo.network_name);
884 >  ConfigServerInfo.network_name = NULL;
885 >  xfree(ConfigServerInfo.network_desc);
886 >  ConfigServerInfo.network_desc = NULL;
887 >  xfree(ConfigServerInfo.rsa_private_key_file);
888 >  ConfigServerInfo.rsa_private_key_file = NULL;
889 >  xfree(ConfigServerInfo.tls_certificate_file);
890 >  ConfigServerInfo.tls_certificate_file = NULL;
891 >  xfree(ConfigServerInfo.tls_dh_param_file);
892 >  ConfigServerInfo.tls_dh_param_file = NULL;
893 >  xfree(ConfigServerInfo.tls_supported_groups);
894 >  ConfigServerInfo.tls_supported_groups = NULL;
895 >  xfree(ConfigServerInfo.tls_cipher_list);
896 >  ConfigServerInfo.tls_cipher_list = NULL;
897 >  xfree(ConfigServerInfo.tls_cipher_suites);
898 >  ConfigServerInfo.tls_cipher_suites = NULL;
899 >  xfree(ConfigServerInfo.tls_message_digest_algorithm);
900 >  ConfigServerInfo.tls_message_digest_algorithm = NULL;
901 >
902 >  /* Clean out ConfigAdminInfo */
903 >  xfree(ConfigAdminInfo.name);
904 >  ConfigAdminInfo.name = NULL;
905 >  xfree(ConfigAdminInfo.email);
906 >  ConfigAdminInfo.email = NULL;
907 >  xfree(ConfigAdminInfo.description);
908 >  ConfigAdminInfo.description = NULL;
909 >
910 >  /* Clean out ConfigServerHide */
911 >  xfree(ConfigServerHide.flatten_links_file);
912 >  ConfigServerHide.flatten_links_file = NULL;
913 >  xfree(ConfigServerHide.hidden_name);
914 >  ConfigServerHide.hidden_name = NULL;
915  
916 < /* get_conf_ping()
917 < *
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)
2793 < {
2794 <  struct ClassItem *aclass;
2795 <  struct AccessItem *aconf;
2796 <
2797 <  if (conf != NULL)
2798 <  {
2799 <    aconf = (struct AccessItem *)map_to_conf(conf);
2800 <    if (aconf->class_ptr != NULL)
2801 <    {
2802 <      aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2803 <      *pingwarn = PingWarning(aclass);
2804 <      return PingFreq(aclass);
2805 <    }
2806 <  }
2807 <
2808 <  return BAD_PING;
916 >  /* Clean out listeners */
917 >  listener_close_marked();
918   }
919  
920 < /* get_client_class()
921 < *
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)
920 > static void
921 > conf_handle_tls(bool cold)
922   {
923 <  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)
923 >  if (tls_new_credentials() == false)
924    {
925 <    DLINK_FOREACH(ptr, target_p->localClient->confs.head)
925 >    if (cold == true)
926      {
927 <      conf = ptr->data;
928 <
2831 <      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 <      }
927 >      ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
928 >      exit(EXIT_FAILURE);
929      }
930 <  }
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;
2874 < }
2875 <
2876 < /* find_class()
2877 < *
2878 < * inputs       - string name of class
2879 < * output       - corresponding Class pointer
2880 < * side effects - NONE
2881 < */
2882 < struct ConfItem *
2883 < find_class(const char *classname)
2884 < {
2885 <  struct ConfItem *conf;
2886 <
2887 <  if ((conf = find_exact_name_conf(CLASS_TYPE, classname, NULL, NULL)) != NULL)
2888 <    return conf;
2889 <
2890 <  return class_default;
2891 < }
2892 <
2893 < /* check_class()
2894 < *
2895 < * inputs       - NONE
2896 < * output       - NONE
2897 < * side effects -
2898 < */
2899 < void
2900 < check_class(void)
2901 < {
2902 <  dlink_node *ptr = NULL, *next_ptr = NULL;
2903 <
2904 <  DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2905 <  {
2906 <    struct ClassItem *aclass = map_to_conf(ptr->data);
2907 <
2908 <    if (!aclass->active && !CurrUserCount(aclass))
930 >    else
931      {
932 <      destroy_cidr_class(aclass);
933 <      delete_conf_item(ptr->data);
932 >      /* Failed to load new settings/certs, old ones remain active */
933 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
934 >                           "Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
935      }
936    }
937   }
938  
939 < /* init_class()
939 > /* read_conf_files()
940   *
941 < * inputs       - NONE
942 < * output       - NONE
943 < * side effects -
941 > * inputs       - cold start YES or NO
942 > * output       - none
943 > * side effects - read all conf files needed, ircd.conf kline.conf etc.
944   */
945   void
946 < init_class(void)
946 > conf_read_files(bool cold)
947   {
948 <  struct ClassItem *aclass;
2926 <
2927 <  class_default = make_conf_item(CLASS_TYPE);
948 >  char buf[IRCD_BUFSIZE];
949  
950 <  aclass = map_to_conf(class_default);
951 <  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;
950 >  conf_parser_ctx.boot = cold;
951 >  conf_parser_ctx.conf_file = fopen(ConfigGeneral.configfile, "r");
952  
953 <  client_check_cb = register_callback("check_client", check_client);
2938 < }
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;
2955 <
2956 <  if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
953 >  if (conf_parser_ctx.conf_file == NULL)
954    {
955 <    DLINK_FOREACH(ptr, client_p->localClient->confs.head)
955 >    if (cold == true)
956      {
957 <      conf = ptr->data;
958 <      if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
959 <          || (conf->type == CLIENT_TYPE))
2963 <      {
2964 <        aconf = (struct AccessItem *)map_to_conf(conf);
2965 <        if ((class_conf = aconf->class_ptr) == NULL)
2966 <          continue;
2967 <        aclass = (struct ClassItem *)map_to_conf(class_conf);
2968 <        sendq = MaxSendq(aclass);
2969 <        return sendq;
2970 <      }
957 >      ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
958 >           ConfigGeneral.configfile, strerror(errno));
959 >      exit(EXIT_FAILURE);
960      }
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;
2978 }
2979
2980 /* conf_add_class_to_conf()
2981 *
2982 * inputs       - pointer to config item
2983 * output       - NONE
2984 * side effects - Add a class pointer to a conf
2985 */
2986 void
2987 conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
2988 {
2989  struct AccessItem *aconf = map_to_conf(conf);
2990  struct ClassItem *class = NULL;
2991
2992  if (class_name == NULL)
2993  {
2994    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);
3010
3011  if (aconf->class_ptr == NULL || !class->active)
3012  {
3013    if (conf->type == CLIENT_TYPE)
3014      sendto_realops_flags(UMODE_ALL, L_ALL,
3015                           "Warning *** Defaulting to default class for %s@%s",
3016                           aconf->user, aconf->host);
961      else
962 <      sendto_realops_flags(UMODE_ALL, L_ALL,
963 <                           "Warning *** Defaulting to default class for %s",
964 <                           conf->name);
965 <    aconf->class_ptr = class_default;
962 >    {
963 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
964 >                           "Unable to read configuration file '%s': %s",
965 >                           ConfigGeneral.configfile, strerror(errno));
966 >      return;
967 >    }
968    }
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];
969  
970 <  aconf = map_to_conf(conf);
970 >  /*
971 >   * We need to know the initial filename for the yyerror() to report
972 >   *
973 >   *  FIXME: The full path is in conffilenamebuf first time since we
974 >   *          don't know anything else
975 >   *
976 >   *  - Gozem 2002-07-21
977 >   */
978 >  strlcpy(conffilebuf, ConfigGeneral.configfile, sizeof(conffilebuf));
979  
980 <  conf_add_class_to_conf(conf, class_name);
980 >  if (cold == false)
981 >    conf_clear();
982  
983 <  if (!aconf->host || !conf->name)
984 <  {
3046 <    sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3047 <    ilog(L_WARN, "Bad connect block");
3048 <    return -1;
3049 <  }
983 >  conf_read(conf_parser_ctx.conf_file);
984 >  fclose(conf_parser_ctx.conf_file);
985  
986 <  if (EmptyString(aconf->passwd) && !IsConfCryptLink(aconf))
987 <  {
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 <  }
986 >  log_iterate(log_reopen);
987 >  conf_handle_tls(cold);
988  
989 <  nuh.nuhmask  = aconf->host;
990 <  nuh.nickptr  = NULL;
3061 <  nuh.userptr  = conf_user;
3062 <  nuh.hostptr  = conf_host;
989 >  isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
990 >  isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
991  
992 <  nuh.nicksize = 0;
993 <  nuh.usersize = sizeof(conf_user);
3066 <  nuh.hostsize = sizeof(conf_host);
992 >  snprintf(buf, sizeof(buf), "beI:%u", ConfigChannel.max_bans);
993 >  isupport_add("MAXLIST", buf, -1);
994  
995 <  split_nuh(&nuh);
995 >  isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
996 >  isupport_add("CHANTYPES", "#", -1);
997  
998 <  MyFree(aconf->host);
999 <  aconf->host = NULL;
998 >  snprintf(buf, sizeof(buf), "#:%u", ConfigChannel.max_channels);
999 >  isupport_add("CHANLIMIT", buf, -1);
1000  
1001 <  DupString(aconf->user, conf_user); /* somehow username checking for servers
1002 <                                 got lost in H6/7, will have to be re-added */
3075 <  DupString(aconf->host, conf_host);
1001 >  isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1002 >  isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1003  
1004 <  lookup_confhost(conf);
1005 <
3079 <  return 0;
1004 >  snprintf(buf, sizeof(buf), "%s", "beI,k,l,cimnprstuCKLMNORST");
1005 >  isupport_add("CHANMODES", buf, -1);
1006   }
1007  
1008 < /* conf_add_d_conf()
1008 > /* conf_add_class_to_conf()
1009   *
1010   * inputs       - pointer to config item
1011   * output       - NONE
1012 < * side effects - Add a d/D line
1012 > * side effects - Add a class pointer to a conf
1013   */
1014   void
1015 < conf_add_d_conf(struct AccessItem *aconf)
1015 > conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1016   {
1017 <  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
1017 >  if (EmptyString(name) || (conf->class = class_find(name, true)) == NULL)
1018    {
1019 <    /* XXX ensure user is NULL */
1020 <    MyFree(aconf->user);
1021 <    aconf->user = NULL;
1022 <    add_conf_by_address(CONF_DLINE, aconf);
1019 >    conf->class = class_default;
1020 >
1021 >    if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1022 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1023 >                           "Warning *** Defaulting to default class for %s@%s",
1024 >                           conf->user, conf->host);
1025 >    else
1026 >      sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1027 >                           "Warning *** Defaulting to default class for %s",
1028 >                           conf->name);
1029    }
1030   }
1031  
# Line 3119 | Line 1038 | conf_add_d_conf(struct AccessItem *aconf
1038   void
1039   yyerror(const char *msg)
1040   {
1041 <  char newlinebuf[IRCD_BUFSIZE];
3123 <
3124 <  if (ypass != 1)
1041 >  if (conf_parser_ctx.pass != 1)
1042      return;
1043  
1044 <  strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1045 <  sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1046 <                       conffilebuf, lineno + 1, msg, newlinebuf);
1047 <  ilog(L_WARN, "\"%s\", line %u: %s: %s",
1048 <       conffilebuf, lineno + 1, msg, newlinebuf);
1049 < }
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);
1044 >  const char *p = stripws(linebuf);
1045 >  sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1046 >                       "\"%s\", line %u: %s: %s",
1047 >                       conffilebuf, lineno, msg, p);
1048 >  ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1049 >       conffilebuf, lineno, msg, p);
1050   }
1051  
1052 < int
1053 < conf_yy_fatal_error(const char *msg)
1052 > void
1053 > conf_error_report(const char *msg)
1054   {
1055 <  return 0;
1055 >  const char *p = stripws(linebuf);
1056 >  sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1057 >                       "\"%s\", line %u: %s: %s",
1058 >                       conffilebuf, lineno, msg, p);
1059 >  ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1060 >       conffilebuf, lineno, msg, p);
1061   }
1062  
1063   /*
1064   * valid_tkline()
1065 < *
1065 > *
1066   * inputs       - pointer to ascii string to check
1067   *              - whether the specified time is in seconds or minutes
1068   * output       - -1 not enough parameters
# Line 3156 | Line 1070 | conf_yy_fatal_error(const char *msg)
1070   * side effects - none
1071   * Originally written by Dianora (Diane, db@db.net)
1072   */
1073 < time_t
1074 < valid_tkline(char *p, int minutes)
1073 > uintmax_t
1074 > valid_tkline(const char *data, const int minutes)
1075   {
1076 <  time_t result = 0;
1076 >  const unsigned char *p = (const unsigned char *)data;
1077 >  unsigned char tmpch = '\0';
1078 >  uintmax_t result = 0;
1079  
1080 <  while (*p)
1080 >  while ((tmpch = *p++))
1081    {
1082 <    if (IsDigit(*p))
3167 <    {
3168 <      result *= 10;
3169 <      result += ((*p) & 0xF);
3170 <      p++;
3171 <    }
3172 <    else
1082 >    if (!IsDigit(tmpch))
1083        return 0;
1084 +
1085 +    result *= 10;
1086 +    result += (tmpch & 0xF);
1087    }
1088  
1089 <  /* in the degenerate case where oper does a /quote kline 0 user@host :reason
1090 <   * i.e. they specifically use 0, I am going to return 1 instead
1091 <   * as a return value of non-zero is used to flag it as a temporary kline
1089 >  /*
1090 >   * In the degenerate case where oper does a /quote kline 0 user@host :reason
1091 >   * i.e. they specifically use 0, I am going to return 1 instead as a return
1092 >   * value of non-zero is used to flag it as a temporary kline
1093     */
3180
1094    if (result == 0)
1095      result = 1;
1096  
1097 <  /*
1097 >  /*
1098     * If the incoming time is in seconds convert it to minutes for the purpose
1099     * of this calculation
1100     */
1101 <  if (!minutes)
1102 <    result = result / (time_t)60;
1101 >  if (minutes == 0)
1102 >    result = result / 60;
1103  
1104    if (result > MAX_TDKLINE_TIME)
1105      result = MAX_TDKLINE_TIME;
1106  
1107 <  result = result * (time_t)60;  /* turn it into seconds */
1107 >  result = result * 60;  /* Turn it into seconds */
1108  
1109    return result;
1110   }
1111  
1112 + /* valid_wild_card_simple()
1113 + *
1114 + * inputs       - data to check for sufficient non-wildcard characters
1115 + * outputs      - 1 if valid, else 0
1116 + * side effects - none
1117 + */
1118 + bool
1119 + valid_wild_card_simple(const char *data)
1120 + {
1121 +  const unsigned char *p = (const unsigned char *)data;
1122 +  unsigned char tmpch = '\0';
1123 +  unsigned int nonwild = 0, wild = 0;
1124 +
1125 +  while ((tmpch = *p++))
1126 +  {
1127 +    if (tmpch == '\\' && *p)
1128 +    {
1129 +      ++p;
1130 +      if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1131 +        return true;
1132 +    }
1133 +    else if (!IsMWildChar(tmpch))
1134 +    {
1135 +      if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1136 +        return true;
1137 +    }
1138 +    else
1139 +      ++wild;
1140 +  }
1141 +
1142 +  return wild == 0;
1143 + }
1144 +
1145   /* valid_wild_card()
1146   *
1147   * input        - pointer to client
1148   *              - int flag, 0 for no warning oper 1 for warning oper
1149   *              - count of following varargs to check
1150   * output       - 0 if not valid, 1 if valid
1151 < * side effects - NOTICE is given to source_p if warn is 1
1151 > * side effects - NOTICE is given to client if warn is 1
1152   */
1153 < int
1154 < valid_wild_card(struct Client *source_p, int warn, int count, ...)
1153 > bool
1154 > valid_wild_card(int count, ...)
1155   {
1156 <  char *p;
1157 <  char tmpch;
3212 <  int nonwild = 0;
1156 >  unsigned char tmpch = '\0';
1157 >  unsigned int nonwild = 0;
1158    va_list args;
1159  
1160    /*
# Line 3228 | Line 1173 | valid_wild_card(struct Client *source_p,
1173  
1174    while (count--)
1175    {
1176 <    p = va_arg(args, char *);
1176 >    const unsigned char *p = va_arg(args, const unsigned char *);
1177      if (p == NULL)
1178        continue;
1179  
# Line 3240 | Line 1185 | valid_wild_card(struct Client *source_p,
1185           * If we find enough non-wild characters, we can
1186           * break - no point in searching further.
1187           */
1188 <        if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1189 <          return 1;
1188 >        if (++nonwild >= ConfigGeneral.min_nonwildcard)
1189 >        {
1190 >          va_end(args);
1191 >          return true;
1192 >        }
1193        }
1194      }
1195    }
1196  
1197 <  if (warn)
1198 <    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;
1197 >  va_end(args);
1198 >  return false;
1199   }
1200  
1201   /* XXX should this go into a separate file ? -Dianora */
# Line 3262 | Line 1208 | valid_wild_card(struct Client *source_p,
1208   *              - parse_flags bit map of things to test
1209   *              - pointer to user or string to parse into
1210   *              - pointer to host or NULL to parse into if non NULL
1211 < *              - pointer to optional tkline time or NULL
1211 > *              - pointer to optional tkline time or NULL
1212   *              - pointer to target_server to parse into if non NULL
1213   *              - pointer to reason to parse into
1214   *
1215 < * output       - 1 if valid, -1 if not valid
1215 > * output       - 1 if valid, 0 if not valid
1216   * side effects - A generalised k/d/x etc. line parser,
1217   *               "ALINE [time] user@host|string [ON] target :reason"
1218   *                will parse returning a parsed user, host if
# Line 3278 | Line 1224 | valid_wild_card(struct Client *source_p,
1224   *                if target_server is NULL and an "ON" is found error
1225   *                is reported.
1226   *                if reason pointer is NULL ignore pointer,
1227 < *                this allows usee of parse_a_line in unkline etc.
1227 > *                this allows use of parse_a_line in unkline etc.
1228   *
1229   * - Dianora
1230   */
1231 < int
1232 < 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)
1231 > bool
1232 > parse_aline(const char *cmd, struct Client *client, int parc, char **parv, struct aline_ctx *aline)
1233   {
1234 <  int found_tkline_time=0;
1235 <  static char def_reason[] = "No Reason";
1236 <  static char user[USERLEN*4+1];
3294 <  static char host[HOSTLEN*4+1];
3295 <
3296 <  parv++;
3297 <  parc--;
1234 >  static char default_reason[] = CONF_NOREASON;
1235 >  static char user[USERLEN * 2 + 1];
1236 >  static char host[HOSTLEN * 2 + 1];
1237  
1238 <  found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1238 >  ++parv;
1239 >  --parc;
1240  
1241 <  if (found_tkline_time != 0)
1241 >  if (aline->add == true && (aline->duration = valid_tkline(*parv, TK_MINUTES)))
1242    {
1243 <    parv++;
1244 <    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 <    }
1243 >    ++parv;
1244 >    --parc;
1245    }
1246  
1247    if (parc == 0)
1248    {
1249 <    sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1250 <               me.name, source_p->name, cmd);
3320 <    return -1;
1249 >    sendto_one_numeric(client, &me, ERR_NEEDMOREPARAMS, cmd);
1250 >    return false;
1251    }
1252  
1253 <  if (h_p == NULL)
1254 <    *up_p = *parv;
1253 >  if (aline->simple_mask == true)
1254 >  {
1255 >    aline->mask = *parv;
1256 >    aline->user = NULL;
1257 >    aline->host = NULL;
1258 >  }
1259    else
1260    {
1261 <    if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1262 <      return -1;
1261 >    struct split_nuh_item nuh;
1262 >
1263 >    nuh.nuhmask  = *parv;
1264 >    nuh.nickptr  = NULL;
1265 >    nuh.userptr  = user;
1266 >    nuh.hostptr  = host;
1267 >
1268 >    nuh.nicksize = 0;
1269 >    nuh.usersize = sizeof(user);
1270 >    nuh.hostsize = sizeof(host);
1271 >
1272 >    split_nuh(&nuh);
1273  
1274 <    *up_p = user;
1275 <    *h_p = host;
1274 >    aline->mask = NULL;
1275 >    aline->user = user;
1276 >    aline->host = host;
1277    }
3333
3334  parc--;
3335  parv++;
1278  
1279 <  if (parc != 0)
1279 >  ++parv;
1280 >  --parc;
1281 >
1282 >  if (parc)
1283    {
1284      if (irccmp(*parv, "ON") == 0)
1285      {
1286 <      parc--;
1287 <      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 <      }
1286 >      ++parv;
1287 >      --parc;
1288  
1289 <      if (!IsOperRemoteBan(source_p))
1289 >      if (!HasOFlag(client, OPER_FLAG_REMOTEBAN))
1290        {
1291 <        sendto_one(source_p, form_str(ERR_NOPRIVS),
1292 <                   me.name, source_p->name, "remoteban");
3355 <        return -1;
1291 >        sendto_one_numeric(client, &me, ERR_NOPRIVS, "remoteban");
1292 >        return false;
1293        }
1294  
1295        if (parc == 0 || EmptyString(*parv))
1296        {
1297 <        sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1298 <                   me.name, source_p->name, cmd);
3362 <        return -1;
1297 >        sendto_one_numeric(client, &me, ERR_NEEDMOREPARAMS, cmd);
1298 >        return false;
1299        }
1300  
1301 <      *target_server = *parv;
1302 <      parc--;
1303 <      parv++;
1301 >      aline->server = *parv;
1302 >      ++parv;
1303 >      --parc;
1304      }
1305      else
1306 <    {
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;
3402 <    }
3403 <    else
3404 <      *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;
1306 >      aline->server = NULL;
1307    }
1308  
1309 <  if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1309 >  if (aline->add == true)
1310    {
1311 <    /* Explicit user@host mask given */
1312 <
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 <    }
1311 >    if (parc == 0 || EmptyString(*parv))
1312 >      aline->reason = default_reason;
1313      else
1314 <    {
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;
1314 >      aline->reason = *parv;
1315    }
3457  else if (!(flags & NOUSERLOOKUP))
3458  {
3459    /* Try to find user@host mask from nick */
3460    /* 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    }
1316  
1317 <    /*
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);
3486 <    else
3487 <      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;
3511 <  }
3512 <
3513 <  if (strlen(comment) > REASONLEN)
3514 <    comment[REASONLEN-1] = '\0';
3515 <
3516 <  return 1;
1317 >  return true;
1318   }
1319  
1320   /* match_conf_password()
# Line 3523 | Line 1324 | valid_comment(struct Client *source_p, c
1324   * output       - 1 or 0 if match
1325   * side effects - none
1326   */
1327 < int
1328 < match_conf_password(const char *password, const struct AccessItem *aconf)
1327 > bool
1328 > match_conf_password(const char *password, const struct MaskItem *conf)
1329   {
1330    const char *encr = NULL;
1331  
1332 <  if (password == NULL || aconf->passwd == NULL)
1333 <    return 0;
1332 >  if (EmptyString(password) || EmptyString(conf->passwd))
1333 >    return false;
1334  
1335 <  if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1336 <  {
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 <  }
1335 >  if (conf->flags & CONF_FLAGS_ENCRYPTED)
1336 >    encr = crypt(password, conf->passwd);
1337    else
1338      encr = password;
1339  
1340 <  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 <  }
1340 >  return encr && strcmp(encr, conf->passwd) == 0;
1341   }
1342  
1343   /*
# Line 3619 | Line 1375 | split_nuh(struct split_nuh_item *const i
1375  
1376    if (iptr->nickptr)
1377      strlcpy(iptr->nickptr, "*", iptr->nicksize);
1378 +
1379    if (iptr->userptr)
1380      strlcpy(iptr->userptr, "*", iptr->usersize);
1381 +
1382    if (iptr->hostptr)
1383      strlcpy(iptr->hostptr, "*", iptr->hostsize);
1384  
# Line 3628 | Line 1386 | split_nuh(struct split_nuh_item *const i
1386    {
1387      *p = '\0';
1388  
1389 <    if (iptr->nickptr && *iptr->nuhmask != '\0')
1389 >    if (iptr->nickptr && *iptr->nuhmask)
1390        strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1391  
1392 <    if ((q = strchr(++p, '@'))) {
1392 >    if ((q = strchr(++p, '@')))
1393 >    {
1394        *q++ = '\0';
1395  
1396 <      if (*p != '\0')
1396 >      if (*p)
1397          strlcpy(iptr->userptr, p, iptr->usersize);
1398  
1399 <      if (*q != '\0')
1399 >      if (*q)
1400          strlcpy(iptr->hostptr, q, iptr->hostsize);
1401      }
1402      else
1403      {
1404 <      if (*p != '\0')
1404 >      if (*p)
1405          strlcpy(iptr->userptr, p, iptr->usersize);
1406      }
1407    }
# Line 3654 | Line 1413 | split_nuh(struct split_nuh_item *const i
1413        /* if found a @ */
1414        *p++ = '\0';
1415  
1416 <      if (*iptr->nuhmask != '\0')
1416 >      if (*iptr->nuhmask)
1417          strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1418  
1419 <      if (*p != '\0')
1419 >      if (*p)
1420          strlcpy(iptr->hostptr, p, iptr->hostsize);
1421      }
1422      else
1423      {
1424 <      /* no @ found */
1425 <      if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1424 >      /* No @ found */
1425 >      if (iptr->nickptr == NULL || strpbrk(iptr->nuhmask, ".:"))
1426          strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1427        else
1428          strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1429      }
1430    }
1431   }
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 9595 by michael, Fri Sep 4 16:48:45 2020 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines