lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-22 02:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: httpc支持ipv6 (#2125)

Browse Source 
* fix: httpc支持ipv6

* httpc ip:port解析放在c层

* lua-socket.c listen增加ip:port字符串解析, 相关cluster代码修改 #2124

* socketchannel changehost port可置空

* socketchannel changehost恢复port判空

* httpc解析域名加端口号逻辑优化

* 注释中字符串模式内容格式优化

---------

Co-authored-by: zhuyin.zhu <zhuyin.zhu@bytedance.com>
This commit is contained in:
IAN.Z
2025-12-27 17:11:52 +08:00
committed by GitHub
parent 1bbdeb3132
commit bed435660e
7 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
service/clusterd.lua
View File

@@ -39,11 +39,9 @@ local function open_channel(t, key)
end
local succ, err, c
if address then
local host, port = string.match(address, "(.+):([^:]+)$")
host = host:match("^%[(.-)%]$") or host
c = node_sender[key]
if c == nil then
c = skynet.newservice("clustersender", key, nodename, host, port)
c = skynet.newservice("clustersender", key, nodename, address)
if node_sender[key] then
-- double check
skynet.kill(c)
@@ -53,14 +51,14 @@ local function open_channel(t, key)
end
end
succ = pcall(skynet.call, c, "lua", "changenode", host, port)
succ = pcall(skynet.call, c, "lua", "changenode", address)
if succ then
t[key] = c
ct.channel = c
node_sender_closed[key] = nil
else
err = string.format("changenode [%s] (%s:%s) failed", key, host, port)
err = string.format("changenode [%s] (%s:%s) failed", key, address)
end
elseif address == false then
c = node_sender[key]
@@ -147,11 +145,7 @@ function command.listen(source, addr, port, maxclient)
local gate = skynet.newservice("gate")
if port == nil then
local address = assert(node_address[addr], addr .. " is down")
addr, port = string.match(address, "(.+):([^:]+)$")
addr = addr:match("^%[(.-)%]$") or addr
port = tonumber(port)
assert(port ~= 0)
skynet.call(gate, "lua", "open", { address = addr, port = port, maxclient = maxclient })
skynet.call(gate, "lua", "open", { address = address, port = port, maxclient = maxclient })
skynet.ret(skynet.pack(addr, port))
else
local realaddr, realport = skynet.call(gate, "lua", "open", { address = addr, port = port, maxclient = maxclient })

4
service/clustersender.lua
View File

@@ -60,10 +60,10 @@ end
function command.changenode(host, port)
if not host then
skynet.error(string.format("Close cluster sender %s:%d", channel.__host, channel.__port))
skynet.error("Close cluster sender", channel.__host, channel.__port)
channel:close()
else
channel:changehost(host, tonumber(port))
channel:changehost(host, port)
channel:connect(true)
end
skynet.ret(skynet.pack(nil))