openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2024-11-23 16:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

open proxy channel failed

Browse Source 
Signed-off-by: xzh457 <xiaozihan4@h-partners.com>
Change-Id: I3e1a5866535b7bc49839bbc6df3f4eef30df42c0
This commit is contained in:
xzh457 2024-11-15 12:20:45 +08:00
parent 8c7f598d21
commit 98e060f24f
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/transmission/trans_channel/proxy/src/softbus_proxychannel_transceiver.c
View File

@ -657,20 +657,28 @@ int32_t TransProxyCloseConnChannelReset(uint32_t connectionId, bool isDisconnect
return SOFTBUS_OK;
}
int32_t TransProxyConnExistProc(ProxyConnInfo *conn, ProxyChannelInfo *chan, int32_t chanNewId)
static int32_t TransProxyConnExistProc(ProxyChannelInfo *chan, int32_t chanNewId, const ConnectOption *connInfo)
{
if (conn == NULL || chan == NULL) {
if (chan == NULL) {
TRANS_LOGE(TRANS_CTRL, "invalid param");
return SOFTBUS_INVALID_PARAM;
}
SoftbusHitraceStart(SOFTBUS_HITRACE_ID_VALID, (uint64_t)(chanNewId + ID_OFFSET));
TRANS_LOGI(TRANS_CTRL,
"SoftBusHiTraceChainBegin: set hiTraceId=%{public}" PRIu64, (uint64_t)(chanNewId + ID_OFFSET));
ConnectType type = conn->connInfo.type;
if (conn->state == PROXY_CHANNEL_STATUS_PYH_CONNECTING) {
int32_t ret = GetProxyChannelLock();
TRANS_CHECK_AND_RETURN_RET_LOGE(ret == SOFTBUS_OK, ret, TRANS_CTRL, "lock mutex fail!");
ProxyConnInfo conn;
if (TransGetConn(connInfo, &conn, false) != SOFTBUS_OK) {
ReleaseProxyChannelLock();
TRANS_LOGE(TRANS_CTRL, "get connectInfo failed, channelId=%{public}d", chanNewId);
return SOFTBUS_TRANS_PROXY_CONN_ADD_REF_FAILED;
}
ConnectType type = conn.connInfo.type;
if (conn.state == PROXY_CHANNEL_STATUS_PYH_CONNECTING) {
ProxyChannelInfo channelInfo = {
.channelId = chanNewId,
.reqId = (int32_t)conn->requestId,
.reqId = (int32_t)conn.requestId,
.isServer = -1,
.type = type,
.status = PROXY_CHANNEL_STATUS_PYH_CONNECTING,
@ -678,19 +686,21 @@ int32_t TransProxyConnExistProc(ProxyConnInfo *conn, ProxyChannelInfo *chan, int
};
TransProxySpecialUpdateChanInfo(&channelInfo);
ReleaseProxyChannelLock();
TRANS_LOGI(TRANS_CTRL, "reuse connection requestId=%{public}d", chan->reqId);
} else {
ReleaseProxyChannelLock();
ProxyChannelInfo channelInfo = {
.channelId = chanNewId,
.reqId = -1,
.isServer = -1,
.type = type,
.status = PROXY_CHANNEL_STATUS_HANDSHAKEING,
.connId = conn->connId
.connId = conn.connId
};
TransProxySpecialUpdateChanInfo(&channelInfo);
if (TransAddConnRefByConnId(conn->connId, (bool)chan->isServer) != SOFTBUS_OK) {
TRANS_LOGE(TRANS_CTRL, "TransAddConnRefByConnId: connId=%{public}u err", conn->connId);
if (TransAddConnRefByConnId(conn.connId, (bool)chan->isServer) != SOFTBUS_OK) {
TRANS_LOGE(TRANS_CTRL, "TransAddConnRefByConnId: connId=%{public}u err", conn.connId);
return SOFTBUS_TRANS_PROXY_CONN_ADD_REF_FAILED;
}
TransProxyPostHandshakeMsgToLoop(chanNewId);
@ -799,14 +809,14 @@ int32_t TransProxyOpenConnChannel(const AppInfo *appInfo, const ConnectOption *c
return SOFTBUS_TRANS_PROXY_CREATE_CHANNEL_FAILED;
}
if (TransGetConn(connInfo, &conn, false) == SOFTBUS_OK) {
ret = TransProxyConnExistProc(&conn, chan, chanNewId);
ret = TransProxyConnExistProc(chan, chanNewId, connInfo);
if (ret == SOFTBUS_TRANS_PROXY_CONN_ADD_REF_FAILED) {
ret = TransProxyOpenNewConnChannel(PROXY, connInfo, chanNewId);
}
} else {
ret = TransProxyOpenNewConnChannel(PROXY, connInfo, chanNewId);
if ((ret == SOFTBUS_TRANS_PROXY_CONN_REPEAT) && (TransGetConn(connInfo, &conn, false) == SOFTBUS_OK)) {
ret = TransProxyConnExistProc(&conn, chan, chanNewId);
ret = TransProxyConnExistProc(chan, chanNewId, connInfo);
}
}
if (ret == SOFTBUS_OK) {

13
tests/core/transmission/trans_channel/proxy_channel/softbus_trans_proxy_transceiver_test.cpp
View File

@ -289,20 +289,15 @@ HWTEST_F(SoftbusProxyTransceiverTest, CompareConnectOption001, TestSize.Level1)
*/
HWTEST_F(SoftbusProxyTransceiverTest, TransProxyConnExistProc001, TestSize.Level1)
{
ProxyConnInfo conn;
ProxyChannelInfo chan;
ConnectOption connInfo;
(void)memset_s(&connInfo, sizeof(ConnectOption), 1, sizeof(ConnectOption));
int32_t chanNewId = 1;
bool isServer = false;
TransCreateConnByConnId(1, isServer);
conn.connInfo.type = CONNECT_BR;
conn.state = PROXY_CHANNEL_STATUS_PYH_CONNECTING;
chan.isServer = false;
int32_t ret = TransProxyConnExistProc(&conn, &chan, chanNewId);
EXPECT_EQ(SOFTBUS_OK, ret);
conn.state = PROXY_CHANNEL_STATUS_HANDSHAKEING;
ret = TransProxyConnExistProc(&conn, &chan, chanNewId);
EXPECT_NE(SOFTBUS_OK, ret);
int32_t ret = TransProxyConnExistProc(&chan, chanNewId, &connInfo);
EXPECT_EQ(SOFTBUS_TRANS_PROXY_CONN_ADD_REF_FAILED, ret);
}
/**