socks-client
Advanced tools
Comparing version 1.0.6 to 1.0.7
var net = require('net'); | ||
var ipaddr = require('ipaddr.js'); | ||
var ip = require('ip'); | ||
@@ -54,2 +53,8 @@ var SmartBuffer = require('smart-buffer'); | ||
// Connect & negotiation timeout | ||
var timeout = setTimeout(function () { | ||
finish(new Error("Connection Timed Out"), socket, null, callback); | ||
}, options.timeout); | ||
// Socket events | ||
@@ -73,8 +78,2 @@ socket.once('close', function () { | ||
// Connect & negotiation timeout | ||
setTimeout(function () { | ||
finish(new Error("Connection Timed Out"), socket, null, callback); | ||
}, options.timeout); | ||
socket.connect(options.proxy.port, options.proxy.ipaddress); | ||
@@ -91,3 +90,3 @@ | ||
if (net.isIPv4(options.target.host)) { | ||
buff.writeBuffer(new Buffer(ipaddr.parse(options.target.host).toByteArray())); | ||
buff.writeBuffer(ip.toBuffer(options.target.host)); | ||
buff.writeStringNT(options.proxy.userid); | ||
@@ -194,6 +193,6 @@ } else { | ||
buff.writeUInt8(0x01); | ||
buff.writeBuffer(new Buffer(ipaddr.parse(options.target.host).toByteArray())); | ||
buff.writeBuffer(ip.toBuffer(options.target.host)); | ||
} else if (net.isIPv6(options.target.host)) { | ||
buff.writeUInt8(0x04); | ||
buff.writeBuffer(new Buffer(ipaddr.parse(options.target.host).toByteArray())); | ||
buff.writeBuffer(ip.toBuffer(options.target.host)); | ||
} else { | ||
@@ -268,2 +267,4 @@ buff.writeUInt8(0x03); | ||
} | ||
clearTimeout(timeout); | ||
callback(err, socket, info); | ||
@@ -299,3 +300,3 @@ } | ||
buff.writeUInt8(0x04); | ||
buff.writeBuffer(new Buffer(ipaddr.parse(target.host).toByteArray())); | ||
buff.writeBuffer(ip.toBuffer(target.host)); | ||
} else { | ||
@@ -302,0 +303,0 @@ buff.writeUInt8(0x03); |
{ | ||
"name": "socks-client", | ||
"version": "1.0.6", | ||
"version": "1.0.7", | ||
"description": "A SOCKS proxy client library supporting SOCKS 4, 4a, and 5. (also supports BIND/Associate)", | ||
@@ -32,6 +32,5 @@ "main": "lib/socks-client.js", | ||
"dependencies": { | ||
"ip": "~0.1.0", | ||
"smart-buffer": "~1.0.1", | ||
"ipaddr.js": "~0.1.1" | ||
"ip": "^0.3.2", | ||
"smart-buffer": "^1.0.1" | ||
} | ||
} |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
2
91
25492
+ Addedip@0.3.3(transitive)
+ Addedsmart-buffer@1.1.15(transitive)
- Removedipaddr.js@~0.1.1
- Removedip@0.1.0(transitive)
- Removedipaddr.js@0.1.9(transitive)
- Removedsmart-buffer@1.0.13(transitive)
Updatedip@^0.3.2
Updatedsmart-buffer@^1.0.1