April 2020 - tor-commits - lists.torproject.org

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Apr '20

24 Apr '20

commit b49feffda784df6fe4c7c182a53dabdcfb85a6bb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 19:45:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+fr.po | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 93df0819ea..f2eac4931c 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1,3 +1,4 @@ +# # Translators: # nicolas hernandez <nicolas.hernandez(a)aleph-networks.com>, 2019 # David Georges, 2019 @@ -6,6 +7,7 @@ # erinm, 2019 # Emma Peel, 2019 # AO <ao(a)localizationlab.org>, 2020 +# robin Amielh <robinamielh(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -13,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-11 12:15+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>, 2020\n" +"Last-Translator: robin Amielh <robinamielh(a)gmail.com>, 2020\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,38 +25,59 @@ msgstr "" #: https//community.torproject.org/ (content/contents+en.lrpage.title) msgid "Join the Tor Community" -msgstr "" +msgstr "Rejoignez la communauté Tor" #: https//community.torproject.org/ (content/contents+en.lrpage.subtitle) msgid "Our community is made up of human rights defenders around the world." msgstr "" +"Notre communauté est composée de défenseurs des droits humains du monde " +"entier." #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "The Tor community is made up of all kinds of contributors." -msgstr "" +msgstr "La communauté Tor est composée de toutes sortes de contributeurs." #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "" "Some people write documentation and bug reports, while others hold Tor " "events and conduct outreach." msgstr "" +"Certaines personnes rédigent de la documentation et des rapports de bugs, tandis que d'autres organisent des événements Tor et mènent des activités de sensibilisation.\n" +" \n" +"\n" +" \n" +" \n" +" \n" +" " #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "" "Whether you have a lot of time to volunteer or a little, and whether you " "consider yourself technical or not, we want you to join our community, too." msgstr "" +"Que vous ayez beaucoup de temps pour faire du volontariat ou un peu, et que " +"vous vous considériez technique ou non, nous voulons que vous rejoigniez " +"également notre communauté." #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "" "Below you'll find some different ways to volunteer with the Tor community as" " well as resources to help you help Tor." msgstr "" +"Vous trouverez ci-dessous différentes façons de faire du bénévolat avec la " +"communauté Tor ainsi que des ressources pour vous aider à aider Tor." #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.title) msgid "Relay operations" msgstr "" +"Opérations de relais\n" +" \n" +"\n" +" \n" +" \n" +" \n" +" " #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.subtitle) @@ -62,21 +85,26 @@ msgid "" "Relays are the backbone of the Tor network. Help make Tor stronger and " "faster by running a relay today." msgstr "" +"Les relais sont l'épine dorsale du réseau Tor. Aidez Tor à devenir plus fort" +" et plus rapide en exécutant un relais aujourd'hui." #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.cta) msgid "Grow the Tor network" -msgstr "" +msgstr "Développez le réseau Tor" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) msgid "The Tor network relies on volunteers to donate bandwidth." msgstr "" +"Le réseau Tor compte sur des bénévoles pour donner de la bande passante." #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body) msgid "The more people who run relays, the better the Tor network will be." msgstr "" +"Plus il y aura de personnes qui gèrent des relais, meilleur sera le réseau " +"Tor." #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.body)

1 0

[snowflake/master] Remove unused Resetter interface.
by dcf＠torproject.org 24 Apr '20

24 Apr '20

