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>
This commit is contained in:

committed by
Nicholas Bellinger

parent
69d755747d
commit
dc58f760e2
@@ -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",
|
||||
|
Reference in New Issue
Block a user