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

lib/iscsi: Factor out send target portals from iscsi_send_tgts() into a helper function

Browse Source 
iSCSI login redirect will change SendTargets. To make the change
easier, factor out sending target portals from iscsi_send_tgts
into iscsi_send_tgt_portals() even if iscsi_send_tgt_portals() is
used only once.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ic565421afc9b099a507aac59ef7c741b113efa8b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3443
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-07-23 12:52:42 +09:00 committed by Jim Harris
parent 1d08c96288
commit f5ee7d9bd8
1 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
lib/iscsi/tgt_node.c
View File

@ -296,16 +296,58 @@ iscsi_tgt_node_allow_iscsi_name(struct spdk_iscsi_tgt_node *target, const char *
return false; return false;
} }
static int
iscsi_send_tgt_portals(struct spdk_iscsi_conn *conn,
struct spdk_iscsi_tgt_node *target,
uint8_t *data, int alloc_len, int total)
{
char buf[MAX_TMPBUF];
struct spdk_iscsi_portal_grp *pg;
struct spdk_iscsi_pg_map *pg_map;
struct spdk_iscsi_portal *p;
char *host;
int len;
TAILQ_FOREACH(pg_map, &target->pg_map_head, tailq) {
pg = pg_map->pg;
TAILQ_FOREACH(p, &pg->head, per_pg_tailq) {
if (alloc_len - total < 1) {
/* TODO: long text responses support */
SPDK_ERRLOG("SPDK doesn't support long text responses now, "
"you can use larger MaxRecvDataSegmentLength"
"value in initiator\n");
return alloc_len;
}
host = p->host;
/* wildcard? */
if (!strcasecmp(host, "[::]") || !strcasecmp(host, "0.0.0.0")) {
if (spdk_sock_is_ipv6(conn->sock)) {
snprintf(buf, sizeof buf, "[%s]", conn->target_addr);
host = buf;
} else if (spdk_sock_is_ipv4(conn->sock)) {
snprintf(buf, sizeof buf, "%s", conn->target_addr);
host = buf;
} else {
/* skip portal for the family */
continue;
}
}
SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "TargetAddress=%s:%s,%d\n",
host, p->port, pg->tag);
len = snprintf((char *)data + total, alloc_len - total,
"TargetAddress=%s:%s,%d", host, p->port, pg->tag);
total += len + 1;
}
}
return total;
}
int int
iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn,
const char *tiqn, uint8_t *data, int alloc_len, int data_len) const char *tiqn, uint8_t *data, int alloc_len, int data_len)
{ {
char buf[MAX_TMPBUF]; struct spdk_iscsi_tgt_node *target;
struct spdk_iscsi_portal_grp *pg;
struct spdk_iscsi_pg_map *pg_map;
struct spdk_iscsi_portal *p;
struct spdk_iscsi_tgt_node *target;
char *host;
int total; int total;
int len; int len;
int rc; int rc;
@ -335,49 +377,13 @@ iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn,
continue; continue;
} }
/* DO SENDTARGETS */ len = snprintf((char *)data + total, alloc_len - total, "TargetName=%s",
len = snprintf((char *) data + total, alloc_len - total, target->name);
"TargetName=%s", target->name);
total += len + 1; total += len + 1;
/* write to data */ total = iscsi_send_tgt_portals(conn, target, data, alloc_len, total);
TAILQ_FOREACH(pg_map, &target->pg_map_head, tailq) { if (alloc_len - total < 1) {
pg = pg_map->pg; break;
TAILQ_FOREACH(p, &pg->head, per_pg_tailq) {
if (alloc_len - total < 1) {
pthread_mutex_unlock(&g_iscsi.mutex);
/* TODO: long text responses support */
SPDK_ERRLOG("SPDK doesn't support long text responses now, "
"you can use larger MaxRecvDataSegmentLength"
"value in initiator\n");
return alloc_len;
}
host = p->host;
/* wildcard? */
if (strcasecmp(host, "[::]") == 0
|| strcasecmp(host, "0.0.0.0") == 0) {
if (spdk_sock_is_ipv6(conn->sock)) {
snprintf(buf, sizeof buf, "[%s]",
conn->target_addr);
host = buf;
} else if (spdk_sock_is_ipv4(conn->sock)) {
snprintf(buf, sizeof buf, "%s",
conn->target_addr);
host = buf;
} else {
/* skip portal for the family */
continue;
}
}
SPDK_DEBUGLOG(SPDK_LOG_ISCSI,
"TargetAddress=%s:%s,%d\n",
host, p->port, pg->tag);
len = snprintf((char *) data + total,
alloc_len - total,
"TargetAddress=%s:%s,%d",
host, p->port, pg->tag);
total += len + 1;
}
} }
} }
pthread_mutex_unlock(&g_iscsi.mutex); pthread_mutex_unlock(&g_iscsi.mutex);