working commit

sockhand.cpp

@@ -15,11 +15,11 @@ extern "C" {
 #include <msgheader.hpp>
 #include <sockhand.hpp>
 #include <uxlogger.hpp>
-
+#include <networkaux.hpp>
 
 #include <uxcontrol.pb.h>
 
-void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, int prefix) {
+void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, std::vector<std::string> routes) {
         sock = newsock;
         auto interfaceName = std::format("uxsrv{}", sock);
         auto createRes = interface.Create(interfaceName);
@@ -27,7 +27,7 @@ void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, in
                 uxlogger.Error(createRes.error());
                 return;
         }
-        uxlogger.Debug(std::format("Set local ip address {}/{} for {}", laddr, prefix, interfaceName));
+        uxlogger.Debug(std::format("Set local ip address {} for {}", laddr, interfaceName));
         auto setAddrRes = interface.SetIP4Address(laddr);
         if (!setAddrRes) {
                 uxlogger.Error(setAddrRes.error());
@@ -82,15 +82,52 @@ void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, in
                 }
         }
 
-        std::thread sendThr(&SocketHandler::SendMessages, this, raddr);
+        for (const auto& route : routes) {
+                auto prefixRes = netprefix(route);
+                if (!prefixRes) {
+                        uxlogger.Error(prefixRes.error());
+                        continue;
+                }
+                auto networkRes = network(route);
+                if (!networkRes) {
+                        uxlogger.Error(networkRes.error());
+                        continue;
+                }
+                auto network = networkRes.value();
+                auto prefix = prefixRes.value();
+
+                uxlogger.Log(std::format("Send route message for {}/{}", network, prefix));
+                uxcontrol::RouteMessage routeMsg;
+                auto meta = routeMsg.mutable_meta();
+                meta->set_kind(localRouteMsg);
+                routeMsg.set_address(network);
+                routeMsg.set_prefix(prefix);
+                std::string rawMessage;
+                routeMsg.SerializeToString(&rawMessage);
+
+                MessageHeader header(rawMessage.size());
+                auto rawHeader = header.Encode();
+                std::string rawPacket;
+                rawPacket.append(rawHeader);
+                rawPacket.append(rawMessage);
+
+                int wsize;
+                if ((wsize = write(sock, rawPacket.data(), rawPacket.size())) < 0) {
+                        int errnoCopy = errno;
+                        std::string error = std::strerror(errnoCopy);
+                        uxlogger.Log(std::format("Write message error: {}", error));
+                        return;
+                }
+
+        }
+        std::thread sendThr(&SocketHandler::SendMessages, this);
         sendThr.detach();
 
         done.acquire();
         uxlogger.Log("Handler done");
 }
 
-void SocketHandler::SendMessages(std::string raddr) {
-
+void SocketHandler::SendMessages(void) {
         while (true) {
                 auto readRes = interface.Read();
                 if (!readRes) {
@@ -119,10 +156,10 @@ void SocketHandler::SendMessages(std::string raddr) {
                 if ((wsize = send(sock, rawPacket.data(), rawPacket.size(), 0)) < 0) {
                         int errnoCopy = errno;
                         std::string error = std::strerror(errnoCopy);
-                        uxlogger.Log(std::format("Write packet error: {}", error));
+                        uxlogger.Error(std::format("Write packet error: {}", error));
                         break;
                 }
-                uxlogger.Log("Send internetPacket message");
+                uxlogger.Debug("Send internetPacket message");
 
         }
         done.release();