diff --git a/services/audioclient/BUILD.gn b/services/audioclient/BUILD.gn
index 6324b60f04b8632b51f2e5f8c0a10e73ffb5f66e..0cdba2722d51aaf7c31cfac06ee8292523babf4e 100644
--- a/services/audioclient/BUILD.gn
+++ b/services/audioclient/BUILD.gn
@@ -42,6 +42,13 @@ ohos_shared_library("distributed_audio_sink_client") {
     "${services_path}/common/audioparam",
   ]
 
+  if (distributed_audio_extension) {
+    include_dirs += [
+      "${distributedaudio_ext_path}/services/audioclient/directmicclient/include",
+      "${distributedaudio_ext_path}/services/audioclient/directspkclient/include",
+    ]
+  }
+
   public_configs = [ ":daudio_client_pub_config" ]
 
   sources = [
@@ -49,6 +56,13 @@ ohos_shared_library("distributed_audio_sink_client") {
     "${audio_client_path}/spkclient/src/dspeaker_client.cpp",
   ]
 
+  if (distributed_audio_extension) {
+    sources += [
+      "${distributedaudio_ext_path}/services/audioclient/directmicclient/src/direct_dmic_client.cpp",
+      "${distributedaudio_ext_path}/services/audioclient/directspkclient/src/direct_dspeaker_client.cpp",
+    ]
+  }
+
   deps = [
     "${audio_transport_path}/decodetransport:distributed_audio_decode_transport",
     "${audio_transport_path}/encodetransport:distributed_audio_encode_transport",
@@ -59,6 +73,10 @@ ohos_shared_library("distributed_audio_sink_client") {
     "audio_framework:audio_capturer",
     "audio_framework:audio_client",
     "audio_framework:audio_renderer",
+    "c_utils:utils",
+    "drivers_interface_audio:libaudio_proxy_1.0",
+    "hdf_core:libhdf_ipc_adapter",
+    "hdf_core:libhdi",
     "hisysevent_native:libhisysevent",
     "hitrace_native:hitrace_meter",
   ]
diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp
index 6fe25ea26fc5af4f3575472415def79c43310a43..c2c024b600c103df62a79b5bd461ee1abb7c1e8c 100644
--- a/services/audiomanager/managersource/src/daudio_source_dev.cpp
+++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp
@@ -778,12 +778,14 @@ int32_t DAudioSourceDev::TaskOpenCtrlChannel(const std::string &args)
         return ERR_DH_AUDIO_NULLPTR;
     }
     if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) {
+        DHLOGE("Task open ctrl channel, args length is invalid.");
         return ERR_DH_AUDIO_SA_PARAM_INVALID;
     }
 
     json jAudioParam;
     json jParam = json::parse(args, nullptr, false);
     if (!JsonParamCheck(jParam, { KEY_DH_ID })) {
+        DHLOGE("Task open ctrl channel, json param check error.");
         return ERR_DH_AUDIO_FAILED;
     }
     int32_t ret = NotifySinkDev(OPEN_CTRL, jAudioParam, jParam[KEY_DH_ID]);
@@ -805,7 +807,7 @@ int32_t DAudioSourceDev::TaskOpenCtrlChannel(const std::string &args)
         return ret;
     }
 
-    DHLOGI("Open audio ctrl channel success.");
+    DHLOGI("Task open ctrl channel success.");
     return DH_SUCCESS;
 }
 
diff --git a/services/audiomanager/servicesink/BUILD.gn b/services/audiomanager/servicesink/BUILD.gn
index b26f583817a8699c15ca309b86a139d7d1de2969..b8d9dd431b990b6545e3516dc0995d4bb36d0d9e 100755
--- a/services/audiomanager/servicesink/BUILD.gn
+++ b/services/audiomanager/servicesink/BUILD.gn
@@ -71,13 +71,6 @@ ohos_shared_library("distributed_audio_sink") {
     "src/daudio_sink_stub.cpp",
   ]
 
-  if (distributed_audio_extension) {
-    sources += [
-      "${distributedaudio_ext_path}/services/audioclient/directmicclient/src/direct_dmic_client.cpp",
-      "${distributedaudio_ext_path}/services/audioclient/directspkclient/src/direct_dspeaker_client.cpp",
-    ]
-  }
-
   deps = [
     "${audio_transport_path}/audioctrltransport:distributed_audio_control",
     "${audio_transport_path}/decodetransport:distributed_audio_decode_transport",
@@ -93,8 +86,6 @@ ohos_shared_library("distributed_audio_sink") {
     "c_utils:utils",
     "drivers_interface_audio:libaudio_proxy_1.0",
     "dsoftbus:softbus_client",
-    "hdf_core:libhdf_ipc_adapter",
-    "hdf_core:libhdi",
     "hisysevent_native:libhisysevent",
     "hitrace_native:hitrace_meter",
     "ipc:ipc_core",
diff --git a/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp b/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp
index 9a4a096d6f5f4d58b20746429c2fccc276ff8ddf..fd2fb2765a0f2139462e7132bd08f597e2fde19c 100644
--- a/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp
+++ b/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp
@@ -146,7 +146,6 @@ void AudioDataChannel::OnSessionClosed(int32_t sessionId)
         return;
     }
     listener->OnSessionClosed();
-    sessionId_ = 0;
 }
 
 void AudioDataChannel::OnBytesReceived(int32_t sessionId, const void *data, uint32_t dataLen)
diff --git a/services/softbusadapter/src/softbus_adapter.cpp b/services/softbusadapter/src/softbus_adapter.cpp
index 855ec7c4456d5360ec1fc0bfafbb59d3d1859327..8e05acf614573abc3783055f911201f59c26ed59 100644
--- a/services/softbusadapter/src/softbus_adapter.cpp
+++ b/services/softbusadapter/src/softbus_adapter.cpp
@@ -84,6 +84,7 @@ int32_t SoftbusAdapter::CreateSoftbusSessionServer(const std::string &pkgName, c
         }
     } else {
         DHLOGI("Session is already created.");
+        return DH_SUCCESS;
     }
 
     mapSessionSet_[sessionName].insert(peerDevId);
@@ -195,6 +196,7 @@ int32_t SoftbusAdapter::RegisterSoftbusListener(const std::shared_ptr<ISoftbusLi
     std::lock_guard<std::mutex> lisLock(listenerMtx_);
     if (mapListenersN_.find(strListenerKey) != mapListenersN_.end()) {
         DHLOGD("Session listener already register.");
+        return DH_SUCCESS;
     }
     mapListenersN_.insert(std::make_pair(strListenerKey, listener));
     return DH_SUCCESS;