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/trunk/src/conf.c (file contents):
Revision 7789 by michael, Mon Oct 17 15:50:10 2016 UTC vs.
Revision 8314 by michael, Wed Feb 28 17:47:23 2018 UTC

# Line 1 | Line 1
1   /*
2   *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (c) 1997-2016 ircd-hybrid development team
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 340 | Line 340 | check_client(struct Client *source_p)
340      case TOO_MANY:
341        sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
342                             "Too many on IP for %s (%s).",
343 <                           get_client_name(source_p, SHOW_IP),
343 >                           client_get_name(source_p, SHOW_IP),
344                             source_p->sockhost);
345        ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
346 <           get_client_name(source_p, SHOW_IP));
346 >           client_get_name(source_p, SHOW_IP));
347        ++ServerStats.is_ref;
348        exit_client(source_p, "No more connections allowed on that IP");
349        break;
# Line 351 | Line 351 | check_client(struct Client *source_p)
351      case I_LINE_FULL:
352        sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
353                             "auth {} block is full for %s (%s).",
354 <                           get_client_name(source_p, SHOW_IP),
354 >                           client_get_name(source_p, SHOW_IP),
355                             source_p->sockhost);
356        ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
357 <           get_client_name(source_p, SHOW_IP));
357 >           client_get_name(source_p, SHOW_IP));
358        ++ServerStats.is_ref;
359        exit_client(source_p, "No more connections allowed in your connection class");
360        break;
# Line 364 | Line 364 | check_client(struct Client *source_p)
364        /*       a purely cosmetical change */
365        sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
366                             "Unauthorized client connection from %s on [%s/%u].",
367 <                           get_client_name(source_p, SHOW_IP),
367 >                           client_get_name(source_p, SHOW_IP),
368                             source_p->connection->listener->name,
369                             source_p->connection->listener->port);
370        ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
371 <           get_client_name(source_p, SHOW_IP),
371 >           client_get_name(source_p, SHOW_IP),
372             source_p->connection->listener->name,
373             source_p->connection->listener->port);
374  
# Line 629 | Line 629 | set_default_conf(void)
629    ConfigServerInfo.max_nick_length = 9;
630    ConfigServerInfo.max_topic_length = 80;
631    ConfigServerInfo.hub = 0;
632 –  ConfigServerInfo.libgeoip_database_options = 0;
632  
633    log_del_all();
634  
# Line 639 | Line 638 | set_default_conf(void)
638    ConfigChannel.invite_client_count = 10;
639    ConfigChannel.invite_client_time = 300;
640    ConfigChannel.invite_delay_channel = 5;
641 +  ConfigChannel.invite_expire_time = 1800;
642    ConfigChannel.knock_client_count = 1;
643    ConfigChannel.knock_client_time = 300;
644    ConfigChannel.knock_delay_channel = 60;
645    ConfigChannel.max_channels = 25;
646    ConfigChannel.max_invites = 20;
647 <  ConfigChannel.max_bans = 25;
647 >  ConfigChannel.max_bans = 100;
648 >  ConfigChannel.max_bans_large = 500;
649    ConfigChannel.default_join_flood_count = 18;
650    ConfigChannel.default_join_flood_time = 6;
651  
# Line 672 | Line 673 | set_default_conf(void)
673    ConfigGeneral.disable_auth = 0;
674    ConfigGeneral.kill_chase_time_limit = 90;
675    ConfigGeneral.default_floodcount = 8;
676 +  ConfigGeneral.default_floodtime = 1;
677    ConfigGeneral.failed_oper_notice = 1;
678    ConfigGeneral.dots_in_ident = 0;
679    ConfigGeneral.min_nonwildcard = 4;
# Line 692 | Line 694 | set_default_conf(void)
694    ConfigGeneral.stats_P_oper_only = 0;
695    ConfigGeneral.stats_u_oper_only = 0;
696    ConfigGeneral.caller_id_wait = 60;
697 <  ConfigGeneral.opers_bypass_callerid = 0;
697 >  ConfigGeneral.opers_bypass_callerid = 1;
698    ConfigGeneral.pace_wait = 10;
699    ConfigGeneral.pace_wait_simple = 1;
700    ConfigGeneral.short_motd = 0;
# Line 902 | Line 904 | static const struct oper_flags
904   const char *
905   oper_privs_as_string(const unsigned int flags)
906   {
907 <  static char buf[sizeof(flag_table) / sizeof(struct oper_flags)];
907 >  static char buf[sizeof(flag_table) / sizeof(flag_table[0])];
908    char *p = buf;
909  
910    for (const struct oper_flags *tab = flag_table; tab->flag; ++tab)
# Line 1017 | Line 1019 | clear_out_old_conf(void)
1019  
1020    pseudo_clear();  /* Clear pseudo {} items */
1021  
1020 – #ifdef HAVE_LIBGEOIP
1021 –  GeoIP_delete(GeoIPv4_ctx);
1022 –  GeoIPv4_ctx = NULL;
1023 –  GeoIP_delete(GeoIPv6_ctx);
1024 –  GeoIPv6_ctx = NULL;
1025 – #endif
1026 –
1022    /* Clean out ConfigServerInfo */
1023    xfree(ConfigServerInfo.description);
1024    ConfigServerInfo.description = NULL;
# Line 1031 | Line 1026 | clear_out_old_conf(void)
1026    ConfigServerInfo.network_name = NULL;
1027    xfree(ConfigServerInfo.network_desc);
1028    ConfigServerInfo.network_desc = NULL;
1034 –  xfree(ConfigServerInfo.libgeoip_ipv6_database_file);
1035 –  ConfigServerInfo.libgeoip_ipv6_database_file = NULL;
1036 –  xfree(ConfigServerInfo.libgeoip_ipv4_database_file);
1037 –  ConfigServerInfo.libgeoip_ipv4_database_file = NULL;
1029    xfree(ConfigServerInfo.rsa_private_key_file);
1030    ConfigServerInfo.rsa_private_key_file = NULL;
1031    xfree(ConfigServerInfo.ssl_certificate_file);
# Line 1143 | Line 1134 | read_conf_files(int cold)
1134    snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1135             ConfigChannel.max_channels);
1136    isupport_add("CHANLIMIT", chanlimit, -1);
1137 <  snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1137 >  snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstuCLMORST");
1138    isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1139    isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1140    isupport_add("CHANMODES", chanmodes, -1);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)