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

rpc: add listen address configuration option

Browse Source 
This also changes the default listen address from 0.0.0.0 (accept any
connection) to 127.0.0.1 (accept only connections from the local host).

Change-Id: I3de09c582c95126d240795550a56be7aedea639c
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-12-13 16:12:27 -07:00 committed by Jim Harris
parent e6d1a5ac36
commit 71e54bb941
3 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/spdk/iscsi.conf.in
View File

@ -63,7 +63,9 @@
# Default is disabled. Note that the RPC interface is not # Default is disabled. Note that the RPC interface is not
# authenticated, so users should be careful about enabling # authenticated, so users should be careful about enabling
# RPC in non-trusted environments. # RPC in non-trusted environments.
#Enable No Enable No
# Listen address for the RPC service.
Listen 127.0.0.1
# Users must change the PortalGroup section(s) to match the IP addresses # Users must change the PortalGroup section(s) to match the IP addresses
# for their environment. # for their environment.

2
etc/spdk/nvmf.conf.in
View File

@ -29,6 +29,8 @@
# authenticated, so users should be careful about enabling # authenticated, so users should be careful about enabling
# RPC in non-trusted environments. # RPC in non-trusted environments.
Enable No Enable No
# Listen address for the RPC service.
Listen 127.0.0.1
# Users may change this section to create a different number or size of # Users may change this section to create a different number or size of
# malloc LUNs. # malloc LUNs.

55
lib/rpc/rpc.c
View File

@ -53,6 +53,7 @@
#include "spdk/log.h" #include "spdk/log.h"
#define RPC_SELECT_INTERVAL 4000 /* 4ms */ #define RPC_SELECT_INTERVAL 4000 /* 4ms */
#define RPC_DEFAULT_LISTEN_ADDR "127.0.0.1"
static struct spdk_poller *g_rpc_poller = NULL; static struct spdk_poller *g_rpc_poller = NULL;
@ -95,6 +96,25 @@ enable_rpc(void)
return 0; return 0;
} }
static const char *
rpc_get_listen_addr(void)
{
struct spdk_conf_section *sp;
const char *val;
sp = spdk_conf_find_section(NULL, "Rpc");
if (sp == NULL) {
return 0;
}
val = spdk_conf_section_get_val(sp, "Listen");
if (val == NULL) {
val = RPC_DEFAULT_LISTEN_ADDR;
}
return val;
}
void void
spdk_rpc_register_method(const char *method, spdk_rpc_method_handler func) spdk_rpc_register_method(const char *method, spdk_rpc_method_handler func)
{ {
@ -136,9 +156,11 @@ spdk_jsonrpc_handler(
static void static void
spdk_rpc_setup(void *arg) spdk_rpc_setup(void *arg)
{ {
struct sockaddr_in serv_addr;
uint16_t port; uint16_t port;
int family, protocol; char port_str[16];
struct addrinfo hints;
struct addrinfo *res;
const char *listen_addr;
/* Unregister the one-shot setup poller */ /* Unregister the one-shot setup poller */
spdk_poller_unregister(&g_rpc_poller, NULL); spdk_poller_unregister(&g_rpc_poller, NULL);
@ -147,19 +169,26 @@ spdk_rpc_setup(void *arg)
return; return;
} }
listen_addr = rpc_get_listen_addr();
port = SPDK_JSONRPC_PORT_BASE + spdk_app_get_instance_id(); port = SPDK_JSONRPC_PORT_BASE + spdk_app_get_instance_id();
snprintf(port_str, sizeof(port_str), "%" PRIu16, port);
family = AF_INET; hints.ai_family = AF_UNSPEC;
protocol = IPPROTO_TCP; hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
memset(&serv_addr, 0, sizeof(serv_addr)); if (getaddrinfo(listen_addr, port_str, &hints, &res) != 0) {
serv_addr.sin_family = family; SPDK_ERRLOG("Unable to look up RPC listen address '%s'\n", listen_addr);
serv_addr.sin_addr.s_addr = INADDR_ANY; return;
serv_addr.sin_port = htons(port); }
g_jsonrpc_server = spdk_jsonrpc_server_listen(family, protocol, g_jsonrpc_server = spdk_jsonrpc_server_listen(res->ai_family, res->ai_protocol,
(struct sockaddr *)&serv_addr, sizeof(serv_addr), res->ai_addr, res->ai_addrlen,
spdk_jsonrpc_handler); spdk_jsonrpc_handler);
freeaddrinfo(res);
if (g_jsonrpc_server == NULL) { if (g_jsonrpc_server == NULL) {
SPDK_ERRLOG("spdk_jsonrpc_server_listen() failed\n"); SPDK_ERRLOG("spdk_jsonrpc_server_listen() failed\n");
return; return;
@ -213,8 +242,10 @@ spdk_rpc_config_text(FILE *fp)
" # Default is disabled. Note that the RPC interface is not\n" " # Default is disabled. Note that the RPC interface is not\n"
" # authenticated, so users should be careful about enabling\n" " # authenticated, so users should be careful about enabling\n"
" # RPC in non-trusted environments.\n" " # RPC in non-trusted environments.\n"
" Enable %s\n", " Enable %s\n"
enable_rpc() ? "Yes" : "No"); " # Listen address for the RPC service.\n"
" Listen %s\n",
enable_rpc() ? "Yes" : "No", rpc_get_listen_addr());
} }
SPDK_SUBSYSTEM_REGISTER(spdk_rpc, spdk_rpc_initialize, spdk_rpc_finish, spdk_rpc_config_text) SPDK_SUBSYSTEM_REGISTER(spdk_rpc, spdk_rpc_initialize, spdk_rpc_finish, spdk_rpc_config_text)