Don't add IP country if there is no IP-DB match, user shorter country…

… format by default
airdcpp · Oct 18, 2020 · 3977fe0 · 3977fe0
1 parent fe8d4fb
commit 3977fe0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/airdcpp/airdcpp/GeoIP.cpp b/airdcpp/airdcpp/GeoIP.cpp
@@ -93,7 +93,7 @@ string GeoIP::getCountry(const string& ip) const {
 			&mmdb_error
 		);
 
-		if (mmdb_error == MMDB_SUCCESS && gai_error == 0) {
+		if (res.found_entry && mmdb_error == MMDB_SUCCESS && gai_error == 0) {
 			const string& setting = SETTING(COUNTRY_FORMAT);
 
 			ParamMap params;

diff --git a/airdcpp/airdcpp/SettingsManager.cpp b/airdcpp/airdcpp/SettingsManager.cpp
@@ -774,7 +774,7 @@ SettingsManager::SettingsManager() : connectionRegex("(\\d+(\\.\\d+)?)")
 	setDefault(ALLOW_MATCH_FULL_LIST, true);
 	setDefault(REPORT_ADDED_SOURCES, false);
 	setDefault(EXPAND_BUNDLES, false);
-	setDefault(COUNTRY_FORMAT, "%[2code] - %[name]");
+	setDefault(COUNTRY_FORMAT, "%[2code]");
 	setDefault(FORMAT_DIR_REMOTE_TIME, false);
 	setDefault(DISCONNECT_MIN_SOURCES, 2);
 	setDefault(USE_SLOW_DISCONNECTING_DEFAULT, true);

diff --git a/windows/HubFrame.cpp b/windows/HubFrame.cpp
@@ -1790,6 +1790,8 @@ LRESULT HubFrame::onCustomDraw(int /*idCtrl*/, LPNMHDR pnmh, BOOL& /*bHandled*/)
 
 	case CDDS_SUBITEM | CDDS_ITEMPREPAINT: {
 		if(SETTING(GET_USER_COUNTRY) && (ctrlUsers.findColumn(cd->iSubItem) == UserUtil::COLUMN_IP4 || ctrlUsers.findColumn(cd->iSubItem) == UserUtil::COLUMN_IP6)) {
+			auto isV6 = ctrlUsers.findColumn(cd->iSubItem) == UserUtil::COLUMN_IP6;
+
 			CRect rc;
 			ctrlUsers.GetSubItemRect((int)cd->nmcd.dwItemSpec, cd->iSubItem, LVIR_BOUNDS, rc);
 
@@ -1808,7 +1810,8 @@ LRESULT HubFrame::onCustomDraw(int /*idCtrl*/, LPNMHDR pnmh, BOOL& /*bHandled*/)
 				POINT p = { rc.left, top };
 
 				const auto ii = (ItemInfo*)cd->nmcd.lItemlParam;
-				auto countryInfo = FormatUtil::toCountryInfo(ii->onlineUser->getIdentity().getTcpConnectIp());
+				const auto userIp = isV6 ? ii->onlineUser->getIdentity().getIp6() : ii->onlineUser->getIdentity().getIp4();
+				auto countryInfo = FormatUtil::toCountryInfo(userIp);
 				ResourceLoader::flagImages.Draw(cd->nmcd.hdc, countryInfo.flagIndex, p, LVSIL_SMALL);
 
 				top = rc.top + (rc.Height() - WinUtil::getTextHeight(cd->nmcd.hdc) - 1)/2;