March 2022 - tor-commits - lists.torproject.org

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 11 Mar '22

11 Mar '22

commit b84739cf853434e823dbe7ef2f8cc4ae89aff5a8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 11 20:47:42 2022 +0000 new translations in support-portal --- contents+uk.po | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/contents+uk.po b/contents+uk.po index a70aebf45b..0733eb7fb3 100644 --- a/contents+uk.po +++ b/contents+uk.po @@ -4446,6 +4446,8 @@ msgid "" "More details on this process can be found in this " "[visualization](../../https/https-1/)." msgstr "" +"Більш детальну інформацію про цей процес можна знайти в цій [візуалізації](../../https/https-1/).\n" +" " #: https//support.torproject.org/about/protections/ #: (content/about/protections/contents+en.lrquestion.description) @@ -4453,6 +4455,8 @@ msgid "" "Note that all your local ISP can observe now is that you are communicating " "with Tor nodes." msgstr "" +"Зауважте, що все, що ваш локальний провайдер може спостерігати зараз, це те, що ви спілкуєтеся з вузлами Tor.\n" +" " #: https//support.torproject.org/about/protections/ #: (content/about/protections/contents+en.lrquestion.description) @@ -4460,11 +4464,15 @@ msgid "" "Similarly, servers in the Internet just see that they are being contacted by" " Tor nodes." msgstr "" +"Аналогічно, сервери в Інтернеті просто бачать, що з ними зв’язуються вузли Tor.\n" +" " #: https//support.torproject.org/about/protections/ #: (content/about/protections/contents+en.lrquestion.description) msgid "Generally speaking, Tor aims to solve three privacy problems:" msgstr "" +"Загалом, Tor прагне вирішити три проблеми конфіденційності:\n" +" " #: https//support.torproject.org/about/protections/ #: (content/about/protections/contents+en.lrquestion.description) @@ -4669,6 +4677,8 @@ msgid "" "Some antivirus software will pop up malware and/or vulnerability warnings " "when Tor Browser is launched." msgstr "" +"Деякі антивірусні програми під час запуску Tor Browser видають попередження про шкідливе програмне забезпечення та/або вразливості.\n" +" " #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -4730,6 +4740,8 @@ msgstr "" #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) msgid "In order to manage your bookmarks in Tor Browser, go to:" msgstr "" +"Щоб керувати своїми закладками в браузері Tor, перейдіть до:\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) @@ -4737,21 +4749,29 @@ msgid "" "- Hamburger menu >> Library >> Bookmarks >> Show All Bookmarks (below the " "menu)" msgstr "" +"- Меню гамбургера >> Бібліотека >> Закладки >> Показати всі закладки (під меню)\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) msgid "- From the toolbar on the Library window, click Import and Backup" msgstr "" +"- На панелі інструментів у вікні «Бібліотека» натисніть «Імпорт і резервне копіювання».\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) msgid "**If you wish to export bookmarks**" msgstr "" +"**Якщо ви хочете експортувати закладки**\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) msgid "- Choose Export Bookmarks to HTML" msgstr "" +"- Виберіть Експорт закладок у HTML\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) @@ -4760,21 +4780,29 @@ msgid "" "the file, which is named bookmarks.html by default. The desktop is usually a" " good spot, but any place that is easy to remember will work." msgstr "" +"- У вікні Експорт файлу закладок виберіть місце для збереження файлу, який за замовчуванням називається bookmarks.html. Зазвичай хорошим місцем є робочий стіл, але підійде будь-яке місце, що легко запам'ятовується.\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) msgid "- Click the Save button. The Export Bookmarks File window will close." msgstr "" +"- Натисніть кнопку Зберегти. Вікно Експорт файлу закладок закриється.\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) msgid "- Close the Library window." msgstr "" +"- Закрийте вікно бібліотеки.\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) msgid "> Your bookmarks are now successfully exported from Tor Browser." msgstr "" +"> Ваші закладки тепер успішно експортовано з браузера Tor.\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) @@ -4782,16 +4810,22 @@ msgid "" "The bookmarks HTML file you saved is now ready to be imported into another " "web browser." msgstr "" +"Збережений вами HTML-файл закладок тепер готовий до імпорту в інший веб-браузер.\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) msgid "**If you wish to import bookmarks**" msgstr "" +"**Якщо ви хочете імпортувати закладки**\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) msgid "- Choose Import Bookmarks from HTML" msgstr "" +"- Виберіть Імпорт закладок з HTML\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) @@ -4799,11 +4833,15 @@ msgid "" "- Within the Import Bookmarks File window that opens, navigate to the " "bookmarks HTML file you are importing and select the file." msgstr "" +"- У вікні «Імпорт файлу закладок», що відкриється, перейдіть до HTML-файлу закладок, який ви імпортуєте, і виберіть файл.\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description) msgid "- Click the Open button. The Import Bookmarks File window will close." msgstr "" +"- Натисніть кнопку Відкрити. Вікно Імпорт файлу закладок закриється.\n" +" " #: https//support.torproject.org/tbb/export-and-import-bookmarks/ #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description)

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 11 Mar '22