commit 17c0d0ff82ccc0fad077ceb8ff8b20d580c56a24 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 23 18:31:48 2020 -0600 Remove unused Resetter interface. WaitForReset is not used since 70126177fbdf5b1fa4977f2fc26f624641708098. --- client/lib/interfaces.go | 6 ------ client/lib/webrtc.go | 16 +--------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/client/lib/interfaces.go b/client/lib/interfaces.go index f6e8240..57171f8 100644 --- a/client/lib/interfaces.go +++ b/client/lib/interfaces.go @@ -9,16 +9,10 @@ type Connector interface { Connect() error } -type Resetter interface { - Reset() - WaitForReset() -} - // Interface for a single remote WebRTC peer. // In the Client context, "Snowflake" refers to the remote browser proxy. type Snowflake interface { io.ReadWriteCloser - Resetter Connector } diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index e2a755f..719ea74 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -15,7 +15,7 @@ import ( // Remote WebRTC peer. // Implements the |Snowflake| interface, which includes -// |io.ReadWriter|, |Resetter|, and |Connector|. +// |io.ReadWriter| and |Connector|. // // Handles preparation of go-webrtc PeerConnection. Only ever has // one DataChannel. @@ -33,7 +33,6 @@ type WebRTCPeer struct { writePipe *io.PipeWriter lastReceive time.Time buffer bytes.Buffer - reset chan struct{} closed bool @@ -61,7 +60,6 @@ func NewWebRTCPeer(config *webrtc.Configuration, // Error channel is mostly for reporting during the initial SDP offer // creation & local description setting, which happens asynchronously. connection.errorChannel = make(chan error, 1) - connection.reset = make(chan struct{}, 1) // Override with something that's not NullLogger to have real logging. connection.BytesLogger = &BytesNullLogger{} @@ -98,23 +96,11 @@ func (c *WebRTCPeer) Close() error { c.once.Do(func() { c.closed = true c.cleanup() - c.Reset() log.Printf("WebRTC: Closing") }) return nil } -// As part of |Resetter| -func (c *WebRTCPeer) Reset() { - if nil == c.reset { - return - } - c.reset <- struct{}{} -} - -// As part of |Resetter| -func (c *WebRTCPeer) WaitForReset() { <-c.reset } - // Prevent long-lived broken remotes. // Should also update the DataChannel in underlying go-webrtc's to make Closes // more immediate / responsive.

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 24 Apr '20

24 Apr '20

commit 2bf4e7e473af134fb6c11ba1397fcc02a56d23f6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 17:50:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+hr.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+hr.po b/contents+hr.po index 151ad5bbd4..c78ed2c1c0 100644 --- a/contents+hr.po +++ b/contents+hr.po @@ -2852,6 +2852,8 @@ msgid "" "If you find Tor Browser on the list of apps which need updating, select it " "and click the \"Update\" button." msgstr "" +"Ako na popisu aplikacija koje je potrebno ažurirati, pronađeš Tor " +"preglednik, odaberi ga i pritisni gumb „Ažuriraj”." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 24 Apr '20

24 Apr '20

