nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Code simplifications for AP_CONN_STATE_CONTROLLER_WAIT

Browse Source
This commit is contained in:
Neel Chauhan 2020-07-31 09:21:43 -07:00
parent 60f699c859
commit 837e0c4dc9
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/or/connection_edge.c
View File

@ -1511,7 +1511,7 @@ connection_entry_set_controller_wait(entry_connection_t *conn)
{ {
CONNECTION_AP_EXPECT_NONPENDING(conn); CONNECTION_AP_EXPECT_NONPENDING(conn);
ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_CONTROLLER_WAIT; ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_CONTROLLER_WAIT;
control_event_enter_controller_wait(); control_event_stream_status(conn, STREAM_EVENT_CONTROLLER_WAIT, 0);
} }
/** The AP connection <b>conn</b> has just failed while attaching or /** The AP connection <b>conn</b> has just failed while attaching or

10
src/feature/control/control_events.c
View File

@ -819,6 +819,7 @@ control_event_stream_status(entry_connection_t *conn, stream_status_event_t tp,
case STREAM_EVENT_NEW_RESOLVE: status = "NEWRESOLVE"; break; case STREAM_EVENT_NEW_RESOLVE: status = "NEWRESOLVE"; break;
case STREAM_EVENT_FAILED_RETRIABLE: status = "DETACHED"; break; case STREAM_EVENT_FAILED_RETRIABLE: status = "DETACHED"; break;
case STREAM_EVENT_REMAP: status = "REMAP"; break; case STREAM_EVENT_REMAP: status = "REMAP"; break;
case STREAM_EVENT_CONTROLLER_WAIT: status = "CONTROLLER_WAIT"; break;
default: default:
log_warn(LD_BUG, "Unrecognized status code %d", (int)tp); log_warn(LD_BUG, "Unrecognized status code %d", (int)tp);
return 0; return 0;
@ -2364,15 +2365,6 @@ control_events_free_all(void)
disable_log_messages = 0; disable_log_messages = 0;
} }
/** Our own router descriptor has changed; tell any controllers that care.
*/
int
control_event_enter_controller_wait(void)
{
send_control_event(EVENT_CONTROLLER_WAIT, "650 CONTROLLER_WAIT\r\n");
return 0;
}
#ifdef TOR_UNIT_TESTS #ifdef TOR_UNIT_TESTS
/* For testing: change the value of global_event_mask */ /* For testing: change the value of global_event_mask */
void void

3
src/feature/control/control_events.h
View File

@ -36,7 +36,8 @@ typedef enum stream_status_event_t {
STREAM_EVENT_NEW = 5, STREAM_EVENT_NEW = 5,
STREAM_EVENT_NEW_RESOLVE = 6, STREAM_EVENT_NEW_RESOLVE = 6,
STREAM_EVENT_FAILED_RETRIABLE = 7, STREAM_EVENT_FAILED_RETRIABLE = 7,
STREAM_EVENT_REMAP = 8 STREAM_EVENT_REMAP = 8,
STREAM_EVENT_CONTROLLER_WAIT = 9
} stream_status_event_t; } stream_status_event_t;
/** Used to indicate the type of a buildtime event */ /** Used to indicate the type of a buildtime event */