Modify wifi-aware-test to set attributes by user input

diff --git a/test/wifi-aware-publish-test.c b/test/wifi-aware-publish-test.c
index 56ed815..8514b6c 100644 (file)
--- a/test/wifi-aware-publish-test.c
+++ b/test/wifi-aware-publish-test.c
@@ -73,7 +73,7 @@
                } \
        } while (0)
 
-#define SERVICE_NAME "CtsVerifierTestService"
+#define SERVICE_NAME "Wi-Fi Aware Test"
 #define PUB_SSI "Extra bytes in the publisher discovery"
 #define MSG_PUB_TO_SUB "Ready"
 #define PORT 1234

diff --git a/test/wifi-aware-subscribe-test.c b/test/wifi-aware-subscribe-test.c
index d6c74da..62c5ca8 100644 (file)
--- a/test/wifi-aware-subscribe-test.c
+++ b/test/wifi-aware-subscribe-test.c
@@ -73,7 +73,7 @@
                } \
        } while (0)
 
-#define SERVICE_NAME "CtsVerifierTestService"
+#define SERVICE_NAME "Wi-Fi Aware Test"
 #define PUB_SSI "Extra bytes in the subscriber discovery"
 #define MSG_SUB_TO_PUB "Let's talk"
 

diff --git a/test/wifi-aware-test.c b/test/wifi-aware-test.c
index 2477917..8060a60 100644 (file)
--- a/test/wifi-aware-test.c
+++ b/test/wifi-aware-test.c
@@ -89,7 +89,6 @@
                }\
        } while (0)
 
-#define SERVICE_NAME "CtsVerifierTestService"
 #define MATCH_FILTER "bytes used for matching"
 #define PUB_SSI "Extra bytes in the publisher discovery"
 #define UPDATE_PUB_SSI "Updated Specific Information"
@@ -462,14 +461,24 @@ static void __set_publish_config(wifi_aware_publish_h publish)
        int ret = 0;
        int publish_type = 0;
        char service_name[MAX_SERVICE_NAME_LEN + 1] = {0, };
+       char str_specific_info[MAX_SPECIFIC_INFO_LEN + 1] = {0, };
        unsigned char specific_info[MAX_SPECIFIC_INFO_LEN + 1] = {0, };
        unsigned char match_filter[MAX_MATCH_FILTER_LEN + 1] = {0, };
        size_t len = 0;
+       int set_info = 0;
        int set_mf = 0;
 
+       printf("Service Name: ");
+       if (scanf(" %255s", service_name) < 0)
+               return;
+
+       ret = wifi_aware_publish_set_service_name(publish,
+                       service_name);
+       if (ret != WIFI_AWARE_ERROR_NONE)
+               return;
+
        printf("Choose publish type(0-Solicited, 1-Unsolicited): ");
-       ret = scanf("%d", &publish_type);
-       if (ret < 0)
+       if (scanf("%d", &publish_type) < 0)
                return;
 
        ret = wifi_aware_publish_set_type(publish,
@@ -478,21 +487,26 @@ static void __set_publish_config(wifi_aware_publish_h publish)
        if (ret != WIFI_AWARE_ERROR_NONE)
                return;
 
-       strncpy(service_name, SERVICE_NAME, MAX_SERVICE_NAME_LEN);
-       ret = wifi_aware_publish_set_service_name(publish,
-                       service_name);
-       if (ret != WIFI_AWARE_ERROR_NONE)
+       printf("Do you want to set Service Specific Information? (0-No, 1-Yes) ");
+       if (scanf("%d", &set_info) < 0)
                return;
+       
+       if (set_info == 1) {
+               if (scanf(" %1024s", str_specific_info) < 0)
+                       return;
 
-       len = strlen(PUB_SSI);
-       memcpy(specific_info, PUB_SSI, len);
-       ret = wifi_aware_publish_set_service_specific_info(publish,
-                       specific_info, len);
-       if (ret != WIFI_AWARE_ERROR_NONE)
+               len = strlen(str_specific_info);
+               memcpy(specific_info, str_specific_info, len);
+               ret = wifi_aware_publish_set_service_specific_info(publish,
+                               specific_info, len);
+               if (ret != WIFI_AWARE_ERROR_NONE)
+                       return;
+       }
+
+       printf("Do you want to set Match Filter? (0-No, 1-Yes) ");
+       if (scanf("%d", &set_mf) < 0)
                return;
 
-       printf("Do you set Match Filter(0-No, 1-Yes): ");
-       ret = scanf("%d", &set_mf);
        if (set_mf == 1) {
                int n = __set_match_filter(match_filter);
                if (n < 0 || n >= MAX_MATCH_FILTER_LEN) {
@@ -676,14 +690,24 @@ static void __set_subscribe_config(wifi_aware_subscribe_h subscribe)
        int ret = 0;
        int subscribe_type = 0;
        char service_name[MAX_SERVICE_NAME_LEN + 1] = {0, };
+       char str_specific_info[MAX_SPECIFIC_INFO_LEN + 1] = {0, };
        unsigned char specific_info[MAX_SPECIFIC_INFO_LEN + 1] = {0, };
        unsigned char match_filter[MAX_MATCH_FILTER_LEN + 1] = {0, };
        size_t len = 0;
+       int set_info = 0;
        int set_mf = 0;
 
+       printf("Service Name: ");
+       if (scanf("%255s", service_name) < 0)
+               return;
+
+       ret = wifi_aware_subscribe_set_service_name(subscribe,
+                       service_name);
+       if (ret != WIFI_AWARE_ERROR_NONE)
+               return;
+
        printf("Choose subscribe type(0-Active, 1-Passive): ");
-       ret = scanf("%d", &subscribe_type);
-       if (ret < 0)
+       if (scanf("%d", &subscribe_type) < 0)
                return;
 
        ret = wifi_aware_subscribe_set_type(subscribe,
@@ -692,21 +716,25 @@ static void __set_subscribe_config(wifi_aware_subscribe_h subscribe)
        if (ret != WIFI_AWARE_ERROR_NONE)
                return;
 
-       strncpy(service_name, SERVICE_NAME, MAX_SERVICE_NAME_LEN);
-       ret = wifi_aware_subscribe_set_service_name(subscribe,
-                       service_name);
-       if (ret != WIFI_AWARE_ERROR_NONE)
+       printf("Do you want to set Service Specific Information? (0-No, 1-Yes) ");
+       if (scanf("%d", &set_info) < 0)
                return;
+       
+       if (set_info == 1) {
+               if (scanf(" %1024s", str_specific_info) < 0)
+                       return;
 
-       len = strlen(SUB_SSI);
-       memcpy(specific_info, SUB_SSI, len);
-       ret = wifi_aware_subscribe_set_service_specific_info(subscribe,
+               len = strlen(str_specific_info);
+               memcpy(specific_info, str_specific_info, len);
+               ret = wifi_aware_subscribe_set_service_specific_info(subscribe,
                        specific_info, len);
-       if (ret != WIFI_AWARE_ERROR_NONE)
-               return;
+               if (ret != WIFI_AWARE_ERROR_NONE)
+                       return;
+       }
 
        printf("Do you set Match Filter(0-No, 1-Yes): ");
-       ret = scanf("%d", &set_mf);
+       if (scanf("%d", &set_mf) < 0)
+               return;
        if (set_mf == 1) {
                int n = __set_match_filter(match_filter);
                if (n < 0 || n >= MAX_MATCH_FILTER_LEN) {