- tor-commits - lists.torproject.org

[pluggable-transports/snowflake-webext] branch main updated: perf: don't wait for WebRTC to establish before connecting to server
by gitolite role 23 Dec '22

23 Dec '22

This is an automated email from the git hooks/post-receive script. cohosh pushed a commit to branch main in repository pluggable-transports/snowflake-webext. The following commit(s) were added to refs/heads/main by this push: new 1eb496c perf: don't wait for WebRTC to establish before connecting to server 1eb496c is described below commit 1eb496c37455b0df465ddf767292da1506abec3b Author: WofWca <wofwca(a)protonmail.com> AuthorDate: Sun Nov 6 20:11:10 2022 +0400 perf: don't wait for WebRTC to establish before connecting to server https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- proxypair.js | 13 +++++-------- spec/proxypair.spec.js | 23 ++++++++++++++++++++--- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/proxypair.js b/proxypair.js index db37045..07670fb 100644 --- a/proxypair.js +++ b/proxypair.js @@ -105,6 +105,8 @@ class ProxyPair { }, this.config.answerTimeout); } + this.connectRelay(offer); + return true; } @@ -131,10 +133,6 @@ class ProxyPair { this.messageTimer = setTimeout(onStaleTimeout, this.config.messageTimeout); }; this.refreshStaleTimeout(); - - // This is the point when the WebRTC datachannel is done, so the next step - // is to establish websocket to the server. - this.connectRelay(); }; channel.onclose = () => { log('WebRTC DataChannel closed.'); @@ -154,10 +152,10 @@ class ProxyPair { } /** - * Assumes WebRTC datachannel is connected. + * @param {RTCSessionDescription} remoteDescription * @private */ - connectRelay() { + connectRelay(remoteDescription) { dbg('Connecting to relay...'); // Get a remote IP address from the PeerConnection, if possible. Add it to // the WebSocket URL's query string if available. @@ -166,8 +164,7 @@ class ProxyPair { // are not marked experimental, were undefined when I tried them in Firefox // 52.2.0. // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/remoteDe… - const desc = this.pc.remoteDescription; - const peer_ip = Parse.ipFromSDP(desc!= null ? desc.sdp : undefined); + const peer_ip = Parse.ipFromSDP(remoteDescription.sdp); const params = []; if (peer_ip != null) { params.push(["client_ip", peer_ip]); diff --git a/spec/proxypair.spec.js b/spec/proxypair.spec.js index c624dbf..0c2dff4 100644 --- a/spec/proxypair.spec.js +++ b/spec/proxypair.spec.js @@ -104,15 +104,24 @@ describe('ProxyPair', function() { expect(pp.client.onmessage).not.toBeNull(); }); - it('connects to the relay once datachannel opens', function() { + it('connects to the relay once a client offer is received', function() { spyOn(pp, 'connectRelay'); pp.active = true; - pp.client.onopen(); + pp.receiveWebRTCOffer( + { + type: 'offer', + sdp: 'foo' + }, + () => {}, + ) expect(pp.connectRelay).toHaveBeenCalled(); }); it('connects to a relay', function() { - pp.connectRelay(); + pp.connectRelay({ + type: 'offer', + sdp: 'foo' + }); expect(pp.relay.onopen).not.toBeNull(); expect(pp.relay.onclose).not.toBeNull(); expect(pp.relay.onerror).not.toBeNull(); @@ -123,6 +132,13 @@ describe('ProxyPair', function() { it('proxies data from client to relay', function() { var msg; + pp.receiveWebRTCOffer( + { + type: 'offer', + sdp: 'foo' + }, + () => {}, + ); pp.pc.ondatachannel({ channel: { bufferedAmount: 0, @@ -130,6 +146,7 @@ describe('ProxyPair', function() { send: function(data) {} } }); + pp.client.onopen(); spyOn(pp.client, 'send'); spyOn(pp.relay, 'send'); msg = new MessageEvent("message", { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated: Fix typos
by gitolite role 22 Dec '22

