Skip to content
Snippets Groups Projects
Commit 021949b0 authored by echicken's avatar echicken :chicken:
Browse files

Use client.ip_address instead of user.ip_address; check if protocol is Telnet or SSH

parent fa3a836d
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Show whitespace changes
Inline Side-by-side
Showing
with 5 additions and 5 deletions
xtrn/wttr.in/locator.js
+ 5
− 5
View file @ 021949b0
...@@ -82,11 +82,11 @@ function wsrsGetIPAddress() { ...@@ -82,11 +82,11 @@ function wsrsGetIPAddress() {
} }
function getAddress() { function getAddress() {
log(LOG_DEBUG, 'user.ip_address is ' + user.ip_address); log(LOG_DEBUG, 'client.ip_address is ' + client.ip_address);
const addrRe = /(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^169\.254\.)|(^::1$)|(^[fF][cCdD])/; const addrRe = /(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^169\.254\.)|(^::1$)|(^[fF][cCdD])/;
if (user.ip_address.search(addrRe) > -1) { if (client.ip_address.search(addrRe) > -1) {
var addr; var addr;
if (client.protocol === 'Telnet') { if (client.protocol === 'Telnet' || client.protocol === 'SSH') {
log(LOG_DEBUG, 'Trying wsts method'); log(LOG_DEBUG, 'Trying wsts method');
addr = wstsGetIPAddress(); addr = wstsGetIPAddress();
log(LOG_DEBUG, 'wsts result: ' + addr); log(LOG_DEBUG, 'wsts result: ' + addr);
...@@ -99,8 +99,8 @@ function getAddress() { ...@@ -99,8 +99,8 @@ function getAddress() {
log(LOG_DEBUG, 'returning: ' + addr); log(LOG_DEBUG, 'returning: ' + addr);
return addr; return addr;
} }
log(LOG_DEBUG, 'returning: ' + user.ip_address); log(LOG_DEBUG, 'returning: ' + client.ip_address);
return user.ip_address; return client.ip_address;
} }
this; this;
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment