- tor-commits - lists.torproject.org

[translation/support-portal] new staging, ref: tpo/community/l10n#40049
by emmapeel＠torproject.org 31 Jan '22

31 Jan '22

commit 3a4fda302c9f0b0ebb0893aca5edbb1e53670c15 Author: emma peel <emma.peel(a)riseup.net> Date: Mon Jan 31 16:26:07 2022 +0000 new staging, ref: tpo/community/l10n#40049 --- .gitlab-ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10ea31cf4d..9f23ae5a53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,8 @@ -variables: - TRANSLATION_BRANCH : "support-portal" - -include: - project: tpo/community/l10n - file: ci-templates/lektor-with-more-langs.yml +variables: + TRANSLATION_BRANCH : "support-portal" + LEKTOR_PROJECT: tpo/web/support + +include: + - project: tpo/tpa/ci-templates + file: lektor-l10n-staging-trigger.yml +

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 31 Jan '22

31 Jan '22

commit 69e287777e64249334899a4e9a0a1296191e9bca Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 31 13:15:11 2022 +0000 new translations in communitytpo-contentspot --- contents+zh-TW.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 25ed5d53e4..5b88df680f 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -2942,7 +2942,7 @@ msgstr "追蹤與監控無所不在。" msgid "" "We think privacy should be the default online, and that's what our software " "provides." -msgstr "我們深信網路應該預設就是要尊重隱私的，這且是我們的軟體所要提供給大家的。" +msgstr "我們深信網路應該預設就是要尊重隱私的，這也是我們的軟體所要提供給大家的。" #: (dynamic) msgid "Privacy isn't about having something to hide." @@ -3096,28 +3096,30 @@ msgid "" " and [Social " "Contract](https://gitweb.torproject.org/community/policies.git/tree/social_…." msgstr "" +"- " +"符合洋蔥路由的[行為準則](https://gitweb.torproject.org/community/policies.git/tree/cod…" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.cta) msgid "Best Practices for Trainers" -msgstr "" +msgstr "教育訓練講師的最佳實務作法" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body) msgid "" "Running security training is a fun and rewarding way to help your community " "conduct human rights work safely." -msgstr "" +msgstr "辦理數位安全教育對於保護您的在地社群裡的人權推動來說，是很有趣且也很有效的方式。" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body) msgid "## Before the training" -msgstr "" +msgstr "## 訓練開始之前" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body) msgid "_Am I the right person to give this training?_" -msgstr "" +msgstr "_我是否適合擔任這場訓練課程的講師？_" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 31 Jan '22

31 Jan '22

