1
0
mirror of https://github.com/weechat/weechat.git synced 2026-06-27 21:36:37 +02:00

relay: don't remove relay from config when the binding fails (closes #225), add options "stop" and "restart" in command /relay

This commit is contained in:
Sébastien Helleu
2014-11-02 11:16:39 +01:00
parent a2c7420262
commit e85ae88b25
21 changed files with 587 additions and 276 deletions
+34 -26
View File
@@ -3,44 +3,52 @@
----
/relay list|listfull|listrelay
add [ipv4.][ipv6.][ssl.]<protocol.name> <port>
del [ipv4.][ipv6.][ssl.]<protocol.name>
add <name> <port>
del|stop|restart <name>
raw
sslcertkey
list: Auflistung der Relay-Clients (nur aktive Relays)
listfull: detaillierte Auflistung der Relay-Clients (alle Relays)
listrelay: Auflistung der Relays (Name und Port)
add: fügt ein Relay, für ein Protokoll + Name, hinzu
del: entfernt Relay für ein Protokoll + Name
ipv4: erzwingt die Nutzung von IPv4
ipv6: erzwingt die Nutzung von IPv6
ssl: aktiviert SSL
protocol.name: Protokoll und Name des Relay:
- Protokoll "irc": Name des Servers welcher geteilt werden soll (optional). Wird kein Name angegeben, dann muss der Client den Servernamen mittels Befehl "PASS" anfordern. Format: "PASS Server:Passwort")
- Protokoll "weechat" (Name wird nicht unterstützt)
port: Port den das Relay nutzen soll
raw: öffnet Buffer mit RAW-Relay Daten
sslcertkey: setzt SSL Zertifikat/Schlüssel mittels Eintrag in Option relay.network.ssl_cert_key
list: list relay clients (only active relays)
listfull: list relay clients (verbose, all relays)
listrelay: list relays (name and port)
add: add a relay (listen on a port)
del: remove a relay (clients remain connected)
stop: close the server socket (clients remain connected)
restart: close the server socket and listen again on port (clients remain connected)
name: relay name (see format below)
port: port used for relay
raw: open buffer with raw Relay data
sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key
Ohne Angabe von Argumenten werden alle Relay-Clients in einem neuen Buffer dargestellt.
Relay name is: [ipv4.][ipv6.][ssl.]<protocol.name>
ipv4: force use of IPv4
ipv6: force use of IPv6
ssl: enable SSL
protocol.name: protocol and name to relay:
- protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password")
- protocol "weechat" (name is not used)
Beispiele:
IRC Proxy für Server "freenode":
The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port.
The "weechat" protocol allows a remote interface to connect on the port, see the list here: http://weechat.org/download/
Without argument, this command opens buffer with list of relay clients.
Examples:
irc proxy, for server "freenode":
/relay add irc.freenode 8000
IRC Proxy, für Server "freenode", mit SSL:
irc proxy, for server "freenode", with SSL:
/relay add ssl.irc.freenode 8001
IRC Proxy für alle Server (Client wählt aus), mit SSL:
irc proxy, for all servers (client will choose), with SSL:
/relay add ssl.irc 8002
WeeChat Protokoll:
weechat protocol:
/relay add weechat 9000
WeeChat Protokoll, mit SSL:
weechat protocol with SSL:
/relay add ssl.weechat 9001
WeeChat Protokoll, mit SSL, nur IPv4 nutzen:
weechat protocol with SSL, using only IPv4:
/relay add ipv4.ssl.weechat 9001
WeeChat Protokoll, mit SSL, nur IPv6 nutzen:
weechat protocol with SSL, using only IPv6:
/relay add ipv6.ssl.weechat 9001
WeeChat Protokoll, mit SSL, mit IPv4 + IPv6:
weechat protocol with SSL, using IPv4 + IPv6:
/relay add ipv4.ipv6.ssl.weechat 9001
----
+15 -7
View File
@@ -3,25 +3,33 @@
----
/relay list|listfull|listrelay
add [ipv4.][ipv6.][ssl.]<protocol.name> <port>
del [ipv4.][ipv6.][ssl.]<protocol.name>
add <name> <port>
del|stop|restart <name>
raw
sslcertkey
list: list relay clients (only active relays)
listfull: list relay clients (verbose, all relays)
listrelay: list relays (name and port)
add: add relay for a protocol + name
del: remove relay for a protocol + name
add: add a relay (listen on a port)
del: remove a relay (clients remain connected)
stop: close the server socket (clients remain connected)
restart: close the server socket and listen again on port (clients remain connected)
name: relay name (see format below)
port: port used for relay
raw: open buffer with raw Relay data
sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key
Relay name is: [ipv4.][ipv6.][ssl.]<protocol.name>
ipv4: force use of IPv4
ipv6: force use of IPv6
ssl: enable SSL
protocol.name: protocol and name to relay:
- protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password")
- protocol "weechat" (name is not used)
port: port used for relay
raw: open buffer with raw Relay data
sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key
The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port.
The "weechat" protocol allows a remote interface to connect on the port, see the list here: http://weechat.org/download/
Without argument, this command opens buffer with list of relay clients.
+18 -10
View File
@@ -3,25 +3,33 @@
----
/relay list|listfull|listrelay
add [ipv4.][ipv6.][ssl.]<protocole.nom> <port>
del [ipv4.][ipv6.][ssl.]<protocole.nom>
add <nom> <port>
del|stop|restart <nom>
raw
sslcertkey
list : lister les clients pour le relai
listfull : lister les clients pour le relai (verbeux)
listrelay : lister les relais (nom et port)
add : ajouter un relai pour un protocole + nom
del : supprimer un relai pour un protocole + nom
list : lister les clients pour le relai
listfull : lister les clients pour le relai (verbeux)
listrelay : lister les relais (nom et port)
add : ajouter un relai (écouter sur un port)
del : supprimer un relai (les clients restent connectés)
stop : fermer le socket serveur (les clients restent connectés)
restart : fermer le socket serveur et écouter à nouveau sur le port (les clients restent connectés)
nom : nom du relai (voir le format ci-dessous)
port : port utilisé pour le relai
raw : ouvrir le tampon avec les données brutes Relay
sslcertkey : définir le certificat/clé SSL en utilisant le chemin de l'option relay.network.ssl_cert_key
Le nom du relai est : [ipv4.][ipv6.][ssl.]<protocole.nom>
ipv4 : forcer l'utilisation d'IPv4
ipv6 : forcer l'utilisation d'IPv6
ssl : activer SSL
protocole.nom : protocole et nom à relayer :
- protocole "irc" : le nom est le serveur à partager (optionnel, si non donné, le nom de serveur doit être envoyé par le client dans la commande "PASS", avec le format : "PASS serveur:motdepasse")
- protocole "weechat" (le nom n'est pas utilisé)
port : port utilisé pour le relai
raw : ouvrir le tampon avec les données brutes Relay
sslcertkey : définir le certificat/clé SSL en utilisant le chemin de l'option relay.network.ssl_cert_key
Le protocole "irc" permet à n'importe quel client IRC (incluant WeeChat lui-même) de se connecter sur le port.
Le protocole "weechat" permet à une interface distante de se connecter sur le port, voir la liste ici : http://weechat.org/download/
Sans paramètre, cette commande ouvre le tampon avec la liste des clients pour le relai.
+35 -27
View File
@@ -3,44 +3,52 @@
----
/relay list|listfull|listrelay
add [ipv4.][ipv6.][ssl.]<protocollo.nome> <porta>
del [ipv4.][ipv6.][ssl.]<protocollo.nome>
add <name> <port>
del|stop|restart <name>
raw
sslcertkey
list: elenca i client relay (solo quelli attivi)
listfull: elenca i client relay (dettagliato, tutti i relay)
listrelay: elenca i relay (nome e porta)
add: aggiunge relay per un protocollo + nome
del: rimuove relay per un protocollo + nome
ipv4: forza l'uso del protocollo IPv4
ipv6: forza l'uso del protocollo IPv6
ssl: abilita SSL
protocollo.nome: protocollo e nome con cui effettuare il relay
- protocollo "irc": il nome è il server da condividere
(opzionale,
se non fornito, il nome del server deve essere inviato dal client nel comando "PASS", con il formato: "PASS server:password")
- protocollo "weechat" (il nome non viene usato)
porta: porta usata per il relay
raw: apre il buffer con dati raw Relay
sslcertkey: imposta chiave/certificato SSl usando un path nell'opzione relay.network.ssl_cert_key
list: list relay clients (only active relays)
listfull: list relay clients (verbose, all relays)
listrelay: list relays (name and port)
add: add a relay (listen on a port)
del: remove a relay (clients remain connected)
stop: close the server socket (clients remain connected)
restart: close the server socket and listen again on port (clients remain connected)
name: relay name (see format below)
port: port used for relay
raw: open buffer with raw Relay data
sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key
Senza argomento, il comando apre i buffer con l'elenco dei client relay.
Relay name is: [ipv4.][ipv6.][ssl.]<protocol.name>
ipv4: force use of IPv4
ipv6: force use of IPv6
ssl: enable SSL
protocol.name: protocol and name to relay:
- protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password")
- protocol "weechat" (name is not used)
Esempi:
proxy irc, per il server "freenode":
The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port.
The "weechat" protocol allows a remote interface to connect on the port, see the list here: http://weechat.org/download/
Without argument, this command opens buffer with list of relay clients.
Examples:
irc proxy, for server "freenode":
/relay add irc.freenode 8000
irc proxy, per il server "freenode", con SSL:
irc proxy, for server "freenode", with SSL:
/relay add ssl.irc.freenode 8001
protocollo weechat:
irc proxy, for all servers (client will choose), with SSL:
/relay add ssl.irc 8002
weechat protocol:
/relay add weechat 9000
protocollo weechat con SSL:
weechat protocol with SSL:
/relay add ssl.weechat 9001
protocollo weechat con SSL, usando solo IPv4:
weechat protocol with SSL, using only IPv4:
/relay add ipv4.ssl.weechat 9001
protocollo weechat con SSL, usando solo IPv6:
weechat protocol with SSL, using only IPv6:
/relay add ipv6.ssl.weechat 9001
protocollo weechat con SSL, usando IPv4 + IPv6:
weechat protocol with SSL, using IPv4 + IPv6:
/relay add ipv4.ipv6.ssl.weechat 9001
----
+34 -26
View File
@@ -3,44 +3,52 @@
----
/relay list|listfull|listrelay
add [ipv4.][ipv6.][ssl.]<protocol.name> <port>
del [ipv4.][ipv6.][ssl.]<protocol.name>
add <name> <port>
del|stop|restart <name>
raw
sslcertkey
list: リレーするクライアントをリストアップ (アクティブなもののみ)
listfull: リレーするクライアントをリストアップ (詳細、全てのリレー)
listrelay: リレーをリストアップ (名前とポート番号)
add: プロトコル + 名前のリレーを追加
del: プロトコル + 名前のリレーを削除
ipv4: IPv4 を強制的に利用
ipv6: IPv6 を強制的に利用
ssl: SSL を有効化
protocol.name: リレーするプロトコルと名前:
- protocol "irc": name は共有するサーバ名 (任意指定、指定しない場合、サーバ名は "PASS" コマンドでクライアントが送信するものと同じでなければいけません、"PASS" コマンドのフォーマットは "PASS server:password")
- protocol "weechat" (name は使われません)
port: リレーに使うポート番号
raw: 生 Relay データバッファを開く
sslcertkey: オプション relay.network.ssl_cert_key のパスを使って SSL 証明書/鍵を設定
list: list relay clients (only active relays)
listfull: list relay clients (verbose, all relays)
listrelay: list relays (name and port)
add: add a relay (listen on a port)
del: remove a relay (clients remain connected)
stop: close the server socket (clients remain connected)
restart: close the server socket and listen again on port (clients remain connected)
name: relay name (see format below)
port: port used for relay
raw: open buffer with raw Relay data
sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key
引数無しの場合、リレークライアントのリストを含むバッファを開く
Relay name is: [ipv4.][ipv6.][ssl.]<protocol.name>
ipv4: force use of IPv4
ipv6: force use of IPv6
ssl: enable SSL
protocol.name: protocol and name to relay:
- protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password")
- protocol "weechat" (name is not used)
例:
サーバ "freenode" に対する irc プロキシを設定:
The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port.
The "weechat" protocol allows a remote interface to connect on the port, see the list here: http://weechat.org/download/
Without argument, this command opens buffer with list of relay clients.
Examples:
irc proxy, for server "freenode":
/relay add irc.freenode 8000
サーバ "freenode" に対する SSL を有効化した irc プロキシを設定:
irc proxy, for server "freenode", with SSL:
/relay add ssl.irc.freenode 8001
SSL を有効化してすべてのサーバに対する irc プロキシを設定 (クライアントがサーバを選ぶ):
irc proxy, for all servers (client will choose), with SSL:
/relay add ssl.irc 8002
weechat プロトコル:
weechat protocol:
/relay add weechat 9000
SSL を有効化した weechat プロトコル:
weechat protocol with SSL:
/relay add ssl.weechat 9001
SSL を有効にした weechat プロトコル、IPv4 だけを利用:
weechat protocol with SSL, using only IPv4:
/relay add ipv4.ssl.weechat 9001
SSL を有効にした weechat プロトコル、IPv6 だけを利用:
weechat protocol with SSL, using only IPv6:
/relay add ipv6.ssl.weechat 9001
SSL を有効にした weechat プロトコル、IPv4 IPv6 を利用:
weechat protocol with SSL, using IPv4 + IPv6:
/relay add ipv4.ipv6.ssl.weechat 9001
----
+35 -27
View File
@@ -3,44 +3,52 @@
----
/relay list|listfull|listrelay
add [ipv4.][ipv6.][ssl.]<protokół.nazwa> <port>
del [ipv4.][ipv6.][ssl.]<protokół.nazwa>
add <name> <port>
del|stop|restart <name>
raw
kluczSSL
sslcertkey
list: wyświetla klienty relay (tylko aktywne)
listfull: wyświetla klienty relay (wszystkie)
listrelay: wyświetla relaye (nazwa i port)
add: dodaje relay dla protokołu + nazwa
del: usuwa relay dla protokołu + nazwa
ipv4: wymusza użycie IPv4
ipv6: wymusza użycie IPv6
ssl: włącza SSL
protokół.nazwa: protokół i nazwa dla relay:
- protokół "irc": nazwą jest dzielony serwer (opcjonalnie, jeśli nie zostanie podana, nazwa serwera musi zostać wysłanaprzez klienta w komendzie"PASS", w formacie: "PASS serwer:hasło")
- protokół "weechat" (nazwa nie jest używana)
port: port używany przez relay
raw: otwiera bufor z nieprzetworzonymi danymi Relay
kluczSSL: ustawia certyfikat SSL/hasło używając ścieżki w opcji relay.network.ssl_cert_key
list: list relay clients (only active relays)
listfull: list relay clients (verbose, all relays)
listrelay: list relays (name and port)
add: add a relay (listen on a port)
del: remove a relay (clients remain connected)
stop: close the server socket (clients remain connected)
restart: close the server socket and listen again on port (clients remain connected)
name: relay name (see format below)
port: port used for relay
raw: open buffer with raw Relay data
sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key
Bez argumentu komenda otwiera bufor z listą klientów relay.
Relay name is: [ipv4.][ipv6.][ssl.]<protocol.name>
ipv4: force use of IPv4
ipv6: force use of IPv6
ssl: enable SSL
protocol.name: protocol and name to relay:
- protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password")
- protocol "weechat" (name is not used)
Przykłady:
pośrednik irc dla serwera "freenode":
The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port.
The "weechat" protocol allows a remote interface to connect on the port, see the list here: http://weechat.org/download/
Without argument, this command opens buffer with list of relay clients.
Examples:
irc proxy, for server "freenode":
/relay add irc.freenode 8000
pośrednik irc dla serwera "freenode", z SSL:
irc proxy, for server "freenode", with SSL:
/relay add ssl.irc.freenode 8001
pośrednik irc dla wszystkich serwerów (klient wybiera) z SSL:
irc proxy, for all servers (client will choose), with SSL:
/relay add ssl.irc 8002
protokół weechat:
weechat protocol:
/relay add weechat 9000
protokół weechat z SSL:
weechat protocol with SSL:
/relay add ssl.weechat 9001
protokół weechat z SSL, używający tylko IPv4:
weechat protocol with SSL, using only IPv4:
/relay add ipv4.ssl.weechat 9001
protokół weechat z SSL, używający tylko IPv6:
weechat protocol with SSL, using only IPv6:
/relay add ipv6.ssl.weechat 9001
protokół weechat z SSL, używający IPv4 + IPv6:
weechat protocol with SSL, using IPv4 + IPv6:
/relay add ipv4.ipv6.ssl.weechat 9001
----