working commit

sockhand.cpp

@@ -19,9 +19,7 @@ extern "C" {
 
 #include <uxcontrol.pb.h>
 
-const std::string internetPkgMsg = "internetPkg";
-const std::string tunAddressMsg = "tunAddress";
-const std::string Msg = "localRoute";
+
 
 
 using namespace std::chrono_literals;
@@ -52,10 +50,21 @@ void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, in
                 return;
         }
 
+
         std::thread recvThr(&SocketHandler::RecvMessages, this);
         recvThr.detach();
 
-#if 1
+        std::thread sendThr(&SocketHandler::SendMessages, this, raddr, prefix);
+        sendThr.detach();
+
+        done.acquire();
+        uxlogger.Log("Handler done");
+}
+
+void SocketHandler::SendMessages(std::string raddr, int prefix) {
+
+        uxlogger.Log(std::format("Send address message"));
+
         uxcontrol::AddressMessage addrMsg;
         auto meta = addrMsg.mutable_meta();
         meta->set_kind(tunAddressMsg);
@@ -77,17 +86,39 @@ void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, in
                 uxlogger.Log(std::format("Write message error: {}", error));
                 return;
         }
-#endif
-        std::thread sendThr(&SocketHandler::SendMessages, this);
-        sendThr.detach();
-
-        done.acquire();
-        uxlogger.Log("Handler done");
-}
-
-
-void SocketHandler::SendMessages(void) {
         while (true) {
+                auto readRes = interface.Read();
+                if (!readRes) {
+                        uxlogger.Error(std::format("Read packet error: {}", readRes.error()));
+                        continue;
+
+                }
+                auto packet = readRes.value();
+
+                uxcontrol::PacketMessage intPacket;
+                auto meta = intPacket.mutable_meta();
+                meta->set_kind(internetPkgMsg);
+                intPacket.set_payload(packet);
+
+                std::string rawMessage;
+                intPacket.SerializeToString(&rawMessage);
+
+                MessageHeader header(rawMessage.size());
+                auto rawHeader = header.Encode();
+
+                std::string rawPacket;
+                rawPacket.append(rawHeader);
+                rawPacket.append(rawMessage);
+
+                int wsize = 0;
+                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));
+                        break;
+                }
+                uxlogger.Log("Send internetPacket message");
+                /*
                 MessageHeader header(0);
                 auto rawHeader = header.Encode();
                 int wsize;
@@ -99,7 +130,8 @@ void SocketHandler::SendMessages(void) {
                                 break;
                         }
                 }
-                std::this_thread::sleep_for(std::chrono::seconds(30));
+                std::this_thread::sleep_for(std::chrono::seconds(3));
+                */
         }
         done.release();
         uxlogger.Log("Send messages done");