commit ec8b972bd1712de650ceb9d5a356087ed7801975 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 31 12:45:10 2022 +0000 new translations in communitytpo-contentspot --- contents+zh-TW.po | 59 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 570dcdadd1..25ed5d53e4 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -2916,68 +2916,70 @@ msgid "" " to the [Tor Community Team](https://lists.torproject.org/cgi-" "bin/mailman/listinfo/tor-community-team) mailing list." msgstr "" +"活動結束後，記得將場地清潔還原，並撤掉張貼的海報文宣，也請把您的活動相關記錄寄送到[洋蔥路由社群發展團隊](https://lists.torproj…" +"bin/mailman/listinfo/tor-community-team)的郵件通訊清單。" #: (dynamic) msgid "" "Word of mouth is critical to reaching new people and helping them protect " "themselves online. Here's how you can help:" -msgstr "" +msgstr "口耳相傳是招募新人的關鍵，可以讓更多了解如何保護自己的網路活動，底下是您可以協助的方式：" #: (dynamic) msgid "Privacy and freedom are human rights." -msgstr "" +msgstr "隱私與自由是基本人權。" #: (dynamic) msgid "" "These rights are denied online around the world, but Tor gives them back." -msgstr "" +msgstr "在現今的全球資訊網上，這些權利已經被剝奪了，但是洋蔥路由可以幫他們取回這些基本人權。" #: (dynamic) msgid "Tracking and surveillance are widespread." -msgstr "" +msgstr "追蹤與監控無所不在。" #: (dynamic) msgid "" "We think privacy should be the default online, and that's what our software " "provides." -msgstr "" +msgstr "我們深信網路應該預設就是要尊重隱私的，這且是我們的軟體所要提供給大家的。" #: (dynamic) msgid "Privacy isn't about having something to hide." -msgstr "" +msgstr "捍衛隱私並不代表是有什麼見不得人的事情要隱藏，" #: (dynamic) msgid "" "Privacy is about protecting who we are as human beings: our fears, our " "relationships, and our vulnerabilities." -msgstr "" +msgstr "隱私是要保護身為人類的本質，包括我們的恐懼、我們的人際關係以及我們的弱點，" #: (dynamic) msgid "People shouldn't be exploited for using the internet." -msgstr "" +msgstr "人們不應該為了使用網路而被剝奪這項權利。" #: (dynamic) msgid "" "Trackers are harvesting our every move, but a safer internet is possible." -msgstr "" +msgstr "網路上的追蹤者正在收集與監控我們的一舉一動，然而要營造更安全的網路環境仍是有可能的。" #: (dynamic) msgid "" "Tor software is developed by the Tor Project, a 501(c)(3) nonprofit " "organization." -msgstr "" +msgstr "洋蔥路由軟體是由洋蔥路由專案計畫所開發維護的，是依據美國501(c)(3)所設立的非營利事業機構。" #: (dynamic) msgid "We build free and open source software anyone can use." -msgstr "" +msgstr "我們開發與維護任何人都能使用的開源與自由軟體，" #: (dynamic) msgid "Tor software is used by millions of people around the world." -msgstr "" +msgstr "全世界有上百萬的人都在使用洋蔥路由軟體，" #: (dynamic) msgid "Journalists, activists, and everyday internet users rely on Tor." -msgstr "" +msgstr "其中包括媒體記者、社運人士以及普通的網路使用者。" #: (dynamic) msgid "Contributors to this page:" @@ -2986,7 +2988,7 @@ msgstr "此頁面的貢獻者：" #: https//community.torproject.org/outreach/kit/ #: (content/outreach/kit/contents+en.lrpage.body) msgid "## Street Team Kit" -msgstr "" +msgstr "## 街頭團隊包" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.section) @@ -2997,12 +2999,12 @@ msgstr "" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.section) msgid "training" -msgstr "" +msgstr "教育訓練" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.cta) msgid "Check out our resources" -msgstr "" +msgstr "查看我們提供的資源" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) @@ -3010,7 +3012,7 @@ msgid "" "Our Community team delivers digital security training about Tor to human " "rights defenders, journalists, activists and marginalized communities around" " the world." -msgstr "" +msgstr "我們的社群發展團隊有提供一系列的教育訓練課程，針對媒體記者、社運人士、弱勢族群等對象，其議題包括洋蔥路由、數位安全、人權捍衛宣導等。" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) @@ -3019,69 +3021,70 @@ msgid "" " us and send an email to [training at " "torproject.org](mailto:training@torproject.org)." msgstr "" +"若想要我們來幫您的組織或社群辦理洋蔥路由教育訓練課程的話，請透過[洋蔥路由教育訓練](mailto:training@torproject.org)信箱與我們聯繫。" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) msgid "" "Or, if you want to teach your community about Tor, these training materials " "are for you!" -msgstr "" +msgstr "或者若您想要在您的社群裡自行舉辦洋蔥路由的相關訓練課程，底下這些資料可以供您使用！" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) msgid "### Community building" -msgstr "" +msgstr "### 社群經營" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) msgid "" "Do you know of or have any Tor training materials (slides, guides, fanzines," " videos, and other formats) that should be part of this training section?" -msgstr "" +msgstr "您知道有其他洋蔥路由教育訓練的相關素材(投影片、教學文件、海報、影片或其他格式)應該要收錄在這裡嗎？" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) msgid "" "Please send an email to [training at " "torproject.org](mailto:training@torproject.org) with:" -msgstr "" +msgstr "請寄送電子郵件到[洋蔥路由教育訓練](mailto:training@torproject.org)信箱，並請詳述下列資訊：" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) msgid "- Title and description" -msgstr "" +msgstr "- 標題與描述" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) msgid "- Author and author contact information" -msgstr "" +msgstr "- 作者與其聯繫方式" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) msgid "- Link to download or access the resource" -msgstr "" +msgstr "- 資料下載的連結" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) msgid "- Resource license (Creative Commons or similar license)" -msgstr "" +msgstr "- 資料的使用授權(例如創用CC或其他授權方式)" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) msgid "Please note that we will evaluate if:" -msgstr "" +msgstr "請注意我們仍會進行後續評估：" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) msgid "- The material is being updated and maintained." -msgstr "" +msgstr "- 該資料素材是否有更新維護。" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body) msgid "" "- Do no harm: demystifies the \"dark/deep web\" and training materials that " "will not put people at risk." -msgstr "" +msgstr "- 不具傷害性：破除「黑暗/深層網路」的相關迷思，且該教育訓練的素材不會對人造成風險。" #: https//community.torproject.org/training/resources/ #: (content/training/resources/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 31 Jan '22