11 Mar '22

commit 6633b1fc36843e45b25c58fcdaf711e393c2fd6f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 11 19:47:48 2022 +0000 new translations in support-portal --- contents+ko.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+ko.po b/contents+ko.po index af20995dfd..2ff4406d56 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -14113,12 +14113,12 @@ msgstr "" #: https//support.torproject.org/abuse/legal-questions-about-tor-abuse/ #: (content/abuse/legal-questions/contents+en.lrquestion.title) msgid "I have legal questions about Tor abuse." -msgstr "" +msgstr "Tor 남용과 관련돼 저에게 제기된 법률 문제가 있습니다," #: https//support.torproject.org/abuse/legal-questions-about-tor-abuse/ #: (content/abuse/legal-questions/contents+en.lrquestion.description) msgid "We're only the developers." -msgstr "" +msgstr "저희는 개발자일 뿐입니다." #: https//support.torproject.org/abuse/legal-questions-about-tor-abuse/ #: (content/abuse/legal-questions/contents+en.lrquestion.description)

1 0

[snowflake/main] Generate tarballs in release CI
by meskio＠torproject.org 11 Mar '22

11 Mar '22

commit e18a4ac147a417991e91a6c30c355c23ba78b5ae Author: Anna “CyberTailor” <cyber(a)sysrq.in> Date: Wed Feb 23 04:07:59 2022 +0500 Generate tarballs in release CI The `generate_tarball` job vendors all Go modules to make packaging for distributions easier. --- .gitlab-ci.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ec32fd..2ef29ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -166,3 +166,40 @@ debian-testing: <<: *test-template script: - *go-test + +generate_tarball: + stage: deploy + image: golang:1.17-stretch + rules: + - if: $CI_COMMIT_TAG + script: + - go mod vendor + - tar czf ${CI_PROJECT_NAME}-${CI_COMMIT_TAG#v}.tar.gz --transform "s,^,${CI_PROJECT_NAME}-${CI_COMMIT_TAG#v}/," * + after_script: + - echo TAR_JOB_ID=$CI_JOB_ID >> generate_tarball.env + artifacts: + paths: + - ${CI_PROJECT_NAME}-${CI_COMMIT_TAG#v}.tar.gz + reports: + dotenv: generate_tarball.env + +release-job: + stage: deploy + image: registry.gitlab.com/gitlab-org/release-cli:latest + rules: + - if: $CI_COMMIT_TAG + needs: + - job: generate_tarball + artifacts: true + script: + - echo "running release_job" + release: + name: 'Release $CI_COMMIT_TAG' + description: 'Created using the release-cli' + tag_name: '$CI_COMMIT_TAG' + ref: '$CI_COMMIT_TAG' + assets: + links: + - name: '${CI_PROJECT_NAME}-${CI_COMMIT_TAG#v}.tar.gz' + url: '${CI_PROJECT_URL}/-/jobs/${TAR_JOB_ID}/artifacts/file/${CI_PROJECT_NAME}-${CI_COMMIT_TAG#v}.tar.gz' +

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 11 Mar '22

11 Mar '22

commit 36f8631626b6b9b412e4fc07707016a4c96dc65f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 11 18:17:45 2022 +0000 new translations in support-portal --- contents+ko.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contents+ko.po b/contents+ko.po index 6a09d12cda..af20995dfd 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -14009,7 +14009,7 @@ msgstr "트롤러나 다른 집단 공격에 빠르게 대응해야, 공격자 msgid "" "And most individual IP addresses do equate to individual humans, on any " "given IRC network at any given time." -msgstr "" +msgstr "그리고 주어진 시간에 IRC 네트워크에서 개별 IP 주소 대다수는 웬만하면 각 개인과 대응됩니다." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -14025,6 +14025,8 @@ msgid "" "generally a losing battle to keep klining a single ill-behaved IRC user " "until that user gets bored and goes away." msgstr "" +"오픈 프록시 사용을 막고자 하는 게 헛된 노력임에도 불구하고, 트롤링하는 IRC 유저 하나를 밴 해두면 이윽고 해당 유저가 지쳐 떠날 수" +" 있으므로 아예 효과가 없다고 볼 수는 없습니다." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description)

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-99.0.0b1-11.5-1
by aguestuser (＠aguestuser) 11 Mar '22

11 Mar '22

aguestuser pushed new branch tor-browser-99.0.0b1-11.5-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-99.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-99.0.0-11.5-1
by aguestuser (＠aguestuser) 11 Mar '22

11 Mar '22

aguestuser pushed new branch android-components-99.0.0-11.5-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 11 Mar '22

11 Mar '22

commit 3cf6e5c71399030af790e2365fd5eab08ff25df1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 11 16:17:43 2022 +0000 new translations in support-portal --- contents+ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ko.po b/contents+ko.po index 63d1bbf0c9..6a09d12cda 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -14002,7 +14002,7 @@ msgstr "한편 IRC 서버 관리자 관점에서 볼 때, 보안은 양자택일 msgid "" "By responding quickly to trolls or any other social attack, it may be " "possible to make the attack scenario less attractive to the attacker." -msgstr "" +msgstr "트롤러나 다른 집단 공격에 빠르게 대응해야, 공격자의 시나리오대로 흘러가지 않을 수 있기 때문입니다." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description)

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 11 Mar '22

11 Mar '22

commit dc8451409f67032b6428c7f45c4bc20817609e30 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 11 15:47:58 2022 +0000 new translations in support-portal --- contents+ko.po | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/contents+ko.po b/contents+ko.po index 4806c9fced..63d1bbf0c9 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -13933,12 +13933,12 @@ msgstr "" #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.title) msgid "Tor is banned from the IRC network I want to use." -msgstr "" +msgstr "제가 쓰려 하는 IRC 네트워크에서 Tor가 밴 됐습니다." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) msgid "Sometimes jerks make use of Tor to troll IRC channels." -msgstr "" +msgstr "몇몇 멍청한 것들이 Tor를 이용해 IRC 채널에 트롤 짓, 즉 적대 유발 행위를 벌이는 경우가 가끔 있습니다." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -13946,11 +13946,13 @@ msgid "" "This abuse results in IP-specific temporary bans (\"klines\" in IRC lingo), " "as the network operators try to keep the troll off of their network." msgstr "" +"이러한 남용 행위로 인해 IP 특정 임시 밴 (IRC에서는 'klines'라고 속되게 부릅니다) 이 이루어집니다. 네트워크 관리자가 트롤" +" 행위를 하는 것들을 자신의 네트워크에서 쫓아내기 위함입니다." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) msgid "This response underscores a fundamental flaw in IRC's security model:" -msgstr "" +msgstr "위와 같은 관리자의 대응에서 IRC의 보안 모델이 가진 근본적 결함이 확실하게 드러납니다:" #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -13958,6 +13960,8 @@ msgid "" "they assume that IP addresses equate to humans, and by banning the IP " "address they can ban the human." msgstr "" +"IRC 보안 모델에선 IP 주소가 '한 사람'에 대응된다고 상정합니다. 따라서 IP 주소를 밴 하면 그 사람도 밴 할 수 있다고 보는 " +"거죠." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -13966,6 +13970,8 @@ msgid "" "the literally millions of open proxies and compromised computers around the " "Internet." msgstr "" +"실제론 그렇지 않습니다. 위 사례와 같은 많은 훼방꾼들은 문자 그대로 수백만 개에 달하는 오픈 프록시를 활용하며, 보안이 취약한 인터넷 " +"상의 컴퓨터도 그들의 트롤 짓에 활용됩니다." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -13975,18 +13981,21 @@ msgid "" "sprung up based on this flawed security model (not unlike the antivirus " "industry)." msgstr "" +"IRC 네트워크는 이러한 모든 노드를 차단하려 한다는 점에서, 지는 싸움을 하고 있는 거죠. 그러던 중 트롤 짓에 대응하기 위한 " +"블랙리스트 산업이 비록 규모는 작지만 이 결함있는 보안 모델에 기반해 혜성처럼 등장했습니다(안티바이러스 업계의 등장 배경과 아주 다르진 " +"않습니다)." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) msgid "The Tor network is just a drop in the bucket here." -msgstr "" +msgstr "Tor 네트워크는 여기 블랙리스트에 들어있을 뿐입니다." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) msgid "" "On the other hand, from the viewpoint of IRC server operators, security is " "not an all-or-nothing thing." -msgstr "" +msgstr "한편 IRC 서버 관리자 관점에서 볼 때, 보안은 양자택일의 대상이 아닙니다." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description)

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 11 Mar '22

11 Mar '22

commit 200d2bc51479aa4c71da187d654d9f4c34e15142 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 11 14:47:47 2022 +0000 new translations in support-portal --- contents+ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ko.po b/contents+ko.po index 43875914c2..4806c9fced 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -14007,7 +14007,7 @@ msgstr "" msgid "" "The exceptions include NAT gateways which may be allocated access as special" " cases." -msgstr "" +msgstr "특례로 접속이 할당된 NAT 게이트도 예외로 포함됩니다." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description)

