enable_termination_event is always true
authorCheoleun Moon <chleun.moon@samsung.com>
Mon, 23 Mar 2020 07:16:13 +0000 (16:16 +0900)
committerCheoleun Moon <chleun.moon@samsung.com>
Mon, 23 Mar 2020 07:16:13 +0000 (16:16 +0900)
src/include/wifi-aware-config.h
src/include/wifi-aware-private.h
src/wifi-aware-gdbus.c
src/wifi-aware-private.c

index 702c245..a9d9aea 100644 (file)
@@ -45,7 +45,6 @@ typedef struct {
        uint16_t specific_info_len;
        uint8_t match_filter[WIFI_AWARE_MAX_MATCH_FILTER_LEN];
        uint16_t match_filter_len;
-       bool enable_termination_event;
        bool enable_ranging;
 } wifi_aware_publish_request_s;
 
@@ -58,7 +57,6 @@ typedef struct {
        uint16_t specific_info_len;
        uint8_t match_filter[WIFI_AWARE_MAX_MATCH_FILTER_LEN];
        uint16_t match_filter_len;
-       uint8_t enable_termination_event;
 } wifi_aware_subscribe_request_s;
 
 #ifdef __cplusplus
index b4d4e6c..c858c7b 100644 (file)
@@ -61,7 +61,6 @@ void _wifi_aware_publish_set_service_specific_info(wifi_aware_publish_h publish,
                const unsigned char *service_specific_info, size_t len);
 void _wifi_aware_publish_set_match_filter(wifi_aware_publish_h publish,
                const unsigned char *match_filter, size_t len);
-void _wifi_aware_publish_set_enable_termination_event(wifi_aware_publish_h publish, bool enable);
 void _wifi_aware_publish_set_enable_ranging(wifi_aware_publish_h publish, bool enable);
 wifi_aware_publish_request_s *_wifi_aware_publish_get_request(wifi_aware_publish_h publish_handle);
 uint16_t _wifi_aware_session_get_publish_id(wifi_aware_session_h session);
@@ -76,7 +75,6 @@ void _wifi_aware_subscribe_set_service_specific_info(wifi_aware_subscribe_h subs
                const unsigned char *service_specific_info, size_t len);
 void _wifi_aware_subscribe_set_match_filter(wifi_aware_subscribe_h subscribe,
                const unsigned char *match_filter, size_t len);
-void _wifi_aware_subscribe_set_enable_termination_event(wifi_aware_subscribe_h subscribe, bool enable);
 wifi_aware_subscribe_request_s *_wifi_aware_subscribe_get_request(wifi_aware_subscribe_h subscribe_handle);
 uint16_t _wifi_aware_session_get_subscribe_id(wifi_aware_session_h session);
 
index 0b1b726..b06cee8 100644 (file)
@@ -272,7 +272,6 @@ static GVariant *__create_publish_request_param(int client_id, wifi_aware_publis
                g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
                g_variant_builder_add(builder, "{sv}", "match_filter", __pack_byte_array(req->match_filter, req->match_filter_len));
        }
-       g_variant_builder_add(builder, "{sv}", "enable_termination_event", g_variant_new("b", req->enable_termination_event));
        g_variant_builder_add(builder, "{sv}", "enable_ranging", g_variant_new("b", req->enable_ranging));
 
        params = g_variant_new("(ia{sv})", client_id, builder);
@@ -303,7 +302,6 @@ static GVariant *__create_update_publish_request_param(int client_id,
                g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
                g_variant_builder_add(builder, "{sv}", "match_filter", __pack_byte_array(req->match_filter, req->match_filter_len));
        }
-       g_variant_builder_add(builder, "{sv}", "enable_termination_event", g_variant_new("b", req->enable_termination_event));
        g_variant_builder_add(builder, "{sv}", "enable_ranging", g_variant_new("b", req->enable_ranging));
 
        params = g_variant_new("(iqa{sv})", client_id, pub_id, builder);
@@ -328,7 +326,6 @@ static GVariant *__create_subscribe_request_param(int client_id, wifi_aware_subs
                g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
                g_variant_builder_add(builder, "{sv}", "match_filter", __pack_byte_array(req->match_filter, req->match_filter_len));
        }
-       g_variant_builder_add(builder, "{sv}", "enable_termination_event", g_variant_new("b", req->enable_termination_event));
 
        params = g_variant_new("(ia{sv})", client_id, builder);
        g_variant_builder_unref(builder);
@@ -358,7 +355,6 @@ static GVariant *__create_update_subscribe_request_param(int client_id,
                g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
                g_variant_builder_add(builder, "{sv}", "match_filter", __pack_byte_array(req->match_filter, req->match_filter_len));
        }
-       g_variant_builder_add(builder, "{sv}", "enable_termination_event", g_variant_new("b", req->enable_termination_event));
 
        params = g_variant_new("(iua{sv})", client_id, sub_id, builder);
        g_variant_builder_unref(builder);
index 711ea9e..b8ec685 100644 (file)
@@ -620,7 +620,6 @@ void _wifi_aware_publish_set_default_values(wifi_aware_publish_h publish)
        req->publish_type = WIFI_AWARE_PUBLISH_TYPE_UNSOLICITED;
        req->specific_info_len = 0;
        req->match_filter_len = 0;
-       req->enable_termination_event = true;
        req->enable_ranging = false;
 }
 
@@ -755,7 +754,6 @@ void _wifi_aware_subscribe_set_default_values(
        req->specific_info_len = 0;
        //memset(req->match_filter[WIFI_AWARE_MAX_MATCH_FILTER_LEN], 0, WIFI_AWARE_MAX_MATCH_FILTER_LEN);
        req->match_filter_len = 0;
-       req->enable_termination_event = true;
 }
 
 void _wifi_aware_subscribe_set_ttl(wifi_aware_subscribe_h subscribe, unsigned short ttl)