working commit

sockhand.cpp

@@ -19,29 +19,68 @@ 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;
 
 
-void SocketHandler::Handle(int newsock) {
+void SocketHandler::Handle(int newsock, std::string laddr, std::string raddr, int prefix) {
         sock = newsock;
-
-        auto createRes = interface.Create(std::format("uxsrv{}", sock));
+        auto interfaceName = std::format("uxsrv{}", sock);
+        auto createRes = interface.Create(interfaceName);
         if (!createRes) {
-                uxlogger.Log(createRes.error());
+                uxlogger.Error(createRes.error());
+                return;
+        }
+        uxlogger.Debug(std::format("Set local ip address {}/{} for {}", laddr, prefix, interfaceName));
+        auto setAddrRes = interface.SetIP4Address(laddr);
+        if (!setAddrRes) {
+                uxlogger.Error(setAddrRes.error());
+                return;
+        }
+        auto setPrefixRes = interface.SetIP4Netmask(prefix);
+        if (!setPrefixRes) {
+                uxlogger.Error(setPrefixRes.error());
                 return;
         }
         auto upRes = interface.Up();
         if (!createRes) {
-                uxlogger.Log(createRes.error());
+                uxlogger.Error(createRes.error());
                 return;
         }
 
-        std::thread sendThr(&SocketHandler::SendMessages, this);
-        sendThr.detach();
-
         std::thread recvThr(&SocketHandler::RecvMessages, this);
         recvThr.detach();
 
+#if 1
+        uxcontrol::AddressMessage addrMsg;
+        auto meta = addrMsg.mutable_meta();
+        meta->set_kind(tunAddressMsg);
+        addrMsg.set_address(raddr);
+        addrMsg.set_prefix(prefix);
+        std::string rawMessage;
+        addrMsg.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;
+        }
+#endif
+        std::thread sendThr(&SocketHandler::SendMessages, this);
+        sendThr.detach();
+
         done.acquire();
         uxlogger.Log("Handler done");
 }
@@ -60,7 +99,7 @@ void SocketHandler::SendMessages(void) {
                                 break;
                         }
                 }
-                std::this_thread::sleep_for(std::chrono::seconds(1));
+                std::this_thread::sleep_for(std::chrono::seconds(30));
         }
         done.release();
         uxlogger.Log("Send messages done");
@@ -86,7 +125,7 @@ void SocketHandler::RecvMessages(void) {
                         uxlogger.Log(std::format("Decode header error: {}", decodeRes.error()));
                         break;
                 }
-                auto pSize = header.PacketSize();
+                auto pSize = header.PayloadSize();
                 if (pSize > 0) {
                         std::string rawMessage(pSize, 0);
                         if ((rsize = recv(sock, rawMessage.data(), rawMessage.size(), MSG_WAITALL)) < 0) {