9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ircd: remove basically entirely pointless ServerInfo.hub (closes #167)

Browse source
This commit is contained in:
William Pitcock 2016-03-19 23:05:07 -05:00
parent 72b51232a9
commit 1859e9d7d7
8 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/ircd.conf.example
View file

@ -51,7 +51,6 @@ serverinfo {
sid = "42X"; sid = "42X";
description = "charybdis test server"; description = "charybdis test server";
network_name = "StaticBox"; network_name = "StaticBox";
hub = yes;
/* On multi-homed hosts you may need the following. These define /* On multi-homed hosts you may need the following. These define
* the addresses we connect from to other servers. */ * the addresses we connect from to other servers. */

5
doc/reference.conf
View file

@ -134,11 +134,6 @@ serverinfo {
*/ */
network_name = "MyNet"; network_name = "MyNet";
/* hub: allow this server to act as a hub and have multiple servers
* connected to it.
*/
hub = no;
/* vhost: the IP to bind to when we connect outward to ipv4 servers. /* vhost: the IP to bind to when we connect outward to ipv4 servers.
* This should be an ipv4 IP only. * This should be an ipv4 IP only.
*/ */

4
doc/server-version-info.txt
View file

@ -17,8 +17,6 @@
+----------------------------+ +----------------------------+
| 'e' | USE_EXCEPT | | 'e' | USE_EXCEPT |
|------+---------------------| |------+---------------------|
| 'H' | HUB |
|------+---------------------|
| 'I' | USE_INVEX | | 'I' | USE_INVEX |
|------+---------------------| |------+---------------------|
| 'K' | USE_KNOCK | | 'K' | USE_KNOCK |
@ -29,8 +27,6 @@
|------+---------------------| |------+---------------------|
| 'S' | OPERS_SEE_ALL_USERS | | 'S' | OPERS_SEE_ALL_USERS |
|------+---------------------| |------+---------------------|
| 'T' | IGNORE_BOGUS_TS |
|------+---------------------|
| 'Z' | ZIPLINKS | | 'Z' | ZIPLINKS |
|------+---------------------| |------+---------------------|
| '6' | IPv6 | | '6' | IPv6 |

1
ircd/newconf.c
View file

@ -2265,7 +2265,6 @@ remove_conf_item(const char *topconf, const char *name)
static struct ConfEntry conf_serverinfo_table[] = static struct ConfEntry conf_serverinfo_table[] =
{ {
{ "description", CF_QSTRING, NULL, 0, &ServerInfo.description }, { "description", CF_QSTRING, NULL, 0, &ServerInfo.description },
{ "hub", CF_YESNO, NULL, 0, &ServerInfo.hub },
{ "network_name", CF_QSTRING, conf_set_serverinfo_network_name, 0, NULL }, { "network_name", CF_QSTRING, conf_set_serverinfo_network_name, 0, NULL },
{ "name", CF_QSTRING, conf_set_serverinfo_name, 0, NULL }, { "name", CF_QSTRING, conf_set_serverinfo_name, 0, NULL },

2
ircd/s_conf.c
View file

@ -690,8 +690,6 @@ set_default_conf(void)
ServerInfo.specific_ipv6_vhost = 0; ServerInfo.specific_ipv6_vhost = 0;
#endif #endif
/* Don't reset hub, as that will break lazylinks */
/* ServerInfo.hub = false; */
AdminInfo.name = NULL; AdminInfo.name = NULL;
AdminInfo.email = NULL; AdminInfo.email = NULL;
AdminInfo.description = NULL; AdminInfo.description = NULL;

13
ircd/s_serv.c
View file

@ -797,19 +797,6 @@ server_estab(struct Client *client_p)
/* Its got identd , since its a server */ /* Its got identd , since its a server */
SetGotId(client_p); SetGotId(client_p);
/* If there is something in the serv_list, it might be this
* connecting server..
*/
if(!ServerInfo.hub && serv_list.head)
{
if(client_p != serv_list.head->data || serv_list.head->next)
{
ServerStats.is_ref++;
sendto_one(client_p, "ERROR :I'm a leaf not a hub");
return exit_client(client_p, client_p, client_p, "I'm a leaf");
}
}
if(IsUnknown(client_p)) if(IsUnknown(client_p))
{ {
/* the server may be linking based on certificate fingerprint now. --nenolod */ /* the server may be linking based on certificate fingerprint now. --nenolod */

6
modules/m_info.c
View file

@ -285,12 +285,6 @@ static struct InfoStruct info_table[] = {
&ConfigFileEntry.hide_spoof_ips, &ConfigFileEntry.hide_spoof_ips,
"Hide IPs of spoofed users" "Hide IPs of spoofed users"
}, },
{
"hub",
OUTPUT_BOOLEAN_YN,
&ServerInfo.hub,
"Server is a hub"
},
{ {
"kline_delay", "kline_delay",
OUTPUT_DECIMAL, OUTPUT_DECIMAL,

4
modules/m_version.c
View file

@ -124,10 +124,6 @@ confopts(void)
if(ConfigChannel.use_except) if(ConfigChannel.use_except)
*p++ = 'e'; *p++ = 'e';
/* might wanna hide this :P */
if(ServerInfo.hub)
*p++ = 'H';
if(ConfigChannel.use_invex) if(ConfigChannel.use_invex)
*p++ = 'I'; *p++ = 'I';