diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-02-22 12:46:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-02-22 12:46:43 -0500 |
| commit | 295e6557a9d37b4466602d77e0dc2ada060fddd4 (patch) | |
| tree | f2b3b81146b2672e3f44816fbe8a77d830b81b11 | |
| parent | c084ae145e7eb77303ce401083a94b0d9d7fe57e (diff) | |
| parent | b65ad83ebea7a454f7eee377069734175e42b244 (diff) | |
| download | tor-295e6557a9d37b4466602d77e0dc2ada060fddd4.tar.gz tor-295e6557a9d37b4466602d77e0dc2ada060fddd4.zip | |
Merge remote branch 'sebastian/coverity'
| -rw-r--r-- | src/or/control.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/or/control.c b/src/or/control.c index 9840ea6294..0f71855286 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2095,21 +2095,24 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len, connection_printf_to_buf(conn, "552 Unknown purpose \"%s\"\r\n", purp); SMARTLIST_FOREACH(args, char *, cp, tor_free(cp)); smartlist_free(args); + goto done; } } if ((smartlist_len(args) == 1) || (smartlist_len(args) >= 2 && is_keyval_pair(smartlist_get(args, 1)))) { - // "EXTENDCIRCUIT 0" || EXTENDCIRCUIT 0 foo=bar" - circ = circuit_launch_by_router(intended_purpose, NULL, - CIRCLAUNCH_NEED_CAPACITY); - if (!circ) { - connection_write_str_to_buf("551 Couldn't start circuit\r\n", conn); - } else { - connection_printf_to_buf(conn, "250 EXTENDED %lu\r\n", - (unsigned long)circ->global_identifier); - } - goto done; + // "EXTENDCIRCUIT 0" || EXTENDCIRCUIT 0 foo=bar" + circ = circuit_launch_by_router(intended_purpose, NULL, + CIRCLAUNCH_NEED_CAPACITY); + if (!circ) { + connection_write_str_to_buf("551 Couldn't start circuit\r\n", conn); + } else { + connection_printf_to_buf(conn, "250 EXTENDED %lu\r\n", + (unsigned long)circ->global_identifier); + } + SMARTLIST_FOREACH(args, char *, cp, tor_free(cp)); + smartlist_free(args); + goto done; } // "EXTENDCIRCUIT 0 router1,router2" || // "EXTENDCIRCUIT 0 router1,router2 PURPOSE=foo" @@ -2125,9 +2128,6 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len, SMARTLIST_FOREACH(args, char *, cp, tor_free(cp)); smartlist_free(args); - if (!zero_circ && !circ) { - goto done; - } routers = smartlist_create(); SMARTLIST_FOREACH(router_nicknames, const char *, n, |