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

Comparing:
ircd-hybrid-7.2/src/s_conf.c (file contents), Revision 632 by michael, Thu Jun 1 10:53:00 2006 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 9638 by michael, Tue Sep 29 12:49:07 2020 UTC

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

Comparing:
ircd-hybrid-7.2/src/s_conf.c (property svn:keywords), Revision 632 by michael, Thu Jun 1 10:53:00 2006 UTC vs.
ircd-hybrid/trunk/src/conf.c (property svn:keywords), Revision 9638 by michael, Tue Sep 29 12:49:07 2020 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines