diff mbox series

[Bluez,v3,07/13] plugins/admin_policy: add admin_policy adapter driver

Message ID 20210728211405.Bluez.v3.7.I29607be7ac91b0a494ab51713ba14f583eb858ed@changeid (mailing list archive)
State Superseded
Headers show
Series Admin policy series | expand

Commit Message

Howard Chung July 28, 2021, 1:15 p.m. UTC 
From: Yun-Hao Chung <howardchung@chromium.org>

This adds code to register admin_policy driver to adapter when
admin_policy plugin is enabled.

The following test steps were performed:
1. restart bluetoothd
2. check if "Admin Policy is enabled" in system log

Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---

(no changes since v1)

 plugins/admin.c        | 67 ++++++++++++++++++++++++++++++++++++++++++
 plugins/admin_policy.c | 67 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+)

Comments

Luiz Augusto von Dentz July 28, 2021, 5:42 p.m. UTC | #1 
Hi Howard,

On Wed, Jul 28, 2021 at 6:16 AM Howard Chung <howardchung@google.com> wrote:
>
> From: Yun-Hao Chung <howardchung@chromium.org>
>
> This adds code to register admin_policy driver to adapter when
> admin_policy plugin is enabled.
>
> The following test steps were performed:
> 1. restart bluetoothd
> 2. check if "Admin Policy is enabled" in system log
>
> Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
> ---
>
> (no changes since v1)
>
>  plugins/admin.c        | 67 ++++++++++++++++++++++++++++++++++++++++++
>  plugins/admin_policy.c | 67 ++++++++++++++++++++++++++++++++++++++++++

Looks like the old file still being added, besides you should update
your patch description as well since you still mentioning it as
admin_policy in quite a few of them.

