61 lines
2.9 KiB
Diff
61 lines
2.9 KiB
Diff
From 1473de8149a7e3b9921f8bb0b5067fc3f6128ba7 Mon Sep 17 00:00:00 2001
|
|
From: heppen <hepeng68@huawei.com>
|
|
Date: Mon, 4 Sep 2023 11:16:32 +0800
|
|
Subject: [PATCH] open udp stream switch
|
|
|
|
---
|
|
adapter/default_config/feature_config/standard/config.gni | 2 +-
|
|
.../trans_channel/tcp_direct/src/trans_tcp_direct_manager.c | 2 +-
|
|
.../trans_channel/tcp_direct/src/trans_tcp_direct_wifi.c | 4 ++--
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/adapter/default_config/feature_config/standard/config.gni b/adapter/default_config/feature_config/standard/config.gni
|
|
index 6602d7ed7..c9bb34f20 100644
|
|
--- a/adapter/default_config/feature_config/standard/config.gni
|
|
+++ b/adapter/default_config/feature_config/standard/config.gni
|
|
@@ -23,7 +23,7 @@ declare_args() {
|
|
dsoftbus_feature_protocol_newip = false
|
|
|
|
dsoftbus_feature_trans_udp = true
|
|
- dsoftbus_feature_trans_udp_stream = false
|
|
+ dsoftbus_feature_trans_udp_stream = true
|
|
dsoftbus_feature_trans_udp_file = true
|
|
|
|
dsoftbus_feature_ip_auth = true
|
|
diff --git a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_manager.c b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_manager.c
|
|
index 9b73c13ae..5a9ba5e60 100644
|
|
--- a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_manager.c
|
|
+++ b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_manager.c
|
|
@@ -248,7 +248,7 @@ static int32_t TransUpdAppInfo(AppInfo *appInfo, const ConnectOption *connInfo)
|
|
|
|
int32_t TransOpenDirectChannel(const AppInfo *appInfo, const ConnectOption *connInfo, int32_t *channelId)
|
|
{
|
|
- SoftBusLog(SOFTBUS_LOG_TRAN, SOFTBUS_LOG_ERROR, "TransOpenDirectChannel");
|
|
+ SoftBusLog(SOFTBUS_LOG_TRAN, SOFTBUS_LOG_INFO, "TransOpenDirectChannel");
|
|
if (appInfo == NULL || connInfo == NULL || channelId == NULL) {
|
|
return SOFTBUS_INVALID_PARAM;
|
|
}
|
|
diff --git a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_wifi.c b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_wifi.c
|
|
index 868dfc503..89d0db256 100644
|
|
--- a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_wifi.c
|
|
+++ b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_wifi.c
|
|
@@ -28,7 +28,7 @@
|
|
|
|
int32_t OpenTcpDirectChannel(const AppInfo *appInfo, const ConnectOption *connInfo, int32_t *channelId)
|
|
{
|
|
- SoftBusLog(SOFTBUS_LOG_TRAN, SOFTBUS_LOG_ERROR, "OpenTcpDirectChannel");
|
|
+ SoftBusLog(SOFTBUS_LOG_TRAN, SOFTBUS_LOG_INFO, "OpenTcpDirectChannel");
|
|
if (appInfo == NULL || connInfo == NULL || channelId == NULL) {
|
|
return SOFTBUS_INVALID_PARAM;
|
|
}
|
|
@@ -78,4 +78,4 @@ int32_t OpenTcpDirectChannel(const AppInfo *appInfo, const ConnectOption *connIn
|
|
*channelId = newchannelId;
|
|
SoftBusLog(SOFTBUS_LOG_TRAN, SOFTBUS_LOG_INFO, "OpenTcpDirectChannel end: channelId=%d", newchannelId);
|
|
return SOFTBUS_OK;
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|
|
--
|
|
2.33.0
|
|
|