From 9761d9b10ce51cccbb198926cbac861d65224f0a Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Thu, 11 Jul 2024 18:45:25 +0900 Subject: [PATCH] Fix TCT issues Change-Id: I2c577240761f8e0822e42998a5cb0fa0e631653b --- src/asp-client.cpp | 2 +- src/include/asp-conts.h | 4 ++-- unittest/asp-gtest-util.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/asp-client.cpp b/src/asp-client.cpp index d19ac27..4d38c85 100755 --- 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 d48f8d5..59ed1af 100644 --- 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 35d18c9..1e840fd 100644 --- 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("!@#$%^&*()~!@#")); } -- 2.34.1