Merge remote-tracking branch 'origin/server_service' into server_service

src/internals/protos/distribicom.proto

@@ -154,6 +154,8 @@ message WorkerRegistryRequest {
 
   // the port the worker is listening to.
   uint32 workerPort = 2;
+
+  string worker_ip=3;
 }
 
 // Every subscriber should have a certificate it created to ensure the connections from the server
@@ -213,4 +215,6 @@ message WorkerConfigs {
 
   // the port the worker is listening to.
   uint32 workerPort = 2;
+
+  string worker_ip=3;
 };

src/services/factory.cpp

@@ -34,9 +34,10 @@ services::configurations::create_app_configs(const std::string &server_hostname,
 }
 
 distribicom::WorkerConfigs
-services::configurations::create_worker_configs(const distribicom::AppConfigs &app_configs, int worker_port) {
+services::configurations::create_worker_configs(const distribicom::AppConfigs &app_configs, int worker_port, std::string worker_hostname) {
     distribicom::WorkerConfigs c;
     c.set_workerport(worker_port);
+    c.set_worker_ip(worker_hostname);
     c.mutable_appconfigs()->CopyFrom(app_configs);
     return c;
 }

src/services/factory.hpp

@@ -12,7 +12,7 @@ namespace services::configurations {
     create_app_configs(const std::string &server_hostname, int poly_deg, int logt, int rows, int cols, std::uint64_t
     ele_size);
 
-    distribicom::WorkerConfigs create_worker_configs(const distribicom::AppConfigs &app_configs, int worker_port);
+    distribicom::WorkerConfigs create_worker_configs(const distribicom::AppConfigs &app_configs, int worker_port, std::string worker_hostname);
 
     distribicom::ClientConfigs create_client_configs(const distribicom::AppConfigs &app_configs, int client_port);
 }

src/services/manager.cpp

@@ -15,7 +15,7 @@ namespace services {
         try {
 
             auto requesting_worker =  utils::extract_ip(context);
-            std::string subscribing_worker_address = "localhost:52100";
+            std::string subscribing_worker_address =request->worker_ip() + ":" + std::to_string(request->workerport());
 
             // creating client to the worker:
             auto worker_conn = std::make_unique<distribicom::Worker::Stub>(distribicom::Worker::Stub(

src/services/worker.cpp

@@ -33,6 +33,7 @@ namespace services {
         distribicom::WorkerRegistryRequest request;
 
         request.set_workerport(cnfgs.workerport());
+        request.set_worker_ip(cnfgs.worker_ip());
 
         manager_conn->RegisterAsWorker(&context, request, &response);
         strategy = std::make_shared<work_strategy::RowMultiplicationStrategy>(

test/services/worker_test.cpp

@@ -103,7 +103,8 @@ std::thread setupWorker(std::latch &wg, distribicom::AppConfigs &configs) {
             services::Worker worker(
                     services::configurations::create_worker_configs(
                             configs,
-                            std::stoi(std::string(worker_port))
+                            std::stoi(std::string(worker_port)),
+                            "0.0.0.0"
                     )
             );