move callback to service method

ryzom · Jun 26, 2024 · 8fe1b01 · 8fe1b01
1 parent c55cc9e
commit 8fe1b01
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/nelns/naming_service/nelns/naming_service/functions.cpp b/nelns/naming_service/nelns/naming_service/functions.cpp
@@ -405,21 +405,6 @@ void cbACKUnregistration(CMessage &msgin, TSockId from, CCallbackNetBase &netbas
 	}
 }
 
-/**
- * Callback for service registration when the naming service goes down and up (don't need to broadcast)
- */
-void cbResendRegisteration(CMessage &msgin, TSockId from, CCallbackNetBase &netbase)
-{
-	string name;
-	vector<CInetAddress> addr;
-	TServiceId sid;
-	msgin.serial(name);
-	msgin.serialCont(addr);
-	msgin.serial(sid);
-
-	doRegister(name, addr, sid, from, netbase, true);
-}
-
 /**
  * Callback for service unregistration.
  *

diff --git a/nelns/naming_service/nelns/naming_service/naming_service.cpp b/nelns/naming_service/nelns/naming_service/naming_service.cpp
@@ -96,7 +96,7 @@ void CNamingService::init()
 
 	TCallbackItem CallbackArray[] = {
 		{ "RG", [=](auto &msgin, auto from, auto &netbase) { cbRegister(msgin, from); } },
-		{ "RRG", cbResendRegisteration },
+		{ "RRG", [=](auto &msgin, auto from, auto &netbase) { cbResendRegisteration(msgin, from); } },
 		{ "QP", cbQueryPort },
 		{ "UNI", cbUnregisterSId },
 		{ "ACK_UNI", cbACKUnregistration },
@@ -139,3 +139,16 @@ void CNamingService::cbRegister(CMessage &msgin, TSockId from)
 
 	doRegister(name, addr, sid, from, *CallbackServer);
 }
+
+void CNamingService::cbResendRegisteration(CMessage &msgin, TSockId from)
+{
+	string name;
+	vector<CInetAddress> addr;
+	TServiceId sid;
+	msgin.serial(name);
+	msgin.serialCont(addr);
+	msgin.serial(sid);
+
+	doRegister(name, addr, sid, from, *CallbackServer, true);
+}
+
diff --git a/nelns/naming_service/nelns/naming_service/naming_service.h b/nelns/naming_service/nelns/naming_service/naming_service.h
@@ -40,6 +40,11 @@ class CNamingService : public NLNET::IService
 	 */
 	void cbRegister(NLNET::CMessage &msgin, NLNET::TSockId from);
 
+	/**
+	 * Callback for service registration when the naming service goes down and up (don't need to broadcast)
+	 */
+	void cbResendRegisteration(NLNET::CMessage &msgin, NLNET::TSockId from);
+
 	/// Service instance manager singleton
 	CServiceInstanceManager _ServiceInstances;
 };

diff --git a/nelns/naming_service/tests/naming_service.it.cpp b/nelns/naming_service/tests/naming_service.it.cpp
@@ -214,6 +214,7 @@ TEST_F(CNamingServiceIT, shouldUpdateServiceRegistry)
 	client.send(msgout);
 	client.flush();
 	namingService.update();
+	client.update2(-1, 200);
 
 	EXPECT_THAT(
 	    RegisteredServices,