nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 21:16:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit some minor fixes from this sandbox so i can commit the next one

Browse Source 
svn:r2229
This commit is contained in:
Roger Dingledine 2004-08-15 05:28:09 +00:00
parent 20b907db1e
commit 699a9d8b46
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/config.c
View File

@ -431,13 +431,6 @@ static int resolve_my_address(or_options_t *options) {
log_fn(LOG_WARN,"Error obtaining local hostname");
return -1;
}
#if 0 /* don't worry about complaining, as long as it resolves */
if(!strchr(localhostname,'.')) {
log_fn(LOG_WARN,"fqdn '%s' has only one element. Misconfigured machine?",address);
log_fn(LOG_WARN,"Try setting the Address line in your config file.");
return -1;
}
#endif
options->Address = tor_strdup(localhostname);
log_fn(LOG_DEBUG,"Guessed local host name as '%s'",options->Address);
}

3
src/or/connection.c
View File

@ -478,7 +478,8 @@ int connection_connect(connection_t *conn, char *address, uint32_t addr, uint16_
s=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
if (s < 0) {
log_fn(LOG_WARN,"Error creating network socket.");
log_fn(LOG_WARN,"Error creating network socket: %s",
tor_socket_strerror(tor_socket_errno(-1)));
return -1;
}
set_socket_nonblocking(s);

1
src/or/connection_or.c
View File

@ -167,6 +167,7 @@ connection_t *connection_or_connect(uint32_t addr, uint16_t port,
/* this function should never be called if we're already connected to
* id_digest, but check first to be sure */
/*XXX008 this is getting called, at least by dirservers. */
conn = connection_get_by_identity_digest(id_digest, CONN_TYPE_OR);
if(conn) {
tor_assert(conn->nickname);