From nobody Wed Dec 22 18:43:37 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CEA491909AE7; Wed, 22 Dec 2021 18:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JK2K63zt1z3vhk; Wed, 22 Dec 2021 18:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 140522204D; Wed, 22 Dec 2021 18:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMIhbdq089864; Wed, 22 Dec 2021 18:43:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMIhbNH089863; Wed, 22 Dec 2021 18:43:37 GMT (envelope-from git) Date: Wed, 22 Dec 2021 18:43:37 GMT Message-Id: <202112221843.1BMIhbNH089863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 2ccb8fde5eec - main - libiscsiutil: Use open_memstream to build the outgoing block of keys. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ccb8fde5eec8a0a25449374fd5a71654460947f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640198619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MAzMxN3Foz6haolvdnjqsRjQNqgiRcoZrpYd5lRfrj0=; b=R4abTmJQXV+XA9oSTy91TgrER9E8Xp4/8okn6jcQL+FPkBsgtG0TEHatWJKIRzzKbG5goZ iR0BRLlHYyvnyJBbo6L7s6tROqEsneC5wxA1g6eryBV//dCwjrb3IY/rAgsRtgriKhq0by VqcWtGaZlgvrMsuqSiDchUb7ovnsoApyEjjjr/EXJodkPK0MCDdwFwaGLKE5SDeqV+S3XL MpFgLVJTOonhUPatTrVHvW0jCQJ5Rzf2hTWr3IK6MOym59BhHxUg+m1EHTewlnvNLccdY/ 3TCYUNukDA14eCrY4vVl0eW7zpKNeD4ILkSUqNE0xZPWxxX5krT1gs5ZFGgqQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640198619; a=rsa-sha256; cv=none; b=SDgIvSWfCZBPczU3YRmOkLimgvf77fiFxpc+RR/K7KI2Qv3cKcDq2uhsJJHfv0BJ2XhGEz P5GVw/rusGC64L6uJikDJLtdth7wCK9qpkjvyvH4UYsXzk/9tn3H12XGZEUJLGRRi4Q9X0 s1N4z9jzysbq5Xv7YiH6uhyl0ZaD5yzoGTev/KDNBELEziRrkIHNXviezGACU2sUUrhHo4 mXLa0n3+hkjVB5WDzrO1Cmvs6COj+qBzynabBF6rFc20N3GCUX1ISmzIdV7fiBkCnaHIu3 rJErg/puB8cdMMNSKeA7Ys+ro8TyGVpM0Jo+zl70Ea+csEYRQ7IhrdOgaytfag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2ccb8fde5eec8a0a25449374fd5a71654460947f commit 2ccb8fde5eec8a0a25449374fd5a71654460947f Author: John Baldwin AuthorDate: 2021-12-22 18:42:19 +0000 Commit: John Baldwin CommitDate: 2021-12-22 18:43:23 +0000 libiscsiutil: Use open_memstream to build the outgoing block of keys. Reviewed by: mav Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D33546 --- lib/libiscsiutil/keys.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/lib/libiscsiutil/keys.c b/lib/libiscsiutil/keys.c index 185a179906b9..9b165df87557 100644 --- a/lib/libiscsiutil/keys.c +++ b/lib/libiscsiutil/keys.c @@ -106,41 +106,33 @@ keys_load(struct keys *keys, const struct pdu *pdu) void keys_save(struct keys *keys, struct pdu *pdu) { + FILE *fp; char *data; size_t len; int i; - /* - * XXX: Not particularly efficient. - */ - len = 0; + fp = open_memstream(&data, &len); + if (fp == NULL) + log_err(1, "open_memstream"); for (i = 0; i < KEYS_MAX; i++) { if (keys->keys_names[i] == NULL) break; - /* - * +1 for '=', +1 for '\0'. - */ - len += strlen(keys->keys_names[i]) + - strlen(keys->keys_values[i]) + 2; - } - if (len == 0) - return; + fprintf(fp, "%s=%s", keys->keys_names[i], keys->keys_values[i]); - data = malloc(len); - if (data == NULL) - log_err(1, "malloc"); + /* Append a '\0' after each key pair. */ + fputc('\0', fp); + } + if (fclose(fp) != 0) + log_err(1, "fclose"); + + if (len == 0) { + free(data); + data = NULL; + } pdu->pdu_data = data; pdu->pdu_data_len = len; - - for (i = 0; i < KEYS_MAX; i++) { - if (keys->keys_names[i] == NULL) - break; - data += sprintf(data, "%s=%s", - keys->keys_names[i], keys->keys_values[i]); - data += 1; /* for '\0'. */ - } } const char *