From nobody Fri May 16 05:21:45 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1500553818319567.217154727319; Thu, 20 Jul 2017 05:30:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 661B47CE1C; Thu, 20 Jul 2017 12:30:15 +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 1BA357E8F0; Thu, 20 Jul 2017 12:30:15 +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 AF3B73FAE0; Thu, 20 Jul 2017 12:30:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6KCU81r007003 for ; Thu, 20 Jul 2017 08:30:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 685F280920; Thu, 20 Jul 2017 12:30:08 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87E6080929; Thu, 20 Jul 2017 12:30:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 661B47CE1C Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 661B47CE1C From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 20 Jul 2017 14:29:58 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Michal Privoznik , Peter Krempa Subject: [libvirt] [PATCH v2 1/6] qemu: command: Rename and move qemuNetworkDriveGetPort 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: , MIME-Version: 1.0 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 20 Jul 2017 12:30:16 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move it to virstring.c and improve it to parse and validate ports. New name is virStringParsePort. --- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 18 +----------------- src/util/virstring.c | 37 +++++++++++++++++++++++++++++++++++++ src/util/virstring.h | 4 ++++ 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 187b12b32..f0c2c8446 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2656,6 +2656,7 @@ virStringListJoin; virStringListLength; virStringListRemove; virStringMatch; +virStringParsePort; virStringReplace; virStringSearch; virStringSortCompare; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6ac26af3e..be23796df 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -491,22 +491,6 @@ qemuSafeSerialParamValue(const char *value) } -static int -qemuNetworkDriveGetPort(const char *port) -{ - int ret =3D 0; - - if (virStrToLong_i(port, NULL, 10, &ret) < 0 || ret < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse port number '%s'"), - port); - return -1; - } - - return ret; -} - - /** * qemuBuildSecretInfoProps: * @secinfo: pointer to the secret info object @@ -825,7 +809,7 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, goto cleanup; if (src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP) { - if ((uri->port =3D qemuNetworkDriveGetPort(src->hosts->port)) < 0) + if (virStringParsePort(src->hosts->port, &uri->port) < 0) goto cleanup; if (VIR_STRDUP(uri->scheme, diff --git a/src/util/virstring.c b/src/util/virstring.c index 9b54bd6fb..fe61a3516 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1344,3 +1344,40 @@ void virStringTrimOptionalNewline(char *str) if (*tmp =3D=3D '\n') *tmp =3D '\0'; } + + +/** + * virStringParsePort: + * @str: port number to parse + * @port: pointer to parse port into + * + * Parses a string representation of a network port and validates it. Retu= rns + * 0 on success and -1 on error. + */ +int +virStringParsePort(const char *str, + int *port) +{ + unsigned int p =3D 0; + + *port =3D 0; + + if (!str) + return 0; + + if (virStrToLong_uip(str, NULL, 10, &p) < 0) { + virReportError(VIR_ERR_INVALID_ARG, + _("failed to parse port number '%s'"), str); + return -1; + } + + if (p > 65535) { + virReportError(VIR_ERR_INVALID_ARG, + _("port '%s' out of range"), str); + return -1; + } + + *port =3D p; + + return 0; +} diff --git a/src/util/virstring.h b/src/util/virstring.h index 5eaaaea0a..e562bf514 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -296,4 +296,8 @@ char *virStringEncodeBase64(const uint8_t *buf, size_t = buflen); void virStringTrimOptionalNewline(char *str); +int virStringParsePort(const char *str, + int *port) + ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + #endif /* __VIR_STRING_H__ */ --=20 2.13.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list