Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 24 Jul 2014 15:42:32 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r269069 - stable/10/usr.sbin/iscsid
Message-ID:  <201407241542.s6OFgWuo006208@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Thu Jul 24 15:42:32 2014
New Revision: 269069
URL: http://svnweb.freebsd.org/changeset/base/269069

Log:
  MFC r267612 (by trasz):
  Get rid of unneccessary argument.

Modified:
  stable/10/usr.sbin/iscsid/login.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/iscsid/login.c
==============================================================================
--- stable/10/usr.sbin/iscsid/login.c	Thu Jul 24 15:41:16 2014	(r269068)
+++ stable/10/usr.sbin/iscsid/login.c	Thu Jul 24 15:42:32 2014	(r269069)
@@ -214,11 +214,12 @@ login_handle_redirection(struct connecti
 }
 
 static struct pdu *
-login_receive(struct connection *conn, bool initial)
+login_receive(struct connection *conn)
 {
 	struct pdu *response;
 	struct iscsi_bhs_login_response *bhslr;
 	const char *errorstr;
+	static bool initial = true;
 
 	response = pdu_new(conn);
 	pdu_receive(response);
@@ -262,6 +263,8 @@ login_receive(struct connection *conn, b
 	conn->conn_tsih = ntohs(bhslr->bhslr_tsih);
 	conn->conn_statsn = ntohl(bhslr->bhslr_statsn);
 
+	initial = false;
+
 	return (response);
 }
 
@@ -612,7 +615,7 @@ login_negotiate(struct connection *conn)
 	pdu_delete(request);
 	request = NULL;
 
-	response = login_receive(conn, false);
+	response = login_receive(conn);
 	response_keys = keys_new();
 	keys_load(response_keys, response);
 	for (i = 0; i < KEYS_MAX; i++) {
@@ -804,7 +807,7 @@ login_chap(struct connection *conn)
 	login_send_chap_a(conn);
 
 	log_debugx("waiting for CHAP_A/CHAP_C/CHAP_I");
-	response = login_receive(conn, false);
+	response = login_receive(conn);
 
 	log_debugx("sending CHAP_N/CHAP_R");
 	login_send_chap_r(response);
@@ -815,7 +818,7 @@ login_chap(struct connection *conn)
 	 */
 
 	log_debugx("waiting for CHAP result");
-	response = login_receive(conn, false);
+	response = login_receive(conn);
 	if (conn->conn_conf.isc_mutual_user[0] != '\0')
 		login_verify_mutual(response);
 	pdu_delete(response);
@@ -873,7 +876,7 @@ login(struct connection *conn)
 	pdu_send(request);
 	pdu_delete(request);
 
-	response = login_receive(conn, true);
+	response = login_receive(conn);
 
 	response_keys = keys_new();
 	keys_load(response_keys, response);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407241542.s6OFgWuo006208>