diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-18 10:14:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-18 10:14:40 -0400 |
| commit | f8c9cc713d608fcd37d25730e91a88d4a1081f28 (patch) | |
| tree | 66511f361dc9eb1915a7cc469f1001cf57337dbb /src/or/rendservice.c | |
| parent | ec8bdc5da81a27fd0d382db689addd8114347e1e (diff) | |
| parent | b355ddb20f534d772dcb42737ceb1d0264e2c3f1 (diff) | |
| download | tor-f8c9cc713d608fcd37d25730e91a88d4a1081f28.tar tor-f8c9cc713d608fcd37d25730e91a88d4a1081f28.tar.gz | |
Merge remote-tracking branch 'origin/maint-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 689cfb164..daa1651af 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -506,16 +506,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, |