22 Dec '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new 1da9dec348 Fix typos new 1e6d839ce9 Merge branch 'tor-gitlab/mr/668' 1da9dec348 is described below commit 1da9dec3482aa98361d02be050097c5eb77f0db5 Author: Dimitris Apostolou <dimitris.apostolou(a)icloud.com> AuthorDate: Tue Dec 13 18:46:07 2022 +0200 Fix typos --- doc/HACKING/ReleasingTor.md | 2 +- doc/HACKING/WritingTests.md | 2 +- src/app/config/config.c | 2 +- src/app/config/resolve_addr.c | 2 +- src/core/or/congestion_control_common.c | 2 +- src/core/or/congestion_control_st.h | 4 ++-- src/core/or/congestion_control_vegas.c | 8 ++++---- src/core/or/connection_st.h | 2 +- src/core/or/relay.c | 4 ++-- src/core/or/sendme.c | 2 +- src/feature/client/entrynodes.c | 2 +- src/feature/relay/dns.c | 2 +- src/test/test_channelpadding.c | 2 +- src/test/test_config.c | 2 +- src/test/test_dir_handle_get.c | 2 +- src/test/test_hs_control.c | 2 +- src/test/test_periodic_event.c | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 6422d84891..8367bf6c51 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -76,7 +76,7 @@ Steps are: 1. Run `./build.sh` which will download everything you need, including the latest tarballs from the release CI, and auto-commit the signatures if - the checksum match. You will need to confim the commits. + the checksum match. You will need to confirm the commits. 2. If all is good, `git push origin main` your signatures. diff --git a/doc/HACKING/WritingTests.md b/doc/HACKING/WritingTests.md index e1497a77c2..84f5f7f361 100644 --- a/doc/HACKING/WritingTests.md +++ b/doc/HACKING/WritingTests.md @@ -336,7 +336,7 @@ glass-box one is one you implement while looking at how the function is implemented. In either case, make sure to consider common cases *and* edge cases; success -cases and failure csaes. +cases and failure cases. For example, consider testing this function: diff --git a/src/app/config/config.c b/src/app/config/config.c index 7443d6bcb3..6b07d58240 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -7256,7 +7256,7 @@ getinfo_helper_config(control_connection_t *conn, } /* Check whether an address has already been set against the options - * depending on address family and destination type. Any exsting + * depending on address family and destination type. Any existing * value will lead to a fail, even if it is the same value. If not * set and not only validating, copy it into this location too. * Returns 0 on success or -1 if this address is already set. diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 09d4b800f6..130998b7c8 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -810,7 +810,7 @@ find_my_address(const or_options_t *options, int family, int warn_severity, * want to learn here if the address is considered to come from the * Internet basically. * - * @param addr The address to test if local and also test against our resovled + * @param addr The address to test if local and also test against our resolved * address. * * @return True iff address is considered local or else False. diff --git a/src/core/or/congestion_control_common.c b/src/core/or/congestion_control_common.c index e96d22cbfa..98b8f8c7e0 100644 --- a/src/core/or/congestion_control_common.c +++ b/src/core/or/congestion_control_common.c @@ -127,7 +127,7 @@ static uint8_t n_ewma_ss; static uint8_t bwe_sendme_min; /** - * Percentage of the current RTT to use when reseting the minimum RTT + * Percentage of the current RTT to use when resetting the minimum RTT * for a circuit. (RTT is reset when the cwnd hits cwnd_min). */ static uint8_t rtt_reset_pct; diff --git a/src/core/or/congestion_control_st.h b/src/core/or/congestion_control_st.h index f88e1f4a9a..9d8fbe9d77 100644 --- a/src/core/or/congestion_control_st.h +++ b/src/core/or/congestion_control_st.h @@ -41,8 +41,8 @@ typedef enum { * Prop#324: TOR_NOLA - NOLA looks the BDP right in the eye and uses it * immediately as CWND. No slow start, no other congestion signals, no delay, * no bullshit. Like TOR_VEGAS, it also uses aggressive BDP estimates, to - * avoid out-competition. It seems a bit better throughput than Vegas, - * but its agressive BDP and rapid updates may lead to more queue latency. */ + * avoid out-competition. It seems a bit better throughput than Vegas, but + * its aggressive BDP and rapid updates may lead to more queue latency. */ CC_ALG_NOLA = 3, } cc_alg_t; diff --git a/src/core/or/congestion_control_vegas.c b/src/core/or/congestion_control_vegas.c index 54b89dad64..f5061d702e 100644 --- a/src/core/or/congestion_control_vegas.c +++ b/src/core/or/congestion_control_vegas.c @@ -354,12 +354,12 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc, 0); } else { cc->cwnd += inc; - cc->next_cc_event = 1; // Technically irellevant, but for consistency + cc->next_cc_event = 1; // Technically irrelevant, but for consistency } } else { uint64_t old_cwnd = cc->cwnd; - /* Congestion signal: Set cwnd to gamma threshhold */ + /* Congestion signal: Set cwnd to gamma threshold */ cc->cwnd = vegas_bdp(cc) + cc->vegas_params.gamma; /* Compute the percentage we experience a blocked csig vs RTT sig */ @@ -398,8 +398,8 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc, uint64_t old_cwnd = cc->cwnd; uint64_t cwnd_diff; - /* If we are above the delta threshhold, drop cwnd down to the - * delta threshhold. */ + /* If we are above the delta threshold, drop cwnd down to the + * delta threshold. */ cc->cwnd = vegas_bdp(cc) + cc->vegas_params.delta - CWND_INC(cc); /* Account the amount we reduced the cwnd by for the gamma cutoff */ diff --git a/src/core/or/connection_st.h b/src/core/or/connection_st.h index d3a230daa0..87ab6af8d9 100644 --- a/src/core/or/connection_st.h +++ b/src/core/or/connection_st.h @@ -88,7 +88,7 @@ struct connection_t { * connection. */ unsigned int linked_conn_is_closed:1; /** True iff this connection was opened from a listener and thus we've - * recevied this connection. Else, it means we've initiated an outbound + * received this connection. Else, it means we've initiated an outbound * connection. */ unsigned int from_listener:1; diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 69b85b5d80..1d66fde4ba 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -3051,7 +3051,7 @@ channel_flush_from_first_active_circuit, (channel_t *chan, int max)) * * We are accepting this as an "ok" race else the changes are likely non * trivial to make the mark for close to set the num cells to 0 and change - * the free functions to detach the circuit conditionnaly without creating + * the free functions to detach the circuit conditionally without creating * a chain effect of madness. * * The lesson here is arti will prevail and leave the cmux dragon alone. */ @@ -3150,7 +3150,7 @@ channel_flush_from_first_active_circuit, (channel_t *chan, int max)) /* Minimum value is the maximum circuit window size. * * This value is set to a lower bound we believe is reasonable with congestion - * control and basic network tunning parameters. + * control and basic network running parameters. * * SENDME cells makes it that we can control how many cells can be inflight on * a circuit from end to end. This logic makes it that on any circuit cell diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c index 90f4dfcf05..4bb5c268b0 100644 --- a/src/core/or/sendme.c +++ b/src/core/or/sendme.c @@ -351,7 +351,7 @@ circuit_sendme_cell_is_next(int deliver_window, int sendme_inc) * * Because deliver_window starts at CIRCWINDOW_START and counts down, * to get the actual number of received cells for this check, we must - * first convert to receieved cells, or the modulus operator will fail. + * first convert to received cells, or the modulus operator will fail. */ tor_assert(deliver_window <= CIRCWINDOW_START); if (((CIRCWINDOW_START - (deliver_window - 1)) % sendme_inc) != 0) { diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index e7324487da..9abaf78624 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -1895,7 +1895,7 @@ make_guard_confirmed(guard_selection_t *gs, entry_guard_t *guard) guard->confirmed_idx = gs->next_confirmed_idx++; smartlist_add(gs->confirmed_entry_guards, guard); - /** The confirmation ordering might not be the sample ording. We need to + /** The confirmation ordering might not be the sample ordering. We need to * reorder */ smartlist_sort(gs->confirmed_entry_guards, compare_guards_by_sampled_idx); diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 9d50fa7c31..7267ca06dd 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -1459,7 +1459,7 @@ configure_libevent_options(void) * the query itself timed out in transit. */ SET("timeout:", get_consensus_param_exit_dns_timeout()); - /* This tells libevent to attemps up to X times a DNS query if the previous + /* This tells libevent to attempt up to X times a DNS query if the previous * one failed to complete within N second. We believe that this should be * enough to catch temporary hiccups on the first query. But after that, it * should signal us that it won't be able to resolve it. */ diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 261e1f8a37..63c9a3b753 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -862,7 +862,7 @@ test_channelpadding_decide_to_pad_channel(void *arg) * 2. Channel that has not "sent a packet" before the timeout: * 2a. Not within 1.1s of the timeout. * + We should decide to pad later - * 2b. Within 1.1s of the timemout. + * 2b. Within 1.1s of the timeout. * + We should schedule padding * + We should get feedback that we wrote a cell * 2c. Within 0.1s of the timeout. diff --git a/src/test/test_config.c b/src/test/test_config.c index 3ebe095a6a..a53d0b8227 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -6435,7 +6435,7 @@ test_config_include_opened_file_list(void *data) tt_int_op(smartlist_len(opened_files), OP_EQ, 4); tt_int_op(smartlist_contains_string(opened_files, torrcd), OP_EQ, 1); tt_int_op(smartlist_contains_string(opened_files, subfolder), OP_EQ, 1); - // files inside subfolders are not opended, only the subfolder is opened + // files inside subfolders are not opened, only the subfolder is opened tt_int_op(smartlist_contains_string(opened_files, empty), OP_EQ, 1); tt_int_op(smartlist_contains_string(opened_files, file), OP_EQ, 1); // dot files are not opened as we ignore them when we get their name from diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index a7f9fa1d7b..5f93b04c96 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2073,7 +2073,7 @@ test_dir_handle_get_status_vote_next_bandwidth_not_found(void* data) conn = new_dir_conn(); tt_int_op(0, OP_EQ, directory_handle_command_get(conn, - GET("/tor/status-vote/next/bandwdith"), NULL, 0)); + GET("/tor/status-vote/next/bandwidth"), NULL, 0)); fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE, NULL, NULL, 1, 0); diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c index c32803b380..eaeba47b0c 100644 --- a/src/test/test_hs_control.c +++ b/src/test/test_hs_control.c @@ -628,7 +628,7 @@ test_hs_control_store_permanent_creds(void *arg) tor_free(args); tor_free(cp1); - /* Overwrite the credentials and check that they got overwrited. */ + /* Overwrite the credentials and check that they got overwritten. */ args = tor_strdup("2fvhjskjet3n5syd6yfg5lhvwcs62bojmthr35ko5bllr3iqdb4ctdyd " "x25519:UDRvZLvcJo0QRLvDfkpgbtsqbkhIUQZyeo2FNBrgS18= " "Flags=Permanent"); diff --git a/src/test/test_periodic_event.c b/src/test/test_periodic_event.c index 6a9569ae89..58565f6af1 100644 --- a/src/test/test_periodic_event.c +++ b/src/test/test_periodic_event.c @@ -50,7 +50,7 @@ test_pe_initialize(void *arg) /* Initialize the events but the callback won't get called since we would * need to run the main loop and then wait for a second delaying the unit - * tests. Instead, we'll test the callback work indepedently elsewhere. */ + * tests. Instead, we'll test the callback work independently elsewhere. */ initialize_periodic_events(); periodic_events_connect_all(); set_network_participation(false); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated: Add back comments about Stable/familiar decay
by gitolite role 21 Dec '22

21 Dec '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new 5ba2bf2551 Add back comments about Stable/familiar decay 5ba2bf2551 is described below commit 5ba2bf2551b53c40c82f89429bc717b96616dde3 Author: Georg Koppen <gk(a)torproject.org> AuthorDate: Wed Dec 21 10:43:26 2022 +0000 Add back comments about Stable/familiar decay Closes: #40734. --- src/feature/dirauth/dirauth_options.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/feature/dirauth/dirauth_options.inc b/src/feature/dirauth/dirauth_options.inc index a43ed285ce..e2056c9cc7 100644 --- a/src/feature/dirauth/dirauth_options.inc +++ b/src/feature/dirauth/dirauth_options.inc @@ -86,11 +86,12 @@ CONF_VAR(AuthDirVoteGuard, ROUTERSET, 0, NULL) CONF_VAR(AuthDirVoteStableGuaranteeMinUptime, INTERVAL, 0, "30 days") /** If a relay's MTBF is at least this value, then it is always stable. See - * above. */ + * above. (Corresponds to about 7 days for current decay rates.) */ CONF_VAR(AuthDirVoteStableGuaranteeMTBF, INTERVAL, 0, "5 days") /** A relay with at least this much weighted time known can be considered - * familiar enough to be a guard. */ + * familiar enough to be a guard. (Corresponds to about 20 days for current + * decay rates.) */ CONF_VAR(AuthDirVoteGuardGuaranteeTimeKnown, INTERVAL, 0, "8 days") /** A relay with sufficient WFU is around enough to be a guard. */ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torspec] branch main updated (3727309 -> 7116c9c)
by gitolite role 20 Dec '22

