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
Container Registry
Model registry
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
The Tor Project
Core
Tor
Commits
30dd1c87
Commit
30dd1c87
authored
20 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Patches
Plain Diff
Add default trusted-dir-server entries only when no dirserver lines are given in the config file
svn:r2467
parent
508970f8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/or/or.h
+2
-1
2 additions, 1 deletion
src/or/or.h
src/or/routerlist.c
+1
-2
1 addition, 2 deletions
src/or/routerlist.c
with
3 additions
and
3 deletions
src/or/or.h
+
2
−
1
View file @
30dd1c87
...
...
@@ -902,7 +902,6 @@ typedef struct {
struct
config_line_t
*
DirServers
;
/**< List of configuration lines
* for directory servers. */
}
or_options_t
;
/* XXX are these good enough defaults? */
...
...
@@ -1455,6 +1454,8 @@ int router_update_status_from_smartlist(routerinfo_t *r,
time_t
list_time
,
smartlist_t
*
running_list
);
void
add_trusted_dir_server
(
const
char
*
addr
,
uint16_t
port
,
const
char
*
digest
);
void
clear_trusted_dir_servers
(
void
);
/********************************* routerparse.c ************************/
...
...
This diff is collapsed.
Click to expand it.
src/or/routerlist.c
+
1
−
2
View file @
30dd1c87
...
...
@@ -27,7 +27,6 @@ static trusted_dir_server_t *
router_pick_trusteddirserver_impl
(
int
requireother
,
int
fascistfirewall
);
static
void
mark_all_trusteddirservers_up
(
void
);
static
int
router_resolve_routerlist
(
routerlist_t
*
dir
);
static
void
clear_trusted_dir_servers
(
void
);
/****************************************************************************/
...
...
@@ -1162,7 +1161,7 @@ void add_trusted_dir_server(const char *addr, uint16_t port, const char *digest)
smartlist_add
(
trusted_dir_servers
,
ent
);
}
static
void
clear_trusted_dir_servers
(
void
)
void
clear_trusted_dir_servers
(
void
)
{
if
(
trusted_dir_servers
)
{
SMARTLIST_FOREACH
(
trusted_dir_servers
,
trusted_dir_server_t
*
,
ent
,
...
...
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