Feature/naming service tests

.github/workflows/cmake-multi-platform.yml

@@ -154,7 +154,7 @@ jobs:
           if-no-files-found: error
 
       - name: Push image
-        if: github.ref == 'refs/heads/${{ env.DEFAULT_BRANCH }}'
+        if: ${{ github.ref == format('refs/heads/{0}', env.DEFAULT_BRANCH) }}
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
           docker push "${{ needs.strings.outputs.docker-image-tag }}"

nel/include/nel/net/callback_net_base.h

@@ -31,6 +31,7 @@
 #include <queue>
 #endif
 
+#include <functional>
 #include <vector>
 
 
@@ -43,7 +44,7 @@ class CCallbackNetBase;
  * msgin contains parameters of the message
  * from is the SockId of the connection, for a client, from is always the same value
  */
-typedef void (*TMsgCallback) (CMessage &msgin, TSockId from, CCallbackNetBase &netbase);
+typedef std::function<void(CMessage &msgin, TSockId from, CCallbackNetBase &netbase)> TMsgCallback;
 
 
 /// Callback items. See CMsgSocket::update() for an explanation on how the callbacks are called.

nel/src/net/callback_net_base.cpp

@@ -206,7 +206,7 @@ void CCallbackNetBase::processOneMessage ()
 	}
 	else
 	{
-		LNETL3_DEBUG ("LNETL3NB_CB: Calling callback (%s)%s", msgin.getName().c_str(), (cb==_DefaultCallback)?" DEFAULT_CB":"");
+		LNETL3_DEBUG ("LNETL3NB_CB: Calling callback (%s)", msgin.getName().c_str());
 
 		if (_PreDispatchCallback != NULL)
 		{

nelns/naming_service/nelns/naming_service/functions.cpp

@@ -420,28 +420,6 @@ void cbResendRegisteration(CMessage &msgin, TSockId from, CCallbackNetBase &netb
 	doRegister(name, addr, sid, from, netbase, true);
 }
 
-/**
- * Callback for service registration.
- *
- * Message expected : RG
- * - Name of service to register (string)
- * - Address of service (CInetAddress)
- *
- * Message emitted : RG
- * - Allocated service identifier (TServiceId) or 0 if failed
- */
-void cbRegister(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);
-}
-
 /**
  * Callback for service unregistration.
  *

nelns/naming_service/nelns/naming_service/functions.h

@@ -50,18 +50,6 @@ void cbACKUnregistration(NLNET::CMessage &msgin, NLNET::TSockId from, NLNET::CCa
  */
 void cbResendRegisteration(NLNET::CMessage &msgin, NLNET::TSockId from, NLNET::CCallbackNetBase &netbase);
 
-/**
- * Callback for service registration.
- *
- * Message expected : RG
- * - Name of service to register (string)
- * - Address of service (CInetAddress)
- *
- * Message emitted : RG
- * - Allocated service identifier (TServiceId) or 0 if failed
- */
-void cbRegister(NLNET::CMessage &msgin, NLNET::TSockId from, NLNET::CCallbackNetBase &netbase);
-
 /**
  * Callback for service unregistration.
  *

nelns/naming_service/nelns/naming_service/naming_service.cpp

@@ -18,26 +18,15 @@ using std::vector;
 using NLMISC::CConfigFile;
 using NLMISC::Exception;
 using NLMISC::toString;
+using NLNET::CCallbackNetBase;
 using NLNET::CCallbackServer;
 using NLNET::CInetAddress;
+using NLNET::CMessage;
 using NLNET::CUnifiedNetwork;
 using NLNET::TCallbackItem;
 using NLNET::TServiceId;
 using NLNET::TSockId;
 
-//
-// Callback array
-//
-
-TCallbackItem CallbackArray[] = {
-	{ "RG", cbRegister },
-	{ "RRG", cbResendRegisteration },
-	{ "QP", cbQueryPort },
-	{ "UNI", cbUnregisterSId },
-	{ "ACK_UNI", cbACKUnregistration },
-	//	{ "RS", cbRegisteredServices },
-};
-
 /**
  * Init
  */
@@ -105,6 +94,14 @@ void CNamingService::init()
 		nsport = var->asInt();
 	}
 
+	TCallbackItem CallbackArray[] = {
+		{ "RG", [=](auto &msgin, auto from, auto &netbase) { cbRegister(msgin, from); } },
+		{ "RRG", cbResendRegisteration },
+		{ "QP", cbQueryPort },
+		{ "UNI", cbUnregisterSId },
+		{ "ACK_UNI", cbACKUnregistration },
+		//	{ "RS", cbRegisteredServices },
+	};
 	CallbackServer = new CCallbackServer;
 	CallbackServer->init(nsport);
 	CallbackServer->addCallbackArray(CallbackArray, sizeof(CallbackArray) / sizeof(CallbackArray[0]));
@@ -130,3 +127,15 @@ void CNamingService::release()
 		delete CallbackServer;
 	CallbackServer = NULL;
 }
+
+void CNamingService::cbRegister(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);
+}

nelns/naming_service/nelns/naming_service/naming_service.h

@@ -2,6 +2,8 @@
 #define NELNS_NAMING_SERVICE_SERVICE_NAMING_SERVICE_H
 
 #include <nel/net/buf_net_base.h>
+#include <nel/net/callback_net_base.h>
+#include <nel/net/message.h>
 #include <nel/net/service.h>
 
 #include <nelns/naming_service/service_instance_manager.h>
@@ -26,6 +28,18 @@ class CNamingService : public NLNET::IService
 	void release();
 
 private:
+	/**
+	 * Callback for service registration.
+	 *
+	 * Message expected : RG
+	 * - Name of service to register (string)
+	 * - Address of service (CInetAddress)
+	 *
+	 * Message emitted : RG
+	 * - Allocated service identifier (TServiceId) or 0 if failed
+	 */
+	void cbRegister(NLNET::CMessage &msgin, NLNET::TSockId from);
+
 	/// Service instance manager singleton
 	CServiceInstanceManager _ServiceInstances;
 };

nelns/naming_service/tests/CMakeLists.txt

@@ -1,22 +1,29 @@
-add_test_executable(do_allocate_port_test
+add_test_executable(nelns_do_allocate_port_test
         do_allocate_port.test.cpp
 )
-target_link_libraries(do_allocate_port_test
+target_link_libraries(nelns_do_allocate_port_test
         nelns::ns
 )
 
 
-add_test_executable(naming_service_test
+add_test_executable(nelns_naming_service_test
         naming_service.test.cpp
 )
-target_link_libraries(naming_service_test
+target_link_libraries(nelns_naming_service_test
         nelns::ns
 )
 
 
-add_test_executable(service_instance_manager_test
+add_test_executable(nelns_service_instance_manager_test
         service_instance_manager.test.cpp
 )
-target_link_libraries(service_instance_manager_test
+target_link_libraries(nelns_service_instance_manager_test
+        nelns::ns
+)
+
+add_test_executable(nelns_naming_service_it
+        naming_service.it.cpp
+)
+target_link_libraries(nelns_naming_service_it
         nelns::ns
 )