Change data type for pub/sub

diff --git a/src/include/wifi-aware-config.h b/src/include/wifi-aware-config.h
index 51b1197..38c4084 100644 (file)
--- a/src/include/wifi-aware-config.h
+++ b/src/include/wifi-aware-config.h
@@ -39,7 +39,7 @@ typedef struct {
 
 typedef struct {
        uint16_t ttl;
-       uint8_t publish_type;
+       wifi_aware_publish_type_e publish_type;
        char service_name[WIFI_AWARE_MAX_SERVICE_NAME_LEN + 1];
        uint8_t specific_info[WIFI_AWARE_MAX_SERVICE_SPECIFIC_INFO_LEN];
        uint16_t specific_info_len;
@@ -51,7 +51,7 @@ typedef struct {
 
 typedef struct {
        uint16_t ttl;
-       uint8_t subscribe_type;
+       wifi_aware_subscribe_type_e subscribe_type;
        char service_name[WIFI_AWARE_MAX_SERVICE_NAME_LEN + 1];
        uint8_t specific_info[WIFI_AWARE_MAX_SERVICE_SPECIFIC_INFO_LEN];
        uint16_t specific_info_len;

diff --git a/src/wifi-aware-gdbus.c b/src/wifi-aware-gdbus.c
index 25a5d92..194649c 100644 (file)
--- a/src/wifi-aware-gdbus.c
+++ b/src/wifi-aware-gdbus.c
@@ -267,7 +267,7 @@ static GVariant *__create_publish_request_param(int client_id, wifi_aware_publis
 
        builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
        g_variant_builder_add(builder, "{sv}", "ttl", g_variant_new("q", req->ttl));
-       g_variant_builder_add(builder, "{sv}", "publish_type", g_variant_new("y", req->publish_type));
+       g_variant_builder_add(builder, "{sv}", "publish_type", g_variant_new("i", req->publish_type));
        g_variant_builder_add(builder, "{sv}", "service_name", g_variant_new("s", req->service_name));
 
        g_variant_builder_add(builder, "{sv}", "specific_info_len", g_variant_new("q", req->specific_info_len));
@@ -327,7 +327,7 @@ static GVariant *__create_subscribe_request_param(int client_id, wifi_aware_subs
 
        builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
        g_variant_builder_add(builder, "{sv}", "ttl", g_variant_new("q", req->ttl));
-       g_variant_builder_add(builder, "{sv}", "subscribe_type", g_variant_new("y", req->subscribe_type));
+       g_variant_builder_add(builder, "{sv}", "subscribe_type", g_variant_new("i", req->subscribe_type));
        g_variant_builder_add(builder, "{sv}", "service_name", g_variant_new("s", req->service_name));
 
        g_variant_builder_add(builder, "{sv}", "specific_info_len", g_variant_new("q", req->specific_info_len));