commit 0b3e761993ececf570cdbd90b0575ca1ea0a9b0a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 17:20:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+hr.po | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/contents+hr.po b/contents+hr.po index fc4bc4cb7d..151ad5bbd4 100644 --- a/contents+hr.po +++ b/contents+hr.po @@ -511,7 +511,7 @@ msgid "" "and change the permission to allow executing file as program." msgstr "" "Pritiskom desne tipke miša na „start-tor-browser.desktop”, otvori Svojstva " -"ili Osobitosti i promijeni dozvole za izvršavanje datoteke poput programa." +"ili Postavke i promijeni dozvole za izvršavanje datoteke poput programa." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -876,8 +876,8 @@ msgid "" "Or, if you have Tor Browser running, click on \"Preferences\" in the " "hamburger menu and then on \"Tor\" in the sidebar." msgstr "" -"Ili, ako je Tor preglednik pokrenut, pritisni „Osobitosti” u ikoni izbornika" -" (glavni izbornik), a zatim „Tor” u bočnoj traci." +"Ili, ako je Tor preglednik pokrenut, pritisni „Postavke” u ikoni izbornika " +"(glavni izbornik), a zatim „Tor” u bočnoj traci." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -1056,6 +1056,9 @@ msgid "" "\"Request a bridge from torproject.org\" and click \"Request a Bridge...\" " "for BridgeDB to provide a bridge." msgstr "" +"Nakon označavanja opcije „Tor je cenzuriran u mojoj zemlji”, odaberi " +"„Zatraži most od torproject.org” i pritisni „Zatraži most …”, kako bi " +"BridgeDB dostavio most." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1063,6 +1066,8 @@ msgid "" "Complete the CAPTCHA and click \"Submit.\" Click \"Connect\" to save your " "settings." msgstr "" +"Riješi CAPTCHA i pritisni „Pošalji”. Pritisni „Poveži se” kako bi se " +"postavke spremile." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1071,6 +1076,9 @@ msgid "" "the option \"Request a bridge from torproject.org,\" click \"Request a New " "Bridge...\" for BridgeDB to provide a bridge." msgstr "" +"U odjeljku „Mostovi” potvrdi opciju „Koristi most”, a u opciji „Zatraži most" +" od torproject.org” pritisni „Zatraži novi most …”, kako bi BridgeDB " +"dostavio most." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1078,6 +1086,8 @@ msgid "" "Complete the CAPTCHA and click \"Submit.\" Your setting will automatically " "be saved once you close the tab." msgstr "" +"Riješi CAPTCHA i pritisni „Pošalji”. Tvoje će se postavke automatski " +"spremiti kad zatvoriš karticu. " #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -2015,7 +2025,7 @@ msgid "" "control the JavaScript (and other scripts) that runs on individual web " "pages, or block it entirely." msgstr "" -"Tor Browser uključuje dodatak NoScript. Pristupa mu se kroz „Osobitosti” u " +"Tor Browser uključuje dodatak NoScript. Pristupa mu se kroz „Postavke” u " "glavnom izborniku. Zatim odaberi „Prilagodi” i povuci ikonu „S” na gornjem " "desnom kutu prozora. NoScript daje kontrolu nad pokrenutim JavaScript " "elementima na individualnim stranicama, kao i mogućnost da ih se u " @@ -2287,9 +2297,9 @@ msgid "" "click OK." msgstr "" "* Za pokretanje Tor preglednika na Ubuntu, korisnici moraju pokrenuti shell " -"skriptu. Otvori „Datoteke” (preglednik datoteka za Unity), otvori Osobitosti" -" → Ponašanje kartica → postavi „Pokreni izvršne datoteke kad su otvorene” na" -" „Pitaj svaki put”, zatim pritisni U redu." +"skriptu. Otvori „Datoteke” (preglednik datoteka za Unity), otvori Postavke →" +" Ponašanje kartica → postavi „Pokreni izvršne datoteke kad su otvorene” na " +"„Pitaj svaki put”, zatim pritisni U redu." #: https//tb-manual.torproject.org/known-issues/ #: (content/known-issues/contents+en.lrtopic.body) @@ -2790,12 +2800,12 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### UPDATING" -msgstr "" +msgstr "### AKTUALIZIRANJE" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "You can update Tor Browser automatically or manually." -msgstr "" +msgstr "Tor preglednik možeš aktualizirati automatski ili ručno." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2808,11 +2818,13 @@ msgid "" "This method assumes that you have either Google Play or F-droid installed on" " your mobile device." msgstr "" +"Ova metoda pretpostavlja da na svom uređaju imaš instaliran Google Play ili " +"F-droid." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "##### Google Play" -msgstr "" +msgstr "##### Google Play" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2831,6 +2843,8 @@ msgid "" "Click on the hamburger menu next to the search bar and navigate to \"My apps" " & games\" > \"Updates\"." msgstr "" +"Pritisni ikonu izbornika pored trake za pretraživanje i idi na „Moje " +"aplikacije i igre” > „Ažuriranja”." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2842,7 +2856,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "##### F-Droid" -msgstr "" +msgstr "##### F-Droid" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 24 Apr '20

24 Apr '20

