From owner-svn-src-stable@FreeBSD.ORG Sat Nov 22 17:58:40 2014 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B5EED21; Sat, 22 Nov 2014 17:58:40 +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 403E5E8F; Sat, 22 Nov 2014 17:58:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMHweY5001851; Sat, 22 Nov 2014 17:58:40 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMHweJv001850; Sat, 22 Nov 2014 17:58:40 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201411221758.sAMHweJv001850@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 22 Nov 2014 17:58:40 +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: r274875 - 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-stable@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 17:58:40 -0000 Author: trasz Date: Sat Nov 22 17:58:39 2014 New Revision: 274875 URL: https://svnweb.freebsd.org/changeset/base/274875 Log: MFC r273543: Clean up (refactor) discovery a little; no functional changes. Sponsored by: The FreeBSD Foundation 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 Sat Nov 22 17:57:54 2014 (r274874) +++ stable/10/usr.sbin/ctld/discovery.c Sat Nov 22 17:58:39 2014 (r274875) @@ -160,7 +160,7 @@ logout_new_response(struct pdu *request) } static void -discovery_add_target(struct keys *response_keys, struct target *targ) +discovery_add_target(struct keys *response_keys, const struct target *targ) { struct portal *portal; char *buf; @@ -206,9 +206,12 @@ discovery(struct connection *conn) { struct pdu *request, *response; struct keys *request_keys, *response_keys; - struct target *targ; + const struct portal_group *pg; + const struct target *targ; const char *send_targets; + pg = conn->conn_portal->p_portal_group; + log_debugx("beginning discovery session; waiting for Text PDU"); request = text_receive(conn); request_keys = keys_new(); @@ -222,11 +225,8 @@ discovery(struct connection *conn) response_keys = keys_new(); if (strcmp(send_targets, "All") == 0) { - TAILQ_FOREACH(targ, - &conn->conn_portal->p_portal_group->pg_conf->conf_targets, - t_next) { - if (targ->t_portal_group != - conn->conn_portal->p_portal_group) { + TAILQ_FOREACH(targ, &pg->pg_conf->conf_targets, t_next) { + if (targ->t_portal_group != pg) { log_debugx("not returning target \"%s\"; " "belongs to a different portal group", targ->t_name); @@ -235,8 +235,7 @@ discovery(struct connection *conn) discovery_add_target(response_keys, targ); } } else { - targ = target_find(conn->conn_portal->p_portal_group->pg_conf, - send_targets); + targ = target_find(pg->pg_conf, send_targets); if (targ == NULL) { log_debugx("initiator requested information on unknown " "target \"%s\"; returning nothing", send_targets);