diff options
| author | Roger Dingledine <arma@torproject.org> | 2003-10-21 09:48:17 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2003-10-21 09:48:17 +0000 |
| commit | e4127e4d3666da72415ad5f673f2f6136531836f (patch) | |
| tree | 6cffdc84c27d917b0293b1a1d1ef1503b45dedf8 /src/or/circuit.c | |
| parent | 80d428b2253e085382edcdb7b741329f9a0f36c0 (diff) | |
| download | tor-e4127e4d3666da72415ad5f673f2f6136531836f.tar.gz tor-e4127e4d3666da72415ad5f673f2f6136531836f.zip | |
move closer to being able to reload config on HUP
rename APPort to SocksPort
introduce new tor_free() macro
svn:r642
Diffstat (limited to 'src/or/circuit.c')
| -rw-r--r-- | src/or/circuit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/circuit.c b/src/or/circuit.c index d3053eb273..18597fd4de 100644 --- a/src/or/circuit.c +++ b/src/or/circuit.c @@ -481,7 +481,7 @@ void circuit_close(circuit_t *circ) { circuit_t *youngest=NULL; assert(circ); - if(options.APPort) { + if(options.SocksPort) { youngest = circuit_get_newest_open(); log_fn(LOG_DEBUG,"youngest %d, circ %d.",(int)youngest, (int)circ); } @@ -496,7 +496,7 @@ void circuit_close(circuit_t *circ) { for(conn=circ->p_streams; conn; conn=conn->next_stream) { connection_send_destroy(circ->p_aci, conn); } - if(options.APPort && youngest == circ) { /* check this after we've sent the destroys, to reduce races */ + if(options.SocksPort && youngest == circ) { /* check this after we've sent the destroys, to reduce races */ /* our current circuit just died. Launch another one pronto. */ log_fn(LOG_INFO,"Youngest circuit dying. Launching a replacement."); circuit_launch_new(1); @@ -616,7 +616,7 @@ void circuit_expire_unused_circuits(void) { void circuit_launch_new(int failure_status) { static int failures=0; - if(!options.APPort) /* we're not an application proxy. no need for circuits. */ + if(!options.SocksPort) /* we're not an application proxy. no need for circuits. */ return; if(failure_status == -1) { /* I was called because a circuit succeeded */ |