6bef902ca5
RPC is a default feature required for almost all usages, so enable RPC by default, but with a UNIX domain socket for security reasons. -r can now be used from the command line to specify an alternative RPC listen address from the default /var/tmp/spdk.sock. Remove the Enable parameter from the Rpc config section but still allow specifying an alternative listen address using the Listen parameter as an alternative to the command line option. This keeps backward compatibility for this release for anyone using the configuration file still. Remove the Rpc sections from all configuration files that were using them, except for those that specified alternate TCP ports for multi-process test cases. We can fix these later to use an alternate UNIX domain socket and to use the command line instead. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: Ife0d03fcab638c67b659f1eb85348ddc2b55c4c4 Reviewed-on: https://review.gerrithub.io/386561 Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
108 lines
3.0 KiB
C
108 lines
3.0 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright (c) Intel Corporation.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name of Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "spdk/stdinc.h"
|
|
|
|
#include "spdk/conf.h"
|
|
#include "spdk/env.h"
|
|
#include "spdk/log.h"
|
|
#include "spdk/rpc.h"
|
|
|
|
#include "spdk_internal/event.h"
|
|
|
|
#define RPC_SELECT_INTERVAL 4000 /* 4ms */
|
|
|
|
static struct spdk_poller *g_rpc_poller = NULL;
|
|
|
|
static const char *
|
|
rpc_get_listen_addr(void)
|
|
{
|
|
struct spdk_conf_section *sp;
|
|
|
|
sp = spdk_conf_find_section(NULL, "Rpc");
|
|
if (sp == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
return spdk_conf_section_get_val(sp, "Listen");
|
|
}
|
|
|
|
static void
|
|
spdk_rpc_subsystem_poll(void *arg)
|
|
{
|
|
spdk_rpc_accept();
|
|
}
|
|
|
|
void
|
|
spdk_rpc_initialize(const char *listen_addr)
|
|
{
|
|
int rc;
|
|
|
|
if (rpc_get_listen_addr() != NULL) {
|
|
listen_addr = rpc_get_listen_addr();
|
|
}
|
|
|
|
if (listen_addr == NULL) {
|
|
return;
|
|
}
|
|
|
|
/* Listen on the requested address */
|
|
rc = spdk_rpc_listen(listen_addr);
|
|
if (rc != 0) {
|
|
SPDK_ERRLOG("Unable to start RPC service at %s\n", listen_addr);
|
|
return;
|
|
}
|
|
|
|
/* Register a poller to periodically check for RPCs */
|
|
spdk_poller_register(&g_rpc_poller, spdk_rpc_subsystem_poll, NULL, spdk_env_get_current_core(),
|
|
RPC_SELECT_INTERVAL);
|
|
}
|
|
|
|
void
|
|
spdk_rpc_finish(void)
|
|
{
|
|
spdk_rpc_close();
|
|
spdk_poller_unregister(&g_rpc_poller, NULL);
|
|
}
|
|
|
|
void
|
|
spdk_rpc_config_text(FILE *fp)
|
|
{
|
|
fprintf(fp,
|
|
"\n"
|
|
"[Rpc]\n"
|
|
" # Listen address for the RPC service.\n"
|
|
" # May be an IP address or an absolute path to a Unix socket.\n"
|
|
" Listen %s\n", rpc_get_listen_addr());
|
|
}
|