Merge branch 'dev' into sconn

This commit is contained in:
Cloud Wu
2014-07-13 19:37:21 +08:00
2 changed files with 8 additions and 3 deletions

View File

@@ -229,7 +229,10 @@ function skynet.self()
end
function skynet.localname(name)
return string_to_handle(c.command("QUERY", name))
local addr = c.command("QUERY", name)
if addr then
return string_to_handle(addr)
end
end
function skynet.launch(...)

View File

@@ -368,8 +368,10 @@ static const char *
cmd_query(struct skynet_context * context, const char * param) {
if (param[0] == '.') {
uint32_t handle = skynet_handle_findname(param+1);
sprintf(context->result, ":%x", handle);
return context->result;
if (handle) {
sprintf(context->result, ":%x", handle);
return context->result;
}
}
return NULL;
}