ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RPC: properly set the address in error cases

Browse Source 
Change-Id: Ie1757ef7b3e382492448f2fca0f5a165cdfac08c
Signed-off-by: GangCao <gang.cao@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475946
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Xiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: Liang Yan <liang.z.yan@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
GangCao 2019-11-27 14:15:22 -05:00 committed by Tomasz Zawadzki
parent 2389caa4f5
commit d453c9400e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/rpc/rpc.c
View File

@ -157,13 +157,21 @@ spdk_rpc_listen(const char *listen_addr)
return -1;
}
snprintf(g_rpc_lock_path, sizeof(g_rpc_lock_path), "%s.lock",
g_rpc_listen_addr_unix.sun_path);
rc = snprintf(g_rpc_lock_path, sizeof(g_rpc_lock_path), "%s.lock",
g_rpc_listen_addr_unix.sun_path);
if (rc < 0 || (size_t)rc >= sizeof(g_rpc_lock_path)) {
SPDK_ERRLOG("RPC lock path too long\n");
g_rpc_listen_addr_unix.sun_path[0] = '\0';
g_rpc_lock_path[0] = '\0';
return -1;
}
g_rpc_lock_fd = open(g_rpc_lock_path, O_RDONLY | O_CREAT, 0600);
if (g_rpc_lock_fd == -1) {
SPDK_ERRLOG("Cannot open lock file %s: %s\n",
g_rpc_lock_path, spdk_strerror(errno));
g_rpc_listen_addr_unix.sun_path[0] = '\0';
g_rpc_lock_path[0] = '\0';
return -1;
}
@ -171,6 +179,8 @@ spdk_rpc_listen(const char *listen_addr)
if (rc != 0) {
SPDK_ERRLOG("RPC Unix domain socket path %s in use. Specify another.\n",
g_rpc_listen_addr_unix.sun_path);
g_rpc_listen_addr_unix.sun_path[0] = '\0';
g_rpc_lock_path[0] = '\0';
return -1;
}
@ -334,6 +344,7 @@ spdk_rpc_close(void)
if (g_rpc_listen_addr_unix.sun_path[0]) {
/* Delete the Unix socket file */
unlink(g_rpc_listen_addr_unix.sun_path);
g_rpc_listen_addr_unix.sun_path[0] = '\0';
}
spdk_jsonrpc_server_shutdown(g_jsonrpc_server);