openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

adb: improve network_connect error messages. 

Test: manual
Change-Id: If8747ba1951d3c87561fbd3fb4968821243b2ee2
This commit is contained in:
Josh Gao 2019-01-30 14:54:10 -08:00
parent eb0875db65
commit 64e597a62f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adb/sysdeps/posix/network.cpp
View File

@ -24,6 +24,7 @@
#include <string>
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
#include <cutils/sockets.h>
#include "adb_unique_fd.h"
@ -136,11 +137,13 @@ int network_connect(const std::string& host, int port, int type, int timeout, st
return fd;
}
if (getaddrinfo_error != 0) {
*error = gai_strerror(getaddrinfo_error);
LOG(WARNING) << "failed to resolve host '" << host << "': " << *error;
*error = android::base::StringPrintf("failed to resolve host: '%s': %s", host.c_str(),
gai_strerror(getaddrinfo_error));
LOG(WARNING) << *error;
} else {
*error = strerror(errno);
LOG(WARNING) << "failed to connect to '" << host << "': " << *error;
*error = android::base::StringPrintf("failed to connect to '%s:%d': %s", host.c_str(), port,
strerror(errno));
LOG(WARNING) << *error;
}
return -1;
}