Skip to content

Commit 0db6c68

Browse files
authored
Merge pull request #2038 from SmartThingsCommunity/hue_ssl_timeout
philips-hue: Re-set socket timeout on sockets after ssl wrap
2 parents 9cdf66a + 5d75fd1 commit 0db6c68

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

drivers/SmartThings/philips-hue/src/lunchbox/sse/eventsource.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,10 @@ local function connecting_action(source)
275275
})
276276
if err ~= nil then return nil, err end
277277

278+
-- Re-set timeout due to cosock not carrying timeout over in some Lua library versions
279+
err = select(2, source._sock:settimeout(60))
280+
if err ~= nil then return nil, err end
281+
278282
err = select(2, source._sock:dohandshake())
279283
if err ~= nil then return nil, err end
280284
end

drivers/SmartThings/philips-hue/src/utils/init.lua

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,16 @@ function utils.labeled_socket_builder(label)
460460
if not sock or err ~= nil then
461461
return nil, (err and "SSL wrap error: " .. err) or "Unexpected nil socket returned from ssl.wrap"
462462
end
463+
log.info(
464+
string.format(
465+
"%sSetting SSL socket timeout for Hue REST Connection", label
466+
)
467+
)
468+
-- Re-set timeout due to cosock not carrying timeout over in some Lua library versions
469+
err = select(2, sock:settimeout(60))
470+
if err ~= nil then
471+
return nil, "settimeout error: " .. err
472+
end
463473
log.info(
464474
string.format(
465475
"%sPerforming SSL handshake for for Hue REST Connection", label

0 commit comments

Comments
 (0)