From 1680dcede1b89aaac81faf52a7b85cdfe614f80d Mon Sep 17 00:00:00 2001 From: liuxueli Date: Wed, 14 Jun 2023 20:25:07 +0800 Subject: [PATCH] =?UTF-8?q?TSG-15568:=20=E8=8E=B7=E5=8F=96server=20subscri?= =?UTF-8?q?ber=20ID=E6=97=B6=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=AF=BC=E8=87=B4=E6=AE=B5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tsg_bridge.cpp | 2 +- test/src/gtest_bridge.cpp | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/tsg_bridge.cpp b/src/tsg_bridge.cpp index 3340008..d8c0d16 100644 --- a/src/tsg_bridge.cpp +++ b/src/tsg_bridge.cpp @@ -468,7 +468,7 @@ const char *srt_attribute_get_client_subscriber_id(const struct session_runtime_ } const char *srt_attribute_get_server_subscriber_id(const struct session_runtime_attribute *srt_attribute) { - if(srt_attribute!=NULL && srt_attribute->client_subscribe_id!=NULL) + if(srt_attribute!=NULL && srt_attribute->server_subscribe_id!=NULL) { return (const char *)(srt_attribute->server_subscribe_id->subscribe_id); } diff --git a/test/src/gtest_bridge.cpp b/test/src/gtest_bridge.cpp index b839e13..562d172 100644 --- a/test/src/gtest_bridge.cpp +++ b/test/src/gtest_bridge.cpp @@ -846,6 +846,27 @@ TEST(TSGBridge, SessionSessionRuntimeAttributeTSG15457) EXPECT_EQ(nullptr, session_runtime_attribute_get(&a_stream)); } +TEST(TSGBridge, SessionSessionRuntimeAttributeSubscriberIDTSG15568) +{ + const struct streaminfo a_stream = {0}; + struct session_runtime_attribute *srt_attribute = (struct session_runtime_attribute *)session_runtime_attribute_new(&a_stream); + + srt_attribute->client_subscribe_id=(struct subscribe_id_info *)dictator_malloc(0, sizeof(struct subscribe_id_info)); + srt_attribute->client_subscribe_id->ref_cnt=1; + srt_attribute->client_subscribe_id->subscribe_id=(char *)"zhansan"; + + struct session_runtime_attribute *srt_attribute_out=(struct session_runtime_attribute *)session_runtime_attribute_get(&a_stream); + EXPECT_NE(nullptr, srt_attribute_out); + + EXPECT_NE(nullptr, srt_attribute_out->client_subscribe_id); + EXPECT_EQ(1, srt_attribute_out->client_subscribe_id->ref_cnt); + EXPECT_STREQ("zhansan", srt_attribute_out->client_subscribe_id->subscribe_id); + EXPECT_STREQ("zhansan", srt_attribute_get_client_subscriber_id((const struct session_runtime_attribute *)srt_attribute_out)); + + EXPECT_EQ(nullptr, srt_attribute_out->server_subscribe_id); + EXPECT_EQ(nullptr, srt_attribute_get_server_subscriber_id((const struct session_runtime_attribute *)srt_attribute_out)); +} + int main(int argc, char *argv[]) { int ret=tsg_bridge_init("tsgconf/main.conf");