pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-12 14:14:48 +02:00
Code Activity

Fix command /connect (options -ssl, -ipv6 and -port) (bug #27486)

Browse Source
This commit is contained in:
Sebastien Helleu
2009-11-19 15:37:32 +01:00
parent 018973370d
commit ebeb335560
13 changed files with 106 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -30,6 +30,7 @@ Version 0.3.1 (under dev!)
* irc: add commands /sajoin, /samode, /sanick, /sapart, /saquit (task #9770)
* irc: add options for CTCP, to block/customize CTCP reply (task #9693)
* irc: add missing CTCP: clientinfo, finger, source, time, userinfo (task #7270)
* irc: fix command /connect (options -ssl, -ipv6 and -port) (bug #27486)
* irc: improve error management on socket error (recv/send)
* irc: improve mask used by command /kickban
* xfer: add missing charset decoding/encoding for IRC DCC chat (bug #27482)
doc/en/autogen/user/irc_commands.txt
+4 -4
View File
@@ -40,16 +40,16 @@
nickname: user or host to ban
........................................
• *`/connect`* `[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port port] [-ipv6] [-ssl]]`::
• *`/connect`* `[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-ipv6] [-ssl]]`::
........................................
connect to IRC server(s)
-all: connect to all servers
servername: internal server name to connect
servername: internal server name to connect (server must have been created by /server add)
-nojoin: do not join any channel (even if autojoin is enabled on server)
hostname: hostname to connect
port: port for server (integer, default is 6667)
hostname: hostname (or IP) of a server
port: port for server (6667 by default)
ipv6: use IPv6 protocol
ssl: use SSL protocol
........................................
doc/fr/autogen/user/irc_commands.txt
+4 -4
View File
@@ -40,16 +40,16 @@
pseudo: pseudo ou hôte pour le bannissement
........................................
• *`/connect`* `[-all [-nojoin] | nom_serveur [nom_serveur ...] [-nojoin] | nom/IP [-port port] [-ipv6] [-ssl]]`::
• *`/connect`* `[-all [-nojoin] | nom_serveur [nom_serveur ...] [-nojoin] | nom[/port] [-ipv6] [-ssl]]`::
........................................
se connecter à un/plusieurs serveur(s) IRC
-all: se reconnecter à tous les serveurs
nom_serveur: nom du serveur pour se connecter
nom_serveur: nom du serveur interne pour se connecter (le serveur doit avoir été créé par /server add)
-nojoin: ne rejoindre aucun canal (même si l'autojoin est activé pour le serveur)
nom/IP: nom/IP pour se connecter
port: port pour le serveur (nombre entier, 6667 par défaut)
nom: nom (ou adresse IP) d'un serveur
port: port pour le serveur (6667 par défaut)
ipv6: utiliser le protocole IPv6
ssl: utiliser le protocole SSL
........................................
po/cs.po
+9 -6
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-11-19 14:35+0100\n"
"POT-Creation-Date: 2009-11-19 15:23+0100\n"
"PO-Revision-Date: 2009-09-14 10:56+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2981,19 +2981,22 @@ msgstr ""
msgid "connect to IRC server(s)"
msgstr "připojit se k IRC serveru/serverům"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port "
"port] [-ipv6] [-ssl]]"
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
"ipv6] [-ssl]]"
msgstr ""
"[-all [-nojoin] | jméno_serveru [jméno_serveru ...] [-nojoin] | hostname [-"
"port port] [-ipv6] [-ssl]]"
#, fuzzy
msgid ""
" -all: connect to all servers\n"
"servername: internal server name to connect\n"
"servername: internal server name to connect (server must have been created "
"by /server add)\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname to connect\n"
" port: port for server (integer, default is 6667)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
" ipv6: use IPv6 protocol\n"
" ssl: use SSL protocol"
msgstr ""
po/de.po
+9 -6
View File
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-11-19 14:35+0100\n"
"POT-Creation-Date: 2009-11-19 15:23+0100\n"
"PO-Revision-Date: 2009-11-17 00:01+0100\n"
"Last-Translator: Nils G <weechatter@arcor.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3079,19 +3079,22 @@ msgstr ""
msgid "connect to IRC server(s)"
msgstr "Mit IRC-Server(n) verbinden"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port "
"port] [-ipv6] [-ssl]]"
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
"ipv6] [-ssl]]"
msgstr ""
"[-all [-nojoin] | Servername [Servername ...] [-nojoin] | Hostname [-port "
"Port] [-ipv6] [-ssl]]"
#, fuzzy
msgid ""
" -all: connect to all servers\n"
"servername: internal server name to connect\n"
"servername: internal server name to connect (server must have been created "
"by /server add)\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname to connect\n"
" port: port for server (integer, default is 6667)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
" ipv6: use IPv6 protocol\n"
" ssl: use SSL protocol"
msgstr ""
po/es.po
+9 -6
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-11-19 14:35+0100\n"
"POT-Creation-Date: 2009-11-19 15:23+0100\n"
"PO-Revision-Date: 2009-09-06 21:25+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2788,19 +2788,22 @@ msgstr ""
msgid "connect to IRC server(s)"
msgstr "conectar a un servidor IRC"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port "
"port] [-ipv6] [-ssl]]"
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
"ipv6] [-ssl]]"
msgstr ""
"[-all [-nojoin] | servidor [servidor ...] [-nojoin] | host [-port puerto] [-"
"ipv6] [-ssl]]"
#, fuzzy
msgid ""
" -all: connect to all servers\n"
"servername: internal server name to connect\n"
"servername: internal server name to connect (server must have been created "
"by /server add)\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname to connect\n"
" port: port for server (integer, default is 6667)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
" ipv6: use IPv6 protocol\n"
" ssl: use SSL protocol"
msgstr ""
po/fr.po
+14 -12
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-11-19 14:35+0100\n"
"PO-Revision-Date: 2009-11-19 14:35+0100\n"
"POT-Creation-Date: 2009-11-19 15:23+0100\n"
"PO-Revision-Date: 2009-11-19 15:24+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
@@ -3053,27 +3053,29 @@ msgid "connect to IRC server(s)"
msgstr "se connecter à un/plusieurs serveur(s) IRC"
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port "
"port] [-ipv6] [-ssl]]"
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
"ipv6] [-ssl]]"
msgstr ""
"[-all [-nojoin] | nom_serveur [nom_serveur ...] [-nojoin] | nom/IP [-port "
"port] [-ipv6] [-ssl]]"
"[-all [-nojoin] | nom_serveur [nom_serveur ...] [-nojoin] | nom[/port] [-"
"ipv6] [-ssl]]"
msgid ""
" -all: connect to all servers\n"
"servername: internal server name to connect\n"
"servername: internal server name to connect (server must have been created "
"by /server add)\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname to connect\n"
" port: port for server (integer, default is 6667)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
" ipv6: use IPv6 protocol\n"
" ssl: use SSL protocol"
msgstr ""
" -all: se reconnecter à tous les serveurs\n"
"nom_serveur: nom du serveur pour se connecter\n"
"nom_serveur: nom du serveur interne pour se connecter (le serveur doit avoir "
"été créé par /server add)\n"
" -nojoin: ne rejoindre aucun canal (même si l'autojoin est activé pour le "
"serveur)\n"
" nom/IP: nom/IP pour se connecter\n"
" port: port pour le serveur (nombre entier, 6667 par défaut)\n"
" nom: nom (ou adresse IP) d'un serveur\n"
" port: port pour le serveur (6667 par défaut)\n"
" ipv6: utiliser le protocole IPv6\n"
" ssl: utiliser le protocole SSL"
po/hu.po
+8 -6
View File
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-11-19 14:35+0100\n"
"POT-Creation-Date: 2009-11-19 15:23+0100\n"
"PO-Revision-Date: 2009-09-20 13:51+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2903,9 +2903,10 @@ msgstr ""
msgid "connect to IRC server(s)"
msgstr "csatlakozás a szerver(ek)hez"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port "
"port] [-ipv6] [-ssl]]"
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
"ipv6] [-ssl]]"
msgstr ""
"[-all [-nojoin] | szervernév [szervernév ...] [-nojoin] | gépnév [-port "
"port] [-ipv6] [-ssl]]"
@@ -2913,10 +2914,11 @@ msgstr ""
#, fuzzy
msgid ""
" -all: connect to all servers\n"
"servername: internal server name to connect\n"
"servername: internal server name to connect (server must have been created "
"by /server add)\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname to connect\n"
" port: port for server (integer, default is 6667)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
" ipv6: use IPv6 protocol\n"
" ssl: use SSL protocol"
msgstr ""
po/it.po
+9 -6
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Weechat 0.31-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-11-19 14:35+0100\n"
"POT-Creation-Date: 2009-11-19 15:23+0100\n"
"PO-Revision-Date: 2009-11-18 21:26+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3031,19 +3031,22 @@ msgstr ""
msgid "connect to IRC server(s)"
msgstr "connette ad uno o più server IRC"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port "
"port] [-ipv6] [-ssl]]"
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
"ipv6] [-ssl]]"
msgstr ""
"[-all [-nojoin] | nome_server [nome_server ...] [-nojoin] | nome_host [-"
"porta porta] [-ipv6] [-ssl]]"
#, fuzzy
msgid ""
" -all: connect to all servers\n"
"servername: internal server name to connect\n"
"servername: internal server name to connect (server must have been created "
"by /server add)\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname to connect\n"
" port: port for server (integer, default is 6667)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
" ipv6: use IPv6 protocol\n"
" ssl: use SSL protocol"
msgstr ""
po/pl.po
+9 -6
View File
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-11-19 14:35+0100\n"
"POT-Creation-Date: 2009-11-19 15:23+0100\n"
"PO-Revision-Date: 2009-09-06 21:25+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: Polish\n"
@@ -3016,19 +3016,22 @@ msgstr ""
msgid "connect to IRC server(s)"
msgstr "łączy się z serwerem(ami) IRC"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port "
"port] [-ipv6] [-ssl]]"
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
"ipv6] [-ssl]]"
msgstr ""
"[-all [-nojoin] | nazwa_serwera [nazwa_serwera ...] [-nojoin] | nazwa_hosta "
"[-port port] [-ipv6] [-ssl]]"
#, fuzzy
msgid ""
" -all: connect to all servers\n"
"servername: internal server name to connect\n"
"servername: internal server name to connect (server must have been created "
"by /server add)\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname to connect\n"
" port: port for server (integer, default is 6667)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
" ipv6: use IPv6 protocol\n"
" ssl: use SSL protocol"
msgstr ""
po/ru.po
+8 -6
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-11-19 14:35+0100\n"
"POT-Creation-Date: 2009-11-19 15:23+0100\n"
"PO-Revision-Date: 2009-09-20 13:50+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2915,9 +2915,10 @@ msgstr ""
msgid "connect to IRC server(s)"
msgstr "подключиться к серверу(-ам)"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port "
"port] [-ipv6] [-ssl]]"
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
"ipv6] [-ssl]]"
msgstr ""
"[-all [-nojoin] | сервер [servername ...] [-nojoin] | адрес [-port порт] [-"
"ipv6] [-ssl]]"
@@ -2925,10 +2926,11 @@ msgstr ""
#, fuzzy
msgid ""
" -all: connect to all servers\n"
"servername: internal server name to connect\n"
"servername: internal server name to connect (server must have been created "
"by /server add)\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname to connect\n"
" port: port for server (integer, default is 6667)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
" ipv6: use IPv6 protocol\n"
" ssl: use SSL protocol"
msgstr ""
po/weechat.pot
+7 -6
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-11-19 14:35+0100\n"
"POT-Creation-Date: 2009-11-19 15:23+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2535,16 +2535,17 @@ msgid "connect to IRC server(s)"
msgstr ""
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port "
"port] [-ipv6] [-ssl]]"
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
"ipv6] [-ssl]]"
msgstr ""
msgid ""
" -all: connect to all servers\n"
"servername: internal server name to connect\n"
"servername: internal server name to connect (server must have been created "
"by /server add)\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname to connect\n"
" port: port for server (integer, default is 6667)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
" ipv6: use IPv6 protocol\n"
" ssl: use SSL protocol"
msgstr ""
src/plugins/irc/irc-command.c
+15 -5
View File
@@ -625,6 +625,16 @@ irc_command_connect (void *data, struct t_gui_buffer *buffer, int argc,
IRC_COLOR_CHAT_SERVER,
ptr_server->name,
IRC_COLOR_CHAT);
if (ipv6)
{
weechat_config_option_set (ptr_server->options[IRC_SERVER_OPTION_IPV6],
"on", 1);
}
if (ssl)
{
weechat_config_option_set (ptr_server->options[IRC_SERVER_OPTION_SSL],
"on", 1);
}
if (!irc_command_connect_one_server (ptr_server, 0))
connect_ok = 0;
}
@@ -3860,15 +3870,15 @@ irc_command_init ()
weechat_hook_command ("connect",
N_("connect to IRC server(s)"),
N_("[-all [-nojoin] | servername [servername ...] "
"[-nojoin] | hostname [-port port] [-ipv6] "
"[-nojoin] | hostname[/port] [-ipv6] "
"[-ssl]]"),
N_(" -all: connect to all servers\n"
"servername: internal server name to connect\n"
"servername: internal server name to connect "
"(server must have been created by /server add)\n"
" -nojoin: do not join any channel (even if "
"autojoin is enabled on server)\n"
" hostname: hostname to connect\n"
" port: port for server (integer, default "
"is 6667)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
" ipv6: use IPv6 protocol\n"
" ssl: use SSL protocol"),
"-all -nojoin"