diff options
| author | Andy Grover | 2015-08-24 19:26:05 +0200 |
|---|---|---|
| committer | Nicholas Bellinger | 2015-08-27 08:27:20 +0200 |
| commit | dc58f760e2e1f8f2265b581d35f211415c4fee0c (patch) | |
| tree | 51c9f16dbef07bd5a931a12a026661e606b865b0 /drivers/target/iscsi/iscsi_target_configfs.c | |
| parent | target/iscsi: Keep local_ip as the actual sockaddr (diff) | |
| download | kernel-qcow2-linux-dc58f760e2e1f8f2265b581d35f211415c4fee0c.tar.gz kernel-qcow2-linux-dc58f760e2e1f8f2265b581d35f211415c4fee0c.tar.xz kernel-qcow2-linux-dc58f760e2e1f8f2265b581d35f211415c4fee0c.zip | |
target/iscsi: Replace conn->login_ip with login_sockaddr
Very similar to how it went with local_sockaddr.
It was embedded in iscsi_login_stats so some changes there, and we needed
to copy in a sockaddr_storage comparison function. Hopefully the kernel
will get a standard one soon, our implementation makes the 3rd.
isert_set_conn_info() became much smaller.
IPV6_ADDRESS_SPACE define goes away, had to modify a call to in6_pton(),
can just use -1 since we are sure string is null-terminated.
Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/iscsi/iscsi_target_configfs.c')
| -rw-r--r-- | drivers/target/iscsi/iscsi_target_configfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c index 8d69c4132221..5afa6294eda2 100644 --- a/drivers/target/iscsi/iscsi_target_configfs.c +++ b/drivers/target/iscsi/iscsi_target_configfs.c @@ -267,7 +267,7 @@ static struct se_tpg_np *lio_target_call_addnptotpg( sock_in6 = (struct sockaddr_in6 *)&sockaddr; sock_in6->sin6_family = AF_INET6; sock_in6->sin6_port = htons((unsigned short)port); - ret = in6_pton(str, IPV6_ADDRESS_SPACE, + ret = in6_pton(str, -1, (void *)&sock_in6->sin6_addr.in6_u, -1, &end); if (ret <= 0) { pr_err("in6_pton returned: %d\n", ret); @@ -753,7 +753,7 @@ static ssize_t lio_target_nacl_show_info( break; } - rb += sprintf(page+rb, " Address %s %s", conn->login_ip, + rb += sprintf(page+rb, " Address %pISc %s", &conn->login_sockaddr, (conn->network_transport == ISCSI_TCP) ? "TCP" : "SCTP"); rb += sprintf(page+rb, " StatSN: 0x%08x\n", |