Commit 46be0fa9 authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

Make last fix work on windows too.


svn:r4009
parent 0fff263a
......@@ -272,7 +272,7 @@ static int cpuworker_main(void *data) {
crypto_free_pk_env(onion_key);
if (last_onion_key)
crypto_free_pk_env(last_onion_key);
close(fd);
tor_close_socket(fd);
spawn_exit();
return 0; /* windows wants this function to return an int */
}
......
......@@ -728,13 +728,13 @@ static int dnsworker_main(void *data) {
log_fn(LOG_INFO,"DNS worker exiting because of error on connection to Tor process.");
log_fn(LOG_INFO,"(Error on %d was %s)", fd, tor_socket_strerror(tor_socket_errno(fd)));
}
close(fd);
tor_close_socket(fd);
spawn_exit();
}
if (address_len && read_all(fd, address, address_len, 1) != address_len) {
log_fn(LOG_ERR,"read hostname failed. Child exiting.");
close(fd);
tor_close_socket(fd);
spawn_exit();
}
address[address_len] = 0; /* null terminate it */
......@@ -761,7 +761,7 @@ static int dnsworker_main(void *data) {
set_uint32(answer+1, ip);
if (write_all(fd, answer, 5, 1) != 5) {
log_fn(LOG_ERR,"writing answer failed. Child exiting.");
close(fd);
tor_close_socket(fd);
spawn_exit();
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment