diff options
author | Andy Grover <agrover@redhat.com> | 2015-03-31 13:43:18 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2015-04-07 20:41:54 -0400 |
commit | 1997e625963e24994a81070fef169e78965f6496 (patch) | |
tree | 1d9dbdc85d5fe5b34393babb04e0267abe9af7ac | |
parent | 86d65dc4fe74d5b3228fe13c5eff0b10ae6808eb (diff) |
iscsi-target: TargetAddress in SendTargets should bracket ipv6 addresses
"The domainname can be specified as either a DNS host name, a
dotted-decimal IPv4 address, or a bracketed IPv6 address as specified
in [RFC2732]."
See https://bugzilla.redhat.com/show_bug.cgi?id=1206868
Reported-by: Kyle Brantley <kyle@averageurl.com>
Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r-- | drivers/target/iscsi/iscsi_target.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 2accb6e47beb..d5f66be6988e 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c | |||
@@ -3468,6 +3468,7 @@ iscsit_build_sendtargets_response(struct iscsi_cmd *cmd, | |||
3468 | tpg_np_list) { | 3468 | tpg_np_list) { |
3469 | struct iscsi_np *np = tpg_np->tpg_np; | 3469 | struct iscsi_np *np = tpg_np->tpg_np; |
3470 | bool inaddr_any = iscsit_check_inaddr_any(np); | 3470 | bool inaddr_any = iscsit_check_inaddr_any(np); |
3471 | char *fmt_str; | ||
3471 | 3472 | ||
3472 | if (np->np_network_transport != network_transport) | 3473 | if (np->np_network_transport != network_transport) |
3473 | continue; | 3474 | continue; |
@@ -3495,8 +3496,12 @@ iscsit_build_sendtargets_response(struct iscsi_cmd *cmd, | |||
3495 | } | 3496 | } |
3496 | } | 3497 | } |
3497 | 3498 | ||
3498 | len = sprintf(buf, "TargetAddress=" | 3499 | if (np->np_sockaddr.ss_family == AF_INET6) |
3499 | "%s:%hu,%hu", | 3500 | fmt_str = "TargetAddress=[%s]:%hu,%hu"; |
3501 | else | ||
3502 | fmt_str = "TargetAddress=%s:%hu,%hu"; | ||
3503 | |||
3504 | len = sprintf(buf, fmt_str, | ||
3500 | inaddr_any ? conn->local_ip : np->np_ip, | 3505 | inaddr_any ? conn->local_ip : np->np_ip, |
3501 | np->np_port, | 3506 | np->np_port, |
3502 | tpg->tpgt); | 3507 | tpg->tpgt); |