[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Specify and implement close-stream and close-circuit contro...
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] Specify and implement close-stream and close-circuit contro...
- From: nickm@xxxxxxxx (Nick Mathewson)
- Date: Tue, 22 Mar 2005 14:36:41 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Tue, 22 Mar 2005 14:37:11 -0500
- Reply-to: or-dev@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv23999/src/or
Modified Files:
control.c or.h relay.c
Log Message:
Specify and implement close-stream and close-circuit control messages
Index: control.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/control.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- control.c 22 Mar 2005 10:34:23 -0000 1.62
+++ control.c 22 Mar 2005 19:36:38 -0000 1.63
@@ -48,8 +48,10 @@
#define CONTROL_CMD_POSTDESCRIPTOR 0x000F
#define CONTROL_CMD_FRAGMENTHEADER 0x0010
#define CONTROL_CMD_FRAGMENT 0x0011
-#define CONTROL_CMD_REDIRECTSTREAM 0x0012
-#define _CONTROL_CMD_MAX_RECOGNIZED 0x0012
+#define CONTROL_CMD_REDIRECTSTREAM 0x0012
+#define CONTROL_CMD_CLOSESTREAM 0x0013
+#define CONTROL_CMD_CLOSECIRCUIT 0x0014
+#define _CONTROL_CMD_MAX_RECOGNIZED 0x0014
/* Recognized error codes. */
#define ERR_UNSPECIFIED 0x0000
@@ -152,6 +154,10 @@
const char *body);
static int handle_control_redirectstream(connection_t *conn, uint32_t len,
const char *body);
+static int handle_control_closestream(connection_t *conn, uint32_t len,
+ const char *body);
+static int handle_control_closecircuit(connection_t *conn, uint32_t len,
+ const char *body);
/** Given a possibly invalid message type code <b>cmd</b>, return a
* human-readable string equivalent. */
@@ -772,7 +778,72 @@
send_control_done(conn);
return 0;
}
+static int
+handle_control_closestream(connection_t *conn, uint32_t len,
+ const char *body)
+{
+ uint32_t conn_id;
+ connection_t *ap_conn;
+ uint8_t reason;
+ int hold_open;
+
+ if (len < 6) {
+ send_control_error(conn, ERR_SYNTAX, "closestream message too short");
+ return 0;
+ }
+ conn_id = ntohl(get_uint32(body));
+ reason = *(uint8_t*)(body+4);
+ hold_open = (*(uint8_t*)(body+5)) & 1;
+
+ if (!(ap_conn = connection_get_by_global_id(conn_id))
+ || ap_conn->state != CONN_TYPE_AP
+ || !ap_conn->socks_request) {
+ send_control_error(conn, ERR_NO_STREAM,
+ "No AP connection found with given ID");
+ return 0;
+ }
+
+ if (!ap_conn->socks_request->has_finished) {
+ socks5_reply_status_t status =
+ connection_edge_end_reason_socks5_response(reason);
+ connection_ap_handshake_socks_reply(ap_conn, NULL, 0, status);
+ }
+ if (hold_open)
+ ap_conn->hold_open_until_flushed = 1;
+ connection_mark_for_close(ap_conn);
+
+ send_control_done(conn);
+ return 0;
+}
+static int
+handle_control_closecircuit(connection_t *conn, uint32_t len,
+ const char *body)
+{
+ uint32_t circ_id;
+ circuit_t *circ;
+ int safe;
+
+ if (len < 5) {
+ send_control_error(conn, ERR_SYNTAX, "closecircuit message too short");
+ return 0;
+ }
+ circ_id = ntohl(get_uint32(body));
+ safe = (*(uint8_t*)(body+4)) & 1;
+
+ if (!(circ = circuit_get_by_global_id(circ_id))) {
+ send_control_error(conn, ERR_NO_CIRC,
+ "No circuit found with given ID");
+ return 0;
+ }
+
+ if (!safe || !circ->p_streams) {
+ circuit_mark_for_close(circ);
+ }
+
+ send_control_done(conn);
+ return 0;
+}
/** Called when <b>conn</b> has no more bytes left on its outbuf. */
int
@@ -882,6 +953,14 @@
if (handle_control_redirectstream(conn, body_len, body))
return -1;
break;
+ case CONTROL_CMD_CLOSESTREAM:
+ if (handle_control_closestream(conn, body_len, body))
+ return -1;
+ break;
+ case CONTROL_CMD_CLOSECIRCUIT:
+ if (handle_control_closecircuit(conn, body_len, body))
+ return -1;
+ break;
case CONTROL_CMD_ERROR:
case CONTROL_CMD_DONE:
case CONTROL_CMD_CONFVALUE:
Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -d -r1.567 -r1.568
--- or.h 22 Mar 2005 19:01:46 -0000 1.567
+++ or.h 22 Mar 2005 19:36:38 -0000 1.568
@@ -1560,7 +1560,7 @@
size_t payload_len, crypt_path_t *cpath_layer);
int connection_edge_package_raw_inbuf(connection_t *conn, int package_partial);
void connection_edge_consider_sending_sendme(connection_t *conn);
-socks5_reply_status_t connection_edge_end_reason_sock5_response(char *payload, uint16_t length);
+socks5_reply_status_t connection_edge_end_reason_socks5_response(int reason);
int errno_to_end_reason(int e);
extern uint64_t stats_n_data_cells_packaged;
Index: relay.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/relay.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- relay.c 22 Mar 2005 10:34:00 -0000 1.50
+++ relay.c 22 Mar 2005 19:36:38 -0000 1.51
@@ -476,16 +476,13 @@
}
}
-/** Translate the <b>payload</b> of length <b>length</b>, which
- * came from a relay 'end' cell, into an appropriate SOCKS5 reply code.
+/** Translate <b>reason</b> (as from a relay 'end' cell) into an
+ * appropriate SOCKS5 reply code.
*/
-static socks5_reply_status_t
-connection_edge_end_reason_socks5_response(char *payload, uint16_t length) {
- if (length < 1) {
- log_fn(LOG_WARN,"End cell arrived with length 0. Should be at least 1.");
- return SOCKS5_GENERAL_ERROR;
- }
- switch (*payload) {
+socks5_reply_status_t
+connection_edge_end_reason_socks5_response(int reason)
+{
+ switch (reason) {
case END_STREAM_REASON_MISC:
return SOCKS5_GENERAL_ERROR;
case END_STREAM_REASON_RESOLVEFAILED:
@@ -511,7 +508,7 @@
case END_STREAM_REASON_TORPROTOCOL:
return SOCKS5_GENERAL_ERROR;
default:
- log_fn(LOG_WARN,"Reason for ending (%d) not recognized.",*payload);
+ log_fn(LOG_WARN,"Reason for ending (%d) not recognized.",reason);
return SOCKS5_GENERAL_ERROR;
}
}
@@ -817,9 +814,14 @@
rh.length),
conn->stream_id, (int)conn->stream_size);
if (conn->socks_request && !conn->socks_request->has_finished) {
- socks5_reply_status_t status =
- connection_edge_end_reason_socks5_response(
- cell->payload+RELAY_HEADER_SIZE, rh.length);
+ socks5_reply_status_t status;
+ if (rh.length < 1) {
+ log_fn(LOG_WARN,"End cell arrived with length 0. Should be at least 1.");
+ status = SOCKS5_GENERAL_ERROR;
+ } else {
+ status = connection_edge_end_reason_socks5_response(
+ *(uint8_t*)cell->payload+RELAY_HEADER_SIZE);
+ }
connection_ap_handshake_socks_reply(conn, NULL, 0, status);
}
#ifdef HALF_OPEN