31 Jan '22

commit 9bb3744a0f0dc390564a487cf43699a23dcddaf7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 31 12:15:10 2022 +0000 new translations in communitytpo-contentspot --- contents+zh-TW.po | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 352ece77e9..570dcdadd1 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -2756,26 +2756,26 @@ msgstr "### 中繼資料的混淆與清除" msgid "" "When you use the Tor network to browse the web you are not sending any " "information by default of who you are or where you are connecting from." -msgstr "" +msgstr "當您透過洋蔥路由網路來瀏覽網頁時，預設狀態下您的電腦是不會發送任何有關於您的個人資訊，也不會揭露您的所在位置。" #: https//community.torproject.org/onion-services/talk/ #: (content/onion-services/talk/contents+en.lrpage.body) msgid "" "The Onion Services use the Tor network to eliminate information about where " "they are situated." -msgstr "" +msgstr "而洋蔥服務則是藉由洋蔥路由網路來清除掉有關網站所在地的相關資訊，" #: https//community.torproject.org/onion-services/talk/ #: (content/onion-services/talk/contents+en.lrpage.body) msgid "" "Using them eliminates all metadata that may be associated with the service " "otherwise." -msgstr "" +msgstr "和普通的網路連線方式相較之下，這項科技能夠清除掉任何可以與該網站服務產生關聯的中繼資料。" #: https//community.torproject.org/onion-services/talk/ #: (content/onion-services/talk/contents+en.lrpage.body) msgid "### One onion a day keeps the surveillance away" -msgstr "" +msgstr "### 一天一洋蔥，監控遠離我" #: https//community.torproject.org/onion-services/talk/ #: (content/onion-services/talk/contents+en.lrpage.body) @@ -2784,6 +2784,7 @@ msgid "" " an [onion site](../setup/) and read about the [protocol " "overview](../overview/)." msgstr "" +"現在您已經了解洋蔥服務的優勢，或許可以考慮架設一個[洋蔥站臺](../setup/)，也可以參閱[通訊協定概覽](../overview/)以取得更多資訊。" #: https//community.torproject.org/onion-services/advanced/ #: (content/onion-services/advanced/contents+en.lrpage.body) @@ -2791,7 +2792,7 @@ msgid "" "In this section you will find how to configure your onion service to enable " "client authorization, Onion-Location and tips to make your onion service " "more secure." -msgstr "" +msgstr "在這個章節裡，會教您如何在您的洋蔥服務上啟用客戶端驗證機制和Onion-Location表頭，以及可以更進一步強化洋蔥服務安全性的建議。" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.section) @@ -2800,113 +2801,113 @@ msgstr "" #: https//community.torproject.org/outreach/kit/ #: (content/outreach/kit/contents+en.lrpage.section) msgid "outreach" -msgstr "" +msgstr "推廣" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "" "Organized by the community, meetups are a great way to find and strengthen " "the privacy supporters community in your local area." -msgstr "" +msgstr "由社群發起的聚會活動，是尋找與強化您的在地社群裡認同隱私倡議者的好方式。" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "### Step 1" -msgstr "" +msgstr "### 第1步" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "" "Connect with a local space that will allow you to meet for an hour or two." -msgstr "" +msgstr "與您當地的公共場館聯繫，預約申請一到兩個小時的使用時段，" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "" "A public library, a social center, a hackerspace or a room in a university " "are some spaces that you can usually host your event." -msgstr "" +msgstr "像是公共圖書館、社區活動中心、駭客工坊或是社區大學裡的講演廳等，都是舉辦這類活動的好地方。" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "### Step 2" -msgstr "" +msgstr "### 第2步" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "" "Choose a date and time that is convenient for your group and the local " "space." -msgstr "" +msgstr "選定一個您在地社群團體與場地皆有空檔的日期與時段，" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "" "On weekends or during week days, after working hours (7 pm) might be better." -msgstr "" +msgstr "週末假日或是平常日的下班後時段(下午7點)會是不錯的選擇。" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "" "After confirming a local and date, create a poster and an online invitation " "to spread the event." -msgstr "" +msgstr "敲定了時間與地點後，就製作些海報文宣或線上邀請函來宣傳您的活動。" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "### Step 3" -msgstr "" +msgstr "### 第3步" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "" "Find a meetup facilitator and draft an agenda, for example, question & " "answer about Tor, how to setup relays." -msgstr "" +msgstr "找個聚會活動的籌辦人並草擬活動議程，例如洋蔥路由答客問或是中繼節點架設教學。" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "Read and follow our [best practices](../../training/best-practices/)." -msgstr "" +msgstr "請詳閱並依照我們的[最佳實務作法](../../training/best-practices/)來辦理。" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "### Step 4" -msgstr "" +msgstr "### 第4步" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "" "Before the meetup, organize the space. Buy some chips and snacks, hang some " "[posters](../kit/) nearby the local, so people can find easily." -msgstr "" +msgstr "在聚會活動開始前，先準備與佈置場地，可以購買些餐點零食，並在會場附近吊掛些[海報](../kit/)以引導前來參加的人。" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "If you have some printed materials and/or Tor swag, put it on a table." -msgstr "" +msgstr "如果您有印製文宣資料或準備洋蔥路由紀念襯衫的話，就直接擺放在會場的桌上。" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "### Step 5" -msgstr "" +msgstr "### 第5步" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "Load your presentation and wait a few minutes to people arrive." -msgstr "" +msgstr "架設好投影片並等參加者到來。" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "" "During the activity take notes about questions, how many knew about Tor " "before, how many are relay operators, etc" -msgstr "" +msgstr "在活動進行的過程中，詳細記錄出席者所提出的問題，以及在場參與者有多少人已經聽過洋蔥路由技術、出席者中又有多少中繼節點架設者等。" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body) msgid "### Step 6" -msgstr "" +msgstr "### 第6步" #: https//community.torproject.org/outreach/meetup/ #: (content/outreach/meetup/contents+en.lrpage.body)

