client: Add advertise.secondary command

This adds advertose.secondary command which can be used to set a
secondary channel to advertise.

Change-Id: I3bfeb3620583efbe77150617b659ef02b5375dd2
Signed-off-by: himanshu <h.himanshu@samsung.com>

diff --git a/client/advertising.c b/client/advertising.c
index 65b8ffb..28c8fdc 100644 (file)
--- a/client/advertising.c
+++ b/client/advertising.c
@@ -63,6 +63,7 @@ static struct ad {
        bool registered;
        char *type;
        char *local_name;
+       char *secondary;
        uint16_t local_appearance;
        uint16_t duration;
        uint16_t timeout;
@@ -440,6 +441,20 @@ static gboolean get_discoverable_timeout(const GDBusPropertyTable *property,
        return TRUE;
 }
 
+static gboolean secondary_exits(const GDBusPropertyTable *property, void *data)
+{
+       return ad.secondary ? TRUE : FALSE;
+}
+
+static gboolean get_secondary(const GDBusPropertyTable *property,
+                                       DBusMessageIter *iter, void *user_data)
+{
+       dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
+                                                       &ad.secondary);
+
+       return TRUE;
+}
+
 static const GDBusPropertyTable ad_props[] = {
        { "Type", "s", get_type },
        { "ServiceUUIDs", "as", get_uuids, NULL, uuids_exists },
@@ -455,6 +470,7 @@ static const GDBusPropertyTable ad_props[] = {
        { "Appearance", "q", get_appearance, NULL, appearance_exits },
        { "Duration", "q", get_duration, NULL, duration_exits },
        { "Timeout", "q", get_timeout, NULL, timeout_exits },
+       { "SecondaryChannel", "s", get_secondary, NULL, secondary_exits },
        { }
 };
 
@@ -918,3 +934,30 @@ void ad_advertise_timeout(DBusConnection *conn, long int *value)
 
        return bt_shell_noninteractive_quit(EXIT_SUCCESS);
 }
+
+void ad_advertise_secondary(DBusConnection *conn, const char *value)
+{
+       if (!value) {
+               if (ad.secondary)
+                        bt_shell_printf("Secondary Channel: %s\n",
+                                                       ad.secondary);
+               return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+       }
+
+       if (ad.secondary && !strcmp(value, ad.secondary))
+               return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+
+       free(ad.secondary);
+
+       if (value[0] == '\0') {
+               ad.secondary = NULL;
+               return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+       }
+
+       ad.secondary = strdup(value);
+
+       g_dbus_emit_property_changed(conn, AD_PATH, AD_IFACE,
+                                                       "SecondaryChannel");
+
+       return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+}

diff --git a/client/advertising.h b/client/advertising.h
index fe3a7c8..9967e65 100755 (executable)
--- a/client/advertising.h
+++ b/client/advertising.h
@@ -41,3 +41,4 @@ void ad_advertise_data(DBusConnection *conn, int argc, char *argv[]);
 void ad_disable_data(DBusConnection *conn);
 void ad_advertise_discoverable(DBusConnection *conn, dbus_bool_t *value);
 void ad_advertise_discoverable_timeout(DBusConnection *conn, long int *value);
+void ad_advertise_secondary(DBusConnection *conn, const char *value);

diff --git a/client/main.c b/client/main.c
index def8552..5b3178c 100644 (file)
--- a/client/main.c
+++ b/client/main.c
@@ -2484,6 +2484,16 @@ static void cmd_advertise_timeout(int argc, char *argv[])
        ad_advertise_timeout(dbus_conn, &value);
 }
 
+static void cmd_advertise_secondary(int argc, char *argv[])
+{
+       if (argc < 2) {
+               ad_advertise_secondary(dbus_conn, NULL);
+               return;
+       }
+
+       ad_advertise_secondary(dbus_conn, argv[1]);
+}
+
 static void ad_clear_uuids(void)
 {
        ad_disable_uuids(dbus_conn);
@@ -2535,6 +2545,13 @@ static void ad_clear_timeout(void)
        ad_advertise_timeout(dbus_conn, &value);
 }
 
+static void ad_clear_secondary(void)
+{
+       const char *value = "";
+
+       ad_advertise_secondary(dbus_conn, value);
+}
+
 static const struct clear_entry ad_clear[] = {
        { "uuids",              ad_clear_uuids },
        { "service",            ad_clear_service },
@@ -2545,6 +2562,7 @@ static const struct clear_entry ad_clear[] = {
        { "appearance",         ad_clear_appearance },
        { "duration",           ad_clear_duration },
        { "timeout",            ad_clear_timeout },
+       { "secondary",          ad_clear_secondary },
        {}
 };
 
@@ -2588,6 +2606,8 @@ static const struct bt_shell_menu advertise_menu = {
                        "Set/Get advertise duration" },
        { "timeout", "[seconds]", cmd_advertise_timeout,
                        "Set/Get advertise timeout" },
+       { "secondary", "[1M/2M/Coded]", cmd_advertise_secondary,
+                       "Set/Get advertise secondary channel" },
        { "clear", "[uuids/service/manufacturer/config-name...]", cmd_ad_clear,
                        "Clear advertise config" },
        { } },