>  2 files changed, 134 insertions(+)
>
> diff --git a/plugins/admin.c b/plugins/admin.c
> index 42866bcf7..923e08cb8 100644
> --- a/plugins/admin.c
> +++ b/plugins/admin.c
> @@ -12,17 +12,84 @@
>  #include <config.h>
>  #endif
>
> +#include "lib/bluetooth.h"
> +
> +#include "src/adapter.h"
> +#include "src/error.h"
>  #include "src/log.h"
>  #include "src/plugin.h"
>
> +#include "src/shared/queue.h"
> +
> +/* |policy_data| has the same life cycle as btd_adapter */
> +static struct btd_admin_policy {
> +       struct btd_adapter *adapter;
> +       uint16_t adapter_id;
> +} *policy_data = NULL;
> +
> +static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)
> +{
> +       struct btd_admin_policy *admin_policy = NULL;
> +
> +       admin_policy = g_try_malloc(sizeof(*admin_policy));
> +       if (!admin_policy) {
> +               btd_error(btd_adapter_get_index(adapter),
> +                               "Failed to allocate memory for admin_policy");
> +               return NULL;
> +       }
> +
> +       admin_policy->adapter = adapter;
> +       admin_policy->adapter_id = btd_adapter_get_index(adapter);
> +
> +       return admin_policy;
> +}
> +
> +static void admin_policy_free(void *data)
> +{
> +       struct btd_admin_policy *admin_policy = data;
> +
> +       g_free(admin_policy);
> +}
> +
> +static int admin_policy_adapter_probe(struct btd_adapter *adapter)
> +{
> +       if (policy_data) {
> +               btd_warn(policy_data->adapter_id,
> +                                               "Policy data already exists");
> +               admin_policy_free(policy_data);
> +               policy_data = NULL;
> +       }
> +
> +       policy_data = admin_policy_new(adapter);
> +       if (!policy_data)
> +               return -ENOMEM;
> +
> +       btd_info(policy_data->adapter_id, "Admin Policy has been enabled");
> +
> +       return 0;
> +}
> +
> +static struct btd_adapter_driver admin_policy_driver = {
> +       .name   = "admin_policy",
> +       .probe  = admin_policy_adapter_probe,
> +       .resume = NULL,
> +};
> +
>  static int admin_init(void)
>  {
>         DBG("");
> +
> +       return btd_register_adapter_driver(&admin_policy_driver);
>  }
>
>  static void admin_exit(void)
>  {
>         DBG("");
> +
> +       btd_unregister_adapter_driver(&admin_policy_driver);
> +
> +       if (policy_data)
> +               admin_policy_free(policy_data);
>  }
>
>  BLUETOOTH_PLUGIN_DEFINE(admin, VERSION,
> diff --git a/plugins/admin_policy.c b/plugins/admin_policy.c
> index dd8d89736..2ece87156 100644
> --- a/plugins/admin_policy.c
> +++ b/plugins/admin_policy.c
> @@ -12,17 +12,84 @@
>  #include <config.h>
>  #endif
>
> +#include "lib/bluetooth.h"
> +
> +#include "src/adapter.h"
> +#include "src/error.h"
>  #include "src/log.h"
>  #include "src/plugin.h"
>
> +#include "src/shared/queue.h"
> +
> +/* |policy_data| has the same life cycle as btd_adapter */
> +static struct btd_admin_policy {
> +       struct btd_adapter *adapter;
> +       uint16_t adapter_id;
> +} *policy_data = NULL;
> +
> +static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)
> +{
> +       struct btd_admin_policy *admin_policy = NULL;
> +
> +       admin_policy = g_try_malloc(sizeof(*admin_policy));
> +       if (!admin_policy) {
> +               btd_error(btd_adapter_get_index(adapter),
> +                               "Failed to allocate memory for admin_policy");
> +               return NULL;
> +       }
> +
> +       admin_policy->adapter = adapter;
> +       admin_policy->adapter_id = btd_adapter_get_index(adapter);
> +
> +       return admin_policy;
> +}
> +
> +static void admin_policy_free(void *data)
> +{
> +       struct btd_admin_policy *admin_policy = data;
> +
> +       g_free(admin_policy);
> +}
> +
> +static int admin_policy_adapter_probe(struct btd_adapter *adapter)
> +{
> +       if (policy_data) {
> +               btd_warn(policy_data->adapter_id,
> +                                               "Policy data already exists");
> +               admin_policy_free(policy_data);
> +               policy_data = NULL;
> +       }
> +
> +       policy_data = admin_policy_new(adapter);
> +       if (!policy_data)
> +               return -ENOMEM;
> +
> +       btd_info(policy_data->adapter_id, "Admin Policy has been enabled");
> +
> +       return 0;
> +}
> +
> +static struct btd_adapter_driver admin_policy_driver = {
> +       .name   = "admin_policy",
> +       .probe  = admin_policy_adapter_probe,
> +       .resume = NULL,
> +};
> +
>  static int admin_policy_init(void)
>  {
>         DBG("");
> +
> +       return btd_register_adapter_driver(&admin_policy_driver);
>  }
>
>  static void admin_policy_exit(void)
>  {
>         DBG("");
> +
> +       btd_unregister_adapter_driver(&admin_policy_driver);
> +
> +       if (policy_data)
> +               admin_policy_free(policy_data);
>  }
>
>  BLUETOOTH_PLUGIN_DEFINE(admin_policy, VERSION,
> --
> 2.32.0.432.gabb21c7263-goog
>
diff mbox series

Patch

diff --git a/plugins/admin.c b/plugins/admin.c
index 42866bcf7..923e08cb8 100644
--- a/plugins/admin.c
+++ b/plugins/admin.c
@@ -12,17 +12,84 @@ 
 #include <config.h>
 #endif
 
+#include "lib/bluetooth.h"
+
+#include "src/adapter.h"
+#include "src/error.h"
 #include "src/log.h"
 #include "src/plugin.h"
 
+#include "src/shared/queue.h"
+
+/* |policy_data| has the same life cycle as btd_adapter */
+static struct btd_admin_policy {
+	struct btd_adapter *adapter;
+	uint16_t adapter_id;
+} *policy_data = NULL;
+
+static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)
+{
+	struct btd_admin_policy *admin_policy = NULL;
+
+	admin_policy = g_try_malloc(sizeof(*admin_policy));
+	if (!admin_policy) {
+		btd_error(btd_adapter_get_index(adapter),
+				"Failed to allocate memory for admin_policy");
+		return NULL;
+	}
+
+	admin_policy->adapter = adapter;
+	admin_policy->adapter_id = btd_adapter_get_index(adapter);
+
+	return admin_policy;
+}
+
+static void admin_policy_free(void *data)
+{
+	struct btd_admin_policy *admin_policy = data;
+
+	g_free(admin_policy);
+}
+
+static int admin_policy_adapter_probe(struct btd_adapter *adapter)
+{
+	if (policy_data) {
+		btd_warn(policy_data->adapter_id,
+						"Policy data already exists");
+		admin_policy_free(policy_data);
+		policy_data = NULL;
+	}
+
+	policy_data = admin_policy_new(adapter);
+	if (!policy_data)
+		return -ENOMEM;
+
+	btd_info(policy_data->adapter_id, "Admin Policy has been enabled");
+
+	return 0;
+}
+
+static struct btd_adapter_driver admin_policy_driver = {
+	.name	= "admin_policy",
+	.probe	= admin_policy_adapter_probe,
+	.resume = NULL,
+};
+
 static int admin_init(void)
 {
 	DBG("");
+
+	return btd_register_adapter_driver(&admin_policy_driver);
 }
 
 static void admin_exit(void)
 {
 	DBG("");
+
+	btd_unregister_adapter_driver(&admin_policy_driver);
+
+	if (policy_data)
+		admin_policy_free(policy_data);
 }
 
 BLUETOOTH_PLUGIN_DEFINE(admin, VERSION,
diff --git a/plugins/admin_policy.c b/plugins/admin_policy.c
index dd8d89736..2ece87156 100644
--- a/plugins/admin_policy.c
+++ b/plugins/admin_policy.c
@@ -12,17 +12,84 @@ 
 #include <config.h>
 #endif
 
+#include "lib/bluetooth.h"
+
+#include "src/adapter.h"
+#include "src/error.h"
 #include "src/log.h"
 #include "src/plugin.h"
 
+#include "src/shared/queue.h"
+
+/* |policy_data| has the same life cycle as btd_adapter */
+static struct btd_admin_policy {
+	struct btd_adapter *adapter;
+	uint16_t adapter_id;
+} *policy_data = NULL;
+
+static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)
+{
+	struct btd_admin_policy *admin_policy = NULL;
+
+	admin_policy = g_try_malloc(sizeof(*admin_policy));
+	if (!admin_policy) {
+		btd_error(btd_adapter_get_index(adapter),
+				"Failed to allocate memory for admin_policy");
+		return NULL;
+	}
+
+	admin_policy->adapter = adapter;
+	admin_policy->adapter_id = btd_adapter_get_index(adapter);
+
+	return admin_policy;
+}
+
+static void admin_policy_free(void *data)
+{
+	struct btd_admin_policy *admin_policy = data;
+
+	g_free(admin_policy);
+}
+
+static int admin_policy_adapter_probe(struct btd_adapter *adapter)
+{
+	if (policy_data) {
+		btd_warn(policy_data->adapter_id,
+						"Policy data already exists");
+		admin_policy_free(policy_data);
+		policy_data = NULL;
+	}
+
+	policy_data = admin_policy_new(adapter);
+	if (!policy_data)
+		return -ENOMEM;
+
+	btd_info(policy_data->adapter_id, "Admin Policy has been enabled");
+
+	return 0;
+}
+
+static struct btd_adapter_driver admin_policy_driver = {
+	.name	= "admin_policy",
+	.probe	= admin_policy_adapter_probe,
+	.resume = NULL,
+};
+
 static int admin_policy_init(void)
 {
 	DBG("");
+
+	return btd_register_adapter_driver(&admin_policy_driver);
 }
 
 static void admin_policy_exit(void)
 {
 	DBG("");
+
+	btd_unregister_adapter_driver(&admin_policy_driver);
+
+	if (policy_data)
+		admin_policy_free(policy_data);
 }
 
 BLUETOOTH_PLUGIN_DEFINE(admin_policy, VERSION,