Merge branch 'master' of https://gitlab.demlabs.net/cellframe/cellframe-ui-sdk

stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.cpp

@@ -410,7 +410,13 @@ void ChChainNetSrvVpn::onPktIn(DapChannelPacket* pkt)
     delete pkt;
 }
 
-
+void ChChainNetSrvVpn::saveCurrentServer(const DapServerInfoList &nodelist)
+{
+    for(auto server : nodelist) {
+        if (server.address == upstreamAddress() && server.name != "Auto")
+            m_currentServer = server;
+    }
+}
 
 
 

stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.h

@@ -89,6 +89,9 @@ namespace Dap {
             // METHODS
             QString m_addr, m_gw;
             QTcpServer *m_fdListener;
+
+            DapServerInfo m_currentServer;
+
         private slots:
             void onFwServerConnected();
             void onFwClientReadyRead();
@@ -114,6 +117,9 @@ namespace Dap {
                 tun->addNewUpstreamRoute(a_dest);
             }
 
+            QString upstreamAddress(){return tun->upstreamAddress();}
+            DapServerInfo currentServer(){return m_currentServer;}
+
             void tunCreate (const QString& a_addr, const QString& a_gw);
             void workerStart(int a_tunSocket);
             int tunSocket();
@@ -143,6 +149,8 @@ namespace Dap {
             void tunCreate(); // create with all predefined before values
             void tunDestroy();
             void tunStandby();
+
+            void saveCurrentServer(const DapServerInfoList &nodelist);
         };
 
     }