Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Connect to 127.0.0.1, not localhost, for tor control channel. Tweak error branches for clarity. #14554

Merged
merged 3 commits into from
Jun 26, 2018
Merged

Connect to 127.0.0.1, not localhost, for tor control channel. Tweak error branches for clarity. #14554

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5b6944
Use host 127.0.0.1 explicitly, instead of defaulting to localhost.
riastradh-brave Jun 26, 2018
2738453
Make early error message distinct.
riastradh-brave Jun 26, 2018
b79ebb2
Pass error along to control connection destruction for consistency.
riastradh-brave Jun 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/tor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,14 +458,14 @@ class TorDaemon extends EventEmitter {
const controlSocket = new net.Socket()
const closeMethod = () => console.log('tor: control socket closed early')
const errorMethod = (err) => {
console.log(`tor: control socket error: ${err}`)
console.log(`tor: control socket connection error: ${err}`)
controlSocket.destroy(err)
}
controlSocket.on('close', closeMethod)
controlSocket.on('error', errorMethod)

// Now connect the socket.
controlSocket.connect({port: portno}, () => {
controlSocket.connect({host: '127.0.0.1', port: portno}, () => {
// If the process died in the interim, give up.
if (!this._process) {
console.log('tor: process died, closing control')
Expand Down Expand Up @@ -535,7 +535,7 @@ class TorDaemon extends EventEmitter {
_controlError (err) {
assert(this._control)
console.log(`tor: control socket error: ${err}`)
this._control.destroy()
this._control.destroy(err)
}

/*
Expand Down