1 0

[snowflake/main] Add Raw Data Output for bytesLogger
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit 91379a42f3c9c36a09c8cfd0769bffed626ffe46 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 12:29:23 2021 +0000 Add Raw Data Output for bytesLogger --- proxy/lib/util.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proxy/lib/util.go b/proxy/lib/util.go index 5055187..a9ac8aa 100644 --- a/proxy/lib/util.go +++ b/proxy/lib/util.go @@ -11,6 +11,7 @@ type bytesLogger interface { AddOutbound(int) AddInbound(int) ThroughputSummary() string + GetStat() (in int, out int) } // bytesNullLogger Default bytesLogger does nothing. @@ -25,6 +26,8 @@ func (b bytesNullLogger) AddInbound(amount int) {} // ThroughputSummary in bytesNullLogger does nothing func (b bytesNullLogger) ThroughputSummary() string { return "" } +func (b bytesNullLogger) GetStat() (in int, out int) { return -1, -1 } + // bytesSyncLogger uses channels to safely log from multiple sources with output // occuring at reasonable intervals. type bytesSyncLogger struct { @@ -92,3 +95,5 @@ func (b *bytesSyncLogger) ThroughputSummary() string { t := time.Now() return fmt.Sprintf("Traffic throughput (up|down): %d %s|%d %s -- (%d OnMessages, %d Sends, over %d seconds)", inbound, inUnit, outbound, outUnit, b.outEvents, b.inEvents, int(t.Sub(b.start).Seconds())) } + +func (b *bytesSyncLogger) GetStat() (in int, out int) { return b.inbound, b.outbound }

