Fix TCT issues

Change-Id: I2c577240761f8e0822e42998a5cb0fa0e631653b

diff --git a/src/asp-client.cpp b/src/asp-client.cpp
index d19ac27a3987972611cf7e7969191750d86f311e..4d38c851d19887fbeba52fef6c45290175494abb 100755 (executable)
--- a/src/asp-client.cpp
+++ b/src/asp-client.cpp
@@ -2231,7 +2231,7 @@ int asp_session_connect(asp_session_h session)
 
        // LCOV_EXCL_START
        GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
-       g_variant_builder_add(builder, "{sv}", "service_mac", g_variant_new("s", service->serviceMac));
+       g_variant_builder_add(builder, "{sv}", "service_mac", g_variant_new("s", service->serviceMac.c_str()));
        g_variant_builder_add(builder, "{sv}", "adv_id", g_variant_new("u", service->advertisementId));
        g_variant_builder_add(builder, "{sv}", "role", g_variant_new("y", service->networkConfig));
        g_variant_builder_add(builder, "{sv}", "config_method", g_variant_new("u", service->networkConfig));

diff --git a/src/include/asp-conts.h b/src/include/asp-conts.h
index d48f8d5d0e2ae110b719a83379e1ab6242e0e50d..59ed1af47db9767a8d5cd2e85c73f25f5168d8ed 100644 (file)
--- a/src/include/asp-conts.h
+++ b/src/include/asp-conts.h
@@ -4,10 +4,10 @@
 #define MAX_SERVICE_NAME_LEN 15
 #define MAX_SERVICE_TYPE_LEN 255
 #define PROTO_LEN 4
-#define KEY_LEN 9 /* http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt */
+#define KEY_LEN 11 /* http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt */
 #define KEY_MIN 0x20 /* RFC 20 */
 #define KEY_MAX 0x7E
 
 #define SERVICE_INFO_LEN 65000
 #define DEFERRED_LEN 144
-#define SESSION_INFO_LEN 144
\ No newline at end of file
+#define SESSION_INFO_LEN 144

diff --git a/unittest/asp-gtest-util.cpp b/unittest/asp-gtest-util.cpp
index 35d18c9b0fe979a20cc5b5d70eb50ba469346506..1e840fd5cd4de889e41115ad43830c08c1c68794 100644 (file)
--- a/unittest/asp-gtest-util.cpp
+++ b/unittest/asp-gtest-util.cpp
@@ -50,7 +50,7 @@ TEST_F(AspUtilTest, isValidKeyP)
 
 TEST_F(AspUtilTest, isValidKeyN)
 {
-    EXPECT_EQ(false, AspUtil::isValidKey("1234567890"));
-    EXPECT_EQ(false, AspUtil::isValidKey("abcdefghij"));
-    EXPECT_EQ(false, AspUtil::isValidKey("!@#$%^&*()"));
+    EXPECT_EQ(false, AspUtil::isValidKey("12345678901234"));
+    EXPECT_EQ(false, AspUtil::isValidKey("abcdefghijklmn"));
+    EXPECT_EQ(false, AspUtil::isValidKey("!@#$%^&*()~!@#"));
 }