handle more purposes in new_route_len

svn:r1618

diff --git a/src/or/onion.c b/src/or/onion.c
index c827d0e3462e41376736422ed9d6e3fa1a7b8531..aa93d81b790b9ac8ac3aa457447439116414da6e 100644 (file)
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -171,9 +171,13 @@ static int new_route_len(double cw, uint8_t purpose, smartlist_t *routers) {
 #else
   if(purpose == CIRCUIT_PURPOSE_C_GENERAL)
     routelen = 3;
-  else if(purpose == CIRCUIT_PURPOSE_C_ESTABLISH_REND)
+  else if(purpose == CIRCUIT_PURPOSE_C_INTRODUCING)
     routelen = 4;
+  else if(purpose == CIRCUIT_PURPOSE_C_ESTABLISH_REND)
+    routelen = 3;
   else if(purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO)
+    routelen = 3;
+  else if(purpose == CIRCUIT_PURPOSE_S_CONNECT_REND)
     routelen = 4;
   else {
     log_fn(LOG_WARN,"Unhandled purpose %d", purpose);