diff options
| author | Timo Sirainen <cras@irssi.org> | 2002-08-26 19:32:15 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2002-08-26 19:32:15 +0000 |
| commit | 1539cf81f3642c5afd1267b3adc4fc2d46308ceb (patch) | |
| tree | 9e2fbd8c9d66bb9efb11c50bfdcd04c79873771b /src/core/chat-commands.c | |
| parent | 13effe87e4d81f4b66b0b9759cf09bab7b631fcb (diff) | |
| download | irssi-1539cf81f3642c5afd1267b3adc4fc2d46308ceb.zip | |
Added OpenSSL support by vjt@users.sf.net. Also fixes a possible crash after
using /SERVER ADD -ircnet.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2890 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core/chat-commands.c')
| -rw-r--r-- | src/core/chat-commands.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c index 4bc931dc..aff0d8b7 100644 --- a/src/core/chat-commands.c +++ b/src/core/chat-commands.c @@ -88,12 +88,16 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, else if (g_hash_table_lookup(optlist, "4") != NULL) conn->family = AF_INET; + if(g_hash_table_lookup(optlist, "ssl") != NULL) + conn->use_ssl = TRUE; + if (g_hash_table_lookup(optlist, "!") != NULL) conn->no_autojoin_channels = TRUE; if (g_hash_table_lookup(optlist, "noproxy") != NULL) g_free_and_null(conn->proxy); + *rawlog_file = g_strdup(g_hash_table_lookup(optlist, "rawlog")); host = g_hash_table_lookup(optlist, "host"); @@ -108,7 +112,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, return conn; } -/* SYNTAX: CONNECT [-4 | -6] [-ircnet <ircnet>] [-host <hostname>] +/* SYNTAX: CONNECT [-4 | -6] [-ssl] [-ircnet <ircnet>] [-host <hostname>] <address>|<chatnet> [<port> [<password> [<nick>]]] */ static void cmd_connect(const char *data) { @@ -209,7 +213,7 @@ static void sig_default_command_server(const char *data, SERVER_REC *server, signal_emit("command server connect", 3, data, server, item); } -/* SYNTAX: SERVER [-4 | -6] [-ircnet <ircnet>] [-host <hostname>] +/* SYNTAX: SERVER [-4 | -6] [-ssl] [-ircnet <ircnet>] [-host <hostname>] [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */ static void cmd_server_connect(const char *data, SERVER_REC *server) { @@ -439,7 +443,7 @@ void chat_commands_init(void) signal_add("default command server", (SIGNAL_FUNC) sig_default_command_server); - command_set_options("connect", "4 6 !! +host noproxy -rawlog"); + command_set_options("connect", "4 6 !! ssl +host noproxy -rawlog"); command_set_options("join", "invite"); command_set_options("msg", "channel nick"); } |