set the circ windows on the middle hop of the rend circs

svn:r1511

diff --git a/src/or/circuit.c b/src/or/circuit.c
index c39f8b317116487d6292dfd0aef3a7e8ac409a4b..89b728f8b2ae9b6a0d0b99eea3abdca9710e8430 100644 (file)
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -945,7 +945,7 @@ void circuit_log_path(int severity, circuit_t *circ) {
                router->nickname, states[hop->state]);
     } else {
       if(circ->purpose == CIRCUIT_PURPOSE_C_REND_JOINED) {
-        snprintf(s, sizeof(buf) - (s - buf), "(rend join)");
+        snprintf(s, sizeof(buf) - (s - buf), "(rendjoin hop)");
       } else {
         snprintf(s, sizeof(buf) - (s - buf), "UNKNOWN ");
       }

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 470f30d77e8629f2ece65f3ce347875b864f25ed..f3a98fb1f88e80effbb178af8675fa2dccac4a5f 100644 (file)
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -210,6 +210,12 @@ rend_client_receive_rendezvous(circuit_t *circ, const char *request, int request
   /* All is well. Extend the circuit. */
   circ->purpose = CIRCUIT_PURPOSE_C_REND_JOINED;
   hop->state = CPATH_STATE_OPEN;
+  /* set the windows to default. these are the windows
+   * that alice thinks bob has.
+   */
+  hop->package_window = CIRCWINDOW_START;
+  hop->deliver_window = CIRCWINDOW_START;
+
   onion_append_to_cpath(&circ->cpath, hop);
   circ->build_state->pending_final_cpath = NULL; /* prevent double-free */
 

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 6029ad89dd6bbc612991a980ab04fff62edbfdd7..40a15aa6c4bb4f1ea08d6a4172441e1d984e884c 100644 (file)
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -593,6 +593,12 @@ rend_service_rendezvous_is_ready(circuit_t *circuit)
 
   /* Append the cpath entry. */
   hop->state = CPATH_STATE_OPEN;
+  /* set the windows to default. these are the windows
+   * that bob thinks alice has.
+   */
+  hop->package_window = CIRCWINDOW_START;
+  hop->deliver_window = CIRCWINDOW_START;
+
   onion_append_to_cpath(&circuit->cpath, hop);
   circuit->build_state->pending_final_cpath = NULL; /* prevent double-free */