20 Dec '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository torspec. from 3727309 prop329: Remove unused section and use relay command 19..22 new e66dd71 Clarify that SRV is 256 bits. new c99151c Clarify that revision counter needs to support 64-bit values. new 7116c9c rend-spec-v3: mark some sections as obsolete The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dir-spec.txt | 10 ++++++---- rend-spec-v3.txt | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[tor] branch release-0.4.7 updated (e1458945a7 -> 2b4651174e)
by gitolite role 20 Dec '22

20 Dec '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.7 in repository tor. from e1458945a7 Merge branch 'maint-0.4.7' into release-0.4.7 new 1d9166c8c9 Enable IP_BIND_ADDRESS_NO_PORT if supported new 2b4651174e Merge branch 'maint-0.4.7' into release-0.4.7 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ip_bind_address_no_port | 5 +++++ src/core/mainloop/connection.c | 24 ++++++++++++++++++++++++ src/lib/sandbox/sandbox.c | 8 ++++++++ 3 files changed, 37 insertions(+) create mode 100644 changes/ip_bind_address_no_port -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1

[tor] branch maint-0.4.7 updated (da48104c99 -> 1d9166c8c9)
by gitolite role 20 Dec '22

20 Dec '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch maint-0.4.7 in repository tor. from da48104c99 Merge branch 'tor-gitlab/mr/667' into maint-0.4.7 new 1d9166c8c9 Enable IP_BIND_ADDRESS_NO_PORT if supported The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ip_bind_address_no_port | 5 +++++ src/core/mainloop/connection.c | 24 ++++++++++++++++++++++++ src/lib/sandbox/sandbox.c | 8 ++++++++ 3 files changed, 37 insertions(+) create mode 100644 changes/ip_bind_address_no_port -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (cfdc9f9d29 -> 923463a1e6)
by gitolite role 20 Dec '22

