From nobody Sun Feb 8 21:33:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507716993407351.17409096074357; Wed, 11 Oct 2017 03:16:33 -0700 (PDT) Received: from localhost ([::1]:40020 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2E3y-0000ZB-LW for importer@patchew.org; Wed, 11 Oct 2017 06:16:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2Dxv-0004pV-BS for qemu-devel@nongnu.org; Wed, 11 Oct 2017 06:10:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2Dxq-0001uJ-2U for qemu-devel@nongnu.org; Wed, 11 Oct 2017 06:10:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36666) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e2Dxp-0001tE-Pz for qemu-devel@nongnu.org; Wed, 11 Oct 2017 06:10:10 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EDE3D8123E for ; Wed, 11 Oct 2017 10:10:08 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49BED68B2B; Wed, 11 Oct 2017 10:10:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EDE3D8123E Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Wed, 11 Oct 2017 11:09:56 +0100 Message-Id: <20171011100959.29326-5-berrange@redhat.com> In-Reply-To: <20171011100959.29326-1-berrange@redhat.com> References: <20171011100959.29326-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 11 Oct 2017 10:10:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 4/7] io: pass a struct iovec into qio_channel_websock_encode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of requiring use of another Buffer, pass a struct iovec into qio_channel_websock_encode, which gives callers more flexibility in how they process data. Signed-off-by: Daniel P. Berrange Reviewed-by: Eric Blake --- io/channel-websock.c | 69 ++++++++++++++++++++++++++++++++----------------= ---- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/io/channel-websock.c b/io/channel-websock.c index 700f5bea22..c29abb53f0 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -582,11 +582,14 @@ static gboolean qio_channel_websock_handshake_io(QIOC= hannel *ioc, } =20 =20 -static void qio_channel_websock_encode_buffer(QIOChannelWebsock *ioc, - Buffer *output, - uint8_t opcode, Buffer *buff= er) +static void qio_channel_websock_encode(QIOChannelWebsock *ioc, + uint8_t opcode, + const struct iovec *iov, + size_t niov, + size_t size) { size_t header_size; + size_t i; union { char buf[QIO_CHANNEL_WEBSOCK_HEADER_LEN_64_BIT]; QIOChannelWebsockHeader ws; @@ -594,25 +597,31 @@ static void qio_channel_websock_encode_buffer(QIOChan= nelWebsock *ioc, =20 header.ws.b0 =3D QIO_CHANNEL_WEBSOCK_HEADER_FIELD_FIN | (opcode & QIO_CHANNEL_WEBSOCK_HEADER_FIELD_OPCODE); - if (buffer->offset < QIO_CHANNEL_WEBSOCK_PAYLOAD_LEN_THRESHOLD_7_BIT) { - header.ws.b1 =3D (uint8_t)buffer->offset; + if (size < QIO_CHANNEL_WEBSOCK_PAYLOAD_LEN_THRESHOLD_7_BIT) { + header.ws.b1 =3D (uint8_t)size; header_size =3D QIO_CHANNEL_WEBSOCK_HEADER_LEN_7_BIT; - } else if (buffer->offset < - QIO_CHANNEL_WEBSOCK_PAYLOAD_LEN_THRESHOLD_16_BIT) { + } else if (size < QIO_CHANNEL_WEBSOCK_PAYLOAD_LEN_THRESHOLD_16_BIT) { header.ws.b1 =3D QIO_CHANNEL_WEBSOCK_PAYLOAD_LEN_MAGIC_16_BIT; - header.ws.u.s16.l16 =3D cpu_to_be16((uint16_t)buffer->offset); + header.ws.u.s16.l16 =3D cpu_to_be16((uint16_t)size); header_size =3D QIO_CHANNEL_WEBSOCK_HEADER_LEN_16_BIT; } else { header.ws.b1 =3D QIO_CHANNEL_WEBSOCK_PAYLOAD_LEN_MAGIC_64_BIT; - header.ws.u.s64.l64 =3D cpu_to_be64(buffer->offset); + header.ws.u.s64.l64 =3D cpu_to_be64(size); header_size =3D QIO_CHANNEL_WEBSOCK_HEADER_LEN_64_BIT; } header_size -=3D QIO_CHANNEL_WEBSOCK_HEADER_LEN_MASK; =20 - trace_qio_channel_websock_encode(ioc, opcode, header_size, buffer->off= set); - buffer_reserve(output, header_size + buffer->offset); - buffer_append(output, header.buf, header_size); - buffer_append(output, buffer->buffer, buffer->offset); + trace_qio_channel_websock_encode(ioc, opcode, header_size, size); + buffer_reserve(&ioc->encoutput, header_size + size); + buffer_append(&ioc->encoutput, header.buf, header_size); + for (i =3D 0; i < niov && size !=3D 0; i++) { + size_t want =3D iov[i].iov_len; + if (want > size) { + want =3D size; + } + buffer_append(&ioc->encoutput, iov[i].iov_base, want); + size -=3D want; + } } =20 =20 @@ -622,6 +631,7 @@ static ssize_t qio_channel_websock_write_wire(QIOChanne= lWebsock *, Error **); static void qio_channel_websock_write_close(QIOChannelWebsock *ioc, uint16_t code, const char *rea= son) { + struct iovec iov; buffer_reserve(&ioc->rawoutput, 2 + (reason ? strlen(reason) : 0)); *(uint16_t *)(ioc->rawoutput.buffer + ioc->rawoutput.offset) =3D cpu_to_be16(code); @@ -629,9 +639,10 @@ static void qio_channel_websock_write_close(QIOChannel= Websock *ioc, if (reason) { buffer_append(&ioc->rawoutput, reason, strlen(reason)); } - qio_channel_websock_encode_buffer( - ioc, &ioc->encoutput, QIO_CHANNEL_WEBSOCK_OPCODE_CLOSE, - &ioc->rawoutput); + iov.iov_base =3D ioc->rawoutput.buffer; + iov.iov_len =3D ioc->rawoutput.offset; + qio_channel_websock_encode(ioc, QIO_CHANNEL_WEBSOCK_OPCODE_CLOSE, + &iov, 1, iov.iov_len); buffer_reset(&ioc->rawoutput); qio_channel_websock_write_wire(ioc, NULL); qio_channel_shutdown(ioc->master, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); @@ -801,9 +812,10 @@ static int qio_channel_websock_decode_payload(QIOChann= elWebsock *ioc, error_setg(errp, "websocket closed by peer"); if (payload_len) { /* echo client status */ - qio_channel_websock_encode_buffer( - ioc, &ioc->encoutput, QIO_CHANNEL_WEBSOCK_OPCODE_CLOSE, - &ioc->encinput); + struct iovec iov =3D { .iov_base =3D ioc->encinput.buffer, + .iov_len =3D ioc->encinput.offset }; + qio_channel_websock_encode(ioc, QIO_CHANNEL_WEBSOCK_OPCODE_CLO= SE, + &iov, 1, iov.iov_len); qio_channel_websock_write_wire(ioc, NULL); qio_channel_shutdown(ioc->master, QIO_CHANNEL_SHUTDOWN_BOTH, N= ULL); } else { @@ -816,9 +828,10 @@ static int qio_channel_websock_decode_payload(QIOChann= elWebsock *ioc, /* ping frames produce an immediate reply, as long as we've not st= ill * got a previous pong queued, in which case we drop the new pong = */ if (ioc->pong_remain =3D=3D 0) { - qio_channel_websock_encode_buffer( - ioc, &ioc->encoutput, QIO_CHANNEL_WEBSOCK_OPCODE_PONG, - &ioc->encinput); + struct iovec iov =3D { .iov_base =3D ioc->encinput.buffer, + .iov_len =3D ioc->encinput.offset }; + qio_channel_websock_encode(ioc, QIO_CHANNEL_WEBSOCK_OPCODE_PON= G, + &iov, 1, iov.iov_len); ioc->pong_remain =3D ioc->encoutput.offset; } } /* pong frames are ignored */ @@ -1120,11 +1133,13 @@ static ssize_t qio_channel_websock_writev(QIOChanne= l *ioc, } =20 done: - if (ioc->rawoutput.offset) { - qio_channel_websock_encode_buffer( - ioc, &ioc->encoutput, QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME, - &ioc->rawoutput); - buffer_reset(&ioc->rawoutput); + if (wioc->rawoutput.offset) { + struct iovec iov =3D { .iov_base =3D wioc->rawoutput.buffer, + .iov_len =3D wioc->rawoutput.offset }; + qio_channel_websock_encode(wioc, + QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME, + &iov, 1, iov.iov_len); + buffer_reset(&wioc->rawoutput); } ret =3D qio_channel_websock_write_wire(wioc, errp); if (ret < 0 && --=20 2.13.5