cache ip: yurots forget IP of broken connections

Author: divinity76

ots/source/protocol.cpp

@@ -50,7 +50,28 @@ Protocol::~Protocol()
 	player = NULL;
 	game = NULL;
 }
-
+#ifdef HHB_STATUS_MAX_4_PER_IP
+unsigned long Protocol::getIP() const
+{
+	uint32_t ret = 0;
+	sockaddr_in sain;
+	socklen_t salen = sizeof(sockaddr_in);
+	if (getpeername(s, (sockaddr*)&sain, &salen) == 0)
+	{
+#if defined WIN32 || defined __WINDOWS__
+		ret = sain.sin_addr.S_un.S_addr;
+#else
+		ret = sain.sin_addr.s_addr;
+#endif
+	}
+	if(ret == 0){
+		return this->cached_ip;
+	}else {
+		this->cached_ip = ret;
+		return ret;
+	}
+}
+#else
 unsigned long Protocol::getIP() const
 {
 	sockaddr_in sain;
@@ -66,7 +87,7 @@ unsigned long Protocol::getIP() const
 
 	return 0;
 }
-
+#endif
 void Protocol::setPlayer(Player* p)
 {
 	player = p;

ots/source/protocol.h

@@ -39,6 +39,10 @@ class Protocol
 	virtual ~Protocol();
 
 	void setPlayer(Player* p);
+#ifdef HHB_STATUS_MAX_4_PER_IP
+	uint32_t cached_ip=0;
+#endif
+
 	unsigned long getIP() const;
 
 	virtual bool CanSee(int x, int y, int z) const = 0;

ots/source/status.cpp

@@ -115,10 +115,18 @@ std::string Status::getStatusString(){
 #ifdef HHB_STATUS_MAX_4_PER_IP
 {
 	size_t otservlist_legal_count = 0;
+#if __cplusplus >= 201703
+// this only works for >= c++17
 	for (const auto& [ip, player_count] : this->ip_counts) {
         (void)ip;
 		otservlist_legal_count += ( player_count > 4 ? 4 : player_count);
     }
+#else
+// this works on >=c++11
+  for (const auto& n : this->ip_counts) {
+		otservlist_legal_count += ( n.second > 4 ? 4 : n.second);
+  }
+#endif
 	ss << otservlist_legal_count;
 }
 #else