lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 12:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

sproto support response nil

Browse Source
This commit is contained in:
Cloud Wu
2017-05-02 15:29:48 +08:00
parent fd427843a9
commit d4eeb1ff28
5 changed files with 83 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lualib/sprotoparser.lua
View File

@@ -104,7 +104,13 @@ function convert.protocol(all, obj)
typename = obj[1] .. "." .. p[1]
all.type[typename] = convert.type(all, { typename, struct })
end
result[p[1]] = typename
if typename == "nil" then
if p[1] == "response" then
result.confirm = true
end
else
result[p[1]] = typename
end
end
return result
end
@@ -259,6 +265,7 @@ end
tag 1 : integer
request 2 : integer # index
response 3 : integer # index
confirm 4 : boolean # true means response nil
}
.group {
@@ -366,18 +373,22 @@ local function packproto(name, p, alltypes)
"\0\0", -- name (id=0, ref=0)
packvalue(p.tag), -- tag (tag=1)
}
if p.request == nil and p.response == nil then
tmp[1] = "\2\0"
if p.request == nil and p.response == nil and p.confirm == nil then
tmp[1] = "\2\0" -- only two fields
else
if p.request then
table.insert(tmp, packvalue(alltypes[p.request].id)) -- request typename (tag=2)
else
table.insert(tmp, "\1\0")
table.insert(tmp, "\1\0") -- skip this field (request)
end
if p.response then
table.insert(tmp, packvalue(alltypes[p.response].id)) -- request typename (tag=3)
elseif p.confirm then
tmp[1] = "\5\0" -- add confirm field
table.insert(tmp, "\1\0") -- skip this field (response)
table.insert(tmp, packvalue(1)) -- confirm = true
else
tmp[1] = "\3\0"
tmp[1] = "\3\0" -- only three fields
end
end