20 Dec '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from cfdc9f9d29 circ: Add function to learn if queue is full new 1d9166c8c9 Enable IP_BIND_ADDRESS_NO_PORT if supported new 713efae94b Merge branch 'maint-0.4.7' new 923463a1e6 Fix duplicate code after tor-gitlab/mr/671 forward merge The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/core/mainloop/connection.c | 7 +++++++ 1 file changed, 7 insertions(+) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[tor] branch main updated: circ: Add function to learn if queue is full
by gitolite role 20 Dec '22

20 Dec '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new cfdc9f9d29 circ: Add function to learn if queue is full cfdc9f9d29 is described below commit cfdc9f9d29fb369a139f4a3a35a829ebe66807bb Author: David Goulet <dgoulet(a)torproject.org> AuthorDate: Wed Dec 14 10:19:14 2022 -0500 circ: Add function to learn if queue is full Related to #40731 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/circuitlist.c | 24 ++++++++++++++++++++++++ src/core/or/circuitlist.h | 2 ++ 2 files changed, 26 insertions(+) diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index 50dc2ee338..cea3a2136f 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -2831,3 +2831,27 @@ assert_circuit_ok,(const circuit_t *c)) tor_assert(!or_circ || !or_circ->rend_splice); } } + +/** Return true iff the circuit queue for the given direction is full that is + * above the high watermark. */ +bool +circuit_is_queue_full(const circuit_t *circ, cell_direction_t direction) +{ + int queue_size; + + tor_assert(circ); + + /* Gather objects we need based on cell direction. */ + if (direction == CELL_DIRECTION_OUT) { + /* Outbound. */ + queue_size = circ->n_chan_cells.n; + } else { + /* Inbound. */ + queue_size = CONST_TO_OR_CIRCUIT(circ)->p_chan_cells.n; + } + + /* Then check if our cell queue has reached its high watermark as in its + * upper limit. This is so we avoid too much memory pressure by queuing a + * large amount of cells. */ + return queue_size >= cell_queue_highwatermark(); +} diff --git a/src/core/or/circuitlist.h b/src/core/or/circuitlist.h index 541a708de2..49ded11f12 100644 --- a/src/core/or/circuitlist.h +++ b/src/core/or/circuitlist.h @@ -247,6 +247,8 @@ MOCK_DECL(void, channel_note_destroy_not_pending, smartlist_t *circuit_find_circuits_to_upgrade_from_guard_wait(void); +bool circuit_is_queue_full(const circuit_t *circ, cell_direction_t direction); + /* Declare the handle helpers */ HANDLE_DECL(circuit, circuit_t, ) #define circuit_handle_free(h) \ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torspec] branch main updated: prop329: Remove unused section and use relay command 19..22
by gitolite role 15 Dec '22

