[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[or-cvs] handle banners from the server side
Update of /home/or/cvsroot/src/or
In directory moria.seul.org:/home/arma/work/onion/cvs/src/or
Modified Files:
connection_exit.c
Log Message:
handle banners from the server side
(text that it spits out immediately upon connect)
Index: connection_exit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_exit.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- connection_exit.c 26 Sep 2002 12:09:10 -0000 1.12
+++ connection_exit.c 1 Oct 2002 05:46:48 -0000 1.13
@@ -53,9 +53,9 @@
if(connection_wants_to_flush(conn)) /* in case there are any queued data cells */
connection_start_writing(conn);
connection_start_reading(conn);
-
- /* also, deliver a 'connected' cell back through the circuit. */
- return connection_exit_send_connected(conn);
+ return
+ connection_exit_send_connected(conn) || /* deliver a 'connected' cell back through the circuit. */
+ connection_process_inbuf(conn); /* in case the server has written anything */
case EXIT_CONN_STATE_OPEN:
/* FIXME down the road, we'll clear out circuits that are pending to close */
connection_stop_writing(conn);
@@ -174,6 +174,7 @@
log(LOG_NOTICE,"connection_exit_process_data_cell(): tell roger: newly connected conn had data waiting!");
// connection_start_writing(conn);
}
+// connection_process_inbuf(conn);
connection_watch_events(conn, POLLIN);
/* also, deliver a 'connected' cell back through the circuit. */