torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix two assert triggers (darn it, I hate releasing software)

Browse Source 
when connecting to a dirserver or OR and the network is down,
we would crash.


svn:r1340
This commit is contained in:
Roger Dingledine
2004-03-26 22:07:45 +00:00
parent fe0afdbde5
commit a54b50557c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/or/connection_or.c
+1 -1
View File
@@ -111,6 +111,7 @@ connection_t *connection_or_connect(routerinfo_t *router) {
/* set up conn so it's got all the data we need to remember */
connection_or_init_conn_from_router(conn, router);
conn->state = OR_CONN_STATE_CONNECTING;
if(connection_add(conn) < 0) { /* no space, forget it */
connection_free(conn);
@@ -126,7 +127,6 @@ connection_t *connection_or_connect(routerinfo_t *router) {
connection_watch_events(conn, POLLIN | POLLOUT | POLLERR);
/* writable indicates finish, readable indicates broken link,
error indicates broken link on windows */
conn->state = OR_CONN_STATE_CONNECTING;
return conn;
/* case 1: fall through */
}
trunk/src/or/directory.c
+2 -3
View File
@@ -40,6 +40,8 @@ void directory_initiate_command(routerinfo_t *router, int command) {
assert(router->identity_pkey);
conn->identity_pkey = crypto_pk_dup_key(router->identity_pkey);
conn->state = command;
if(connection_add(conn) < 0) { /* no space, forget it */
connection_free(conn);
return;
@@ -55,7 +57,6 @@ void directory_initiate_command(routerinfo_t *router, int command) {
connection_watch_events(conn, POLLIN | POLLOUT | POLLERR);
/* writable indicates finish, readable indicates broken link,
error indicates broken link in windowsland. */
conn->state = command;
return;
/* case 1: fall through */
}
@@ -76,7 +77,6 @@ static int directory_send_command(connection_t *conn, int command) {
switch(command) {
case DIR_CONN_STATE_CONNECTING_FETCH:
connection_write_to_buf(fetchstring, strlen(fetchstring), conn);
conn->state = DIR_CONN_STATE_CLIENT_SENDING_FETCH;
break;
case DIR_CONN_STATE_CONNECTING_UPLOAD:
s = router_get_my_descriptor();
@@ -87,7 +87,6 @@ static int directory_send_command(connection_t *conn, int command) {
snprintf(tmp, sizeof(tmp), "POST / HTTP/1.0\r\nContent-Length: %d\r\n\r\n%s",
(int)strlen(s), s);
connection_write_to_buf(tmp, strlen(tmp), conn);
conn->state = DIR_CONN_STATE_CLIENT_SENDING_UPLOAD;
break;
}
return 0;