1 0

[tor/main] hs: Don't BUG() when setting up RP congestion control
by dgoulet＠torproject.org 11 Mar '22

11 Mar '22

commit 069b27860102990b23b58e60fb1de65347f37669 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Mar 9 12:15:12 2022 -0500 hs: Don't BUG() when setting up RP congestion control It is possible to not have the descriptor anymore by the time the rendezvous circuit opens. Don't BUG() on that. Instead, when sending the INTRODUCE1 cell, make sure the descriptor we have (or have just fetched) matches what we setup in the rendezvous circuit. If not, the circuit is closed and another one is opened for a retry. Fixes #40576 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40576 | 5 +++++ src/feature/hs/hs_client.c | 29 +++++++++++++++++++++++------ src/feature/hs/hs_descriptor.c | 13 +++++++++++++ src/feature/hs/hs_descriptor.h | 2 ++ 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/changes/ticket40576 b/changes/ticket40576 new file mode 100644 index 0000000000..c9e3745560 --- /dev/null +++ b/changes/ticket40576 @@ -0,0 +1,5 @@ + o Minor bugfixes (onion service congestion control): + - Avoid a non fatal assert in case we can't setup congestion control on the + rendezvous circuit after opening. Fixes bug 40576; bugfix on + 0.4.7.4-alpha. + diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 81c0459a86..f5891e6bdc 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -624,6 +624,16 @@ send_introduce1(origin_circuit_t *intro_circ, goto tran_err; } + /* Check if the rendevous circuit was setup WITHOUT congestion control but if + * it is enabled and the service supports it. This can happen, see + * setup_rendezvous_circ_congestion_control() and so close rendezvous circuit + * so another one can be created. */ + if (TO_CIRCUIT(rend_circ)->ccontrol == NULL && congestion_control_enabled() + && hs_desc_supports_congestion_control(desc)) { + circuit_mark_for_close(TO_CIRCUIT(rend_circ), END_CIRC_REASON_INTERNAL); + goto tran_err; + } + /* We need to find which intro point in the descriptor we are connected to * on intro_circ. */ ip = find_desc_intro_point_by_ident(intro_circ->hs_ident, desc); @@ -760,7 +770,14 @@ client_intro_circ_has_opened(origin_circuit_t *circ) } /** Setup the congestion control parameters on the given rendezvous circuit. - * This looks at the service descriptor flow control line (if any). */ + * This looks at the service descriptor flow control line (if any). + * + * It is possible that we are unable to set congestion control on the circuit + * if the descriptor can't be found. In that case, the introduction circuit + * can't be opened without it so a fetch will be triggered. + * + * However, if the descriptor asks for congestion control but the RP circuit + * doesn't have it, it will be closed and a new circuit will be opened. */ static void setup_rendezvous_circ_congestion_control(origin_circuit_t *circ) { @@ -771,16 +788,16 @@ setup_rendezvous_circ_congestion_control(origin_circuit_t *circ) /* Setup congestion control parameters on the circuit. */ const hs_descriptor_t *desc = hs_cache_lookup_as_client(&circ->hs_ident->identity_pk); - if (BUG(desc == NULL)) { - /* This should really never happened but in case, scream and stop. */ + if (desc == NULL) { + /* This is possible because between launching the circuit and the circuit + * ending in opened state, the descriptor could have been removed from the + * cache. In this case, we just can't setup congestion control. */ return; } /* Check if the service lists support for congestion control in its * descriptor. If not, we don't setup congestion control. */ - if (!desc->encrypted_data.flow_control_pv || - !protocol_list_supports_protocol(desc->encrypted_data.flow_control_pv, - PRT_FLOWCTRL, PROTOVER_FLOWCTRL_CC)) { + if (!hs_desc_supports_congestion_control(desc)) { return; } diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index 523ededf8c..15ad9d8efb 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -2987,3 +2987,16 @@ hs_descriptor_clear_intro_points(hs_descriptor_t *desc) smartlist_clear(ips); } } + +/** Return true iff we support the given descriptor congestion control + * parameters. */ +bool +hs_desc_supports_congestion_control(const hs_descriptor_t *desc) +{ + tor_assert(desc); + + /* Validate that we support the protocol version in the descriptor. */ + return desc->encrypted_data.flow_control_pv && + protocol_list_supports_protocol(desc->encrypted_data.flow_control_pv, + PRT_FLOWCTRL, PROTOVER_FLOWCTRL_CC); +} diff --git a/src/feature/hs/hs_descriptor.h b/src/feature/hs/hs_descriptor.h index 8f5ee6a2f1..8f42b2138b 100644 --- a/src/feature/hs/hs_descriptor.h +++ b/src/feature/hs/hs_descriptor.h @@ -319,6 +319,8 @@ void hs_desc_superencrypted_data_free_contents( hs_desc_superencrypted_data_t *desc); void hs_desc_encrypted_data_free_contents(hs_desc_encrypted_data_t *desc); +bool hs_desc_supports_congestion_control(const hs_descriptor_t *desc); + #ifdef HS_DESCRIPTOR_PRIVATE /* Encoding. */

1 0