commit 4fdc0e1547b07fab2e546809f66a6df373e7464a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 16:50:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+hr.po | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/contents+hr.po b/contents+hr.po index 966d067f52..fc4bc4cb7d 100644 --- a/contents+hr.po +++ b/contents+hr.po @@ -876,8 +876,8 @@ msgid "" "Or, if you have Tor Browser running, click on \"Preferences\" in the " "hamburger menu and then on \"Tor\" in the sidebar." msgstr "" -"Ili, ako je Tor preglednik pokrenut, pritisni „Postavke” u ikoni izbornika " -"(glavni izbornik), a zatim „Tor” u bočnoj traci." +"Ili, ako je Tor preglednik pokrenut, pritisni „Osobitosti” u ikoni izbornika" +" (glavni izbornik), a zatim „Tor” u bočnoj traci." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -1593,6 +1593,9 @@ msgid "" "functioning properly, so you should weigh your security needs against the " "degree of usability you require." msgstr "" +"Povećanjem sigurnosne razine Tor preglednika onemogućit će se ispravno " +"funkcioniranje nekih stranica, stoga odluči koju razinu sigurnosti želiš u " +"odnosu na funkcionalnost stranica." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1605,6 +1608,8 @@ msgid "" "The Security Settings can be accessed by clicking the Shield icon next to " "the Tor Browser URL bar." msgstr "" +"Sigurnosnim postavkama možeš pristupiti pritiskom na ikone štita pored " +"adresne trake Tor preglednika." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1612,6 +1617,8 @@ msgid "" "To view and adjust your Security Settings, click the 'Advanced Security " "Settings...' button in the shield menu." msgstr "" +"Za prikaz i mijenjanje sigurnosnih postavki, pritisni gumb „Napredne " +"sigurnosne postavke …” u izborniku štita." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1634,6 +1641,9 @@ msgid "" "disable or partially disable certain browser features to protect against " "possible attacks." msgstr "" +"Povećanjem sigurnosne razine onemogućit će se ili će se djelomično " +"onemogućiti određene funkcije preglednika, kako bi te se zaštitilo od " +"mogućih napada." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1641,6 +1651,8 @@ msgid "" "You can enable these settings again at any time by adjusting your Security " "Level." msgstr "" +"Te postavke možeš ponovo aktivirati u bilo kojem trenutku, podešavanjem " +"razine sigurnosti." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1660,6 +1672,7 @@ msgstr "###### Standardno" #: (content/security-settings/contents+en.lrtopic.body) msgid "* At this level, all Tor Browser and website features are enabled." msgstr "" +"* Na ovoj su razini sve funkcije Tor preglednika i web-stranica aktivirane." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1672,6 +1685,8 @@ msgid "" "* This level disables website features that are often dangerous. This may " "cause some sites to lose functionality." msgstr "" +"* Ova razina deaktivira funkcije web-stranica koje su često opasne, čime " +"neke stranice gube svoju funkcionalnost." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1680,6 +1695,9 @@ msgid "" " fonts and math symbols are disabled; audio and video (HTML5 media) are " "click-to-play." msgstr "" +"* JavaScript je deaktiviran za sve ne-[HTTPS](/secure-connections) web-" +"stranice; neki fontovi i matematički simboli su deaktivirani; audio i video " +"(HTML5 mediji) rade po principu pritisni-i-pokreni." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1692,11 +1710,13 @@ msgid "" "* This level only allows website features required for static sites and " "basic services." msgstr "" +"Dopušta samo funkcije web-stranica koje su potrebne za statične stranice i " +"osnovne usluge." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "These changes affect images, media, and scripts." -msgstr "" +msgstr "Ove promjene utječu na slike, medije i skripte." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1705,6 +1725,9 @@ msgid "" "symbols, and images are disabled; audio and video (HTML5 media) are click-" "to-play." msgstr "" +"* JavaScript je deaktiviran za sve web-stranice; neki fontovi, ikone, " +"matematički simboli i slike su deaktivirani; audio i video (HTML5 mediji) " +"rade po principu pritisni-i-pokreni." #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.title) @@ -1917,6 +1940,9 @@ msgid "" "but not yet fixed. Please check the [Known Issues](/known-issues) page to " "see if the problem you are experiencing is already listed there." msgstr "" +"Tor Browser se stalno razvija i neki su nam problemi poznati, ali još nisu " +"riješeni. Pogledaj na stranici [Poznati problemi](/known-issues) je li tvoj " +"problem već poznat." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.title) @@ -1989,6 +2015,11 @@ msgid "" "control the JavaScript (and other scripts) that runs on individual web " "pages, or block it entirely." msgstr "" +"Tor Browser uključuje dodatak NoScript. Pristupa mu se kroz „Osobitosti” u " +"glavnom izborniku. Zatim odaberi „Prilagodi” i povuci ikonu „S” na gornjem " +"desnom kutu prozora. NoScript daje kontrolu nad pokrenutim JavaScript " +"elementima na individualnim stranicama, kao i mogućnost da ih se u " +"potpunosti blokira." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body)

