From nobody Sat Nov 23 15:27:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1723468805181707.8358191024997; Mon, 12 Aug 2024 06:20:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E8FB5121D; Mon, 12 Aug 2024 09:20:03 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 775C7121F; Mon, 12 Aug 2024 09:19:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D956811F2; Mon, 12 Aug 2024 09:19:40 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5DBA311F1 for ; Mon, 12 Aug 2024 09:19:40 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-611-iykRk6ZSNbyZ1aVmVj5PIw-1; Mon, 12 Aug 2024 09:19:38 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E2DD81955EA1 for ; Mon, 12 Aug 2024 13:19:37 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.211]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E09BB196BE80; Mon, 12 Aug 2024 13:19:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723468780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JKWEIRX1i4LQQXHabQJXOFiMn1ibd0oU3siGOBsy3G0=; b=VhgpNXNUiAUncDqvdbrghniJfq91o0n06K4fP+rwpAu1HOPXgaQXt4HYQ2qhm9gdqsL+E5 23fOi5U+6ezM05TXYDT6laHu9ayi92TEiDWuVcJLM53ym6Q5wqcoFOKNknvDXjgBQEuy59 4w4wbWdcx3589dbHS+49+bZmKqnhwCY= X-MC-Unique: iykRk6ZSNbyZ1aVmVj5PIw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH] rpc: adapt for deprecation of ssh_channel_get_exit_status Date: Mon, 12 Aug 2024 14:19:35 +0100 Message-ID: <20240812131935.2198474-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CU2FVBB66XMOIE2LKK6RUAYFSWTY5HAZ X-Message-ID-Hash: CU2FVBB66XMOIE2LKK6RUAYFSWTY5HAZ X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1723468806139116600 Content-Type: text/plain; charset="utf-8" This method is deprecated in libssh 0.11.0 in favour of the more flexible ssh_channel_get_exit_state. Rewrite our code to call the latter, and provide a compat shim that only fills out exit status. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/rpc/virnetlibsshsession.c | 50 +++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 6632e4a9ef..faf7307725 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -48,6 +48,22 @@ VIR_LOG_INIT("rpc.netlibsshsession"); */ #define TRACE_LIBSSH 0 =20 +#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 11, 0) +static int ssh_channel_get_exit_state(ssh_channel channel, + uint32_t *pexit_code, + char **pexit_signal, + int *pcore_dumped) +{ + if (pexit_code) + *pexit_code =3D ssh_channel_get_exit_status(channel); + if (pexit_signal) + *pexit_signal =3D 0; + if (pcore_dumped) + *pcore_dumped =3D 0; + return 0; +} +#endif + typedef enum { VIR_NET_LIBSSH_STATE_NEW, VIR_NET_LIBSSH_STATE_HANDSHAKE_COMPLETE, @@ -1179,12 +1195,21 @@ virNetLibsshChannelRead(virNetLibsshSession *sess, } =20 if (ssh_channel_is_eof(sess->channel)) { + uint32_t status; eof: - if (ssh_channel_get_exit_status(sess->channel)) { + if (ssh_channel_get_exit_state(sess->channel, &status, NULL, NULL)= !=3D 0) { + virReportError(VIR_ERR_LIBSSH, "%s", + _("Unable to fetch remote command exit status")= ); + sess->channelCommandReturnValue =3D 0; + sess->state =3D VIR_NET_LIBSSH_STATE_ERROR_REMOTE; + virObjectUnlock(sess); + return -1; + } + if (status !=3D 0) { virReportError(VIR_ERR_LIBSSH, _("Remote command terminated with non-zero code= : %1$d"), - ssh_channel_get_exit_status(sess->channel)); - sess->channelCommandReturnValue =3D ssh_channel_get_exit_statu= s(sess->channel); + status); + sess->channelCommandReturnValue =3D status; sess->state =3D VIR_NET_LIBSSH_STATE_ERROR_REMOTE; virObjectUnlock(sess); return -1; @@ -1227,15 +1252,24 @@ virNetLibsshChannelWrite(virNetLibsshSession *sess, } =20 if (ssh_channel_is_eof(sess->channel)) { - if (ssh_channel_get_exit_status(sess->channel)) { + uint32_t status; + if (ssh_channel_get_exit_state(sess->channel, &status, NULL, NULL)= !=3D 0) { + virReportError(VIR_ERR_LIBSSH, "%s", + _("Unable to fetch remote command exit status")= ); + sess->channelCommandReturnValue =3D 0; + sess->state =3D VIR_NET_LIBSSH_STATE_ERROR_REMOTE; + ret =3D -1; + goto cleanup; + } + if (status !=3D 0) { virReportError(VIR_ERR_LIBSSH, - _("Remote program terminated with non-zero code= : %1$d"), - ssh_channel_get_exit_status(sess->channel)); + _("Remote command terminated with non-zero code= : %1$d"), + status); + sess->channelCommandReturnValue =3D status; sess->state =3D VIR_NET_LIBSSH_STATE_ERROR_REMOTE; - sess->channelCommandReturnValue =3D ssh_channel_get_exit_statu= s(sess->channel); - ret =3D -1; goto cleanup; + } =20 sess->state =3D VIR_NET_LIBSSH_STATE_CLOSED; --=20 2.45.2