Fix: skip wasted geo-IP lookup blocking the host double-click tooltip
The online-host double-click handler called IPConverter::GetGeoLocation on the UI thread before showing the floating tooltip, even when no local IP database (QQWry/ip2region) was loaded. In that default configuration the result is never displayed, yet the call issues up to three synchronous HTTP requests (5s timeout each), delaying the tooltip by a network round trip or worse. Only run the lookup when a local database is actually loaded, and memoize successful results per IP in a process-wide cache inside GetGeoLocation so the remaining call sites (license activity, host-login fallback) do not re-query the same IP. The cache uses function-local statics rather than class members to keep IPConverter's layout unchanged and stay ABI-compatible with the precompiled PrivateDesktop_Lib.lib QQWry/Ip2Region subclasses. Co-Authored-By: deepseek-v4-pro
This commit is contained in:
1 parent
76decec0fe
commit
d118558eda
2 files changed
+26
-3
No files matched your search
@@ -8728,8 +8728,11 @@ void CMy2015RemoteDlg::OnListClick(NMHDR* pNMHDR, LRESULT* pResult)
|
||||
res[RES_SYSTEM_BITS], res[RES_SYSTEM_CPU], res[RES_SYSTEM_MEM], res[RES_RESOLUTION], startTime, expired.c_str(),
|
||||
res[RES_USERNAME], res[RES_ISADMIN] == "1" ? _L("[管理员]") : res[RES_ISADMIN].IsEmpty() ? "" : _L("[非管理员]"), GetElapsedTime(startTime),
|
||||
ctx->GetProtocol().c_str(), ctx->GetServerPort(), typMap[type].c_str(), ctx->GetMasterID().c_str(), res[RES_CLIENT_ID]);
|
||||
std::string geo = res[RES_CLIENT_PUBIP].IsEmpty() ? "" : m_IPConverter->GetGeoLocation(res[RES_CLIENT_PUBIP].GetString());
|
||||
if (m_HasLocDB) {
|
||||
// 地理信息只在加载了本地 IP 库(QQWry/ip2region)时才查询并展示。
|
||||
// 未装库时 m_IPConverter 是网络版 GetGeoLocation(同步外网 HTTP,可达数秒),
|
||||
// 且结果不会被显示——跳过可消除双击浮窗的弹出延时。
|
||||
if (m_HasLocDB && !res[RES_CLIENT_PUBIP].IsEmpty()) {
|
||||
std::string geo = m_IPConverter->GetGeoLocation(res[RES_CLIENT_PUBIP].GetString());
|
||||
CString qqwryLoc;
|
||||
qqwryLoc.FormatL("\r\n地理信息: %s", geo.c_str());
|
||||
strText += qqwryLoc;
|
||||
|
||||
Reference in new issue
Block a user