From nobody Sun Feb 8 16:49:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1564420384; cv=none; d=zoho.com; s=zohoarc; b=izPM9rMwrteoviSTm8kHZ3Ekd7yhlBxBQ2j22VyqyX06VUZZNgV5BZZL5bnp4JOokVBBCEaXexptu9hK5jDJv1XtpUaD2rDxEYu6bYP86YjXWO6XibmyOEEHGqkBqG85hVxicPUVuxpasUoaFfQtqHbW2PH9/C8eXFYpUqmpRaw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564420384; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=FcF6CS+hqEE29QA8AQgNY33Z3cFuAgXIUFS29U/8MRI=; b=Fda1gJQfGLxVvF67s/hmyhDTEQrseqzP1efFJqzk9Q/dgvA4DG3Ynd9vy2M0lojd6sECYMuBRu6r9m8rYv5L86A/3fZMdbMvimcq3Oceal/JrmmYNoJYsXtzuvNQOGSXWFqDzJ2K5qKoldJSITp8Y2Be50TLbRXYMX++16wQTKI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1564420384332596.4770869025244; Mon, 29 Jul 2019 10:13:04 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A8B747FDF9; Mon, 29 Jul 2019 17:13:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 778A360127; Mon, 29 Jul 2019 17:13:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 394F719731; Mon, 29 Jul 2019 17:13:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6THCw9H028612 for ; Mon, 29 Jul 2019 13:12:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id BC9135C22C; Mon, 29 Jul 2019 17:12:58 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id D08D95C219; Mon, 29 Jul 2019 17:12:57 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 29 Jul 2019 18:11:22 +0100 Message-Id: <20190729171130.25484-41-berrange@redhat.com> In-Reply-To: <20190729171130.25484-1-berrange@redhat.com> References: <20190729171130.25484-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Andrea Bolognani Subject: [libvirt] [PATCH v3 40/48] remote: use enum helpers for parsing remote driver transport X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 29 Jul 2019 17:13:03 +0000 (UTC) Instead of open-coding a string -> enum conversion, use the enum helpers for the remote driver transport. The old code uses STRCASEEQ, so we must force the URI transport to lowercase for sake of back-compatibility. Reviewed-by: Andrea Bolognani Signed-off-by: Daniel P. Berrang=C3=A9 --- src/remote/remote_driver.c | 123 +++++++++++++++++++++---------------- 1 file changed, 69 insertions(+), 54 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 8e1024dca3..706d9e6e14 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -49,11 +49,35 @@ #include "virauth.h" #include "virauthconfig.h" #include "virstring.h" +#include "c-ctype.h" =20 #define VIR_FROM_THIS VIR_FROM_REMOTE =20 VIR_LOG_INIT("remote.remote_driver"); =20 +typedef enum { + REMOTE_DRIVER_TRANSPORT_TLS, + REMOTE_DRIVER_TRANSPORT_UNIX, + REMOTE_DRIVER_TRANSPORT_SSH, + REMOTE_DRIVER_TRANSPORT_LIBSSH2, + REMOTE_DRIVER_TRANSPORT_EXT, + REMOTE_DRIVER_TRANSPORT_TCP, + REMOTE_DRIVER_TRANSPORT_LIBSSH, + + REMOTE_DRIVER_TRANSPORT_LAST, +} remoteDriverTransport; + +VIR_ENUM_DECL(remoteDriverTransport); +VIR_ENUM_IMPL(remoteDriverTransport, + REMOTE_DRIVER_TRANSPORT_LAST, + "tls", + "unix", + "ssh", + "libssh2", + "ext", + "tcp", + "libssh"); + #if SIZEOF_LONG < 8 # define HYPER_TO_TYPE(_type, _to, _from) \ do { \ @@ -176,10 +200,17 @@ static int remoteSplitURIScheme(virURIPtr uri, if (VIR_STRNDUP(*driver, uri->scheme, p ? p - uri->scheme : -1) < 0) return -1; =20 - if (p && - VIR_STRDUP(*transport, p + 1) < 0) { - VIR_FREE(*driver); - return -1; + if (p) { + if (VIR_STRDUP(*transport, p + 1) < 0) { + VIR_FREE(*driver); + return -1; + } + + p =3D *transport; + while (*p) { + *p =3D c_tolower(*p); + p++; + } } =20 return 0; @@ -778,15 +809,7 @@ doRemoteOpen(virConnectPtr conn, virConfPtr conf, unsigned int flags) { - enum { - trans_tls, - trans_unix, - trans_ssh, - trans_libssh2, - trans_ext, - trans_tcp, - trans_libssh, - } transport; + int transport; #ifndef WIN32 VIR_AUTOFREE(char *) daemonPath =3D NULL; #endif @@ -815,42 +838,29 @@ doRemoteOpen(virConnectPtr conn, if (conn->uri) { if (!transport_str) { if (conn->uri->server) - transport =3D trans_tls; + transport =3D REMOTE_DRIVER_TRANSPORT_TLS; else - transport =3D trans_unix; + transport =3D REMOTE_DRIVER_TRANSPORT_UNIX; } else { - if (STRCASEEQ(transport_str, "tls")) { - transport =3D trans_tls; - } else if (STRCASEEQ(transport_str, "unix")) { - if (conn->uri->server) { - virReportError(VIR_ERR_INVALID_ARG, - _("using unix socket and remote " - "server '%s' is not supported."), - conn->uri->server); - return VIR_DRV_OPEN_ERROR; - } else { - transport =3D trans_unix; - } - } else if (STRCASEEQ(transport_str, "ssh")) { - transport =3D trans_ssh; - } else if (STRCASEEQ(transport_str, "libssh2")) { - transport =3D trans_libssh2; - } else if (STRCASEEQ(transport_str, "ext")) { - transport =3D trans_ext; - } else if (STRCASEEQ(transport_str, "tcp")) { - transport =3D trans_tcp; - } else if (STRCASEEQ(transport_str, "libssh")) { - transport =3D trans_libssh; - } else { + if ((transport =3D remoteDriverTransportTypeFromString(transpo= rt_str)) < 0) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("remote_open: transport in URL not recogn= ised " "(should be tls|unix|ssh|ext|tcp|libssh2|= libssh)")); return VIR_DRV_OPEN_ERROR; } + + if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_UNIX && + conn->uri->server) { + virReportError(VIR_ERR_INVALID_ARG, + _("using unix socket and remote " + "server '%s' is not supported."), + conn->uri->server); + return VIR_DRV_OPEN_ERROR; + } } } else { /* No URI, then must be probing so use UNIX socket */ - transport =3D trans_unix; + transport =3D REMOTE_DRIVER_TRANSPORT_UNIX; } =20 /* @@ -861,7 +871,7 @@ doRemoteOpen(virConnectPtr conn, * not require any external libraries or command execution */ if (virIsSUID() && - transport !=3D trans_unix) { + transport !=3D REMOTE_DRIVER_TRANSPORT_UNIX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Only Unix socket URI transport is allowed in set= uid mode")); return VIR_DRV_OPEN_ERROR; @@ -872,10 +882,10 @@ doRemoteOpen(virConnectPtr conn, if (conn->uri && conn->uri->port !=3D 0) { if (virAsprintf(&port, "%d", conn->uri->port) < 0) goto failed; - } else if (transport =3D=3D trans_tls) { + } else if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_TLS) { if (VIR_STRDUP(port, LIBVIRTD_TLS_PORT) < 0) goto failed; - } else if (transport =3D=3D trans_tcp) { + } else if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_TCP) { if (VIR_STRDUP(port, LIBVIRTD_TCP_PORT) < 0) goto failed; } /* Port not used for unix, ext., default for ssh */ @@ -959,7 +969,7 @@ doRemoteOpen(virConnectPtr conn, VIR_DEBUG("proceeding with name =3D %s", name); =20 /* For ext transport, command is required. */ - if (transport =3D=3D trans_ext && !command) { + if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_EXT && !command) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("remote_open: for 'ext' transport, command is req= uired")); goto failed; @@ -967,8 +977,8 @@ doRemoteOpen(virConnectPtr conn, =20 VIR_DEBUG("Connecting with transport %d", transport); /* Connect to the remote service. */ - switch (transport) { - case trans_tls: + switch ((remoteDriverTransport)transport) { + case REMOTE_DRIVER_TRANSPORT_TLS: if (conf && !tls_priority && virConfGetValueString(conf, "tls_priority", &tls_priority) < 0) goto failed; @@ -991,7 +1001,7 @@ doRemoteOpen(virConnectPtr conn, goto failed; #endif =20 - case trans_tcp: + case REMOTE_DRIVER_TRANSPORT_TCP: priv->client =3D virNetClientNewTCP(priv->hostname, port, AF_UNSPE= C); if (!priv->client) goto failed; @@ -1006,7 +1016,7 @@ doRemoteOpen(virConnectPtr conn, =20 break; =20 - case trans_libssh2: + case REMOTE_DRIVER_TRANSPORT_LIBSSH2: if (!sockname) { /* Right now we don't support default session connections */ if (flags & VIR_DRV_OPEN_REMOTE_USER) { @@ -1041,7 +1051,7 @@ doRemoteOpen(virConnectPtr conn, priv->is_secure =3D 1; break; =20 - case trans_libssh: + case REMOTE_DRIVER_TRANSPORT_LIBSSH: if (!sockname) { /* Right now we don't support default session connections */ if (flags & VIR_DRV_OPEN_REMOTE_USER) { @@ -1077,7 +1087,7 @@ doRemoteOpen(virConnectPtr conn, break; =20 #ifndef WIN32 - case trans_unix: + case REMOTE_DRIVER_TRANSPORT_UNIX: if (!sockname) { if (flags & VIR_DRV_OPEN_REMOTE_USER) sockname =3D remoteGetUNIXSocketNonRoot(); @@ -1103,7 +1113,7 @@ doRemoteOpen(virConnectPtr conn, priv->is_secure =3D 1; break; =20 - case trans_ssh: + case REMOTE_DRIVER_TRANSPORT_SSH: if (!command && VIR_STRDUP(command, "ssh") < 0) goto failed; =20 @@ -1135,7 +1145,7 @@ doRemoteOpen(virConnectPtr conn, priv->is_secure =3D 1; break; =20 - case trans_ext: { + case REMOTE_DRIVER_TRANSPORT_EXT: { char const *cmd_argv[] =3D { command, NULL }; if (!(priv->client =3D virNetClientNewExternal(cmd_argv))) goto failed; @@ -1147,15 +1157,20 @@ doRemoteOpen(virConnectPtr conn, =20 #else /* WIN32 */ =20 - case trans_unix: - case trans_ssh: - case trans_ext: + case REMOTE_DRIVER_TRANSPORT_UNIX: + case REMOTE_DRIVER_TRANSPORT_SSH: + case REMOTE_DRIVER_TRANSPORT_EXT: virReportError(VIR_ERR_INVALID_ARG, "%s", _("transport methods unix, ssh and ext are not supp= orted " "under Windows")); goto failed; =20 #endif /* WIN32 */ + + case REMOTE_DRIVER_TRANSPORT_LAST: + default: + virReportEnumRangeError(remoteDriverTransport, transport); + goto failed; } /* switch (transport) */ =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list