Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
orbea
Tor
Commits
5260b4ef
Commit
5260b4ef
authored
2 years ago
by
David Goulet
Browse files
Options
Downloads
Plain Diff
Merge branch 'maint-0.4.5' into maint-0.4.6
parents
4ba89c0c
8d8afc4e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changes/ticket40623
+4
-0
4 additions, 0 deletions
changes/ticket40623
src/core/or/command.c
+5
-5
5 additions, 5 deletions
src/core/or/command.c
with
9 additions
and
5 deletions
changes/ticket40623
0 → 100644
+
4
−
0
View file @
5260b4ef
o Major bugfixes (relay):
- Stop sending TRUNCATED cell and instead close the circuits which sends a
DESTROY cell so every relay in the circuit path can stop queuing cells.
Fixes bug 40623; bugfix on 0.1.0.2-rc.
This diff is collapsed.
Click to expand it.
src/core/or/command.c
+
5
−
5
View file @
5260b4ef
...
...
@@ -660,11 +660,11 @@ command_process_destroy_cell(cell_t *cell, channel_t *chan)
if
(
CIRCUIT_IS_ORIGIN
(
circ
))
{
circuit_mark_for_close
(
circ
,
reason
|
END_CIRC_REASON_FLAG_REMOTE
);
}
else
{
char
payload
[
1
];
log_debug
(
LD_OR
,
"Delivering 'truncated' back."
);
payload
[
0
]
=
(
char
)
reason
;
relay_send_command_from_edge
(
0
,
circ
,
RELAY_COMMAND_TRUNCATED
,
payload
,
sizeof
(
payload
),
NUL
L
);
/* Close the circuit so we stop queuing cells for it and propagate the
* DESTROY cell down the circuit so relays can stop queuing in-flight
* cells for this circuit which helps with memory pressure. */
log_debug
(
LD_OR
,
"Received DESTROY cell from n_chan, closing circuit."
);
circuit_mark_for_close
(
circ
,
END_CIRC_REASON_TORPROTOCO
L
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment