diff options
author | mav <mav@FreeBSD.org> | 2014-07-24 15:31:45 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2014-07-24 15:31:45 +0000 |
commit | 65d6dfa894ef65753d5a9b8cfd692f07a47801ec (patch) | |
tree | 2231e52edc4866e57e0e0baa7e23a74a0fd93703 /usr.sbin | |
parent | c739145ff0dbb31f2524799e8e0ca862acc13ab6 (diff) | |
download | FreeBSD-src-65d6dfa894ef65753d5a9b8cfd692f07a47801ec.zip FreeBSD-src-65d6dfa894ef65753d5a9b8cfd692f07a47801ec.tar.gz |
MFC r267613 (by trasz):
Implement redirection handling in initiator.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/iscsid/iscsid.c | 4 | ||||
-rw-r--r-- | usr.sbin/iscsid/login.c | 60 |
2 files changed, 62 insertions, 2 deletions
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index 1693d30..1297ccd 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -306,10 +306,10 @@ capsicate(struct connection *conn) cap_rights_t rights; #ifdef ICL_KERNEL_PROXY const unsigned long cmds[] = { ISCSIDCONNECT, ISCSIDSEND, ISCSIDRECEIVE, - ISCSIDHANDOFF, ISCSIDFAIL, ISCSISADD, ISCSISREMOVE }; + ISCSIDHANDOFF, ISCSIDFAIL, ISCSISADD, ISCSISREMOVE, ISCSISMODIFY }; #else const unsigned long cmds[] = { ISCSIDHANDOFF, ISCSIDFAIL, ISCSISADD, - ISCSISREMOVE }; + ISCSISREMOVE, ISCSISMODIFY }; #endif cap_rights_init(&rights, CAP_IOCTL); diff --git a/usr.sbin/iscsid/login.c b/usr.sbin/iscsid/login.c index 81a965d..0bdb406 100644 --- a/usr.sbin/iscsid/login.c +++ b/usr.sbin/iscsid/login.c @@ -30,6 +30,7 @@ */ #include <sys/types.h> +#include <sys/ioctl.h> #include <assert.h> #include <stdbool.h> #include <stdio.h> @@ -158,6 +159,60 @@ login_target_error_str(int class, int detail) } } +static void +kernel_modify(const struct connection *conn, const char *target_address) +{ + struct iscsi_session_modify ism; + int error; + + memset(&ism, 0, sizeof(ism)); + ism.ism_session_id = conn->conn_session_id; + memcpy(&ism.ism_conf, &conn->conn_conf, sizeof(ism.ism_conf)); + strlcpy(ism.ism_conf.isc_target_addr, target_address, + sizeof(ism.ism_conf.isc_target)); + error = ioctl(conn->conn_iscsi_fd, ISCSISMODIFY, &ism); + if (error != 0) { + log_err(1, "failed to redirect to %s: ISCSISMODIFY", + target_address); + } +} + +/* + * XXX: The way it works is suboptimal; what should happen is described + * in draft-gilligan-iscsi-fault-tolerance-00. That, however, would + * be much more complicated: we would need to keep "dependencies" + * for sessions, so that, in case described in draft and using draft + * terminology, we would have three sessions: one for discovery, + * one for initial target portal, and one for redirect portal. + * This would allow us to "backtrack" on connection failure, + * as described in draft. + */ +static void +login_handle_redirection(struct connection *conn, struct pdu *response) +{ + struct iscsi_bhs_login_response *bhslr; + struct keys *response_keys; + const char *target_address; + + bhslr = (struct iscsi_bhs_login_response *)response->pdu_bhs; + assert (bhslr->bhslr_status_class == 1); + + response_keys = keys_new(); + keys_load(response_keys, response); + + target_address = keys_find(response_keys, "TargetAddress"); + if (target_address == NULL) + log_errx(1, "received redirection without TargetAddress"); + if (target_address[0] == '\0') + log_errx(1, "received redirection with empty TargetAddress"); + if (strlen(target_address) >= + sizeof(conn->conn_conf.isc_target_addr) - 1) + log_errx(1, "received TargetAddress is too long"); + + log_debugx("received redirection to \"%s\"", target_address); + kernel_modify(conn, target_address); +} + static struct pdu * login_receive(struct connection *conn, bool initial) { @@ -183,6 +238,11 @@ login_receive(struct connection *conn, bool initial) if (bhslr->bhslr_version_active != 0x00) log_errx(1, "received Login PDU with unsupported " "Version-active 0x%x", bhslr->bhslr_version_active); + if (bhslr->bhslr_status_class == 1) { + login_handle_redirection(conn, response); + log_debugx("redirection handled; exiting"); + exit(0); + } if (bhslr->bhslr_status_class != 0) { errorstr = login_target_error_str(bhslr->bhslr_status_class, bhslr->bhslr_status_detail); |