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

Comparing:
ircd-hybrid-7.2/src/s_conf.c (property svn:keywords), Revision 956 by michael, Mon Jul 27 00:34:48 2009 UTC vs.
ircd-hybrid/trunk/src/conf.c (property svn:keywords), Revision 8500 by michael, Thu Apr 5 13:00:49 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines