moony/blinksocks
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

chore(socket): log request address when applications connected to the client

Browse Source 
close: #57
This commit is contained in:
Micooz 2017-06-02 15:52:58 +08:00
parent dcb932ca78
commit 14ea9321ba
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/socket.js
View File

File diff suppressed because one or more lines are too long

15
src/core/socket.js
View File

@ -180,9 +180,10 @@ export class Socket {
logger.info(`[balancer] use: ${__SERVER_HOST__}:${__SERVER_PORT__}`);
}
// connect to our server
return this.connect({host: __SERVER_HOST__, port: __SERVER_PORT__}, () => {
const [dstHost, dstPort] = [addr.host.toString(), addr.port.readUInt16BE(0)];
return this.connect({host: __SERVER_HOST__, port: __SERVER_PORT__, dstHost, dstPort}, () => {
this.createPipe(addr);
this._tracks.push(`${addr.host.toString()}:${addr.port.readUInt16BE(0)}`);
this._tracks.push(`${dstHost}:${dstPort}`);
this._isHandshakeDone = true;
callback(this.onForward);
});
@ -301,13 +302,19 @@ export class Socket {
* connect to a server, for both client and server
* @param host
* @param port
* @param dstHost
* @param dstPort
* @param callback
* @returns {Promise.<void>}
*/
async connect({host, port}, callback) {
async connect({host, port, dstHost, dstPort}, callback) {
// host could be empty, see https://github.com/blinksocks/blinksocks/issues/34
if (host && port) {
logger.info(`[socket] [${this.remote}] connecting to: ${host}:${port}`);
if (__IS_CLIENT__) {
logger.info(`[socket] [${this.remote}] request: ${dstHost}:${dstPort}, connecting to: ${host}:${port}`);
} else {
logger.info(`[socket] [${this.remote}] connecting to: ${host}:${port}`);
}
this._tracks.push(`${host}:${port}`);
try {
const ip = await dnsCache.get(host);