aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00
Code

A few missing parts from SSL patch.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2891 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-08-26 19:40:04 +00:00 committed by cras
parent 1539cf81f3
commit a6c4e47376
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fe-common/irc/fe-irc-server.c
View File

@ -50,7 +50,7 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
return target; return target;
} }
/* SYNTAX: SERVER ADD [-4 | -6] [-auto | -noauto] [-ircnet <ircnet>] /* SYNTAX: SERVER ADD [-4 | -6] [-ssl] [-auto | -noauto] [-ircnet <ircnet>]
[-host <hostname>] [-cmdspeed <ms>] [-cmdmax <count>] [-host <hostname>] [-cmdspeed <ms>] [-cmdmax <count>]
[-port <port>] <address> [<port> [<password>]] */ [-port <port>] <address> [<port> [<password>]] */
static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec, static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec,
@ -98,6 +98,8 @@ static void cmd_server_list(const char *data)
g_string_append(str, "autoconnect, "); g_string_append(str, "autoconnect, ");
if (rec->no_proxy) if (rec->no_proxy)
g_string_append(str, "noproxy, "); g_string_append(str, "noproxy, ");
if (rec->use_ssl)
g_string_append(str, "SSL, ");
if (rec->max_cmds_at_once > 0) if (rec->max_cmds_at_once > 0)
g_string_sprintfa(str, "cmdmax: %d, ", rec->max_cmds_at_once); g_string_sprintfa(str, "cmdmax: %d, ", rec->max_cmds_at_once);
if (rec->cmd_queue_speed > 0) if (rec->cmd_queue_speed > 0)

7
src/irc/core/irc-servers.c
View File

@ -166,8 +166,10 @@ SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
server->connrec = ircconn; server->connrec = ircconn;
server_connect_ref(conn); server_connect_ref(conn);
if (server->connrec->port <= 0) if (server->connrec->port <= 0) {
server->connrec->port = 6667; server->connrec->port =
server->connrec->use_ssl ? 9999 : 6667;
}
server->cmd_queue_speed = ircconn->cmd_queue_speed > 0 ? server->cmd_queue_speed = ircconn->cmd_queue_speed > 0 ?
ircconn->cmd_queue_speed : settings_get_int("cmd_queue_speed"); ircconn->cmd_queue_speed : settings_get_int("cmd_queue_speed");
@ -184,6 +186,7 @@ SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn)
ircconn->max_whois : DEFAULT_MAX_WHOIS; ircconn->max_whois : DEFAULT_MAX_WHOIS;
server->max_msgs_in_cmd = ircconn->max_msgs > 0 ? server->max_msgs_in_cmd = ircconn->max_msgs > 0 ?
ircconn->max_msgs : DEFAULT_MAX_MSGS; ircconn->max_msgs : DEFAULT_MAX_MSGS;
server->connrec->use_ssl = conn->use_ssl;
server_connect_init((SERVER_REC *) server); server_connect_init((SERVER_REC *) server);
return (SERVER_REC *) server; return (SERVER_REC *) server;