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

nvmf_tgt: add IPv6 listen address support

Browse Source 
Change-Id: Ia165c3f033658adc86c8993a2a32783921ab1832
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/396494
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Daniel Verkamp 2018-01-25 16:43:10 -07:00 committed by Jim Harris
parent 808a2b05c2
commit c7b8b414d1
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/nvmf_tgt/conf.c
View File

@ -215,6 +215,12 @@ spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp)
continue; continue;
} }
if (strchr(listen_addrs[num_listen_addrs].traddr, ':')) {
listen_addrs[num_listen_addrs].adrfam = "IPv6";
} else {
listen_addrs[num_listen_addrs].adrfam = "IPv4";
}
num_listen_addrs++; num_listen_addrs++;
} }

43
lib/nvmf/rdma.c
View File

@ -1256,11 +1256,13 @@ static int
spdk_nvmf_rdma_listen(struct spdk_nvmf_transport *transport, spdk_nvmf_rdma_listen(struct spdk_nvmf_transport *transport,
const struct spdk_nvme_transport_id *trid) const struct spdk_nvme_transport_id *trid)
{ {
struct spdk_nvmf_rdma_transport *rtransport; struct spdk_nvmf_rdma_transport *rtransport;
struct spdk_nvmf_rdma_device *device; struct spdk_nvmf_rdma_device *device;
struct spdk_nvmf_rdma_port *port_tmp, *port; struct spdk_nvmf_rdma_port *port_tmp, *port;
struct sockaddr_in saddr; struct addrinfo *res;
int rc; struct addrinfo hints;
int family;
int rc;
rtransport = SPDK_CONTAINEROF(transport, struct spdk_nvmf_rdma_transport, transport); rtransport = SPDK_CONTAINEROF(transport, struct spdk_nvmf_rdma_transport, transport);
@ -1297,11 +1299,36 @@ spdk_nvmf_rdma_listen(struct spdk_nvmf_transport *transport,
return rc; return rc;
} }
memset(&saddr, 0, sizeof(saddr)); switch (port->trid.adrfam) {
saddr.sin_family = AF_INET; case SPDK_NVMF_ADRFAM_IPV4:
saddr.sin_addr.s_addr = inet_addr(port->trid.traddr); family = AF_INET;
saddr.sin_port = htons((uint16_t)strtoul(port->trid.trsvcid, NULL, 10)); break;
rc = rdma_bind_addr(port->id, (struct sockaddr *)&saddr); case SPDK_NVMF_ADRFAM_IPV6:
family = AF_INET6;
break;
default:
SPDK_ERRLOG("Unhandled ADRFAM %d\n", port->trid.adrfam);
free(port);
pthread_mutex_unlock(&rtransport->lock);
return -EINVAL;
}
memset(&hints, 0, sizeof(hints));
hints.ai_family = family;
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = 0;
rc = getaddrinfo(port->trid.traddr, port->trid.trsvcid, &hints, &res);
if (rc) {
SPDK_ERRLOG("getaddrinfo failed: %s (%d)\n", gai_strerror(rc), rc);
free(port);
pthread_mutex_unlock(&rtransport->lock);
return -EINVAL;
}
rc = rdma_bind_addr(port->id, res->ai_addr);
freeaddrinfo(res);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("rdma_bind_addr() failed\n"); SPDK_ERRLOG("rdma_bind_addr() failed\n");
rdma_destroy_id(port->id); rdma_destroy_id(port->id);