Skip to content

Commit 031a44b

Browse files
committed
[BugFix]Fix inappropriate return value judgment.
The Windows getaddrinfo return value format differs from POSIX, so differentiating the processing based on macro definitions fixes Windows build issues.
1 parent e1e984c commit 031a44b

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

debug_router/native/net/websocket_task.cc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,19 @@ bool WebSocketTask::do_connect() {
181181
*/
182182
int ret = getaddrinfo(host, str_port, &ai, &servinfo);
183183
if (ret != 0) {
184+
#ifdef _WIN32
185+
LOGE("getaddrinfo Error: " << gai_strerror(ret));
186+
onFailure("Websocket Task: getaddrinfo Error.", ret);
187+
#else
184188
// Other system error; errno is set to indicate the error.
185189
if (ret == EAI_SYSTEM) {
186-
LOGE("getaddrinfo Error: " << strerror(errno));
187-
onFailure("Websocket Task: getaddrinfo Error.", errno);
190+
LOGE("getaddrinfo Error: " << strerror(GetErrorMessage()));
191+
onFailure("Websocket Task: getaddrinfo Error.", GetErrorMessage());
188192
} else {
189193
LOGE("getaddrinfo Error: " << gai_strerror(ret));
190194
onFailure("Websocket Task: getaddrinfo Error.", ret);
191195
}
196+
#endif
192197
return false;
193198
}
194199

@@ -206,7 +211,7 @@ bool WebSocketTask::do_connect() {
206211
LOGI("Connect socket success. sockfd: " << sockfd);
207212
break;
208213
} else {
209-
LOGE("connect Error: " << strerror(errno));
214+
LOGE("connect Error: " << GetErrorMessage());
210215
}
211216
CLOSESOCKET(sockfd);
212217
}
@@ -254,7 +259,7 @@ bool WebSocketTask::do_connect() {
254259
"Sec-WebSocket-Version: 13\r\n\r\n",
255260
path, host, port);
256261
if (send(socket_guard_->Get(), buf, strlen(buf), 0) == -1) {
257-
LOGE("send http upgrade error: " << strerror(errno));
262+
LOGE("send http upgrade error: " << GetErrorMessage());
258263
onFailure("Websocket Task: socket send failed.", GetErrorMessage());
259264
return false;
260265
}

0 commit comments

Comments
 (0)