15 Dec '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository torspec. The following commit(s) were added to refs/heads/main by this push: new 3727309 prop329: Remove unused section and use relay command 19..22 3727309 is described below commit 372730940f916933447f56da7f12167c79c86c4f Author: David Goulet <dgoulet(a)torproject.org> AuthorDate: Thu Dec 15 11:16:58 2022 -0500 prop329: Remove unused section and use relay command 19..22 As per review from nickm in https://gitlab.torproject.org/tpo/core/torspec/-/merge_requests/95 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/329-traffic-splitting.txt | 52 +++++-------------------------------- tor-spec.txt | 4 +-- 2 files changed, 8 insertions(+), 48 deletions(-) diff --git a/proposals/329-traffic-splitting.txt b/proposals/329-traffic-splitting.txt index e76e38c..b9f5dce 100644 --- a/proposals/329-traffic-splitting.txt +++ b/proposals/329-traffic-splitting.txt @@ -173,12 +173,12 @@ Status: Draft The first two parts of the handshake establish the link, and enable resumption: - 45 -- RELAY_CONFLUX_LINK + 19 -- RELAY_CONFLUX_LINK Sent from the OP to the exit/service in order to link circuits together at the end point. - 46 -- RELAY_CONFLUX_LINKED + 20 -- RELAY_CONFLUX_LINKED Sent from the exit/service to the OP, to confirm the circuits were linked. @@ -224,7 +224,7 @@ Status: Draft The third stage of the handshake exists to help the exit/service measure initial RTT, for use in [SCHEDULING]: - 47 -- RELAY_CONFLUX_LINKED_ACK + 21 -- RELAY_CONFLUX_LINKED_ACK Sent from the OP to the exit/service, to provide initial RTT measurement for the exit/service. @@ -313,7 +313,7 @@ Status: Draft To achieve this, we propose a new relay command used to indicate a switch to another leg: - 48 -- RELAY_CONFLUX_SWITCH + 22 -- RELAY_CONFLUX_SWITCH Sent from the client to the exit/service when switching leg in an already linked circuit construction. @@ -750,47 +750,7 @@ Status: Draft Appended A [ALTERNATIVES] -A.1 BEGIN/END sequencing [ALTERNATIVE_SEQUENCING] - - In this method of signaling, we increment the sequence number by 1 only - when we switch legs, and use BEGIN/END "bookends" to know that all data - on a leg has been received. - - To achieve this, we add a small sequence number to the common relay - header for all relay cells on linked circuits, as well as a field to - signal the beginning of a sequence, intermediate data, and the end of a - sequence. - - Relay command [1 byte] - Recognized [2 bytes] - StreamID [2 bytes] - Digest [4 bytes] - Length [2 bytes] - > Switching [2 bits] # 01 = BEGIN, 00 = CONTINUE, 10 = END - > Sequencing [6 bits] - Data [PAYLOAD_LEN - 12 - Length bytes] - - These fields MUST be present on ALL end-to-end relay cells on each leg - that come from the endpoint, following a RELAY_CIRCUIT_LINK command. - - They are absent on 'leaky pipe' RELAY_COMMAND_DROP and - RELAY_COMMAND_PADDING_NEGOTIATED cells that come from middle relays, as - opposed to the endpoint, to support padding. - - Sequence numbers are incremented by one when an endpoint switches legs - to transmit a cell. This number will wrap; implementations MUST treat - 0 as the next sequence after 2^6-1. Because we do not expect to support - significantly more than 2 legs, and much fewer than 63, this is not an - issue. - - The first cell on a new circuit MUST use the BEGIN code for switching. - Cells are delivered from that circuit until an END switching signal is - received, even if cells arrive first on another circuit with the next - sequence number before and END switching field. Recipients MUST only - deliver cells with a BEGIN, if their Sequencing number is one more than - the last END. - -A.2 Alternative Link Handshake [ALTERNATIVE_LINKING] +A.1 Alternative Link Handshake [ALTERNATIVE_LINKING] The circuit linking in [LINKING_CIRCUITS] could be done as encrypted ntor onionskin extension fields, similar to those used by v3 onions. @@ -814,7 +774,7 @@ A.2 Alternative Link Handshake [ALTERNATIVE_LINKING] linking phase using Proposal 340, to combine initial RELAY_BEGIN cells with RELAY_CIRCUIT_LINK. -A.3. Alternative RTT measurement [ALTERNATIVE_RTT] +A.2. Alternative RTT measurement [ALTERNATIVE_RTT] Instead of measuring RTTs during [LINKING_CIRCUITS], we could create PING/PONG cells, whose sole purpose is to allow endpoints to measure diff --git a/tor-spec.txt b/tor-spec.txt index 38b8b35..f728478 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1686,6 +1686,8 @@ see tor-design.pdf. 16..18 -- Reserved for UDP; Not yet in use, see prop339. + 19..22 -- Reserved for Conflux, see prop329. + 32..40 -- Used for hidden services; see rend-spec-{v2,v3}.txt. 41..42 -- Used for circuit padding; see Section 3 of padding-spec.txt. @@ -1694,8 +1696,6 @@ see tor-design.pdf. 43 -- XON [forward or backward] 44 -- XOFF [forward or backward] - 45..48 -- Reserved for Conflux, see prop329. - Commands labelled as "forward" must only be sent by the originator of the circuit. Commands labelled as "backward" must only be sent by other nodes in the circuit back to the originator. Commands marked -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pluggable-transports/snowflake] branch main updated (53e381e -> 936a1f8)
by gitolite role 15 Dec '22

15 Dec '22

This is an automated email from the git hooks/post-receive script. dcf pushed a change to branch main in repository pluggable-transports/snowflake. from 53e381e Fix server flag name new c6fabb2 Use multiple parallel KCP state machines in the server. new 936a1f8 Add a num-turbotunnel server transport option. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: server/README.md | 25 ++++++++++++++++++++++++ server/lib/http.go | 52 ++++++++++++++++++++++++++++++++++++++++++++----- server/lib/snowflake.go | 45 +++++++++++++++++++++--------------------- server/server.go | 20 ++++++++++++++++++- 4 files changed, 113 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0