From owner-svn-src-all@FreeBSD.ORG Wed Jul 2 10:18:42 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ACC32513; Wed, 2 Jul 2014 10:18:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7F8C923A1; Wed, 2 Jul 2014 10:18:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62AIgwK074705; Wed, 2 Jul 2014 10:18:42 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62AIghR074704; Wed, 2 Jul 2014 10:18:42 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201407021018.s62AIghR074704@svn.freebsd.org> From: Alexander Motin Date: Wed, 2 Jul 2014 10:18:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r268140 - stable/10/usr.sbin/ctld X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 10:18:42 -0000 Author: mav Date: Wed Jul 2 10:18:42 2014 New Revision: 268140 URL: http://svnweb.freebsd.org/changeset/base/268140 Log: MFC r267606: On discovery stage add set of TargetAddress keys to reply, reporting to the client all the portal groups addresses and ports. Modified: stable/10/usr.sbin/ctld/discovery.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/ctld/discovery.c ============================================================================== --- stable/10/usr.sbin/ctld/discovery.c Wed Jul 2 10:16:12 2014 (r268139) +++ stable/10/usr.sbin/ctld/discovery.c Wed Jul 2 10:18:42 2014 (r268140) @@ -35,6 +35,8 @@ #include #include #include +#include +#include #include "ctld.h" #include "iscsi_proto.h" @@ -155,6 +157,48 @@ logout_new_response(struct pdu *request) return (response); } +static void +discovery_add_target(struct keys *response_keys, struct target *targ) +{ + struct portal *portal; + char *buf; + char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV]; + struct addrinfo *ai; + int ret; + + keys_add(response_keys, "TargetName", targ->t_name); + TAILQ_FOREACH(portal, &targ->t_portal_group->pg_portals, p_next) { + ai = portal->p_ai; + ret = getnameinfo(ai->ai_addr, ai->ai_addrlen, + hbuf, sizeof(hbuf), sbuf, sizeof(sbuf), + NI_NUMERICHOST | NI_NUMERICSERV); + if (ret != 0) { + log_warnx("getnameinfo: %s", gai_strerror(ret)); + continue; + } + switch (ai->ai_addr->sa_family) { + case AF_INET: + if (strcmp(hbuf, "0.0.0.0") == 0) + continue; + ret = asprintf(&buf, "%s:%s,%d", hbuf, sbuf, + targ->t_portal_group->pg_tag); + break; + case AF_INET6: + if (strcmp(hbuf, "::") == 0) + continue; + ret = asprintf(&buf, "[%s]:%s,%d", hbuf, sbuf, + targ->t_portal_group->pg_tag); + break; + default: + continue; + } + if (ret <= 0) + log_err(1, "asprintf"); + keys_add(response_keys, "TargetAddress", buf); + free(buf); + } +} + void discovery(struct connection *conn) { @@ -186,7 +230,7 @@ discovery(struct connection *conn) targ->t_name); continue; } - keys_add(response_keys, "TargetName", targ->t_name); + discovery_add_target(response_keys, targ); } } else { targ = target_find(conn->conn_portal->p_portal_group->pg_conf, @@ -194,9 +238,8 @@ discovery(struct connection *conn) if (targ == NULL) { log_debugx("initiator requested information on unknown " "target \"%s\"; returning nothing", send_targets); - } else { - keys_add(response_keys, "TargetName", targ->t_name); - } + } else + discovery_add_target(response_keys, targ); } keys_save(response_keys, response);