Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
Mike Perry
Tor
Commits
1c7c166e
Commit
1c7c166e
authored
1 year ago
by
Mike Perry
Browse files
Options
Downloads
Patches
Plain Diff
LOGGING HACK: Confirm that #40842 circ is marked for close and find where
parent
4119a7f9
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#99080
skipped
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/core/or/conflux_util.c
+18
-0
18 additions, 0 deletions
src/core/or/conflux_util.c
with
18 additions
and
0 deletions
src/core/or/conflux_util.c
+
18
−
0
View file @
1c7c166e
...
...
@@ -38,10 +38,24 @@ circuit_get_package_window(circuit_t *circ,
tor_assert_nonfatal
(
circ
->
purpose
==
CIRCUIT_PURPOSE_CONFLUX_LINKED
);
}
circuit_t
*
orig_circ
=
circ
;
circ
=
conflux_decide_next_circ
(
circ
->
conflux
);
/* If conflux has no circuit to send on, the package window is 0. */
if
(
!
circ
)
{
if
(
!
orig_circ
->
conflux
->
curr_leg
)
{
if
(
orig_circ
->
marked_for_close
)
{
log_warn
(
LD_BUG
,
"Conflux has no circuit to send on. "
"Circuit %p idx %d marked at line %s:%d"
,
orig_circ
,
orig_circ
->
global_circuitlist_idx
,
orig_circ
->
marked_for_close_file
,
orig_circ
->
marked_for_close
);
}
else
{
log_warn
(
LD_BUG
,
"Conflux has no circuit to send on. "
"Circuit %p idx %d not marked for close."
,
orig_circ
,
orig_circ
->
global_circuitlist_idx
);
}
}
return
0
;
}
...
...
@@ -76,6 +90,10 @@ conflux_can_send(conflux_t *cfx)
if
(
send_circ
)
{
return
true
;
}
else
{
if
(
BUG
(
!
cfx
->
in_full_teardown
&&
!
cfx
->
curr_leg
))
{
log_fn
(
LOG_WARN
,
LD_BUG
,
"Conflux has no current circuit to send on. "
);
}
return
false
;
}
}
...
...
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