1
0
mirror of https://github.com/weechat/weechat.git synced 2026-06-16 16:14:46 +02:00

Compare commits

...

21 Commits

Author SHA1 Message Date
Sébastien Helleu a70ca92b74 Version 4.3.3 2024-06-22 11:02:31 +02:00
Sébastien Helleu 684f10c442 debian: update changelog 2024-06-22 10:10:23 +02:00
Sébastien Helleu 2d081b0ef3 core: add version 4.3.3 in release notes 2024-06-22 09:28:46 +02:00
Sébastien Helleu 19be144d2f tests: add tests of hdata returning NULL pointer in eval 2024-06-22 09:09:12 +02:00
Sébastien Helleu fb9a69c6ae core, plugins: return "0x0" instead of "(nil)" for pointers formatted in strings
This is a partial revert of the commit
965beb37de.
2024-06-22 08:59:50 +02:00
Sébastien Helleu c82486d437 core: add issue #446 in ChangeLog 2024-06-10 13:45:48 +02:00
Sébastien Helleu 802e462ce5 perl: fix quote of variable PERL_LFLAGS in CMake file 2024-06-10 09:23:03 +02:00
LuK1337 126a42235c tests: relay: fix relay_http_parse_header function prototype 2024-06-07 12:45:12 +02:00
Sébastien Helleu ddb1db9a2c tests: reset option relay.network.websocket_allowed_origins after changing it in tests (issue #2127)
This fixes a test failure when the test changing the option is executed before
this one:

…/tests/unit/plugins/relay/api/test-relay-api-protocol.cpp:799: error: Failure in TEST(RelayApiProtocolWithClient, RecvJson)
        expected <HTTP/1.1 101 Switching Protocols
Upgrade: websocket
Connection: Upgrade
Sec-WebSocket-Accept: Z5uTZwvwYNDm9w4HFGk26ijp/p0=

>
        but was  <HTTP/1.1 403 Forbidden
Content-Length: 0

>
        difference starts at position 9 at: < HTTP/1.1 403 Forbid>
2024-06-07 12:36:58 +02:00
Sébastien Helleu 26c000c6b0 Version 4.3.3-dev 2024-06-06 21:50:46 +02:00
Sébastien Helleu 59e292a5be Version 4.3.2 2024-06-06 21:45:29 +02:00
Sébastien Helleu 8617bd7d2a core: add version 4.3.2 in release notes 2024-06-06 21:43:37 +02:00
Sébastien Helleu e262cd47b4 xfer: fix display of input prompt in DCC chat buffers (issue #2128) 2024-06-06 13:31:21 +02:00
Sébastien Helleu 5a7db09eb2 irc: fix display of input prompt in private buffers (issue #2128) 2024-06-05 21:05:17 +02:00
Sébastien Helleu 5fc7813643 irc: don't return pointer to irc server if the channel or nick is not found in info "irc_buffer" 2024-06-02 22:50:24 +02:00
Sébastien Helleu dc319af254 core: add link to issue #1549 for ChangeLog entries about permessage-deflate 2024-06-02 09:56:28 +02:00
Sébastien Helleu e920903354 relay: enable websocket extension "permessage-deflate" with "api" relay only 2024-06-02 09:09:16 +02:00
Sébastien Helleu 6457394042 relay: add option relay.look.raw_messages_max_length (issue #2122) 2024-06-01 22:38:55 +02:00
Sébastien Helleu 7516774474 relay: fix websocket permessage-deflate extension when the client doesn't send the max window bits parameters 2024-06-01 22:28:37 +02:00
Sébastien Helleu a9d1b2990f relay: fix allocation and reinit of field "client_context_takeover" in websocket deflate structure 2024-06-01 14:43:31 +02:00
Sébastien Helleu 13198697a9 Version 4.3.2-dev 2024-06-01 14:39:12 +02:00
53 changed files with 616 additions and 295 deletions
+30 -1
View File
@@ -8,6 +8,35 @@
:see-release-notes: If you are upgrading: please see release notes.
:breaking: pass:quotes[*[breaking]*]
[[v4.3.3]]
== Version 4.3.3 (2024-06-22)
[[v4.3.3_fixed]]
=== Fixed
* core, plugins: return "0x0" instead of "(nil)" for pointers formatted in strings
[[v4.3.2]]
== Version 4.3.2 (2024-06-06)
[[v4.3.2_changed]]
=== Changed
* relay: enable websocket extension "permessage-deflate" with "api" relay only (issue #1549)
[[v4.3.2_added]]
=== Added
* relay: add option relay.look.raw_messages_max_length (issue #2122)
[[v4.3.2_fixed]]
=== Fixed
* irc, xfer: fix display of input prompt in IRC private buffers and DCC chat buffers (issue #2128)
* irc: don't return pointer to irc server if the channel or nick is not found in info "irc_buffer"
* relay: fix websocket permessage-deflate extension when the client doesn't send the max window bits parameters (issue #1549)
* relay: fix allocation and reinit of field "client_context_takeover" in websocket deflate structure (issue #1549)
[[v4.3.1]]
== Version 4.3.1 (2024-05-31)
@@ -45,7 +74,7 @@
* {breaking} core: rename variables with creation time in hdata "hotlist": "creation_time.tv_sec" to "time" and "creation_time.tv_usec" to "time_usec"
* {breaking} api: return `-1` or `1` if one input string is NULL and not the other in string comparison functions
* {breaking} api: use whole replacement string instead of first char in function string_remove_color
* core: use nick offline color for nick in action message
* core: use nick offline color for nick in action message (issue #446)
* core: display a specific message when the value of option is unchanged after `/set` command
* core: add variable `${highlight}` in option weechat.look.buffer_time_format (issue #2079)
* core: reintroduce help on the variables and operators in `/help eval` (issue #2005)
+10
View File
@@ -11,6 +11,16 @@ It is recommended to read it when upgrading to a new stable version. +
For a complete list of changes, please look at ChangeLog.
[[v4.3.3]]
== Version 4.3.3 (2024-06-22)
No release notes.
[[v4.3.2]]
== Version 4.3.2 (2024-06-06)
No release notes.
[[v4.3.1]]
== Version 4.3.1 (2024-05-31)
+16
View File
@@ -1,3 +1,19 @@
weechat (4.3.1-1) unstable; urgency=medium
* New upstream release (Closes: #1067608)
- fix FTBFS against libgcrypt 1.11 (Closes: #1071960)
* Add build dependency on libcjson-dev
* Replace pkg-config build dependency by pkgconf
* Minor updates in debian/copyright
-- Emmanuel Bouthenot <kolter@debian.org> Sat, 01 Jun 2024 14:21:02 +0000
weechat (4.1.1-1) unstable; urgency=medium
* New upstream release (Closes: #1055278)
-- Emmanuel Bouthenot <kolter@debian.org> Fri, 03 Nov 2023 20:23:37 +0000
weechat (4.0.5-1) unstable; urgency=medium
* New upstream release
+6 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14416,6 +14416,11 @@ msgid ""
"\"weechat\", \"api\""
msgstr ""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
#, fuzzy
msgid "text color for client description"
msgstr "barva textu pro zvýrazněný prefix"
+57 -52
View File
@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-05-24 10:45+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -2108,11 +2108,11 @@ msgstr ""
"undOperatoren (+, -, *, /, //, %, **)"
msgid ""
" - ${random:min,max}: a random integer number between \"min\" and "
"\"max\" (inclusive)"
" - ${random:min,max}: a random integer number between \"min\" and \"max\" "
"(inclusive)"
msgstr ""
" - ${random:min,max}: eine zufällige ganze Zahl zwischen \"min\" "
"und\"max\" (einschließlich)"
" - ${random:min,max}: eine zufällige ganze Zahl zwischen \"min\" und\"max\" "
"(einschließlich)"
msgid " - ${translate:string}: the translated string"
msgstr " - ${translate:string}: die übersetzte Zeichenkette"
@@ -3043,8 +3043,8 @@ msgid ""
" raw[chat(xxx)]: chat area for buffer with name \"xxx\" (full name "
"including plugin)"
msgstr ""
" raw[chat(xxx)]: Chatbereich für einen Buffer mit dem Namen "
"\"xxx\" (vollständiger Name, mit Erweiterung)"
" raw[chat(xxx)]: Chatbereich für einen Buffer mit dem Namen \"xxx\" "
"(vollständiger Name, mit Erweiterung)"
msgid " raw[bar(*)]: any bar"
msgstr " raw[bar(*)]: beliebige Bar"
@@ -4976,8 +4976,8 @@ msgstr ""
"\"-yes\" ausgeführt werden (siehe /help quit)"
msgid ""
"if set, /upgrade command must be confirmed with extra argument \"-"
"yes\" (see /help upgrade)"
"if set, /upgrade command must be confirmed with extra argument \"-yes\" "
"(see /help upgrade)"
msgstr ""
"ist diese Einstellung aktiviert, muss der \"/upgrade\" Befehl mit dem "
"Argument \"-yes\" ausgeführt werden (siehe /help upgrade)"
@@ -5033,10 +5033,10 @@ msgid ""
"weechat.color.emphasized* are used"
msgstr ""
"Attribute um Textpassagen hervorzuheben: Das setzen von ein- oder mehreren "
"Attributen ist möglich (\"%\" für blinkenden Text, \".\" zum "
"\"dimmen\" (halbe Helligkeit),\"*\" für fett, \"!\" für invertiert, \"/\" "
"für kursiv, \"_\" für unterstrichen); wenn die Zeichenkette leer ist, werden "
"die Farben genutzt die durch weechat.color.emphasized* definiert sind"
"Attributen ist möglich (\"%\" für blinkenden Text, \".\" zum \"dimmen\" "
"(halbe Helligkeit),\"*\" für fett, \"!\" für invertiert, \"/\" für kursiv, "
"\"_\" für unterstrichen); wenn die Zeichenkette leer ist, werden die Farben "
"genutzt die durch weechat.color.emphasized* definiert sind"
msgid ""
"comma separated list of words to highlight; case insensitive comparison (use "
@@ -7008,24 +7008,24 @@ msgstr ""
"Bedingungen um eine Infobar anzuzeigen. Eine einfache Bedingung: \"active\", "
"\"inactive\", \"nicklist\" (Fenster muss aktiv/inaktiv sein oder der Buffer "
"enthält eine Benutzerliste), oder man nutzt einen Ausdruck mit Bedingungen "
"(siehe /help eval). Beispiele: \"${nicklist} && ${info:term_width} > "
"100\" (lokale Variablen für den Ausdruck sind ${active}, ${inactive} und "
"(siehe /help eval). Beispiele: \"${nicklist} && ${info:term_width} > 100\" "
"(lokale Variablen für den Ausdruck sind ${active}, ${inactive} und "
"${nicklist})"
msgid "bar position (bottom, top, left, right)"
msgstr "Position der Infobar (unten, oben, links, rechts)"
msgid ""
"bar filling direction (\"horizontal\" (from left to right) or "
"\"vertical\" (from top to bottom)) when bar position is top or bottom"
"bar filling direction (\"horizontal\" (from left to right) or \"vertical\" "
"(from top to bottom)) when bar position is top or bottom"
msgstr ""
"Darstellung innerhalb der Infobar, falls die Infobar oben/unten angezeigt "
"wird (\"horizontal\" (von links nach rechts) oder \"vertikal\" (von oben "
"nach unten))"
msgid ""
"bar filling direction (\"horizontal\" (from left to right) or "
"\"vertical\" (from top to bottom)) when bar position is left or right"
"bar filling direction (\"horizontal\" (from left to right) or \"vertical\" "
"(from top to bottom)) when bar position is left or right"
msgstr ""
"Darstellung innerhalb der Infobar, falls die Infobar links/rechts angezeigt "
"wird (\"horizontal\" (von links nach rechts) oder \"vertikal\" (von oben "
@@ -7065,9 +7065,9 @@ msgid "separator line between bar and other bars/windows"
msgstr "Trennzeichen zwischen verschieden Infobars und Fenstern"
msgid ""
"items of bar, they can be separated by comma (space between items) or \"+"
"\" (glued items); special syntax \"@buffer:item\" can be used to force "
"buffer used when displaying the bar item"
"items of bar, they can be separated by comma (space between items) or \"+\" "
"(glued items); special syntax \"@buffer:item\" can be used to force buffer "
"used when displaying the bar item"
msgstr ""
"Items einer Bar können entweder durch Kommata (\",\") voneinander getrennt "
"(setzt ein Leerzeichen zwischen die Items), oder durch ein \"+\" Zeichen "
@@ -8811,8 +8811,8 @@ msgid " - ${description}: option description (translated)"
msgstr " - ${description}: Beschreibung der Option (übersetzt)"
msgid ""
" - ${description2}: option description (translated), \"(no "
"description)\" (translated) if there's no description"
" - ${description2}: option description (translated), \"(no description)\" "
"(translated) if there's no description"
msgstr ""
" - ${description2}: Beschreibung der Option (übersetzt), \"(keine "
"Beschreibung)\" (übersetzt) falls keine Beschreibung vorhanden"
@@ -9503,8 +9503,8 @@ msgstr ""
#, c-format
msgid ""
"%s%s: if you want to add a standard server, use the command \"/server "
"add\" (see /help server); if you really want to add a temporary server (NOT "
"%s%s: if you want to add a standard server, use the command \"/server add\" "
"(see /help server); if you really want to add a temporary server (NOT "
"SAVED), turn on the option irc.look.temporary_servers"
msgstr ""
"%s%s: falls ein Standardserver erstellt werden soll, muss der Befehl \"/"
@@ -12667,8 +12667,8 @@ msgid ""
"interval between two checks for notify with IRC command \"whois\" (in "
"minutes)"
msgstr ""
"Intervall zwischen zwei notify Überprüfungen mit dem IRC Befehl "
"\"whois\" (in Minuten)"
"Intervall zwischen zwei notify Überprüfungen mit dem IRC Befehl \"whois\" "
"(in Minuten)"
msgid ""
"cause SASL authentication failure when SASL is requested but unavailable on "
@@ -15016,19 +15016,19 @@ msgstr "%s%s: Interpreter kann nicht freigeben werden"
#, c-format
msgid ""
"%s%s: too few arguments received from client %s%s%s for resource "
"\"%s\" (received: %d arguments, expected: at least %d)"
"%s%s: too few arguments received from client %s%s%s for resource \"%s\" "
"(received: %d arguments, expected: at least %d)"
msgstr ""
"%s%s: Zu wenige Argumente von Client %s%s%s für die Ressource \"%s\" "
"erhalten (Empfangen: %d Argumente, mindestens erwartet: %d)"
#, c-format
msgid ""
"%s%s: too many arguments received from client %s%s%s for resource "
"\"%s\" (received: %d arguments, expected: at most %d)"
"%s%s: too many arguments received from client %s%s%s for resource \"%s\" "
"(received: %d arguments, expected: at most %d)"
msgstr ""
"%s%s: Zu viele Argumente von Client erhalten %s%s%s für die Ressource "
"\"%s\" (Empfangen: %d Argumente, höchstens erwartet: %d)"
"%s%s: Zu viele Argumente von Client erhalten %s%s%s für die Ressource \"%s\" "
"(Empfangen: %d Argumente, höchstens erwartet: %d)"
#, c-format
msgid "%s%s: failed to execute route \"%s %s\" for client %s%s%s"
@@ -15784,6 +15784,11 @@ msgstr ""
"Verbindung zum Relay herstellen oder trennen (durch Kommas getrennte Liste); "
"erlaubte Protokolle: \"irc\", \"weechat\", \"api\""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
msgid "text color for client description"
msgstr "Textfarbe für Client-Beschreibung"
@@ -16107,8 +16112,8 @@ msgid ""
"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option "
"relay.network.tls_cert_key)"
msgstr ""
"%s%s: Fehler: Datei mit TLS Zertifikat/Schlüssel ist nicht lesbar: "
"\"%s\" (Option relay.network.tls_cert_key)"
"%s%s: Fehler: Datei mit TLS Zertifikat/Schlüssel ist nicht lesbar: \"%s\" "
"(Option relay.network.tls_cert_key)"
#, c-format
msgid "%s%s: unable to initialize priority for TLS"
@@ -16252,8 +16257,8 @@ msgstr ""
#, c-format
msgid ""
"%s%s: too few arguments received from client %s%s%s for command "
"\"%s\" (received: %d arguments, expected: at least %d)"
"%s%s: too few arguments received from client %s%s%s for command \"%s\" "
"(received: %d arguments, expected: at least %d)"
msgstr ""
"%s%s: Zu wenige Argumente von Client %s%s%s für den Befehl \"%s\" erhalten "
"(Empfangen: %d Argumente, mindestens Erwartet: %d)"
@@ -17422,22 +17427,22 @@ msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat"
#. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
msgid ""
"list [-o|-ol|-i|-il] || listfull || listdefault || add|addoff|addreplace "
"<name> <hook> "
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
"|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
"<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|"
"<mask> [<name>|<mask>...]] || restart <name>|<mask> [<name>|<mask>...] || "
"show <name> || del <name>|<mask> [<name>|<mask>...] || restore <name>|<mask> "
"[<name>|<mask>...] || default -yes || monitor [<filter>]"
"<name> <hook> [\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" "
"[\"<return_code>\" [\"<post_action>\"]]]]]] || addinput [<hook>] || input|"
"output|recreate <name> || set <name> <option> <value> || rename|copy <name> "
"<new_name> || enable|disable|toggle [<name>|<mask> [<name>|<mask>...]] || "
"restart <name>|<mask> [<name>|<mask>...] || show <name> || del <name>|<mask> "
"[<name>|<mask>...] || restore <name>|<mask> [<name>|<mask>...] || default -"
"yes || monitor [<filter>]"
msgstr ""
"list [-o|-ol|-i|-il] || listfull || listdefault || add|addoff|addreplace "
"<name> <hook> "
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
"|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
"<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|"
"<mask> [<name>|<mask>...]] || restart <name>|<mask> [<name>|<mask>...] || "
"show <name> || del <name>|<mask> [<name>|<mask>...] || restore <name>|<mask> "
"[<name>|<mask>...] || default -yes || monitor [<filter>]"
"<name> <hook> [\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" "
"[\"<return_code>\" [\"<post_action>\"]]]]]] || addinput [<hook>] || input|"
"output|recreate <name> || set <name> <option> <value> || rename|copy <name> "
"<new_name> || enable|disable|toggle [<name>|<mask> [<name>|<mask>...]] || "
"restart <name>|<mask> [<name>|<mask>...] || show <name> || del <name>|<mask> "
"[<name>|<mask>...] || restore <name>|<mask> [<name>|<mask>...] || default -"
"yes || monitor [<filter>]"
msgid "raw[list]: list triggers (without argument, this list is displayed)"
msgstr ""
+6 -1
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
"Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14733,6 +14733,11 @@ msgid ""
"\"weechat\", \"api\""
msgstr ""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
msgid "text color for client description"
msgstr "color del texto para la descripción del cliente"
+10 -2
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"PO-Revision-Date: 2024-05-23 21:02+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-06-01 22:38+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -15489,6 +15489,14 @@ msgstr ""
"relai qui utilisent un de ces protocoles (liste séparée par des virfules) ; "
"protocoles autorisés : \"irc\", \"weechat\", \"api\""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
"nombre maximum de caractères à afficher dans les messages bruts (les très "
"longs messages peuvent provoquer des lenteurs) ; 0 = afficher les messages "
"entiers"
msgid "text color for client description"
msgstr "couleur du texte pour la description du client"
+6 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -13793,6 +13793,11 @@ msgid ""
"\"weechat\", \"api\""
msgstr ""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
#, fuzzy
msgid "text color for client description"
msgstr "információs pult határolóinak színe"
+6 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14771,6 +14771,11 @@ msgid ""
"\"weechat\", \"api\""
msgstr ""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
msgid "text color for client description"
msgstr "colore del testo per la descrizione del client"
+6 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -15206,6 +15206,11 @@ msgid ""
"\"weechat\", \"api\""
msgstr ""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
msgid "text color for client description"
msgstr "クライアント説明用のテキスト色"
+69 -66
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-05-25 13:34+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -813,8 +813,8 @@ msgstr "%sNie można ustawić opcji \"%s\" dla proxy \"%s\""
msgid ""
"%sYou must confirm /%s command with extra argument \"-yes\" (see /help %s)"
msgstr ""
"%sMusisz potwierdzić użycie komendy /%s dodatkowym argumentem \"-"
"yes\" (zobacz /help %s)"
"%sMusisz potwierdzić użycie komendy /%s dodatkowym argumentem \"-yes\" "
"(zobacz /help %s)"
#, c-format
msgid "Options reloaded from %s"
@@ -2044,8 +2044,8 @@ msgstr ""
"*, /, //, %, **)"
msgid ""
" - ${random:min,max}: a random integer number between \"min\" and "
"\"max\" (inclusive)"
" - ${random:min,max}: a random integer number between \"min\" and \"max\" "
"(inclusive)"
msgstr ""
" - ${random:min,max}: losowa liczba całkowita z przedziału od „min” do "
"„max” (włącznie)"
@@ -4741,8 +4741,8 @@ msgstr ""
"\"-yes\" (zobacz /help quit)"
msgid ""
"if set, /upgrade command must be confirmed with extra argument \"-"
"yes\" (see /help upgrade)"
"if set, /upgrade command must be confirmed with extra argument \"-yes\" "
"(see /help upgrade)"
msgstr ""
"jeśli ustawione, komenda /upgrade musi być potwierdzona dodatkowym "
"argumentem \"-yes\" (zobacz /help upgrade)"
@@ -6672,15 +6672,15 @@ msgid "bar position (bottom, top, left, right)"
msgstr "pozycja paska (bottom (dół), top (góra), left (lewo), right (prawo))"
msgid ""
"bar filling direction (\"horizontal\" (from left to right) or "
"\"vertical\" (from top to bottom)) when bar position is top or bottom"
"bar filling direction (\"horizontal\" (from left to right) or \"vertical\" "
"(from top to bottom)) when bar position is top or bottom"
msgstr ""
"kierunek wypełniania paska (\"horizontal\" (od lewej do prawej) lub "
"\"vertical\" (od góry do dołu)), kiedy pozycja paska to góra albo dół"
msgid ""
"bar filling direction (\"horizontal\" (from left to right) or "
"\"vertical\" (from top to bottom)) when bar position is left or right"
"bar filling direction (\"horizontal\" (from left to right) or \"vertical\" "
"(from top to bottom)) when bar position is left or right"
msgstr ""
"kierunek wypełniania paska (\"horizontal\" (od lewej do prawej) lub "
"\"vertical\" (od góry do dołu)), kiedy pozycja paska to lewo albo prawo"
@@ -6719,9 +6719,9 @@ msgid "separator line between bar and other bars/windows"
msgstr "separator pomiędzy paskiem a innymi paskami/oknami"
msgid ""
"items of bar, they can be separated by comma (space between items) or \"+"
"\" (glued items); special syntax \"@buffer:item\" can be used to force "
"buffer used when displaying the bar item"
"items of bar, they can be separated by comma (space between items) or \"+\" "
"(glued items); special syntax \"@buffer:item\" can be used to force buffer "
"used when displaying the bar item"
msgstr ""
"elementy paska, mogą być oddzielone przecinkiem (spacja pomiędzy elementami) "
"lub \"+\" (skleja elementy); specjalna składnia \"@buffer:item\" może być "
@@ -7956,8 +7956,8 @@ msgid ""
msgstr ""
"powłoka używana przez komendę \"/exec -sh\"; może to być nazwa powłoki jeśli "
"znajduje się ona w PATH (na przykład \"bash\") lub ścieżka absolutna (na "
"przykład \"/bin/bash\"); jeśli wartość jest pusta, zostanie użyte "
"\"sh\" (uwaga: zawartość jest przetwarzana, zobacz /help eval)"
"przykład \"/bin/bash\"); jeśli wartość jest pusta, zostanie użyte \"sh\" "
"(uwaga: zawartość jest przetwarzana, zobacz /help eval)"
msgid "text color for a finished command flag in list of commands"
msgstr "kolor tekstu dla flagi zakończonej komendy na liście komend"
@@ -8380,8 +8380,8 @@ msgid " - ${description}: option description (translated)"
msgstr " - ${description}: opis opcji (przetłumaczony)"
msgid ""
" - ${description2}: option description (translated), \"(no "
"description)\" (translated) if there's no description"
" - ${description2}: option description (translated), \"(no description)\" "
"(translated) if there's no description"
msgstr ""
" - ${description2}: opis opcji (przetłumaczony), „(brak opisu)” jeśli nie "
"ma opisu"
@@ -9046,13 +9046,13 @@ msgstr ""
#, c-format
msgid ""
"%s%s: if you want to add a standard server, use the command \"/server "
"add\" (see /help server); if you really want to add a temporary server (NOT "
"%s%s: if you want to add a standard server, use the command \"/server add\" "
"(see /help server); if you really want to add a temporary server (NOT "
"SAVED), turn on the option irc.look.temporary_servers"
msgstr ""
"%s%s: jeśli chcesz dodać standardowy serwer, użyj komendy \"/server "
"add\" (zobacz /help server); jeśli naprawdę chcesz utworzyć serwer "
"tymczasowy (NIE ZAPISANY), włącz opcję irc.look.temporary_servers"
"%s%s: jeśli chcesz dodać standardowy serwer, użyj komendy \"/server add\" "
"(zobacz /help server); jeśli naprawdę chcesz utworzyć serwer tymczasowy (NIE "
"ZAPISANY), włącz opcję irc.look.temporary_servers"
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
@@ -11060,9 +11060,9 @@ msgid ""
"file with ECC private key for mechanism \"ecdsa-nist256p-challenge\" (path "
"is evaluated, see function string_eval_path_home in plugin API reference)"
msgstr ""
"plik z kluczem prywatnym ECC dla mechanizmu \"ecdsa-nist256p-"
"challenge\" (ścieżka jest przetwarzana, zobacz funkcję string_eval_path_home "
"w opisie API wtyczek)"
"plik z kluczem prywatnym ECC dla mechanizmu \"ecdsa-nist256p-challenge\" "
"(ścieżka jest przetwarzana, zobacz funkcję string_eval_path_home w opisie "
"API wtyczek)"
msgid "timeout (in seconds) before giving up SASL authentication"
msgstr ""
@@ -14308,19 +14308,19 @@ msgstr "%s%s: nie można zwolnić interpretera"
#, c-format
msgid ""
"%s%s: too few arguments received from client %s%s%s for resource "
"\"%s\" (received: %d arguments, expected: at least %d)"
"%s%s: too few arguments received from client %s%s%s for resource \"%s\" "
"(received: %d arguments, expected: at least %d)"
msgstr ""
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla zasobu "
"„%s” (otrzymano: %d argumentów, spodziewano się: przynajmniej %d)"
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla zasobu „%s” "
"(otrzymano: %d argumentów, spodziewano się: przynajmniej %d)"
#, c-format
msgid ""
"%s%s: too many arguments received from client %s%s%s for resource "
"\"%s\" (received: %d arguments, expected: at most %d)"
"%s%s: too many arguments received from client %s%s%s for resource \"%s\" "
"(received: %d arguments, expected: at most %d)"
msgstr ""
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla zasobu "
"„%s” (otrzymano: %d argumentów, spodziewano się: najwyżej %d)"
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla zasobu „%s” "
"(otrzymano: %d argumentów, spodziewano się: najwyżej %d)"
#, c-format
msgid "%s%s: failed to execute route \"%s %s\" for client %s%s%s"
@@ -15068,6 +15068,11 @@ msgstr ""
"używających jednego z tych protokołów (lista oddzielona przecinkami); "
"dozwolone protokoły: „irc”, „weechat”, „api”"
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
msgid "text color for client description"
msgstr "kolor tekstu dla opisu klienta"
@@ -15206,8 +15211,8 @@ msgid ""
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
msgstr ""
"oddzielona przecinkami lista algorytmów hashujących używanych dla "
"uwierzytelnienia hasłem w protokole weechat, dostępne wartości: "
"\"plain\" (hasło w postaci jawnej, nie zahashowane), \"sha256\", \"sha512\", "
"uwierzytelnienia hasłem w protokole weechat, dostępne wartości: \"plain\" "
"(hasło w postaci jawnej, nie zahashowane), \"sha256\", \"sha512\", "
"\"pbkdf2+sha256\", \"pbkdf2+sha512\", \"*\" oznacza wszystkie algorytmy, "
"nazwa zaczynająca się od \"!\" oznacza wartość negatywną w celu uniknięcia "
"użycia algorytmu, znak \"*\" może zostać użyty w nazwie (przykłady: \"*\", "
@@ -15375,8 +15380,8 @@ msgid ""
"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option "
"relay.network.tls_cert_key)"
msgstr ""
"%s%s: błąd: nie można odczytać pliku z certyfikatem/kluczem TLS: "
"\"%s\" (opcja relay.network.tls_cert_key)"
"%s%s: błąd: nie można odczytać pliku z certyfikatem/kluczem TLS: \"%s\" "
"(opcja relay.network.tls_cert_key)"
#, c-format
msgid "%s%s: unable to initialize priority for TLS"
@@ -15526,11 +15531,11 @@ msgstr "%s%s: nie udało się wykonać komendy \"%s\" dla klienta %s%s%s"
#, c-format
msgid ""
"%s%s: too few arguments received from client %s%s%s for command "
"\"%s\" (received: %d arguments, expected: at least %d)"
"%s%s: too few arguments received from client %s%s%s for command \"%s\" "
"(received: %d arguments, expected: at least %d)"
msgstr ""
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla komendy "
"\"%s\" (otrzymano: %d argumentów, spodziewano się: przynajmniej %d)"
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla komendy \"%s\" "
"(otrzymano: %d argumentów, spodziewano się: przynajmniej %d)"
msgid "Support of ruby scripts"
msgstr "Wsparcie dla skryptów ruby"
@@ -16631,23 +16636,22 @@ msgstr "zarządzaj triggerami, scyzorykiem WeeChat"
#. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
msgid ""
"list [-o|-ol|-i|-il] || listfull || listdefault || add|addoff|addreplace "
"<name> <hook> "
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
"|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
"<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|"
"<mask> [<name>|<mask>...]] || restart <name>|<mask> [<name>|<mask>...] || "
"show <name> || del <name>|<mask> [<name>|<mask>...] || restore <name>|<mask> "
"[<name>|<mask>...] || default -yes || monitor [<filter>]"
"<name> <hook> [\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" "
"[\"<return_code>\" [\"<post_action>\"]]]]]] || addinput [<hook>] || input|"
"output|recreate <name> || set <name> <option> <value> || rename|copy <name> "
"<new_name> || enable|disable|toggle [<name>|<mask> [<name>|<mask>...]] || "
"restart <name>|<mask> [<name>|<mask>...] || show <name> || del <name>|<mask> "
"[<name>|<mask>...] || restore <name>|<mask> [<name>|<mask>...] || default -"
"yes || monitor [<filter>]"
msgstr ""
"list [-o|-ol|-i|-il] || listfull || listdefault || add|addoff|addreplace "
"<nazwa> <hook> "
"[\"<argumenty>\" [\"<warunki>\" [\"<regex>\" [\"<komenda>\" [\"<zwracany_kod>\" [\"<post_action>\"]]]]]] "
"|| addinput [<hook>] || input|output|recreate <nazwa> || set <nazwa> <opcja> "
"<wartość> || rename|copy <nazwa> <nowa_nazwa> || enable|disable|toggle "
"[<nazwa>|<maska> [<nazwa>|<maska>...]] || restart <nazwa>|<maska> [<nazwa>|"
"<maska>...] || show <nazwa> || del <nazwa>|<maska> [<nazwa>|<maska>...] || "
"restore <nazwa>|<maska> [<nazwa>|<maska>...] || default -yes || monitor "
"[<filtr>]"
"<nazwa> <hook> [\"<argumenty>\" [\"<warunki>\" [\"<regex>\" [\"<komenda>\" "
"[\"<zwracany_kod>\" [\"<post_action>\"]]]]]] || addinput [<hook>] || input|"
"output|recreate <nazwa> || set <nazwa> <opcja> <wartość> || rename|copy "
"<nazwa> <nowa_nazwa> || enable|disable|toggle [<nazwa>|<maska> [<nazwa>|"
"<maska>...]] || restart <nazwa>|<maska> [<nazwa>|<maska>...] || show <nazwa> "
"|| del <nazwa>|<maska> [<nazwa>|<maska>...] || restore <nazwa>|<maska> "
"[<nazwa>|<maska>...] || default -yes || monitor [<filtr>]"
msgid "raw[list]: list triggers (without argument, this list is displayed)"
msgstr ""
@@ -17023,15 +17027,14 @@ msgstr ""
"zastępuje tekst za pomocą rozszerzonego wyrażenia regularnego POSIX "
"(następuje to tylko wtedy, jeśli warunki są spełnione i przed wykonaniem "
"komendy) (uwaga: zawartość jest przetwarzana, kiedy trigger jest "
"uruchamiany, zobacz /help eval); format to: \"/regex/zastąp/"
"zmienna\" (zmienna to zmienna w tablicy hashy do zamiany, jest to "
"opcjonalne), wiele wyrażeń można oddzielić spacja, na przykład: \"/regex1/"
"replace1/var1 /regex2/replace2/var2\"; wyescapowane znaki są interpretowane "
"w wyrażeniu (na przykład \"\\n\"); separator \"/\" może być zastąpiony "
"dowolnym znakiem (jednym lub więcej identycznych znaków); pasujące grupy "
"mogą być użyte w zastępowaniu: ${re:0} do ${re:99}, ${re:+} dla ostatniego "
"dopasowania i ${hide:c,${re:N}} do zastąpienia wszystkich znaków w grupie N "
"znakiem 'c'"
"uruchamiany, zobacz /help eval); format to: \"/regex/zastąp/zmienna\" "
"(zmienna to zmienna w tablicy hashy do zamiany, jest to opcjonalne), wiele "
"wyrażeń można oddzielić spacja, na przykład: \"/regex1/replace1/var1 /regex2/"
"replace2/var2\"; wyescapowane znaki są interpretowane w wyrażeniu (na "
"przykład \"\\n\"); separator \"/\" może być zastąpiony dowolnym znakiem "
"(jednym lub więcej identycznych znaków); pasujące grupy mogą być użyte w "
"zastępowaniu: ${re:0} do ${re:99}, ${re:+} dla ostatniego dopasowania i "
"${hide:c,${re:N}} do zastąpienia wszystkich znaków w grupie N znakiem 'c'"
msgid ""
"command(s) to run if conditions are OK, after regex replacements (many "
+6 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n"
@@ -15118,6 +15118,11 @@ msgid ""
"\"weechat\", \"api\""
msgstr ""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
msgid "text color for client description"
msgstr "cor do texto da descrição do cliente"
+6 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
"Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14243,6 +14243,11 @@ msgid ""
"\"weechat\", \"api\""
msgstr ""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
#, fuzzy
msgid "text color for client description"
msgstr "cor do texto para delimitadores de tempo"
+6 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -13847,6 +13847,11 @@ msgid ""
"\"weechat\", \"api\""
msgstr ""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
#, fuzzy
msgid "text color for client description"
msgstr "цвет разделителей информационной панели"
+6 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-05-07 14:00+0400\n"
"Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -15056,6 +15056,11 @@ msgstr ""
"користећи један од следећих протокола (листа раздвојена запетама); дозвољени "
"протоколи: „irc”, „weechat”, „api”"
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
msgid "text color for client description"
msgstr "боја текста за опис клијента"
+6 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -15379,6 +15379,11 @@ msgid ""
"\"weechat\", \"api\""
msgstr ""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
msgid "text color for client description"
msgstr "istemci açıklaması için metin rengi"
+6 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
"PO-Revision-Date: 2014-08-16 10:27+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -12624,6 +12624,11 @@ msgid ""
"\"weechat\", \"api\""
msgstr ""
msgid ""
"max number of chars to display in raw messages (very long messages can cause "
"slowness); 0 = display whole messages"
msgstr ""
msgid "text color for client description"
msgstr ""
+10 -8
View File
@@ -1149,9 +1149,9 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path,
int type, debug_id;
struct t_hashtable *hashtable;
EVAL_DEBUG_MSG(1, "eval_hdata_get_value(\"%s\", %p, \"%s\")",
EVAL_DEBUG_MSG(1, "eval_hdata_get_value(\"%s\", 0x%lx, \"%s\")",
(hdata) ? hdata->name : "(null)",
pointer,
(unsigned long)pointer,
path);
value = NULL;
@@ -1167,7 +1167,7 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path,
/* no path? just return current pointer as string */
if (!path || !path[0])
{
snprintf (str_value, sizeof (str_value), "%p", pointer);
snprintf (str_value, sizeof (str_value), "0x%lx", (unsigned long)pointer);
value = strdup (str_value);
goto end;
}
@@ -1224,7 +1224,8 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path,
break;
case WEECHAT_HDATA_POINTER:
pointer = hdata_pointer (hdata, pointer, var_name);
snprintf (str_value, sizeof (str_value), "%p", pointer);
snprintf (str_value, sizeof (str_value),
"0x%lx", (unsigned long)pointer);
value = strdup (str_value);
break;
case WEECHAT_HDATA_TIME:
@@ -1273,7 +1274,7 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path,
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
snprintf (str_value, sizeof (str_value),
"%p", ptr_value);
"0x%lx", (unsigned long)ptr_value);
value = strdup (str_value);
break;
case HASHTABLE_TIME:
@@ -1288,7 +1289,8 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path,
}
else
{
snprintf (str_value, sizeof (str_value), "%p", pointer);
snprintf (str_value, sizeof (str_value),
"0x%lx", (unsigned long)pointer);
value = strdup (str_value);
}
break;
@@ -2432,8 +2434,8 @@ eval_replace_regex (const char *string, regex_t *regex, const char *replace,
result = NULL;
EVAL_DEBUG_MSG(1, "eval_replace_regex(\"%s\", %p, \"%s\")",
string, regex, replace);
EVAL_DEBUG_MSG(1, "eval_replace_regex(\"%s\", 0x%lx, \"%s\")",
string, (unsigned long)regex, replace);
if (!string || !regex || !replace)
goto end;
+2 -1
View File
@@ -559,7 +559,8 @@ hashtable_to_string (enum t_hashtable_type type, const void *value)
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
snprintf (str_value, sizeof (str_value), "%p", value);
snprintf (str_value, sizeof (str_value), "0x%lx",
(unsigned long)value);
return str_value;
break;
case HASHTABLE_TIME:
+2 -1
View File
@@ -43,7 +43,8 @@ struct t_infolist_item;
#define HASHTABLE_SET_POINTER(__name, __pointer) \
if (__pointer) \
{ \
snprintf (str_value, sizeof (str_value), "%p", __pointer); \
snprintf (str_value, sizeof (str_value), \
"0x%lx", (unsigned long)__pointer); \
hashtable_set (hashtable, __name, str_value); \
} \
else \
+1 -1
View File
@@ -265,7 +265,7 @@ input_data (struct t_gui_buffer *buffer, const char *data,
}
/* execute modifier "input_text_for_buffer" */
snprintf (str_buffer, sizeof (str_buffer), "%p", buffer);
snprintf (str_buffer, sizeof (str_buffer), "0x%lx", (unsigned long)buffer);
new_data = hook_modifier_exec (NULL,
"input_text_for_buffer",
str_buffer,
+1 -1
View File
@@ -947,7 +947,7 @@ gui_bar_item_input_text_cb (const void *pointer, void *data,
}
/* for modifiers */
snprintf (str_buffer, sizeof (str_buffer), "%p", buffer);
snprintf (str_buffer, sizeof (str_buffer), "0x%lx", (unsigned long)buffer);
/* execute modifier with basic string (without cursor tag) */
ptr_input = NULL;
+1 -1
View File
@@ -434,7 +434,7 @@ gui_bar_check_conditions (struct t_gui_bar *bar,
*/
snprintf (str_modifier, sizeof (str_modifier),
"bar_condition_%s", bar->name);
snprintf (str_window, sizeof (str_window), "%p", window);
snprintf (str_window, sizeof (str_window), "0x%lx", (unsigned long)window);
str_displayed = hook_modifier_exec (NULL,
str_modifier,
str_window,
+2 -2
View File
@@ -677,8 +677,8 @@ gui_chat_printf_datetime_tags_internal (struct t_gui_buffer *buffer,
if (modifier_data && string)
{
snprintf (modifier_data, length_data,
"%p;%s",
buffer,
"0x%lx;%s",
(unsigned long)buffer,
(tags) ? tags : "");
if (display_time)
{
+1 -1
View File
@@ -192,7 +192,7 @@ gui_history_add (struct t_gui_buffer *buffer, const char *string)
{
char *string2, str_buffer[128];
snprintf (str_buffer, sizeof (str_buffer), "%p", buffer);
snprintf (str_buffer, sizeof (str_buffer), "0x%lx", (unsigned long)buffer);
string2 = hook_modifier_exec (NULL, "history_add", str_buffer, string);
/*
+2 -1
View File
@@ -158,7 +158,8 @@ gui_input_text_changed_modifier_and_signal (struct t_gui_buffer *buffer,
gui_buffer_undo_add (buffer);
/* send modifier, and change input if needed */
snprintf (str_buffer, sizeof (str_buffer), "%p", buffer);
snprintf (str_buffer, sizeof (str_buffer),
"0x%lx", (unsigned long)buffer);
new_input = hook_modifier_exec (NULL,
"input_text_content",
str_buffer,
+2 -2
View File
@@ -69,8 +69,8 @@ gui_nicklist_send_signal (const char *signal, struct t_gui_buffer *buffer,
if (str_args)
{
snprintf (str_args, length,
"%p,%s",
buffer,
"0x%lx,%s",
(unsigned long)buffer,
(arguments) ? arguments : "");
(void) hook_signal_send (signal,
WEECHAT_HOOK_SIGNAL_STRING, str_args);
+1 -1
View File
@@ -155,7 +155,7 @@ end:
}
/* add pointer and plugin name */
snprintf (str_value, sizeof (str_value), "%p", ptr_buffer);
snprintf (str_value, sizeof (str_value), "0x%lx", (unsigned long)ptr_buffer);
weechat_hashtable_set (info, "pointer", str_value);
weechat_hashtable_set (info, "plugin",
weechat_buffer_get_string (ptr_buffer, "plugin"));
+2 -1
View File
@@ -82,7 +82,8 @@ fset_mouse_focus_cb (const void *pointer, void *data, struct t_hashtable *info)
if (!ptr_fset_option)
return info;
snprintf (str_value, sizeof (str_value), "%p", ptr_fset_option);
snprintf (str_value, sizeof (str_value),
"0x%lx", (unsigned long)ptr_fset_option);
weechat_hashtable_set (info, "fset_option", str_value);
snprintf (str_value, sizeof (str_value), "%ld", option_index);
weechat_hashtable_set (info, "fset_option_index", str_value);
+2 -1
View File
@@ -661,7 +661,8 @@ irc_bar_item_focus_buffer_nicklist (const void *pointer, void *data,
ptr_nick = irc_nick_search (ptr_server, ptr_channel, nick);
if (ptr_nick)
{
snprintf (str_value, sizeof (str_value), "%p", ptr_nick);
snprintf (str_value, sizeof (str_value),
"0x%lx", (unsigned long)ptr_nick);
weechat_hashtable_set (info, "irc_nick", str_value);
if (ptr_nick->host)
+68 -49
View File
@@ -49,6 +49,10 @@ char *irc_channel_typing_state_string[IRC_CHANNEL_NUM_TYPING_STATES] =
char *irc_channel_default_chantypes = "#&";
char *irc_channel_get_buffer_input_prompt (struct t_irc_server *server,
struct t_irc_channel *channel);
/*
* Checks if a channel pointer is valid for a server.
*
@@ -185,7 +189,7 @@ irc_channel_create_buffer (struct t_irc_server *server,
struct t_hashtable *buffer_props;
int buffer_created, current_buffer_number, buffer_position;
int autojoin_join, manual_join, noswitch;
char str_number[32], *channel_name_lower, *buffer_name;
char str_number[32], *channel_name_lower, *buffer_name, *prompt;
const char *short_name, *localvar_channel;
buffer_created = 0;
@@ -225,6 +229,9 @@ irc_channel_create_buffer (struct t_irc_server *server,
buffer_props,
"localvar_set_type",
(channel_type == IRC_CHANNEL_TYPE_CHANNEL) ? "channel" : "private");
prompt = irc_channel_get_buffer_input_prompt (server, NULL);
weechat_hashtable_set (buffer_props, "input_prompt", (prompt) ? prompt : "");
free (prompt);
weechat_hashtable_set (buffer_props, "localvar_set_nick", server->nick);
weechat_hashtable_set (buffer_props, "localvar_set_host", server->host);
weechat_hashtable_set (buffer_props, "localvar_set_server", server->name);
@@ -611,6 +618,62 @@ irc_channel_set_buffer_modes (struct t_irc_server *server,
}
}
/*
* Gets input prompt for a channel (channel is optional: when channel is not
* given, the prefix for nick is not returned).
*
* Note: result must be freed after use.
*/
char *
irc_channel_get_buffer_input_prompt (struct t_irc_server *server,
struct t_irc_channel *channel)
{
struct t_irc_nick *ptr_nick;
int display_modes;
char str_prefix[64], *prompt;
if (!server || !server->nick)
return NULL;
/* build prefix */
str_prefix[0] = '\0';
if (channel
&& (channel->type == IRC_CHANNEL_TYPE_CHANNEL)
&& weechat_config_boolean (irc_config_look_item_nick_prefix))
{
ptr_nick = irc_nick_search (server, channel, server->nick);
if (ptr_nick)
{
if (weechat_config_boolean (irc_config_look_nick_mode_empty)
|| (ptr_nick->prefix[0] != ' '))
{
snprintf (str_prefix, sizeof (str_prefix), "%s%s",
weechat_color (
irc_nick_get_prefix_color_name (
server, ptr_nick->prefix[0])),
ptr_nick->prefix);
}
}
}
display_modes = (weechat_config_boolean (irc_config_look_item_nick_modes)
&& server->nick_modes && server->nick_modes[0]);
weechat_asprintf (&prompt, "%s%s%s%s%s%s%s%s%s",
str_prefix,
IRC_COLOR_INPUT_NICK,
server->nick,
(display_modes) ? IRC_COLOR_BAR_DELIM : "",
(display_modes) ? "(" : "",
(display_modes) ? IRC_COLOR_ITEM_NICK_MODES : "",
(display_modes) ? server->nick_modes : "",
(display_modes) ? IRC_COLOR_BAR_DELIM : "",
(display_modes) ? ")" : "");
return prompt;
}
/*
* Sets input prompt on channel buffer.
*/
@@ -619,58 +682,14 @@ void
irc_channel_set_buffer_input_prompt (struct t_irc_server *server,
struct t_irc_channel *channel)
{
struct t_irc_nick *ptr_nick;
int display_modes;
char str_prefix[64], *prompt;
char *prompt;
if (!server || !channel || !channel->buffer)
return;
if (server->nick)
{
/* build prefix */
str_prefix[0] = '\0';
if (weechat_config_boolean (irc_config_look_item_nick_prefix)
&& (channel->type == IRC_CHANNEL_TYPE_CHANNEL))
{
ptr_nick = irc_nick_search (server, channel, server->nick);
if (ptr_nick)
{
if (weechat_config_boolean (irc_config_look_nick_mode_empty)
|| (ptr_nick->prefix[0] != ' '))
{
snprintf (str_prefix, sizeof (str_prefix), "%s%s",
weechat_color (
irc_nick_get_prefix_color_name (
server, ptr_nick->prefix[0])),
ptr_nick->prefix);
}
}
}
display_modes = (weechat_config_boolean (irc_config_look_item_nick_modes)
&& server->nick_modes && server->nick_modes[0]);
weechat_asprintf (&prompt, "%s%s%s%s%s%s%s%s%s",
str_prefix,
IRC_COLOR_INPUT_NICK,
server->nick,
(display_modes) ? IRC_COLOR_BAR_DELIM : "",
(display_modes) ? "(" : "",
(display_modes) ? IRC_COLOR_ITEM_NICK_MODES : "",
(display_modes) ? server->nick_modes : "",
(display_modes) ? IRC_COLOR_BAR_DELIM : "",
(display_modes) ? ")" : "");
if (prompt)
{
weechat_buffer_set (channel->buffer, "input_prompt", prompt);
free (prompt);
}
}
else
{
weechat_buffer_set (channel->buffer, "input_prompt", "");
}
prompt = irc_channel_get_buffer_input_prompt (server, channel);
weechat_buffer_set (channel->buffer, "input_prompt", (prompt) ? prompt : "");
free (prompt);
}
/*
+5 -1
View File
@@ -57,7 +57,7 @@ irc_info_create_string_with_pointer (char **string, void *pointer)
*string = malloc (64);
if (*string)
{
snprintf (*string, 64, "%p", pointer);
snprintf (*string, 64, "0x%lx", (unsigned long)pointer);
}
}
}
@@ -298,7 +298,11 @@ irc_info_info_irc_buffer_cb (const void *pointer, void *data,
/* search for server or channel buffer */
if (server && ptr_server && channel)
{
ptr_channel = irc_channel_search (ptr_server, channel);
if (!ptr_channel)
ptr_server = NULL;
}
free (server);
free (channel);
+2 -2
View File
@@ -143,8 +143,8 @@ irc_typing_channel_set_nick (struct t_irc_channel *channel, const char *nick,
char signal_data[1024];
snprintf (signal_data, sizeof (signal_data),
"%p;%s;%s",
channel->buffer,
"0x%lx;%s;%s",
(unsigned long)channel->buffer,
(state == IRC_CHANNEL_TYPING_STATE_ACTIVE) ? "typing" :
((state == IRC_CHANNEL_TYPING_STATE_PAUSED) ? "paused" : "off"),
nick);
+1 -1
View File
@@ -32,7 +32,7 @@ if(PERL_FOUND)
add_definitions(${PERL_CFLAGS})
include_directories(${PERL_INCLUDE_PATH})
# ugly hack to force linking against Dynaloader.a
string(REGEX MATCH "/[^ $]*/DynaLoader.a" PERL_DYNALOADER ${PERL_LFLAGS})
string(REGEX MATCH "/[^ $]*/DynaLoader.a" PERL_DYNALOADER "${PERL_LFLAGS}")
if(PERL_DYNALOADER)
string(REPLACE "${PERL_DYNALOADER}" "" PERL_LFLAGS "${PERL_LFLAGS}")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PERL_LFLAGS}")
+1 -1
View File
@@ -512,7 +512,7 @@ plugin_api_info_buffer_cb (const void *pointer, void *data,
if (!ptr_buffer)
return NULL;
snprintf (value, sizeof (value), "%p", ptr_buffer);
snprintf (value, sizeof (value), "0x%lx", (unsigned long)ptr_buffer);
return strdup (value);
}
+1 -1
View File
@@ -379,7 +379,7 @@ plugin_script_ptr2str (void *pointer)
return str_pointer[index_pointer];
snprintf (str_pointer[index_pointer], sizeof (str_pointer[index_pointer]),
"%p", pointer);
"0x%lx", (unsigned long)pointer);
return str_pointer[index_pointer];
}
@@ -206,7 +206,8 @@ relay_remote_network_check_auth (struct t_relay_remote *remote,
relay_websocket_parse_extensions (
weechat_hashtable_get (http_resp->headers, "sec-websocket-extensions"),
remote->ws_deflate);
remote->ws_deflate,
1); /* ws_deflate_allowed */
if (!accept_ok)
{
+4 -2
View File
@@ -215,7 +215,8 @@ relay_irc_sendf (struct t_relay_client *client, const char *format, ...)
hashtable_in = NULL;
hashtable_out = NULL;
snprintf (modifier_data, sizeof (modifier_data), "%p", client);
snprintf (modifier_data, sizeof (modifier_data),
"0x%lx", (unsigned long)client);
new_msg1 = weechat_hook_modifier_exec ("relay_client_irc_out1",
modifier_data, vbuffer);
@@ -1641,7 +1642,8 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
data);
}
snprintf (modifier_data, sizeof (modifier_data), "%p", client);
snprintf (modifier_data, sizeof (modifier_data),
"0x%lx", (unsigned long)client);
new_data = weechat_hook_modifier_exec ("relay_client_irc_in",
modifier_data, data);
+6
View File
@@ -1620,6 +1620,8 @@ relay_client_new_with_infolist (struct t_infolist *infolist)
new_client->ws_deflate->client_context_takeover = weechat_infolist_integer (infolist, "ws_deflate_client_context_takeover");
new_client->ws_deflate->window_bits_deflate = weechat_infolist_integer (infolist, "ws_deflate_window_bits_deflate");
new_client->ws_deflate->window_bits_inflate = weechat_infolist_integer (infolist, "ws_deflate_window_bits_inflate");
new_client->ws_deflate->server_max_window_bits_recv = weechat_infolist_integer (infolist, "ws_deflate_server_max_window_bits_recv");
new_client->ws_deflate->client_max_window_bits_recv = weechat_infolist_integer (infolist, "ws_deflate_client_max_window_bits_recv");
new_client->ws_deflate->strm_deflate = NULL;
new_client->ws_deflate->strm_inflate = NULL;
if (weechat_infolist_search_var (infolist, "ws_deflate_strm_deflate_dict"))
@@ -2073,6 +2075,10 @@ relay_client_add_to_infolist (struct t_infolist *infolist,
return 0;
if (!weechat_infolist_new_var_integer (ptr_item, "ws_deflate_window_bits_inflate", client->ws_deflate->window_bits_inflate))
return 0;
if (!weechat_infolist_new_var_integer (ptr_item, "ws_deflate_server_max_window_bits_recv", client->ws_deflate->server_max_window_bits_recv))
return 0;
if (!weechat_infolist_new_var_integer (ptr_item, "ws_deflate_client_max_window_bits_recv", client->ws_deflate->client_max_window_bits_recv))
return 0;
if (!weechat_infolist_new_var_pointer (ptr_item, "ws_deflate_strm_deflate", client->ws_deflate->strm_deflate))
return 0;
if (!weechat_infolist_new_var_pointer (ptr_item, "ws_deflate_strm_inflate", client->ws_deflate->strm_inflate))
+8
View File
@@ -59,6 +59,7 @@ struct t_config_section *relay_config_section_remote = NULL;
struct t_config_option *relay_config_look_auto_open_buffer = NULL;
struct t_config_option *relay_config_look_display_clients = NULL;
struct t_config_option *relay_config_look_raw_messages = NULL;
struct t_config_option *relay_config_look_raw_messages_max_length = NULL;
/* relay config, color section */
@@ -1455,6 +1456,13 @@ relay_config_init ()
"buffer)"),
NULL, 0, 65535, "256", NULL, 0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
relay_config_look_raw_messages_max_length = weechat_config_new_option (
relay_config_file, relay_config_section_look,
"raw_messages_max_length", "integer",
N_("max number of chars to display in raw messages (very long "
"messages can cause slowness); 0 = display whole messages"),
NULL, 0, INT_MAX, "4096", NULL, 0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
}
/* section color */
+1
View File
@@ -34,6 +34,7 @@ extern struct t_config_section *relay_config_section_path;
extern struct t_config_option *relay_config_look_auto_open_buffer;
extern struct t_config_option *relay_config_look_raw_messages;
extern struct t_config_option *relay_config_look_raw_messages_max_length;
extern struct t_config_option *relay_config_color_client;
extern struct t_config_option *relay_config_color_status[];
+17 -4
View File
@@ -385,6 +385,10 @@ error:
/*
* Parses and saves a HTTP header in hashtable "headers".
*
* The parameter "ws_deflate_allowed" controls whether the websocket extension
* "permessage-deflate" is allowed or not (it is allowed only with "api"
* protocol).
*
* Returns:
* 1: OK, header saved
* 0: error: invalid format
@@ -392,7 +396,8 @@ error:
int
relay_http_parse_header (struct t_relay_http_request *request,
const char *header)
const char *header,
int ws_deflate_allowed)
{
char *pos, *name, *name_lower, *error, **items;
const char *ptr_value;
@@ -465,7 +470,12 @@ relay_http_parse_header (struct t_relay_http_request *request,
* extensions
*/
if (strcmp (name_lower, "sec-websocket-extensions") == 0)
relay_websocket_parse_extensions (ptr_value, request->ws_deflate);
{
relay_websocket_parse_extensions (
ptr_value,
request->ws_deflate,
ws_deflate_allowed);
}
free (name);
free (name_lower);
@@ -891,7 +901,7 @@ void
relay_http_recv (struct t_relay_client *client, const char *data)
{
char *new_partial, *pos;
int length;
int length, ws_deflate_allowed;
if (client->partial_message)
{
@@ -924,8 +934,11 @@ relay_http_recv (struct t_relay_client *client, const char *data)
}
else
{
ws_deflate_allowed = (client->protocol == RELAY_PROTOCOL_API) ?
1 : 0;
relay_http_parse_header (client->http_req,
client->partial_message);
client->partial_message,
ws_deflate_allowed);
}
pos[0] = '\r';
pos++;
+13 -9
View File
@@ -303,8 +303,9 @@ relay_raw_message_add (enum t_relay_msg_type msg_type,
const char *peer_id,
const char *data, int data_size)
{
char *raw_data, *buf, prefix[1024], prefix_arrow[16];
int length;
char *raw_data, *raw_data_cut, *buf, prefix[1024], prefix_arrow[16];
const char *ptr_raw_data;
int max_length;
struct t_relay_raw_message *new_raw_message;
struct timeval tv_now;
@@ -350,15 +351,18 @@ relay_raw_message_add (enum t_relay_msg_type msg_type,
(peer_id && peer_id[0]) ? peer_id : "");
}
length = strlen (relay_msg_type_string[msg_type]) + strlen (raw_data) + 1;
buf = malloc (length);
if (buf)
raw_data_cut = NULL;
ptr_raw_data = raw_data;
max_length = weechat_config_integer (relay_config_look_raw_messages_max_length);
if (max_length > 0)
{
snprintf (buf, length, "%s%s",
relay_msg_type_string[msg_type],
raw_data);
raw_data_cut = weechat_string_cut (raw_data, max_length, 0, 0, " (...)");
ptr_raw_data = raw_data_cut;
}
weechat_asprintf (&buf, "%s%s",
relay_msg_type_string[msg_type],
(ptr_raw_data) ? ptr_raw_data : "");
free (raw_data_cut);
gettimeofday (&tv_now, NULL);
new_raw_message = relay_raw_message_add_to_list (
tv_now.tv_sec,
+2
View File
@@ -544,6 +544,8 @@ relay_remote_new_with_infolist (struct t_infolist *infolist)
new_remote->ws_deflate->client_context_takeover = weechat_infolist_integer (infolist, "ws_deflate_client_context_takeover");
new_remote->ws_deflate->window_bits_deflate = weechat_infolist_integer (infolist, "ws_deflate_window_bits_deflate");
new_remote->ws_deflate->window_bits_inflate = weechat_infolist_integer (infolist, "ws_deflate_window_bits_inflate");
new_remote->ws_deflate->server_max_window_bits_recv = weechat_infolist_integer (infolist, "ws_deflate_server_max_window_bits_recv");
new_remote->ws_deflate->client_max_window_bits_recv = weechat_infolist_integer (infolist, "ws_deflate_client_max_window_bits_recv");
new_remote->ws_deflate->strm_deflate = NULL;
new_remote->ws_deflate->strm_inflate = NULL;
if (weechat_infolist_search_var (infolist, "ws_deflate_strm_deflate_dict"))
+60 -20
View File
@@ -49,9 +49,11 @@ relay_websocket_deflate_alloc ()
new_ws_deflate->enabled = 0;
new_ws_deflate->server_context_takeover = 0;
new_ws_deflate->server_context_takeover = 0;
new_ws_deflate->client_context_takeover = 0;
new_ws_deflate->window_bits_deflate = 0;
new_ws_deflate->window_bits_inflate = 0;
new_ws_deflate->server_max_window_bits_recv = 0;
new_ws_deflate->client_max_window_bits_recv = 0;
new_ws_deflate->strm_deflate = NULL;
new_ws_deflate->strm_inflate = NULL;
@@ -145,9 +147,11 @@ relay_websocket_deflate_reinit (struct t_relay_websocket_deflate *ws_deflate)
{
ws_deflate->enabled = 0;
ws_deflate->server_context_takeover = 0;
ws_deflate->server_context_takeover = 0;
ws_deflate->client_context_takeover = 0;
ws_deflate->window_bits_deflate = 0;
ws_deflate->window_bits_inflate = 0;
ws_deflate->server_max_window_bits_recv = 0;
ws_deflate->client_max_window_bits_recv = 0;
relay_websocket_deflate_free_stream_deflate (ws_deflate);
relay_websocket_deflate_free_stream_inflate (ws_deflate);
}
@@ -297,7 +301,8 @@ relay_websocket_client_handshake_valid (struct t_relay_http_request *request)
void
relay_websocket_parse_extensions (const char *extensions,
struct t_relay_websocket_deflate *ws_deflate)
struct t_relay_websocket_deflate *ws_deflate,
int ws_deflate_allowed)
{
char **exts, **params, **items, *error;
int i, j, num_exts, num_params, num_items;
@@ -315,6 +320,7 @@ relay_websocket_parse_extensions (const char *extensions,
params = weechat_string_split (exts[i], ";", " ", 0, 0, &num_params);
if (params && (num_params >= 1)
&& (strcmp (params[0], "permessage-deflate") == 0)
&& ws_deflate_allowed
&& (weechat_config_integer (relay_config_network_compression) > 0))
{
ws_deflate->enabled = 1;
@@ -322,6 +328,8 @@ relay_websocket_parse_extensions (const char *extensions,
ws_deflate->client_context_takeover = 1;
ws_deflate->window_bits_deflate = 15;
ws_deflate->window_bits_inflate = 15;
ws_deflate->server_max_window_bits_recv = 0;
ws_deflate->client_max_window_bits_recv = 0;
for (j = 1; j < num_params; j++)
{
items = weechat_string_split (params[j], "=", " ", 0, 0, &num_items);
@@ -356,9 +364,15 @@ relay_websocket_parse_extensions (const char *extensions,
}
}
if (strcmp (items[0], "server_max_window_bits") == 0)
{
ws_deflate->server_max_window_bits_recv = 1;
ws_deflate->window_bits_deflate = (int)number;
}
else
{
ws_deflate->client_max_window_bits_recv = 1;
ws_deflate->window_bits_inflate = (int)number;
}
}
}
weechat_string_free_split (items);
@@ -388,7 +402,7 @@ relay_websocket_build_handshake (struct t_relay_http_request *request)
{
const char *sec_websocket_key;
char *key, sec_websocket_accept[128], handshake[4096], hash[160 / 8];
char sec_websocket_extensions[512];
char **extensions, str_window_bits[128], sec_websocket_extensions[1024];
int length, hash_size;
if (!request)
@@ -426,17 +440,41 @@ relay_websocket_build_handshake (struct t_relay_http_request *request)
if (request->ws_deflate->enabled)
{
extensions = weechat_string_dyn_alloc (128);
if (!extensions)
return NULL;
weechat_string_dyn_concat (extensions, "permessage-deflate", -1);
if (!request->ws_deflate->server_context_takeover)
{
weechat_string_dyn_concat (extensions, "; ", -1);
weechat_string_dyn_concat (extensions, "server_no_context_takeover", -1);
}
if (!request->ws_deflate->client_context_takeover)
{
weechat_string_dyn_concat (extensions, "; ", -1);
weechat_string_dyn_concat (extensions, "client_no_context_takeover", -1);
}
if (request->ws_deflate->server_max_window_bits_recv)
{
weechat_string_dyn_concat (extensions, "; ", -1);
snprintf (str_window_bits, sizeof (str_window_bits),
"server_max_window_bits=%d",
request->ws_deflate->window_bits_deflate);
weechat_string_dyn_concat (extensions, str_window_bits, -1);
}
if (request->ws_deflate->client_max_window_bits_recv)
{
weechat_string_dyn_concat (extensions, "; ", -1);
snprintf (str_window_bits, sizeof (str_window_bits),
"client_max_window_bits=%d",
request->ws_deflate->window_bits_inflate);
weechat_string_dyn_concat (extensions, str_window_bits, -1);
}
snprintf (
sec_websocket_extensions, sizeof (sec_websocket_extensions),
"Sec-WebSocket-Extensions: permessage-deflate; "
"%s"
"%s"
"server_max_window_bits=%d; "
"client_max_window_bits=%d\r\n",
(!request->ws_deflate->server_context_takeover) ? "server_no_context_takeover; " : "",
(!request->ws_deflate->client_context_takeover) ? "client_no_context_takeover; " : "",
request->ws_deflate->window_bits_deflate,
request->ws_deflate->window_bits_inflate);
"Sec-WebSocket-Extensions: %s\r\n",
*extensions);
weechat_string_dyn_free (extensions, 1);
}
else
{
@@ -951,11 +989,13 @@ relay_websocket_deflate_print_log (struct t_relay_websocket_deflate *ws_deflate,
const char *prefix)
{
weechat_log_printf ("%s ws_deflate:", prefix);
weechat_log_printf ("%s enabled . . . . . . . . : %d", prefix, ws_deflate->enabled);
weechat_log_printf ("%s server_context_takeover : %d", prefix, ws_deflate->server_context_takeover);
weechat_log_printf ("%s client_context_takeover : %d", prefix, ws_deflate->client_context_takeover);
weechat_log_printf ("%s window_bits_deflate . . : %d", prefix, ws_deflate->window_bits_deflate);
weechat_log_printf ("%s window_bits_inflate . . : %d", prefix, ws_deflate->window_bits_inflate);
weechat_log_printf ("%s strm_deflate. . . . . . : %p", prefix, ws_deflate->strm_deflate);
weechat_log_printf ("%s strm_inflate. . . . . . : %p", prefix, ws_deflate->strm_inflate);
weechat_log_printf ("%s enabled. . . . . . . . . . : %d", prefix, ws_deflate->enabled);
weechat_log_printf ("%s server_context_takeover. . : %d", prefix, ws_deflate->server_context_takeover);
weechat_log_printf ("%s client_context_takeover. . : %d", prefix, ws_deflate->client_context_takeover);
weechat_log_printf ("%s window_bits_deflate. . . . : %d", prefix, ws_deflate->window_bits_deflate);
weechat_log_printf ("%s window_bits_inflate. . . . : %d", prefix, ws_deflate->window_bits_inflate);
weechat_log_printf ("%s server_max_window_bits_recv: %d", prefix, ws_deflate->server_max_window_bits_recv);
weechat_log_printf ("%s client_max_window_bits_recv: %d", prefix, ws_deflate->client_max_window_bits_recv);
weechat_log_printf ("%s strm_deflate . . . . . . . : %p", prefix, ws_deflate->strm_deflate);
weechat_log_printf ("%s strm_inflate . . . . . . . : %p", prefix, ws_deflate->strm_inflate);
}
+4 -1
View File
@@ -49,6 +49,8 @@ struct t_relay_websocket_deflate
/* ("server_max_window_bits") */
int window_bits_inflate; /* window bits for client (decomp.) */
/* ("client_max_window_bits") */
int server_max_window_bits_recv; /* "server_max_window_bits" received?*/
int client_max_window_bits_recv; /* "client_max_window_bits" received?*/
z_stream *strm_deflate; /* stream for deflate (compression) */
z_stream *strm_inflate; /* stream for inflate (decompression)*/
};
@@ -69,7 +71,8 @@ extern int relay_websocket_is_valid_http_get (enum t_relay_protocol protocol,
const char *message);
extern int relay_websocket_client_handshake_valid (struct t_relay_http_request *request);
extern void relay_websocket_parse_extensions (const char *extensions,
struct t_relay_websocket_deflate *ws_deflate);
struct t_relay_websocket_deflate *ws_deflate,
int ws_deflate_allowed);
extern char *relay_websocket_build_handshake (struct t_relay_http_request *request);
extern int relay_websocket_decode_frame (const unsigned char *buffer,
unsigned long long length,
@@ -872,7 +872,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,short_name,"
"nicklist,title,local_variables,"
@@ -896,7 +897,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,type");
relay_weechat_msg_send (ptr_client, msg);
@@ -918,7 +920,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,"
"prev_buffer,next_buffer");
@@ -942,7 +945,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,"
"prev_buffer,next_buffer");
@@ -966,7 +970,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,"
"prev_buffer,next_buffer");
@@ -1010,7 +1015,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,short_name,"
"local_variables");
@@ -1033,7 +1039,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,title");
relay_weechat_msg_send (ptr_client, msg);
@@ -1055,7 +1062,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,local_variables");
relay_weechat_msg_send (ptr_client, msg);
@@ -1076,7 +1084,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name");
relay_weechat_msg_send (ptr_client, msg);
@@ -1107,8 +1116,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"line_data:%p",
ptr_line_data);
"line_data:0x%lx",
(unsigned long)ptr_line_data);
relay_weechat_msg_add_hdata (
msg, cmd_hdata,
"buffer,date,date_usec,date_printed,date_usec_printed,"
@@ -1133,7 +1142,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name");
relay_weechat_msg_send (ptr_client, msg);
+4 -1
View File
@@ -733,7 +733,10 @@ trigger_callback_signal_cb (const void *pointer, void *data,
{
str_data[0] = '\0';
if (signal_data)
snprintf (str_data, sizeof (str_data), "%p", signal_data);
{
snprintf (str_data, sizeof (str_data),
"0x%lx", (unsigned long)signal_data);
}
ptr_signal_data = str_data;
}
weechat_hashtable_set (ctx.extra_vars, "tg_signal_data", ptr_signal_data);
+1
View File
@@ -380,6 +380,7 @@ xfer_chat_open_buffer (struct t_xfer *xfer)
weechat_buffer_set (xfer->buffer, "short_name",
xfer->remote_nick);
}
weechat_buffer_set (xfer->buffer, "input_prompt", xfer->local_nick);
weechat_buffer_set (xfer->buffer, "localvar_set_type", "private");
weechat_buffer_set (xfer->buffer, "localvar_set_nick", xfer->local_nick);
weechat_buffer_set (xfer->buffer, "localvar_set_channel", xfer->remote_nick);
+3
View File
@@ -1016,6 +1016,9 @@ TEST(CoreEval, EvalExpression)
WEE_CHECK_EVAL("", "${my_null_pointer}");
snprintf (str_value, sizeof (str_value), "%p", gui_buffers);
WEE_CHECK_EVAL(str_value, "${my_buffer_pointer}");
WEE_CHECK_EVAL(str_value, "${buffer}");
WEE_CHECK_EVAL("0x0", "${buffer.prev_buffer}");
WEE_CHECK_EVAL("0x0", "${buffer.next_buffer}");
WEE_CHECK_EVAL("0x1234abcd", "${my_other_pointer}");
WEE_CHECK_EVAL("", "${buffer[unknown_pointer].full_name}");
WEE_CHECK_EVAL("", "${buffer[my_null_pointer].full_name}");
+17 -15
View File
@@ -47,7 +47,8 @@ extern void relay_http_parse_path (const char *url,
char ***paths, int *num_paths,
struct t_hashtable *params);
extern int relay_http_parse_header (struct t_relay_http_request *request,
const char *header);
const char *header,
int ws_deflate_allowed);
extern void relay_http_add_to_body (struct t_relay_http_request *request,
char **partial_message);
extern int relay_http_get_auth_status (struct t_relay_client *client);
@@ -103,7 +104,7 @@ TEST(RelayHttp, RequestAllocReinitFree)
CHECK(request->ws_deflate);
LONGS_EQUAL(0, request->ws_deflate->enabled);
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
LONGS_EQUAL(0, request->ws_deflate->client_context_takeover);
LONGS_EQUAL(0, request->ws_deflate->window_bits_deflate);
LONGS_EQUAL(0, request->ws_deflate->window_bits_inflate);
POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate);
@@ -146,7 +147,7 @@ TEST(RelayHttp, RequestAllocReinitFree)
CHECK(request->ws_deflate);
LONGS_EQUAL(0, request->ws_deflate->enabled);
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
LONGS_EQUAL(0, request->ws_deflate->client_context_takeover);
LONGS_EQUAL(0, request->ws_deflate->window_bits_deflate);
LONGS_EQUAL(0, request->ws_deflate->window_bits_inflate);
POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate);
@@ -478,7 +479,7 @@ TEST(RelayHttp, ParseHeader)
request = relay_http_request_alloc ();
CHECK(request);
relay_http_parse_method_path (request, "GET /api/version");
relay_http_parse_header (request, NULL);
relay_http_parse_header (request, NULL, 1);
LONGS_EQUAL(RELAY_HTTP_END, request->status);
STRCMP_EQUAL("GET /api/version\n"
"\n",
@@ -489,7 +490,7 @@ TEST(RelayHttp, ParseHeader)
request = relay_http_request_alloc ();
CHECK(request);
relay_http_parse_method_path (request, "GET /api/version");
relay_http_parse_header (request, "");
relay_http_parse_header (request, "", 1);
LONGS_EQUAL(RELAY_HTTP_END, request->status);
STRCMP_EQUAL("GET /api/version\n"
"\n",
@@ -500,7 +501,7 @@ TEST(RelayHttp, ParseHeader)
request = relay_http_request_alloc ();
CHECK(request);
relay_http_parse_method_path (request, "GET /api/version");
relay_http_parse_header (request, "Test");
relay_http_parse_header (request, "Test", 1);
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
STRCMP_EQUAL("GET /api/version\n"
"Test\n",
@@ -511,7 +512,7 @@ TEST(RelayHttp, ParseHeader)
request = relay_http_request_alloc ();
CHECK(request);
relay_http_parse_method_path (request, "GET /api/version");
relay_http_parse_header (request, "X-Test: value");
relay_http_parse_header (request, "X-Test: value", 1);
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
STRCMP_EQUAL("GET /api/version\n"
"X-Test: value\n",
@@ -523,7 +524,7 @@ TEST(RelayHttp, ParseHeader)
request = relay_http_request_alloc ();
CHECK(request);
relay_http_parse_method_path (request, "GET /api/version");
relay_http_parse_header (request, "Accept-Encoding: gzip, zstd, br");
relay_http_parse_header (request, "Accept-Encoding: gzip, zstd, br", 1);
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
STRCMP_EQUAL("GET /api/version\n"
"Accept-Encoding: gzip, zstd, br\n",
@@ -540,7 +541,7 @@ TEST(RelayHttp, ParseHeader)
request = relay_http_request_alloc ();
CHECK(request);
relay_http_parse_method_path (request, "GET /api/version");
relay_http_parse_header (request, "Content-Length: 123");
relay_http_parse_header (request, "Content-Length: 123", 1);
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
STRCMP_EQUAL("GET /api/version\n"
"Content-Length: 123\n",
@@ -555,7 +556,8 @@ TEST(RelayHttp, ParseHeader)
relay_http_parse_method_path (request, "GET /api HTTP/1.1");
relay_http_parse_header (
request,
"Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits");
"Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits",
1);
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
STRCMP_EQUAL(
"GET /api HTTP/1.1\n"
@@ -565,7 +567,7 @@ TEST(RelayHttp, ParseHeader)
CHECK(request->ws_deflate);
LONGS_EQUAL(1, request->ws_deflate->enabled);
LONGS_EQUAL(1, request->ws_deflate->server_context_takeover);
LONGS_EQUAL(1, request->ws_deflate->server_context_takeover);
LONGS_EQUAL(1, request->ws_deflate->client_context_takeover);
LONGS_EQUAL(15, request->ws_deflate->window_bits_deflate);
LONGS_EQUAL(15, request->ws_deflate->window_bits_inflate);
POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate);
@@ -589,8 +591,8 @@ TEST(RelayHttp, AddToBody)
LONGS_EQUAL(RELAY_HTTP_METHOD, request->status);
relay_http_parse_method_path (request, "GET /api/version");
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
relay_http_parse_header (request, "Content-Length: 10");
relay_http_parse_header (request, "");
relay_http_parse_header (request, "Content-Length: 10", 1);
relay_http_parse_header (request, "", 1);
LONGS_EQUAL(RELAY_HTTP_BODY, request->status);
LONGS_EQUAL(10, request->content_length);
LONGS_EQUAL(0, request->body_size);
@@ -616,8 +618,8 @@ TEST(RelayHttp, AddToBody)
LONGS_EQUAL(RELAY_HTTP_METHOD, request->status);
relay_http_parse_method_path (request, "GET /api/version");
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
relay_http_parse_header (request, "Content-Length: 5");
relay_http_parse_header (request, "");
relay_http_parse_header (request, "Content-Length: 5", 1);
relay_http_parse_header (request, "", 1);
LONGS_EQUAL(RELAY_HTTP_BODY, request->status);
LONGS_EQUAL(5, request->content_length);
LONGS_EQUAL(0, request->body_size);
@@ -62,9 +62,11 @@ TEST(RelayWebsocket, DeflateAllocFree)
ws_deflate = relay_websocket_deflate_alloc ();
LONGS_EQUAL(0, ws_deflate->enabled);
LONGS_EQUAL(0, ws_deflate->server_context_takeover);
LONGS_EQUAL(0, ws_deflate->server_context_takeover);
LONGS_EQUAL(0, ws_deflate->client_context_takeover);
LONGS_EQUAL(0, ws_deflate->window_bits_deflate);
LONGS_EQUAL(0, ws_deflate->window_bits_inflate);
LONGS_EQUAL(0, ws_deflate->server_max_window_bits_recv);
LONGS_EQUAL(0, ws_deflate->client_max_window_bits_recv);
POINTERS_EQUAL(NULL, ws_deflate->strm_deflate);
POINTERS_EQUAL(NULL, ws_deflate->strm_inflate);
@@ -163,34 +165,80 @@ TEST(RelayWebsocket, ClientHandshakeValid)
LONGS_EQUAL(-2, relay_websocket_client_handshake_valid (request));
hashtable_set (request->headers, "origin", "example.com");
LONGS_EQUAL(0, relay_websocket_client_handshake_valid (request));
config_file_option_reset (relay_config_network_websocket_allowed_origins, 1);
relay_websocket_deflate_reinit (request->ws_deflate);
relay_websocket_parse_extensions ("permessage-deflate", request->ws_deflate, 1);
LONGS_EQUAL(1, request->ws_deflate->enabled);
LONGS_EQUAL(1, request->ws_deflate->server_context_takeover);
LONGS_EQUAL(1, request->ws_deflate->client_context_takeover);
LONGS_EQUAL(15, request->ws_deflate->window_bits_deflate);
LONGS_EQUAL(15, request->ws_deflate->window_bits_inflate);
LONGS_EQUAL(0, request->ws_deflate->server_max_window_bits_recv);
LONGS_EQUAL(0, request->ws_deflate->client_max_window_bits_recv);
WEE_TEST_STR(
"HTTP/1.1 101 Switching Protocols\r\n"
"Upgrade: websocket\r\n"
"Connection: Upgrade\r\n"
"Sec-WebSocket-Accept: fhLJYtv//ugX2vQXpifQgByRZ5Y=\r\n"
"Sec-WebSocket-Extensions: permessage-deflate\r\n"
"\r\n",
relay_websocket_build_handshake (request));
relay_websocket_deflate_reinit (request->ws_deflate);
relay_websocket_parse_extensions (
"permessage-deflate; client_max_window_bits",
request->ws_deflate);
request->ws_deflate,
1);
LONGS_EQUAL(1, request->ws_deflate->enabled);
LONGS_EQUAL(1, request->ws_deflate->server_context_takeover);
LONGS_EQUAL(1, request->ws_deflate->client_context_takeover);
LONGS_EQUAL(15, request->ws_deflate->window_bits_deflate);
LONGS_EQUAL(15, request->ws_deflate->window_bits_inflate);
LONGS_EQUAL(0, request->ws_deflate->server_max_window_bits_recv);
LONGS_EQUAL(1, request->ws_deflate->client_max_window_bits_recv);
WEE_TEST_STR(
"HTTP/1.1 101 Switching Protocols\r\n"
"Upgrade: websocket\r\n"
"Connection: Upgrade\r\n"
"Sec-WebSocket-Accept: fhLJYtv//ugX2vQXpifQgByRZ5Y=\r\n"
"Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15\r\n"
"Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits=15\r\n"
"\r\n",
relay_websocket_build_handshake (request));
relay_websocket_deflate_reinit (request->ws_deflate);
relay_websocket_parse_extensions (
"permessage-deflate; client_max_window_bits = 12; server_no_context_takeover",
request->ws_deflate);
request->ws_deflate,
1);
LONGS_EQUAL(1, request->ws_deflate->enabled);
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
LONGS_EQUAL(1, request->ws_deflate->client_context_takeover);
LONGS_EQUAL(15, request->ws_deflate->window_bits_deflate);
LONGS_EQUAL(12, request->ws_deflate->window_bits_inflate);
LONGS_EQUAL(0, request->ws_deflate->server_max_window_bits_recv);
LONGS_EQUAL(1, request->ws_deflate->client_max_window_bits_recv);
WEE_TEST_STR(
"HTTP/1.1 101 Switching Protocols\r\n"
"Upgrade: websocket\r\n"
"Connection: Upgrade\r\n"
"Sec-WebSocket-Accept: fhLJYtv//ugX2vQXpifQgByRZ5Y=\r\n"
"Sec-WebSocket-Extensions: permessage-deflate; server_no_context_takeover; server_max_window_bits=15; client_max_window_bits=12\r\n"
"Sec-WebSocket-Extensions: permessage-deflate; server_no_context_takeover; client_max_window_bits=12\r\n"
"\r\n",
relay_websocket_build_handshake (request));
relay_websocket_deflate_reinit (request->ws_deflate);
relay_websocket_parse_extensions (
"permessage-deflate; client_max_window_bits = 12; server_max_window_bits=8; client_no_context_takeover; server_no_context_takeover",
request->ws_deflate);
request->ws_deflate,
1);
LONGS_EQUAL(1, request->ws_deflate->enabled);
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
LONGS_EQUAL(0, request->ws_deflate->client_context_takeover);
LONGS_EQUAL(8, request->ws_deflate->window_bits_deflate);
LONGS_EQUAL(12, request->ws_deflate->window_bits_inflate);
LONGS_EQUAL(1, request->ws_deflate->server_max_window_bits_recv);
LONGS_EQUAL(1, request->ws_deflate->client_max_window_bits_recv);
WEE_TEST_STR(
"HTTP/1.1 101 Switching Protocols\r\n"
"Upgrade: websocket\r\n"
@@ -212,16 +260,26 @@ TEST(RelayWebsocket, ParseExtensions)
{
struct t_relay_websocket_deflate ws_deflate;
relay_websocket_parse_extensions (NULL, NULL);
relay_websocket_parse_extensions ("test", NULL);
relay_websocket_parse_extensions (NULL, &ws_deflate);
relay_websocket_parse_extensions (NULL, NULL, 1);
relay_websocket_parse_extensions ("test", NULL, 1);
relay_websocket_parse_extensions (NULL, &ws_deflate, 1);
memset (&ws_deflate, 0, sizeof (ws_deflate));
relay_websocket_parse_extensions ("test", &ws_deflate);
relay_websocket_parse_extensions ("test", &ws_deflate, 1);
LONGS_EQUAL(0, ws_deflate.enabled);
memset (&ws_deflate, 0, sizeof (ws_deflate));
relay_websocket_parse_extensions ("permessage-deflate", &ws_deflate);
relay_websocket_parse_extensions ("permessage-deflate", &ws_deflate, 0);
LONGS_EQUAL(0, ws_deflate.enabled);
LONGS_EQUAL(0, ws_deflate.server_context_takeover);
LONGS_EQUAL(0, ws_deflate.client_context_takeover);
LONGS_EQUAL(0, ws_deflate.window_bits_deflate);
LONGS_EQUAL(0, ws_deflate.window_bits_inflate);
POINTERS_EQUAL(NULL, ws_deflate.strm_deflate);
POINTERS_EQUAL(NULL, ws_deflate.strm_inflate);
memset (&ws_deflate, 0, sizeof (ws_deflate));
relay_websocket_parse_extensions ("permessage-deflate", &ws_deflate, 1);
LONGS_EQUAL(1, ws_deflate.enabled);
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
@@ -232,7 +290,8 @@ TEST(RelayWebsocket, ParseExtensions)
memset (&ws_deflate, 0, sizeof (ws_deflate));
relay_websocket_parse_extensions ("permessage-deflate; client_max_window_bits",
&ws_deflate);
&ws_deflate,
1);
LONGS_EQUAL(1, ws_deflate.enabled);
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
@@ -245,7 +304,8 @@ TEST(RelayWebsocket, ParseExtensions)
memset (&ws_deflate, 0, sizeof (ws_deflate));
relay_websocket_parse_extensions (
"permessage-deflate; client_max_window_bits=4",
&ws_deflate);
&ws_deflate,
1);
LONGS_EQUAL(1, ws_deflate.enabled);
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
@@ -258,7 +318,8 @@ TEST(RelayWebsocket, ParseExtensions)
memset (&ws_deflate, 0, sizeof (ws_deflate));
relay_websocket_parse_extensions (
"permessage-deflate; client_max_window_bits=30",
&ws_deflate);
&ws_deflate,
1);
LONGS_EQUAL(1, ws_deflate.enabled);
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
@@ -271,7 +332,8 @@ TEST(RelayWebsocket, ParseExtensions)
memset (&ws_deflate, 0, sizeof (ws_deflate));
relay_websocket_parse_extensions (
"permessage-deflate; client_max_window_bits=test",
&ws_deflate);
&ws_deflate,
1);
LONGS_EQUAL(1, ws_deflate.enabled);
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
@@ -283,7 +345,8 @@ TEST(RelayWebsocket, ParseExtensions)
memset (&ws_deflate, 0, sizeof (ws_deflate));
relay_websocket_parse_extensions (
"permessage-deflate; client_max_window_bits=9",
&ws_deflate);
&ws_deflate,
1);
LONGS_EQUAL(1, ws_deflate.enabled);
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
@@ -295,7 +358,8 @@ TEST(RelayWebsocket, ParseExtensions)
memset (&ws_deflate, 0, sizeof (ws_deflate));
relay_websocket_parse_extensions (
"permessage-deflate; client_max_window_bits=9; server_max_window_bits=10",
&ws_deflate);
&ws_deflate,
1);
LONGS_EQUAL(1, ws_deflate.enabled);
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
@@ -308,7 +372,8 @@ TEST(RelayWebsocket, ParseExtensions)
relay_websocket_parse_extensions (
"permessage-deflate; client_max_window_bits=9; server_max_window_bits=10; "
"server_no_context_takeover",
&ws_deflate);
&ws_deflate,
1);
LONGS_EQUAL(1, ws_deflate.enabled);
LONGS_EQUAL(0, ws_deflate.server_context_takeover);
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
@@ -321,7 +386,8 @@ TEST(RelayWebsocket, ParseExtensions)
relay_websocket_parse_extensions (
"permessage-deflate; client_max_window_bits=9; server_max_window_bits=10; "
"server_no_context_takeover; client_no_context_takeover",
&ws_deflate);
&ws_deflate,
1);
LONGS_EQUAL(1, ws_deflate.enabled);
LONGS_EQUAL(0, ws_deflate.server_context_takeover);
LONGS_EQUAL(0, ws_deflate.client_context_takeover);
+2 -2
View File
@@ -39,8 +39,8 @@
# devel-number the devel version as hex number ("0x04010000" for "4.1.0-dev")
#
weechat_stable="4.3.1"
weechat_devel="4.3.1"
weechat_stable="4.3.3"
weechat_devel="4.3.3"
stable_major=$(echo "${weechat_stable}" | cut -d"." -f1)
stable_minor=$(echo "${weechat_stable}" | cut -d"." -f2)