comment out whitelist, default to empty whitelist
This commit is contained in:
@ -59,10 +59,10 @@ config.enableMessaging = true
|
|||||||
-- Whitelist (if not empty, only these addresses can enter)
|
-- Whitelist (if not empty, only these addresses can enter)
|
||||||
-- Format: {"Name", {address_table}}
|
-- Format: {"Name", {address_table}}
|
||||||
config.whitelist = {
|
config.whitelist = {
|
||||||
{ "Glaive", { 33, 6, 10, 24, 1, 30, 3, 17, 0 } },
|
--{ "Glaive", { 33, 6, 10, 24, 1, 30, 3, 17, 0 } },
|
||||||
{ "Moon", { 32, 33, 8, 7, 25, 21, 14, 35, 0 } },
|
--{ "Moon", { 32, 33, 8, 7, 25, 21, 14, 35, 0 } },
|
||||||
{ "Caldoric", { 18, 2, 24, 16, 8, 19, 4, 29, 0 } },
|
--{ "Caldoric", { 18, 2, 24, 16, 8, 19, 4, 29, 0 } },
|
||||||
{ "Trading Hall", { 16, 19, 6, 18, 35, 27, 9, 8, 0 } }
|
--{ "Trading Hall", { 16, 19, 6, 18, 35, 27, 9, 8, 0 } }
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Blacklist (these addresses are always blocked)
|
-- Blacklist (these addresses are always blocked)
|
||||||
|
|||||||
@ -389,6 +389,7 @@ local function handleIncomingWormhole()
|
|||||||
-- Send version message to remote gate
|
-- Send version message to remote gate
|
||||||
sleep(0.5) -- Brief delay to ensure connection is stable
|
sleep(0.5) -- Brief delay to ensure connection is stable
|
||||||
utils.sendVersionMessage(PROGRAM_VERSION)
|
utils.sendVersionMessage(PROGRAM_VERSION)
|
||||||
|
utils.debug("Sent: SGCS_V" .. PROGRAM_VERSION)
|
||||||
|
|
||||||
-- Handle iris
|
-- Handle iris
|
||||||
if config.autoCloseIrisOnIncoming then
|
if config.autoCloseIrisOnIncoming then
|
||||||
@ -402,6 +403,7 @@ local function handleIncomingWormhole()
|
|||||||
-- Send password request if iris is closed and password system is enabled
|
-- Send password request if iris is closed and password system is enabled
|
||||||
if config.irisPassword and config.enableMessaging then
|
if config.irisPassword and config.enableMessaging then
|
||||||
utils.sendPasswordRequest()
|
utils.sendPasswordRequest()
|
||||||
|
utils.debug("Sent: IRIS_PASSWORD_REQUIRED")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -425,6 +427,7 @@ local function handleIncomingWormhole()
|
|||||||
elseif (result == 3) then
|
elseif (result == 3) then
|
||||||
-- Received a message
|
-- Received a message
|
||||||
local message = state.lastReceivedMessage
|
local message = state.lastReceivedMessage
|
||||||
|
utils.debug("Received: " .. tostring(message))
|
||||||
|
|
||||||
-- Check if it's a password attempt (don't log passwords in plaintext)
|
-- Check if it's a password attempt (don't log passwords in plaintext)
|
||||||
if message:sub(1, 14) == "IRIS_PASSWORD:" then
|
if message:sub(1, 14) == "IRIS_PASSWORD:" then
|
||||||
@ -662,6 +665,8 @@ local function handleOutgoingDial()
|
|||||||
local message = state.lastReceivedMessage
|
local message = state.lastReceivedMessage
|
||||||
state.lastReceivedMessage = nil
|
state.lastReceivedMessage = nil
|
||||||
|
|
||||||
|
utils.debug("Received: " .. tostring(message))
|
||||||
|
|
||||||
if message and message:sub(1, 6) == "SGCS_V" then
|
if message and message:sub(1, 6) == "SGCS_V" then
|
||||||
state.remoteHasComputer = true
|
state.remoteHasComputer = true
|
||||||
local version = message:sub(7)
|
local version = message:sub(7)
|
||||||
@ -725,7 +730,7 @@ local function handleOutgoingDial()
|
|||||||
sleep(1)
|
sleep(1)
|
||||||
elseif result then
|
elseif result then
|
||||||
-- Password was entered, send it
|
-- Password was entered, send it
|
||||||
utils.sendPassword(result)
|
utils.debug("Sent: IRIS_PASSWORD:" .. result)
|
||||||
|
|
||||||
-- Wait for response
|
-- Wait for response
|
||||||
local function WaitForResponse()
|
local function WaitForResponse()
|
||||||
@ -807,6 +812,7 @@ local function handleOutgoingDial()
|
|||||||
|
|
||||||
-- Only open local iris if connection is safe
|
-- Only open local iris if connection is safe
|
||||||
if connectionSafe and config.irisEnabled then
|
if connectionSafe and config.irisEnabled then
|
||||||
|
utils.debug("Opening local iris NOW")
|
||||||
utils.log("Connection safe - opening local iris")
|
utils.log("Connection safe - opening local iris")
|
||||||
-- Wait 2 seconds to avoid voiding the iris
|
-- Wait 2 seconds to avoid voiding the iris
|
||||||
sleep(2)
|
sleep(2)
|
||||||
|
|||||||
Reference in New Issue
Block a user