1 0

[snowflake/master] Disable trickle ICE.
by dcf＠torproject.org 24 Apr '20

24 Apr '20

commit 6c2e3adc41c2c6d1ed794adac019a5a6eb069536 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 23 22:22:34 2020 -0600 Disable trickle ICE. https://bugs.torproject.org/33984 OnICEGatheringStateChange is no longer called when candidate gathering is complete. SetLocalDescription kicks off the gathering process. https://bugs.torproject.org/28942#comment:28 https://bugs.torproject.org/33157#comment:2 --- client/lib/webrtc.go | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 589bbfa..e2a755f 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -165,10 +165,7 @@ func (c *WebRTCPeer) preparePeerConnection() error { c.pc = nil } - s := webrtc.SettingEngine{} - s.SetTrickle(true) - api := webrtc.NewAPI(webrtc.WithSettingEngine(s)) - pc, err := api.NewPeerConnection(*c.config) + pc, err := webrtc.NewPeerConnection(*c.config) if err != nil { log.Printf("NewPeerConnection ERROR: %s", err) return err @@ -178,22 +175,11 @@ func (c *WebRTCPeer) preparePeerConnection() error { pc.OnICECandidate(func(candidate *webrtc.ICECandidate) { if candidate == nil { log.Printf("WebRTC: Done gathering candidates") + c.offerChannel <- pc.LocalDescription() } else { log.Printf("WebRTC: Got ICE candidate: %s", candidate.String()) } }) - pc.OnICEGatheringStateChange(func(state webrtc.ICEGathererState) { - if state == webrtc.ICEGathererStateComplete { - log.Println("WebRTC: ICEGatheringStateComplete") - c.offerChannel <- pc.LocalDescription() - } - }) - // This callback is not expected, as the Client initiates the creation - // of the data channel, not the remote peer. - pc.OnDataChannel(func(channel *webrtc.DataChannel) { - log.Println("OnDataChannel") - panic("Unexpected OnDataChannel!") - }) c.pc = pc go func() { offer, err := pc.CreateOffer(nil) @@ -226,9 +212,6 @@ func (c *WebRTCPeer) establishDataChannel() error { Ordered: &ordered, } dc, err := c.pc.CreateDataChannel(c.id, dataChannelOptions) - // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare - // an SDP offer while other goroutines operating on this struct handle the - // signaling. Eventually fires "OnOpen". if err != nil { log.Printf("CreateDataChannel ERROR: %s", err) return err

1 0

[snowflake/master] Make WebRTCPeer and Peers not inherit the methods of BytesLogger.
by dcf＠torproject.org 24 Apr '20

24 Apr '20

commit d376d7036bdee70797dbda50af34d5930d45dadd Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 23 21:08:01 2020 -0600 Make WebRTCPeer and Peers not inherit the methods of BytesLogger. You would have been able to do, for example, snowflake.(*WebRTCPeer).AddInbound(...). --- client/lib/peers.go | 2 +- client/lib/webrtc.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/lib/peers.go b/client/lib/peers.go index d385971..f70905e 100644 --- a/client/lib/peers.go +++ b/client/lib/peers.go @@ -20,7 +20,7 @@ import ( // version of Snowflake) type Peers struct { Tongue - BytesLogger + BytesLogger BytesLogger snowflakeChan chan Snowflake activePeers *list.List diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 3e20549..589bbfa 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -40,7 +40,7 @@ type WebRTCPeer struct { lock sync.Mutex // Synchronization for DataChannel destruction once sync.Once // Synchronization for PeerConnection destruction - BytesLogger + BytesLogger BytesLogger } // Construct a WebRTC PeerConnection.

1 0

[snowflake/master] Remove unused BytesSyncLogger.IsLogging.
by dcf＠torproject.org 24 Apr '20

24 Apr '20

commit 9a4e3e7bd97ba87255453a005b2a3474d1914621 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 23 21:12:45 2020 -0600 Remove unused BytesSyncLogger.IsLogging. --- client/lib/util.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/client/lib/util.go b/client/lib/util.go index cacf1d7..8ac0213 100644 --- a/client/lib/util.go +++ b/client/lib/util.go @@ -31,11 +31,9 @@ type BytesSyncLogger struct { Inbound int OutEvents int InEvents int - IsLogging bool } func (b *BytesSyncLogger) Log() { - b.IsLogging = true var amount int output := func() { log.Printf("Traffic Bytes (in|out): %d | %d -- (%d OnMessages, %d Sends)", @@ -71,15 +69,9 @@ func (b *BytesSyncLogger) Log() { } func (b *BytesSyncLogger) AddOutbound(amount int) { - if !b.IsLogging { - return - } b.OutboundChan <- amount } func (b *BytesSyncLogger) AddInbound(amount int) { - if !b.IsLogging { - return - } b.InboundChan <- amount }

1 0

[snowflake/master] Make BytesSyncLogger's implementation details internal.
by dcf＠torproject.org 24 Apr '20

24 Apr '20

commit 2853fc93628bf997903de33cd7aebd1420e5975f Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 23 21:20:16 2020 -0600 Make BytesSyncLogger's implementation details internal. Provide NewBytesSyncLogger that returns an opaque data structure. Automatically start up the logging loop goroutine in NewBytesSyncLogger. --- client/lib/util.go | 52 ++++++++++++++++++++++++++++------------------------ client/snowflake.go | 10 +--------- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/client/lib/util.go b/client/lib/util.go index 8ac0213..44df031 100644 --- a/client/lib/util.go +++ b/client/lib/util.go @@ -10,7 +10,6 @@ const ( ) type BytesLogger interface { - Log() AddOutbound(int) AddInbound(int) } @@ -18,50 +17,55 @@ type BytesLogger interface { // Default BytesLogger does nothing. type BytesNullLogger struct{} -func (b BytesNullLogger) Log() {} func (b BytesNullLogger) AddOutbound(amount int) {} func (b BytesNullLogger) AddInbound(amount int) {} // BytesSyncLogger uses channels to safely log from multiple sources with output // occuring at reasonable intervals. type BytesSyncLogger struct { - OutboundChan chan int - InboundChan chan int - Outbound int - Inbound int - OutEvents int - InEvents int + outboundChan chan int + inboundChan chan int } -func (b *BytesSyncLogger) Log() { - var amount int +// NewBytesSyncLogger returns a new BytesSyncLogger and starts it loggin. +func NewBytesSyncLogger() *BytesSyncLogger { + b := &BytesSyncLogger{ + outboundChan: make(chan int, 5), + inboundChan: make(chan int, 5), + } + go b.log() + return b +} + +func (b *BytesSyncLogger) log() { + var outbound, inbound, outEvents, inEvents int output := func() { log.Printf("Traffic Bytes (in|out): %d | %d -- (%d OnMessages, %d Sends)", - b.Inbound, b.Outbound, b.InEvents, b.OutEvents) - b.Outbound = 0 - b.OutEvents = 0 - b.Inbound = 0 - b.InEvents = 0 + inbound, outbound, inEvents, outEvents) + outbound = 0 + outEvents = 0 + inbound = 0 + inEvents = 0 } last := time.Now() for { select { - case amount = <-b.OutboundChan: - b.Outbound += amount - b.OutEvents++ + case amount := <-b.outboundChan: + outbound += amount + outEvents++ if time.Since(last) > time.Second*LogTimeInterval { last = time.Now() output() } - case amount = <-b.InboundChan: - b.Inbound += amount - b.InEvents++ + case amount := <-b.inboundChan: + inbound += amount + inEvents++ if time.Since(last) > time.Second*LogTimeInterval { last = time.Now() output() } case <-time.After(time.Second * LogTimeInterval): - if b.InEvents > 0 || b.OutEvents > 0 { + if inEvents > 0 || outEvents > 0 { output() } } @@ -69,9 +73,9 @@ func (b *BytesSyncLogger) Log() { } func (b *BytesSyncLogger) AddOutbound(amount int) { - b.OutboundChan <- amount + b.outboundChan <- amount } func (b *BytesSyncLogger) AddInbound(amount int) { - b.InboundChan <- amount + b.inboundChan <- amount } diff --git a/client/snowflake.go b/client/snowflake.go index dda59ae..d66225d 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -161,15 +161,7 @@ func main() { snowflakes.Tongue = sf.NewWebRTCDialer(broker, iceServers) // Use a real logger to periodically output how much traffic is happening. - snowflakes.BytesLogger = &sf.BytesSyncLogger{ - InboundChan: make(chan int, 5), - OutboundChan: make(chan int, 5), - Inbound: 0, - Outbound: 0, - InEvents: 0, - OutEvents: 0, - } - go snowflakes.BytesLogger.Log() + snowflakes.BytesLogger = sf.NewBytesSyncLogger() go ConnectLoop(snowflakes)

1 0

[snowflake/master] Simplify BytesSyncLogger.
by dcf＠torproject.org 24 Apr '20

24 Apr '20

commit 73173cb6987dbf26fdb1036e4b7710c200f87141 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 23 21:26:19 2020 -0600 Simplify BytesSyncLogger. --- client/lib/util.go | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/client/lib/util.go b/client/lib/util.go index 44df031..0eb8ddd 100644 --- a/client/lib/util.go +++ b/client/lib/util.go @@ -6,7 +6,7 @@ import ( ) const ( - LogTimeInterval = 5 + LogTimeInterval = 5 * time.Second ) type BytesLogger interface { @@ -39,35 +39,24 @@ func NewBytesSyncLogger() *BytesSyncLogger { func (b *BytesSyncLogger) log() { var outbound, inbound, outEvents, inEvents int - output := func() { - log.Printf("Traffic Bytes (in|out): %d | %d -- (%d OnMessages, %d Sends)", - inbound, outbound, inEvents, outEvents) - outbound = 0 - outEvents = 0 - inbound = 0 - inEvents = 0 - } - last := time.Now() + ticker := time.NewTicker(LogTimeInterval) for { select { + case <-ticker.C: + if outEvents > 0 || inEvents > 0 { + log.Printf("Traffic Bytes (in|out): %d | %d -- (%d OnMessages, %d Sends)", + inbound, outbound, inEvents, outEvents) + } + outbound = 0 + outEvents = 0 + inbound = 0 + inEvents = 0 case amount := <-b.outboundChan: outbound += amount outEvents++ - if time.Since(last) > time.Second*LogTimeInterval { - last = time.Now() - output() - } case amount := <-b.inboundChan: inbound += amount inEvents++ - if time.Since(last) > time.Second*LogTimeInterval { - last = time.Now() - output() - } - case <-time.After(time.Second * LogTimeInterval): - if inEvents > 0 || outEvents > 0 { - output() - } } } }

1 0