[or-cvs] set the circ windows on the middle hop of the rend circs

[Roger Dingledine]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	circuit.c rendclient.c rendservice.c 
Log Message:
set the circ windows on the middle hop of the rend circs


Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- circuit.c	6 Apr 2004 20:25:18 -0000	1.186
+++ circuit.c	6 Apr 2004 21:25:11 -0000	1.187
@@ -945,7 +945,7 @@
                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 ");
       }

Index: rendclient.c
===================================================================
RCS file: /home/or/cvsroot/src/or/rendclient.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- rendclient.c	6 Apr 2004 20:55:46 -0000	1.23
+++ rendclient.c	6 Apr 2004 21:25:11 -0000	1.24
@@ -210,6 +210,12 @@
   /* 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 */
 

Index: rendservice.c
===================================================================
RCS file: /home/or/cvsroot/src/or/rendservice.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- rendservice.c	6 Apr 2004 21:19:59 -0000	1.33
+++ rendservice.c	6 Apr 2004 21:25:11 -0000	1.34
@@ -593,6 +593,12 @@
 
   /* 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 */