| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent 6a6112a commit 2a5c6d7
1 file changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -281,41 +281,37 @@ exports.getServers = function() { | |||
| 281 | 281 | exports.setServers = function(servers) { | |
| 282 | 282 | // cache the original servers because in the event of an error setting the | |
| 283 | 283 | // servers cares won't have any servers available for resolution | |
| 284 | - var orig = cares.getServers(); | ||
| 284 | + const orig = cares.getServers(); | ||
| 285 | 285 | ||
| 286 | - var newSet = []; | ||
| 287 | - | ||
| 288 | - servers.forEach(function(serv) { | ||
| 289 | - var ver = isIP(serv); | ||
| 290 | - | ||
| 291 | - if (ver) | ||
| 292 | - return newSet.push([ver, serv]); | ||
| 293 | - | ||
| 294 | - var match = serv.match(/\[(.*)\](:\d+)?/); | ||
| 286 | + const newSet = servers.map((serv) => { | ||
| 287 | + var ipVersion = isIP(serv); | ||
| 288 | + if (ipVersion !== 0) | ||
| 289 | + return [ipVersion, serv]; | ||
| 295 | 290 | ||
| 291 | + const match = serv.match(/\[(.*)\](:\d+)?/); | ||
| 296 | 292 | // we have an IPv6 in brackets | |
| 297 | 293 | if (match) { | |
| 298 | - ver = isIP(match[1]); | ||
| 299 | - if (ver) | ||
| 300 | - return newSet.push([ver, match[1]]); | ||
| 294 | + ipVersion = isIP(match[1]); | ||
| 295 | + if (ipVersion !== 0) | ||
| 296 | + return [ipVersion, match[1]]; | ||
| 301 | 297 | } | |
| 302 | 298 | ||
| 303 | - var s = serv.split(/:\d+$/)[0]; | ||
| 304 | - ver = isIP(s); | ||
| 299 | + const s = serv.split(/:\d+$/)[0]; | ||
| 300 | + ipVersion = isIP(s); | ||
| 305 | 301 | ||
| 306 | - if (ver) | ||
| 307 | - return newSet.push([ver, s]); | ||
| 302 | + if (ipVersion !== 0) | ||
| 303 | + return [ipVersion, s]; | ||
| 308 | 304 | ||
| 309 | 305 | throw new Error(`IP address is not properly formatted: ${serv}`); | |
| 310 | 306 | }); | |
| 311 | 307 | ||
| 312 | - var r = cares.setServers(newSet); | ||
| 308 | + const errorNumber = cares.setServers(newSet); | ||
| 313 | 309 | ||
| 314 | - if (r) { | ||
| 310 | + if (errorNumber !== 0) { | ||
| 315 | 311 | // reset the servers to the old servers, because ares probably unset them | |
| 316 | 312 | cares.setServers(orig.join(',')); | |
| 317 | 313 | ||
| 318 | - var err = cares.strerror(r); | ||
| 314 | + var err = cares.strerror(errorNumber); | ||
| 319 | 315 | throw new Error(`c-ares failed to set servers: "${err}" [${servers}]`); | |
| 320 | 316 | } | |
| 321 | 317 | }; | |
| Back | FazBrowse Home | New Git URL |
0 commit comments