diff options
author | Roger Dingledine <arma@torproject.org> | 2012-07-31 05:10:35 -0400 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2012-07-31 05:10:35 -0400 |
commit | aa985598f5914a1b858bf63536dd48ac8d7e0b33 (patch) | |
tree | 2ac4203f1e2e2bbfb9e30e8f721c86de0bf8e180 /src/or/rendservice.c | |
parent | 20c1d3d587984768a9f35edc6708e7f99104401f (diff) | |
parent | 1004489354685e7fe27df7fe7fdb9cc94f2d7d2d (diff) | |
download | tor-aa985598f5914a1b858bf63536dd48ac8d7e0b33.tar.gz tor-aa985598f5914a1b858bf63536dd48ac8d7e0b33.zip |
Merge branch 'maint-0.2.3' into release-0.2.3
Diffstat (limited to 'src/or/rendservice.c')
-rw-r--r-- | src/or/rendservice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 6a51874699..6af4778dfc 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -500,16 +500,16 @@ rend_config_services(const or_options_t *options, int validate_only) /* Copy introduction points to new services. */ /* XXXX This is O(n^2), but it's only called on reconfigure, so it's * probably ok? */ - SMARTLIST_FOREACH(rend_service_list, rend_service_t *, new, { - SMARTLIST_FOREACH(old_service_list, rend_service_t *, old, { + SMARTLIST_FOREACH_BEGIN(rend_service_list, rend_service_t *, new) { + SMARTLIST_FOREACH_BEGIN(old_service_list, rend_service_t *, old) { if (!strcmp(old->directory, new->directory)) { smartlist_add_all(new->intro_nodes, old->intro_nodes); smartlist_clear(old->intro_nodes); smartlist_add(surviving_services, old); break; } - }); - }); + } SMARTLIST_FOREACH_END(old); + } SMARTLIST_FOREACH_END(new); /* Close introduction circuits of services we don't serve anymore. */ /* XXXX it would be nicer if we had a nicer abstraction to use here, |