1 0

[snowflake/main] Add EventOnProxyConnectionOver Reporting
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit e4305a4d2b01f248f70546f745f64b3373f84a2e Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 13:36:22 2021 +0000 Add EventOnProxyConnectionOver Reporting --- proxy/lib/snowflake.go | 6 ++++++ proxy/lib/webrtcconn.go | 2 ++ 2 files changed, 8 insertions(+) diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index a9ac399..cef5644 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -40,6 +40,7 @@ import ( "sync" "time" + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/task" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/util" @@ -350,6 +351,11 @@ func (sf *SnowflakeProxy) makePeerConnectionFromOffer(sdp *webrtc.SessionDescrip defer conn.lock.Unlock() log.Println("OnClose channel") log.Println(conn.bytesLogger.ThroughputSummary()) + in, out := conn.bytesLogger.GetStat() + conn.eventLogger.OnNewSnowflakeEvent(event.EventOnProxyConnectionOver{ + InboundTraffic: in, + OutboundTraffic: out, + }) conn.dc = nil dc.Close() pw.Close() diff --git a/proxy/lib/webrtcconn.go b/proxy/lib/webrtcconn.go index 6e16bec..919a679 100644 --- a/proxy/lib/webrtcconn.go +++ b/proxy/lib/webrtcconn.go @@ -9,6 +9,7 @@ import ( "sync" "time" + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "github.com/pion/ice/v2" "github.com/pion/sdp/v3" "github.com/pion/webrtc/v3" @@ -30,6 +31,7 @@ type webRTCConn struct { once sync.Once // Synchronization for PeerConnection destruction bytesLogger bytesLogger + eventLogger event.SnowflakeEventReceiver } func (c *webRTCConn) Read(b []byte) (int, error) {

1 0

[snowflake/main] Add proxy event logger state propagate
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit f12cfe6a9f682c479314440ac9d53389cb38a54f Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 13:45:53 2021 +0000 Add proxy event logger state propagate --- proxy/lib/snowflake.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index cef5644..8747f66 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -115,6 +115,7 @@ type SnowflakeProxy struct { NATProbeURL string // NATTypeMeasurementInterval is time before NAT type is retested NATTypeMeasurementInterval time.Duration + EventDispatcher event.SnowflakeEventDispatcher shutdown chan struct{} } @@ -340,7 +341,7 @@ func (sf *SnowflakeProxy) makePeerConnectionFromOffer(sdp *webrtc.SessionDescrip close(dataChan) pr, pw := io.Pipe() - conn := &webRTCConn{pc: pc, dc: dc, pr: pr} + conn := &webRTCConn{pc: pc, dc: dc, pr: pr, eventLogger: sf.EventDispatcher} conn.bytesLogger = newBytesSyncLogger() dc.OnOpen(func() { @@ -524,6 +525,9 @@ func (sf *SnowflakeProxy) Start() error { if sf.NATProbeURL == "" { sf.NATProbeURL = DefaultNATProbeURL } + if sf.EventDispatcher == nil { + sf.EventDispatcher = event.NewSnowflakeEventDispatcher() + } broker, err = newSignalingServer(sf.BrokerURL, sf.KeepLocalAddresses) if err != nil {

1 0

[snowflake/main] Add EventOnProxyConnectionOver Event
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit d64af3139496481436f8870f4f43f43dca0d4552 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 13:23:33 2021 +0000 Add EventOnProxyConnectionOver Event --- common/event/interface.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/event/interface.go b/common/event/interface.go index 697f2b7..b41d7c3 100644 --- a/common/event/interface.go +++ b/common/event/interface.go @@ -28,6 +28,12 @@ type EventOnSnowflakeConnectionFailed struct { Error error } +type EventOnProxyConnectionOver struct { + SnowflakeEvent + InboundTraffic int + OutboundTraffic int +} + type SnowflakeEventReceiver interface { // OnNewSnowflakeEvent notify receiver about a new event // This method MUST not block

1 0

[snowflake/main] Extract traffic formatter
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit 9208364475bddb186cb9d6fba6508a420ba1734d Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 14:46:18 2021 +0000 Extract traffic formatter --- proxy/lib/util.go | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/proxy/lib/util.go b/proxy/lib/util.go index a9ac8aa..c7b3684 100644 --- a/proxy/lib/util.go +++ b/proxy/lib/util.go @@ -72,28 +72,28 @@ func (b *bytesSyncLogger) AddInbound(amount int) { // ThroughputSummary view a formatted summary of the throughput totals func (b *bytesSyncLogger) ThroughputSummary() string { - var inUnit, outUnit string - units := []string{"B", "KB", "MB", "GB"} - inbound := b.inbound outbound := b.outbound - for i, u := range units { - inUnit = u - if (inbound < 1000) || (i == len(units)-1) { - break - } - inbound = inbound / 1000 - } - for i, u := range units { - outUnit = u - if (outbound < 1000) || (i == len(units)-1) { - break - } - outbound = outbound / 1000 - } + inbound, inUnit := formatTraffic(inbound) + outbound, outUnit := formatTraffic(outbound) + t := time.Now() return fmt.Sprintf("Traffic throughput (up|down): %d %s|%d %s -- (%d OnMessages, %d Sends, over %d seconds)", inbound, inUnit, outbound, outUnit, b.outEvents, b.inEvents, int(t.Sub(b.start).Seconds())) } func (b *bytesSyncLogger) GetStat() (in int, out int) { return b.inbound, b.outbound } + +func formatTraffic(amount int) (value int, unit string) { + value = amount + units := []string{"B", "KB", "MB", "GB"} + for i, u := range units { + unit = u + if (value < 1000) || (i == len(units)-1) { + break + } + value = value / 1000 + } + return + +}

1 0

[snowflake/main] Fix ProxyEventLogger output
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit 88af9da4a25c26169cadaee9256ce7539db17b19 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 16:22:55 2021 +0000 Fix ProxyEventLogger output --- proxy/lib/pt_event_logger.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/lib/pt_event_logger.go b/proxy/lib/pt_event_logger.go index 5804614..6c4f4e9 100644 --- a/proxy/lib/pt_event_logger.go +++ b/proxy/lib/pt_event_logger.go @@ -9,7 +9,7 @@ import ( ) func NewProxyEventLogger(logPeriod time.Duration) event.SnowflakeEventReceiver { - el := &logEventLogger{} + el := &logEventLogger{logPeriod: logPeriod} el.task = &task.Periodic{Interval: logPeriod, Execute: el.logTick} el.task.Start() return el @@ -36,7 +36,7 @@ func (p *logEventLogger) OnNewSnowflakeEvent(e event.SnowflakeEvent) { func (p *logEventLogger) logTick() error { inbound, inboundUnit := formatTraffic(p.inboundSum) outbound, outboundUnit := formatTraffic(p.inboundSum) - fmt.Printf("In the last %v, there are %v connections. Traffic Relaied ↑ %v %v, ↓ %v %v.", + fmt.Printf("In the last %v, there are %v connections. Traffic Relaied ↑ %v %v, ↓ %v %v.\n", p.logPeriod.String(), p.connectionCount, inbound, inboundUnit, outbound, outboundUnit) p.outboundSum = 0 p.inboundSum = 0

1 0