moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2025-01-06 11:28:13 -05:00
Code Issues Releases Wiki Activity

servlist: Clean up specifying ssl for network

Browse Source
This commit is contained in:
TingPing 2015-01-20 03:03:45 -05:00
parent a838cd9c07
commit e5b65bbd69
1 changed files with 29 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/common/servlist.c
View File

@ -45,6 +45,7 @@ struct defaultserver
char *charset; char *charset;
int loginmode; /* default authentication type */ int loginmode; /* default authentication type */
char *connectcmd; /* default connect command - should only be used for rare login types, paired with LOGIN_CUSTOM */ char *connectcmd; /* default connect command - should only be used for rare login types, paired with LOGIN_CUSTOM */
gboolean ssl;
}; };
static const struct defaultserver def[] = static const struct defaultserver def[] =
@ -77,19 +78,13 @@ static const struct defaultserver def[] =
{0, "irc.kis.lt"}, {0, "irc.kis.lt"},
{0, "irc.vub.lt"}, {0, "irc.vub.lt"},
{"Anthrochat", 0}, {"Anthrochat", 0, 0, 0, 0, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.anthrochat.net/+6697"},
#endif
{0, "irc.anthrochat.net"}, {0, "irc.anthrochat.net"},
{"ARCNet", 0}, {"ARCNet", 0},
{0, "arcnet-irc.org"}, {0, "arcnet-irc.org"},
{"AthemeNet", 0, 0, 0, LOGIN_SASL}, {"AthemeNet", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.atheme.org/+6697"},
#endif
{0, "irc.atheme.org"}, {0, "irc.atheme.org"},
{"AustNet", 0}, {"AustNet", 0},
@ -98,16 +93,10 @@ static const struct defaultserver def[] =
{"AzzurraNet", 0}, {"AzzurraNet", 0},
{0, "irc.azzurra.org"}, {0, "irc.azzurra.org"},
{"Canternet", 0, 0, 0, LOGIN_SASL}, {"Canternet", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.canternet.org/+6697"},
#endif
{0, "irc.canternet.org"}, {0, "irc.canternet.org"},
{"Chat4all", 0}, {"Chat4all", 0, 0, 0, 0, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.chat4all.org/+7001"},
#endif
{0, "irc.chat4all.org"}, {0, "irc.chat4all.org"},
{"ChattingAway", 0}, {"ChattingAway", 0},
@ -148,26 +137,16 @@ static const struct defaultserver def[] =
{0, "irc.lightning.net"}, {0, "irc.lightning.net"},
{0, "irc.servercentral.net"}, {0, "irc.servercentral.net"},
{"ElectroCode", 0}, {"ElectroCode", 0, 0, 0, 0, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.electrocode.net/+6697"},
#endif
{0, "irc.electrocode.net"}, {0, "irc.electrocode.net"},
{"EnterTheGame", 0}, {"EnterTheGame", 0},
{0, "irc.enterthegame.com"}, {0, "irc.enterthegame.com"},
{"EntropyNet", 0, 0, 0, LOGIN_SASL}, {"EntropyNet", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.entropynet.net/+6697"},
#endif
{0, "irc.entropynet.net"}, {0, "irc.entropynet.net"},
{"EsperNet", 0, 0, 0, LOGIN_SASL}, {"EsperNet", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.esper.net/+6697"},
#endif
{0, "irc.esper.net"}, {0, "irc.esper.net"},
{"EUIrc", 0}, {"EUIrc", 0},
@ -182,18 +161,12 @@ static const struct defaultserver def[] =
{"FEFNet", 0, 0, 0, LOGIN_SASL}, {"FEFNet", 0, 0, 0, LOGIN_SASL},
{0, "irc.fef.net"}, {0, "irc.fef.net"},
{"freenode", 0, 0, 0, LOGIN_SASL}, {"freenode", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "chat.freenode.net/+6697"},
#endif
{0, "chat.freenode.net"}, {0, "chat.freenode.net"},
/* irc. points to chat. but many users and urls still reference it */ /* irc. points to chat. but many users and urls still reference it */
{0, "irc.freenode.net"}, {0, "irc.freenode.net"},
{"Furnet", 0}, {"Furnet", 0, 0, 0, 0, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.furnet.org/+6697"},
#endif
{0, "irc.furnet.org"}, {0, "irc.furnet.org"},
{"GalaxyNet", 0}, {"GalaxyNet", 0},
@ -202,10 +175,7 @@ static const struct defaultserver def[] =
{"GameSurge", 0}, {"GameSurge", 0},
{0, "irc.gamesurge.net"}, {0, "irc.gamesurge.net"},
{"GeeksIRC", 0, 0, 0, LOGIN_SASL}, {"GeeksIRC", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.geeksirc.net/+6697"},
#endif
{0, "irc.geeksirc.net"}, {0, "irc.geeksirc.net"},
{"GeekShed", 0}, {"GeekShed", 0},
@ -224,22 +194,13 @@ static const struct defaultserver def[] =
{"IdleMonkeys", 0}, {"IdleMonkeys", 0},
{0, "irc.idlemonkeys.net"}, {0, "irc.idlemonkeys.net"},
{"IndirectIRC", 0}, {"IndirectIRC", 0, 0, 0, 0, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.indirectirc.com/+6697"},
#endif
{0, "irc.indirectirc.com"}, {0, "irc.indirectirc.com"},
{"Interlinked", 0, 0, 0, LOGIN_SASL}, {"Interlinked", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.interlinked.me/+6697"},
#endif
{0, "irc.interlinked.me"}, {0, "irc.interlinked.me"},
{"IRC4Fun", 0, 0, 0, LOGIN_SASL}, {"IRC4Fun", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.irc4fun.net/+6697"},
#endif
{0, "irc.irc4fun.net"}, {0, "irc.irc4fun.net"},
{"IRCHighWay", 0}, {"IRCHighWay", 0},
@ -295,10 +256,7 @@ static const struct defaultserver def[] =
{"PIRC.PL", 0}, {"PIRC.PL", 0},
{0, "irc.pirc.pl"}, {0, "irc.pirc.pl"},
{"PonyChat", 0, 0, 0, LOGIN_SASL}, {"PonyChat", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.ponychat.net/+6697"},
#endif
{0, "irc.ponychat.net"}, {0, "irc.ponychat.net"},
{"PTNet.org", 0}, {"PTNet.org", 0},
@ -322,10 +280,7 @@ static const struct defaultserver def[] =
{"SeilEn.de", 0}, {"SeilEn.de", 0},
{0, "irc.seilen.de"}, {0, "irc.seilen.de"},
{"SeionIRC", 0, 0, 0, LOGIN_SASL}, {"SeionIRC", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.seion.us/+6697"},
#endif
{0, "irc.seion.us"}, {0, "irc.seion.us"},
{"Serenity-IRC", 0}, {"Serenity-IRC", 0},
@ -334,10 +289,7 @@ static const struct defaultserver def[] =
{"SlashNET", 0}, {"SlashNET", 0},
{0, "irc.slashnet.org"}, {0, "irc.slashnet.org"},
{"Snoonet", 0, 0, 0, LOGIN_SASL}, {"Snoonet", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.snoonet.org/+6697"},
#endif
{0, "irc.snoonet.org"}, {0, "irc.snoonet.org"},
{"Snyde", 0}, {"Snyde", 0},
@ -352,43 +304,25 @@ static const struct defaultserver def[] =
{"SorceryNet", 0, 0, 0, LOGIN_SASL}, {"SorceryNet", 0, 0, 0, LOGIN_SASL},
{0, "irc.sorcery.net"}, {0, "irc.sorcery.net"},
{"SpotChat", 0, 0, 0, LOGIN_SASL}, {"SpotChat", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.spotchat.org/+6697"},
#endif
{0, "irc.spotchat.org"}, {0, "irc.spotchat.org"},
{"StarChat", 0}, {"StarChat", 0},
{0, "irc.starchat.net"}, {0, "irc.starchat.net"},
{"Station51", 0}, {"Station51", 0, 0, 0, 0, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.station51.net/+6697"},
#endif
{0, "irc.station51.net"}, {0, "irc.station51.net"},
{"StormBit", 0, 0, 0, LOGIN_SASL}, {"StormBit", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.stormbit.net/+6697"},
#endif
{0, "irc.stormbit.net"}, {0, "irc.stormbit.net"},
{"SwiftIRC", 0}, {"SwiftIRC", 0, 0, 0, 0, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.swiftirc.net/+6697"},
#endif
{0, "irc.swiftirc.net"}, {0, "irc.swiftirc.net"},
{"synIRC", 0}, {"synIRC", 0, 0, 0, 0, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.synirc.net/+6697"},
#endif
{0, "irc.synirc.net"}, {0, "irc.synirc.net"},
{"Techtronix", 0, 0, 0, LOGIN_SASL}, {"Techtronix", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.techtronix.net/+6697"},
#endif
{0, "irc.techtronix.net"}, {0, "irc.techtronix.net"},
{"TinyCrab", 0, 0, 0, LOGIN_SASL}, {"TinyCrab", 0, 0, 0, LOGIN_SASL},
@ -413,16 +347,10 @@ static const struct defaultserver def[] =
{"Worldnet", 0}, {"Worldnet", 0},
{0, "irc.worldnet.net"}, {0, "irc.worldnet.net"},
{"Windfyre", 0}, {"Windfyre", 0, 0, 0, 0, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.windfyre.net/+6697"},
#endif
{0, "irc.windfyre.net"}, {0, "irc.windfyre.net"},
{"Xertion", 0, 0, 0, LOGIN_SASL}, {"Xertion", 0, 0, 0, LOGIN_SASL, 0, TRUE},
#ifdef USE_OPENSSL
{0, "irc.xertion.org/+6697"},
#endif
{0, "irc.xertion.org"}, {0, "irc.xertion.org"},
{0,0} {0,0}
@ -1046,6 +974,10 @@ servlist_load_defaults (void)
{ {
servlist_command_add (net, def[i].connectcmd); servlist_command_add (net, def[i].connectcmd);
} }
if (def[i].ssl)
{
net->flags |= FLAG_USE_SSL;
}
if (g_str_hash (def[i].network) == def_hash) if (g_str_hash (def[i].network) == def_hash)
{ {