From patchwork Thu Dec 21 06:39:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Erickson X-Patchwork-Id: 13501181 Received: from mohas.pair.com (mohas.pair.com [209.68.5.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF8E1B678 for ; Thu, 21 Dec 2023 06:40:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=nuovations.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nuovations.com Received: from mohas.pair.com (localhost [127.0.0.1]) by mohas.pair.com (Postfix) with ESMTP id 5FEE773145 for ; Thu, 21 Dec 2023 01:40:10 -0500 (EST) Received: from localhost.localdomain (unknown [IPv6:2601:647:5a00:15c1:f5ab:4a5e:2861:14b3]) (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 mohas.pair.com (Postfix) with ESMTPSA id 220CA73219 for ; Thu, 21 Dec 2023 01:40:10 -0500 (EST) From: Grant Erickson To: connman@lists.linux.dev Subject: [PATCH v2 05/60] service: Change return type of 'start_wispr_if_connected'. Date: Wed, 20 Dec 2023 22:39:09 -0800 Message-ID: <20231221064007.2347566-6-gerickson@nuovations.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231221064007.2347566-1-gerickson@nuovations.com> References: <20231221064007.2347566-1-gerickson@nuovations.com> Precedence: bulk X-Mailing-List: connman@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: mailmunge 3.11 on 209.68.5.112 This changes the return type of 'start_wispr_if_connected' from 'void' to 'int' to allow callers to conditionally handle its return status. --- src/service.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/service.c b/src/service.c index 0c8a4bc0a0c9..5077e3fb2d1a 100644 --- a/src/service.c +++ b/src/service.c @@ -2394,15 +2394,23 @@ static void complete_online_check(struct connman_service *service, * reachability probes if the IPv4 or IPv6 state * is "connected" (that is, "ready" or "online"). * + * @retval 0 If successful. + * @retval -EINVAL If @a service is null or @a type is invalid. + * @retval -EPERM If online checks are disabled via + * configuration. + * */ -static void start_wispr_if_connected(struct connman_service *service) +static int start_wispr_if_connected(struct connman_service *service) { DBG("service %p (%s) maybe start WISPr", service, connman_service_get_identifier(service)); + if (!service) + return -EINVAL; + if (!online_check_is_enabled_check(service)) - return; + return -EPERM; if (__connman_service_is_connected_state(service, CONNMAN_IPCONFIG_TYPE_IPV4)) @@ -2413,6 +2421,8 @@ static void start_wispr_if_connected(struct connman_service *service) CONNMAN_IPCONFIG_TYPE_IPV6)) __connman_service_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV6); + + return 0; } /**