Received: by 2002:ab2:6991:0:b0:1f7:f6c3:9cb1 with SMTP id v17csp977196lqo; Thu, 9 May 2024 00:34:40 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCU8sBmvH37UVdAVXAaqH6tuVO2Sji5bXz2a1aAUTCGpdC+mf5XKT5mahpzwfm95mvjz+i9jwZB6SFnNK8wZSH67tOki6DmYkc6hl7/0pQ== X-Google-Smtp-Source: AGHT+IHVgPwT2XeDmEp6yElebb9IHLe2zJFrKgDb2yFfXPg1fFTcmcdBtB+8oQtsOSCDIpzT8ARv X-Received: by 2002:a17:906:318d:b0:a59:a979:2b03 with SMTP id a640c23a62f3a-a5a116fdca6mr140602266b.23.1715240080170; Thu, 09 May 2024 00:34:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715240080; cv=pass; d=google.com; s=arc-20160816; b=kzA0X8VHtrGPd0A0ciq2xSO2Zof16eKqnFWz+6M0/eCBmXUgnFCUF8bgzzjRL4V6Gp jW+LT+SeG5ohuMFx7R10huEhifLRZRw9wHLC+sNIAHcihkSt/3ArXYcV7yVmFftGyeyW US0tEwp6KeH+WXuObOWMcrSHmoA3XRY/dJwvZeYnV02GxnjNAfngplcXdIjF/Ga5qbk0 eVs6a5ydcm9vu0i3Go2t5Mcp5l/U5VVjiH7BtzCj+kJfTWpHZi2N4rzkGoM3aatjbiFB tFCCspVAKf7ZsKr4wcADs+WCTCCgPQAWQib6nkDz4lGkmiHSMO+kRMKLe5wsDuWUnZ2j nJRw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=RNUKRMhxFB5TR9apVtd68eMGyeFcOEWAgKGxesDpUeA=; fh=gEFnaafpRaUcg/666smOMYc+2bwkHwZv26zSvZDV2c4=; b=IMWqq4ZO32TqXzGWe4J7S6N8N0r+ZjFz0GM805wLi6a0MqjT4vS8mZEUCmtdF8FHdx cCueGEsIJCMzlbwQCYDYNZvdnJEnxh0xqh/J9l6YPeDQPg177YA9NPAYkFP/FsvlN1pQ hCFVW6HDqtJAJ4pJ591e0Vc8KlgK9GYAZaBThAyvyrW0mXU418ZoVQPMPAvUjsTn6olm za2JBhLe70DcQ8ykqjnXdO+vV4WZPua4fcpZT7ex5V5XSpuOl1ubCHSR/zTKN4d7yZib smATd6dEJgDO8bbIvBCLemIyZR7jkDBoVXt+Vql218rop0bHbm4s1idBwYSQ8jz29Pjo IbMA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Gnvcucrf; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-bluetooth+bounces-4423-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-bluetooth+bounces-4423-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id a640c23a62f3a-a5a17945c6dsi49716466b.17.2024.05.09.00.34.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 00:34:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-4423-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Gnvcucrf; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-bluetooth+bounces-4423-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-bluetooth+bounces-4423-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id BB0631F2277D for ; Thu, 9 May 2024 07:34:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AD7CA149C50; Thu, 9 May 2024 07:34:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Gnvcucrf" X-Original-To: linux-bluetooth@vger.kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (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 17A8613CA81 for ; Thu, 9 May 2024 07:34:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715240076; cv=none; b=lnu2BK0oMdODmZm9co8tlelBvOe253McH78UrPogNJjSapymYq+AFVEiy337WZ7VYPB0MVSDpFUbzTs2gCMf+LkuAFh8NEuYp4gpTTE8xGVTfXzZGgr/A6PbotYwgRFhSZ7vN+b2ifePHk2irsGt9/aY+7cSwebEx5ewCDffo54= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715240076; c=relaxed/simple; bh=mLOdjEDXxcawAfcIKTW1TD6/CsHlyHU8zkn48HRyP9A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=d5sGb76soskrJIXOlgaSPt+ZsTwasVsXxQIB4LcpPJlwmKjVMxLBQ0FVkJ0LGdZ9e7MEYI86J7NqcddiKbt8AOd89z3nsw82iCXr5k7vXzhU5UgkiWzZkEPbVYht2AEnZyVdjX71omwpsfbaQY+mnUR4BC/LUx4QYBNOVTjpkwI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Gnvcucrf; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715240074; x=1746776074; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mLOdjEDXxcawAfcIKTW1TD6/CsHlyHU8zkn48HRyP9A=; b=Gnvcucrfqm+kMi7diJAa1wtz0KMAH3OBkNlkXb7znppaK132w8plvwAc b6TT7gssfp/iwQ6KCoT8SHObY7DTyZVaIhxWJ9v8Ec71WDn0D1+f5xSTZ GIlR7S6makh7EpJpUtZMuiSic3C7r0lC4pIMBnwGdqh4ceKTPeUCzwq3O FdysPLXero2WiGJ/RUOEOQACUmt2X+izDLkAeuA45t1SlQXD8TWzJswKe i7lWh4u0AtFuoUK6mUpZrDt/a7gcHTwtJekkNR44dKNAQixh5SyRE+6rw ybhzJtwzxarx5YIBBhpd08H7UQ+r61/kpgXBiXwekwCvDwZVeaIQLZj/7 Q==; X-CSE-ConnectionGUID: xm5ADZFJS2m2By9cmB9rIw== X-CSE-MsgGUID: 7/Zwe6W8SAeo1zGqG9WyrA== X-IronPort-AV: E=McAfee;i="6600,9927,11067"; a="14952558" X-IronPort-AV: E=Sophos;i="6.08,147,1712646000"; d="scan'208";a="14952558" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2024 00:34:34 -0700 X-CSE-ConnectionGUID: jnv7r0MQQtuAYRVkXIv9Sg== X-CSE-MsgGUID: CkkhbrUsSi6NKmJinICDBg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,147,1712646000"; d="scan'208";a="33691439" Received: from weba0535.iind.intel.com ([10.224.186.30]) by fmviesa003.fm.intel.com with ESMTP; 09 May 2024 00:34:31 -0700 From: Ajay KV To: linux-bluetooth@vger.kernel.org Cc: Ajay KV Subject: [PATCH BlueZ v3 2/2] bluetoothctl: Add submenu for Call control profile testing Date: Thu, 9 May 2024 15:58:55 +0300 Message-Id: <20240509125855.2585411-2-ajay.k.v@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240509125855.2585411-1-ajay.k.v@intel.com> References: <20240509125855.2585411-1-ajay.k.v@intel.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This adds submenu in bluetoothctl for CCP Testing with options like answer and reject the active call. This feature is tested with windows machine as CCP server which uses Teams application to make calls Signed-off-by: Ajay KV --- Makefile.tools | 4 +- client/ccp_test.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++ client/ccp_test.h | 12 +++ client/main.c | 3 + 4 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 client/ccp_test.c create mode 100644 client/ccp_test.h diff --git a/Makefile.tools b/Makefile.tools index 679c914bf8cd..a5587427f549 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -13,7 +13,9 @@ client_bluetoothctl_SOURCES = client/main.c \ client/gatt.h client/gatt.c \ client/admin.h client/admin.c \ client/player.h client/player.c \ - client/mgmt.h client/mgmt.c + client/mgmt.h client/mgmt.c \ + client/ccp_test.c \ + client/ccp_test.h client_bluetoothctl_LDADD = lib/libbluetooth-internal.la \ gdbus/libgdbus-internal.la src/libshared-glib.la \ $(GLIB_LIBS) $(DBUS_LIBS) -lreadline diff --git a/client/ccp_test.c b/client/ccp_test.c new file mode 100644 index 000000000000..c7d5d173f179 --- /dev/null +++ b/client/ccp_test.c @@ -0,0 +1,212 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2024 Intel Corporation. All rights reserved. + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#define _GNU_SOURCE +#include +#include +#include "gdbus/gdbus.h" +#include "lib/bluetooth.h" +#include "src/shared/shell.h" +#include "print.h" +#include "ccp_test.h" + +/* String display constants */ +#define COLORED_NEW COLOR_GREEN "NEW" COLOR_OFF +#define COLORED_CHG COLOR_YELLOW "CHG" COLOR_OFF + +#define BLUEZ_CCP_TEST_INTERFACE "org.bluez.CCPTest1" + +static DBusConnection *dbus_conn; +static GDBusProxy *default_call; +static GList *callList; +static GDBusClient *client; + +static char *proxy_description(GDBusProxy *proxy, const char *title, + const char *description) +{ + const char *path; + + path = g_dbus_proxy_get_path(proxy); + return g_strdup_printf("%s%s%s%s %s ", + description ? "[" : "", + description ? : "", + description ? "] " : "", + title, path); +} + +static void print_info(void *data, void *user_data) +{ + GDBusProxy *proxy = data; + const char *description = user_data; + char *str; + + str = proxy_description(proxy, "CCP", description); + + bt_shell_printf("%s%s\n", str, + default_call == proxy ? "[default]" : ""); + + g_free(str); +} + +static void call_reject_reply(DBusMessage *message, void *user_data) +{ + DBusError error; + + dbus_error_init(&error); + + if (dbus_set_error_from_message(&error, message) == TRUE) { + bt_shell_printf("Failed to reject call: %s\n", error.name); + dbus_error_free(&error); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + bt_shell_printf("operation completed\n"); + + return bt_shell_noninteractive_quit(EXIT_SUCCESS); +} + +static void cmd_reject(int argc, char *argv[]) +{ + if (!default_call) { + bt_shell_printf("No active calls present\n"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + if (g_dbus_proxy_method_call(default_call, "reject", NULL, + call_reject_reply, NULL, NULL) == FALSE) { + bt_shell_printf("Failed to reject call\n"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } +} + +static void call_answer_reply(DBusMessage *message, void *user_data) +{ + DBusError error; + + dbus_error_init(&error); + + if (dbus_set_error_from_message(&error, message) == TRUE) { + bt_shell_printf("Failed to answer call: %s\n", error.name); + dbus_error_free(&error); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + bt_shell_printf("operation completed\n"); + + return bt_shell_noninteractive_quit(EXIT_SUCCESS); +} + +static void cmd_answer(int argc, char *argv[]) +{ + if (!default_call) + return bt_shell_noninteractive_quit(EXIT_FAILURE); + + if (g_dbus_proxy_method_call(default_call, "answer", NULL, + call_answer_reply, NULL, NULL) == FALSE) { + bt_shell_printf("Failed to answer the call\n"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } +} + +static const struct bt_shell_menu call_menu = { + .name = "ccp", + .desc = "ccp test settings submenu", + .entries = { + { "answer", NULL, cmd_answer, "answer the active call" }, + { "reject", NULL, cmd_reject, "reject the active call" }, + }, +}; + +static void ccp_add_call(GDBusProxy *proxy) +{ + bt_shell_printf("[CHG] CCP Test caller added\n"); + callList = g_list_append(callList, proxy); + + if (!default_call) + default_call = proxy; + + print_info(proxy, COLORED_NEW); +} + +static void ccp_remove_call(GDBusProxy *proxy) +{ + bt_shell_printf("[CHG] CCP Test caller removed\n"); + + if (default_call == proxy) + default_call = NULL; + + callList = g_list_remove(callList, proxy); +} + +static void proxy_added(GDBusProxy *proxy, void *user_data) +{ + const char *interface; + + interface = g_dbus_proxy_get_interface(proxy); + + if (!strcmp(interface, BLUEZ_CCP_TEST_INTERFACE)) + ccp_add_call(proxy); +} + +static void proxy_removed(GDBusProxy *proxy, void *user_data) +{ + const char *interface; + + interface = g_dbus_proxy_get_interface(proxy); + + if (!strcmp(interface, BLUEZ_CCP_TEST_INTERFACE)) + ccp_remove_call(proxy); +} + +static void ccptest_property_changed(GDBusProxy *proxy, const char *name, + DBusMessageIter *iter) +{ + char *str; + + str = proxy_description(proxy, "CCP Test", COLORED_CHG); + print_iter(str, name, iter); + g_free(str); + + bt_shell_printf("[CHG] CCP Test property : %s\n", name); +} + +static void property_changed(GDBusProxy *proxy, const char *name, + DBusMessageIter *iter, void *user_data) +{ + const char *interface; + + interface = g_dbus_proxy_get_interface(proxy); + + if (!strcmp(interface, BLUEZ_CCP_TEST_INTERFACE)) + ccptest_property_changed(proxy, name, iter); +} + +void ccptest_add_submenu(void) +{ + bt_shell_add_submenu(&call_menu); + + dbus_conn = bt_shell_get_env("DBUS_CONNECTION"); + if (!dbus_conn || client) + return; + + client = g_dbus_client_new(dbus_conn, "org.bluez", "/org/bluez"); + + g_dbus_client_set_proxy_handlers(client, proxy_added, proxy_removed, + property_changed, NULL); + g_dbus_client_set_disconnect_watch(client, NULL, NULL); +} + +void ccptest_remove_submenu(void) +{ + g_dbus_client_unref(client); +} diff --git a/client/ccp_test.h b/client/ccp_test.h new file mode 100644 index 000000000000..fc2ab2042bb8 --- /dev/null +++ b/client/ccp_test.h @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2024 Intel Corporation. All rights reserved. + * + * + */ + +void ccptest_add_submenu(void); +void ccptest_remove_submenu(void); diff --git a/client/main.c b/client/main.c index c8b0f7f1c2d8..e3836d5ed3f9 100644 --- a/client/main.c +++ b/client/main.c @@ -34,6 +34,7 @@ #include "admin.h" #include "player.h" #include "mgmt.h" +#include "ccp_test.h" /* String display constants */ #define COLORED_NEW COLOR_GREEN "NEW" COLOR_OFF @@ -3199,6 +3200,7 @@ int main(int argc, char *argv[]) admin_add_submenu(); player_add_submenu(); + ccptest_add_submenu(); mgmt_add_submenu(); client = g_dbus_client_new(dbus_conn, "org.bluez", "/org/bluez"); @@ -3216,6 +3218,7 @@ int main(int argc, char *argv[]) admin_remove_submenu(); player_remove_submenu(); + ccptest_remove_submenu(); mgmt_remove_submenu(); g_dbus_client_unref(client); -- 2.34.1