From 242bd101058354a6d4f4d72fc3fefbb30bb78428 Mon Sep 17 00:00:00 2001
From: Charlie <14987915+charlie3wx@user.noreply.gitee.com>
Date: Tue, 10 Dec 2024 15:54:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=B3=A8=E5=86=8CUSB?=
 =?UTF-8?q?=E5=8F=91=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/include/dm_constants.h                        | 6 ++++++
 services/service/src/discovery/discovery_manager.cpp | 5 ++++-
 services/service/src/softbus/softbus_listener.cpp    | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h
index 056c80a7a..09bfd45bd 100755
--- a/common/include/dm_constants.h
+++ b/common/include/dm_constants.h
@@ -199,9 +199,13 @@ constexpr const char* FILTER_PARA_INCLUDE_TRUST = "FILTER_INCLUDE_TRUST";
 constexpr const char* CONN_ADDR_TYPE_ID = "ID_TYPE";
 constexpr const char* CONN_ADDR_TYPE_BR = "BR_TYPE";
 constexpr const char* CONN_ADDR_TYPE_BLE = "BLE_TYPE";
+constexpr const char* CONN_ADDR_TYPE_USB = "USB_TYPE";
 constexpr const char* CONN_ADDR_TYPE_WLAN_IP = "WLAN_IP_TYPE";
 constexpr const char* CONN_ADDR_TYPE_ETH_IP = "ETH_IP_TYPE";
 
+// Softbus connection address type int
+constexpr int32_t CONNECTION_ADDR_USB = 5;
+
 // Parameter Key
 constexpr const char* PARAM_KEY_META_TYPE = "META_TYPE";
 constexpr const char* PARAM_KEY_TARGET_ID = "TARGET_ID";
@@ -209,6 +213,8 @@ constexpr const char* PARAM_KEY_BR_MAC = "BR_MAC";
 constexpr const char* PARAM_KEY_BLE_MAC = "BLE_MAC";
 constexpr const char* PARAM_KEY_WIFI_IP = "WIFI_IP";
 constexpr const char* PARAM_KEY_WIFI_PORT = "WIFI_PORT";
+constexpr const char* PARAM_KEY_USB_IP = "USB_IP";
+constexpr const char* PARAM_KEY_USB_PORT = "USB_PORT";
 constexpr const char* PARAM_KEY_AUTH_TOKEN = "AUTH_TOKEN";
 constexpr const char* PARAM_KEY_AUTH_TYPE = "AUTH_TYPE";
 constexpr const char* PARAM_KEY_PIN_CODE = "PIN_CODE";
diff --git a/services/service/src/discovery/discovery_manager.cpp b/services/service/src/discovery/discovery_manager.cpp
index ba78be029..3078a37ea 100644
--- a/services/service/src/discovery/discovery_manager.cpp
+++ b/services/service/src/discovery/discovery_manager.cpp
@@ -101,7 +101,10 @@ int32_t DiscoveryManager::EnableDiscoveryListener(const std::string &pkgName,
         std::lock_guard<std::mutex> capLock(capabilityMapLocks_);
         capabilityMap_[pkgNameTemp] = std::string(dmSubInfo.capability);
     }
-
+    if (discoverParam.find(PARAM_KEY_DISC_MEDIUM) != discoverParam.end()) {
+        int32_t medium = std::atoi((discoverParam.find(PARAM_KEY_DISC_MEDIUM)->second).c_str());
+        dmSubInfo.medium = static_cast<DmExchangeMedium>(medium);
+    }
     int32_t ret = softbusListener_->RefreshSoftbusLNN(DM_PKG_NAME, dmSubInfo, LNN_DISC_CAPABILITY);
     if (ret != DM_OK) {
         LOGE("EnableDiscoveryListener failed, softbus refresh lnn ret: %{public}d.", ret);
diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp
index 12484b968..8bc8e4c9f 100644
--- a/services/service/src/softbus/softbus_listener.cpp
+++ b/services/service/src/softbus/softbus_listener.cpp
@@ -893,6 +893,11 @@ void SoftbusListener::ConvertDeviceInfoToDmDevice(const DeviceInfo &device, DmDe
         std::string udidHash(ConvertBytesToUpperCaseHexString((addrInfo->info).ble.udidHash,
             sizeof((addrInfo->info).ble.udidHash) / sizeof(*((addrInfo->info).ble.udidHash))));
         jsonObj[PARAM_KEY_BLE_UDID_HASH] = udidHash;
+    } else if (addrInfo->type == CONNECTION_ADDR_USB) {
+        std::string usbIp((addrInfo->info).ip.ip);
+        jsonObj[PARAM_KEY_USB_IP] = usbIp;
+        jsonObj[PARAM_KEY_USB_PORT] = (addrInfo->info).ip.port;
+        jsonObj[PARAM_KEY_CONN_ADDR_TYPE] = CONN_ADDR_TYPE_USB;
     } else {
         LOGI("Unknown connection address type: %{public}d.", addrInfo->type);
     }
-- 
Gitee