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

get rid of those pesky tabs

Browse Source 
svn:r1264
This commit is contained in:
Roger Dingledine 2004-03-12 13:00:34 +00:00
parent 6af8d0606f
commit 87797bcde5
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/connection.c
View File

@ -144,7 +144,7 @@ void connection_free_all(void) {
} }
/* Close the underlying socket for conn, so we don't try to flush it. /* Close the underlying socket for conn, so we don't try to flush it.
* Must be used in conjunction with connection_mark_for_close * Must be used in conjunction with (right before) connection_mark_for_close
*/ */
void connection_close_immediate(connection_t *conn) void connection_close_immediate(connection_t *conn)
{ {
@ -227,7 +227,7 @@ void connection_expire_held_open(void)
assert(conn->marked_for_close); assert(conn->marked_for_close);
if (now - conn->timestamp_lastwritten >= 15) { if (now - conn->timestamp_lastwritten >= 15) {
log_fn(LOG_WARN,"Giving up on marked_for_close conn that's been flushing for 15s (fd %d, type %s, state %d).", log_fn(LOG_WARN,"Giving up on marked_for_close conn that's been flushing for 15s (fd %d, type %s, state %d).",
conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state); conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state);
conn->hold_open_until_flushed = 0; conn->hold_open_until_flushed = 0;
} }
} }
@ -419,8 +419,8 @@ int retry_all_connections(void) {
if(options.ORPort) { if(options.ORPort) {
listener_close_if_present(CONN_TYPE_OR_LISTENER); listener_close_if_present(CONN_TYPE_OR_LISTENER);
if(connection_create_listener(options.ORBindAddress, if(connection_create_listener(options.ORBindAddress,
(uint16_t) options.ORPort, (uint16_t) options.ORPort,
CONN_TYPE_OR_LISTENER) < 0) CONN_TYPE_OR_LISTENER) < 0)
return -1; return -1;
} }
@ -428,7 +428,7 @@ int retry_all_connections(void) {
if(options.DirPort) { if(options.DirPort) {
listener_close_if_present(CONN_TYPE_DIR_LISTENER); listener_close_if_present(CONN_TYPE_DIR_LISTENER);
if(connection_create_listener(options.DirBindAddress, if(connection_create_listener(options.DirBindAddress,
(uint16_t) options.DirPort, (uint16_t) options.DirPort,
CONN_TYPE_DIR_LISTENER) < 0) CONN_TYPE_DIR_LISTENER) < 0)
return -1; return -1;
} }
@ -436,7 +436,7 @@ int retry_all_connections(void) {
if(options.SocksPort) { if(options.SocksPort) {
listener_close_if_present(CONN_TYPE_AP_LISTENER); listener_close_if_present(CONN_TYPE_AP_LISTENER);
if(connection_create_listener(options.SocksBindAddress, if(connection_create_listener(options.SocksBindAddress,
(uint16_t) options.SocksPort, (uint16_t) options.SocksPort,
CONN_TYPE_AP_LISTENER) < 0) CONN_TYPE_AP_LISTENER) < 0)
return -1; return -1;
} }

12
src/or/main.c
View File

@ -70,7 +70,7 @@ int connection_add(connection_t *conn) {
nfds++; nfds++;
log(LOG_INFO,"connection_add(): new conn type %s, socket %d, nfds %d.", log(LOG_INFO,"connection_add(): new conn type %s, socket %d, nfds %d.",
CONN_TYPE_TO_STRING(conn->type), conn->s, nfds); CONN_TYPE_TO_STRING(conn->type), conn->s, nfds);
return 0; return 0;
} }
@ -90,7 +90,7 @@ int connection_remove(connection_t *conn) {
assert(nfds>0); assert(nfds>0);
log_fn(LOG_INFO,"removing socket %d (type %s), nfds now %d", log_fn(LOG_INFO,"removing socket %d (type %s), nfds now %d",
conn->s, CONN_TYPE_TO_STRING(conn->type), nfds-1); conn->s, CONN_TYPE_TO_STRING(conn->type), nfds-1);
/* if it's an edge conn, remove it from the list /* if it's an edge conn, remove it from the list
* of conn's on this circuit. If it's not on an edge, * of conn's on this circuit. If it's not on an edge,
* flush and send destroys for all circuits on this conn * flush and send destroys for all circuits on this conn
@ -711,8 +711,8 @@ int network_init(void)
int r; int r;
r = WSAStartup(0x101,&WSAData); r = WSAStartup(0x101,&WSAData);
if (r) { if (r) {
log_fn(LOG_WARN,"Error initializing windows network layer: code was %d",r); log_fn(LOG_WARN,"Error initializing windows network layer: code was %d",r);
return -1; return -1;
} }
/* XXXX We should call WSACleanup on exit, I think. */ /* XXXX We should call WSACleanup on exit, I think. */
#endif #endif
@ -733,8 +733,8 @@ int tor_main(int argc, char *argv[]) {
log_fn(LOG_WARN,"Tor v%s. This is experimental software. Do not use it if you need anonymity.",VERSION); log_fn(LOG_WARN,"Tor v%s. This is experimental software. Do not use it if you need anonymity.",VERSION);
if (network_init()<0) { if (network_init()<0) {
log_fn(LOG_ERR,"Error initializing network; exiting."); log_fn(LOG_ERR,"Error initializing network; exiting.");
return 1; return 1;
} }
atexit(exit_function); atexit(exit_function);