Release v0.6.58: preserve LAN connections across missed discovery

src/lan.cpp

@@ -242,8 +242,8 @@ struct LanService::Impl
                         if(peers.contains(target))send(socket,peers.at(target).address,packet);
                     });
                     clipboardActive=clipboard->active();
-                    if(shareInput)for(auto &[peer,entry]:trusted.items())if(peers.contains(peer))
-                        endpoints.push_back({peer,entry.at("key"),peers.at(peer).address.sin_addr.s_addr});
+                    if(shareInput)for(auto &[peer,entry]:trusted.items())
+                        endpoints.push_back({peer,entry.at("key"),peers.contains(peer)?peers.at(peer).address.sin_addr.s_addr:0});
                     if(now>=nextHello)
                     {
                         epoch=lan::randomHex(16); // Fresh challenge prevents replayed presence from staying online.

src/lan_channel.cpp

@@ -207,7 +207,7 @@ std::string InputChannel::status()const{return impl->state;}
 void InputChannel::disconnect(){impl->reset(GetTickCount64(),"Input disconnected; local control restored.");}
 struct InputHub::Impl
 {
-    struct Link { InputEndpoint endpoint;std::unique_ptr<InputChannel> channel;uint64_t generation{},epoch{}; };
+    struct Link { InputEndpoint endpoint;std::unique_ptr<InputChannel> channel;uint64_t generation{},epoch{};std::string lastState; };
     struct Pending {SOCKET socket;uint32_t address;uint64_t since;};
     std::string local;uint16_t port;SOCKET listener=INVALID_SOCKET;
     std::map<std::string,Link> links;std::vector<Pending> pending;uint64_t epoch{},retry{};
@@ -217,19 +217,29 @@ struct InputHub::Impl
     void poll(const std::vector<InputEndpoint> &endpoints,const std::vector<RoutedInput> &out,std::vector<RoutedInput> &in,uint64_t now)
     {
         for(auto it=links.begin();it!=links.end();){
-            auto match=std::find_if(endpoints.begin(),endpoints.end(),[&](auto &e){return e.id==it->first&&e.key==it->second.endpoint.key&&e.port==it->second.endpoint.port&&e.address==it->second.endpoint.address;});
+            auto match=std::find_if(endpoints.begin(),endpoints.end(),[&](auto &e){return e.id==it->first&&e.key==it->second.endpoint.key&&e.port==it->second.endpoint.port;});
             if(match==endpoints.end())it=links.erase(it);else ++it;
         }
         for(auto &e:endpoints)if(e.id!=local&&!links.contains(e.id)){
             Link link;link.endpoint=e;link.channel=std::make_unique<InputChannel>(local,e.id,e.key,0,e.port,true);link.epoch=++epoch;links.emplace(e.id,std::move(link));
         }
+        // Discovery is a hint, not the lifetime of authenticated input sessions.
+        // Keep the last usable address across missed announcements. A new address
+        // is used only once a channel is down, never to tear down working input.
+        for(auto &e:endpoints){if(e.id==local)continue;auto &link=links.at(e.id);
+            if(e.address&&!link.channel->ready()&&e.address!=link.endpoint.address){
+                link.channel->disconnect();link.endpoint.address=e.address;
+            }
+        }
         bool listenNeeded=std::any_of(endpoints.begin(),endpoints.end(),[&](auto &e){return e.id<local;});
         if(!listenNeeded){closeSocket(listener);for(auto &p:pending)closeSocket(p.socket);pending.clear();}
         if(listenNeeded&&listener==INVALID_SOCKET&&now>=retry){
             listener=::socket(AF_INET,SOCK_STREAM,IPPROTO_TCP);BOOL yes=TRUE;sockaddr_in a{};a.sin_family=AF_INET;a.sin_port=htons(port);
             if(listener==INVALID_SOCKET||setsockopt(listener,SOL_SOCKET,SO_EXCLUSIVEADDRUSE,(char*)&yes,sizeof(yes))||!nonblocking(listener)||bind(listener,(sockaddr*)&a,sizeof(a))||listen(listener,SOMAXCONN)){
-                closeSocket(listener);retry=now+1500;error="TCP input port is unavailable.";
-            }else error.clear();
+                auto detail="TCP input port "+std::to_string(port)+" is unavailable (Windows error "+std::to_string(WSAGetLastError())+").";
+                if(error!=detail)log(L"LAN input: "+wide(detail));
+                closeSocket(listener);retry=now+1500;error=std::move(detail);
+            }else {error.clear();log(L"LAN input listener ready on TCP "+std::to_wstring(port));}
         }
         if(listener!=INVALID_SOCKET)for(int n=0;n<16&&pending.size()<64;++n){
             sockaddr_in a{};int size=sizeof(a);SOCKET sock=accept(listener,(sockaddr*)&a,&size);if(sock==INVALID_SOCKET)break;
@@ -243,7 +253,7 @@ struct InputHub::Impl
                 else if(count>=int(length+4)){
                     done=true;
                     try{auto hello=Json::parse(bytes+4,bytes+4+length);auto id=hello.value("id","");auto link=links.find(id);
-                        if(id<local&&hello.value("to","")==local&&hello.value("version",0)==2&&link!=links.end()&&link->second.endpoint.address==it->address&&link->second.channel->adopt(uintptr_t(it->socket),now))it->socket=INVALID_SOCKET;
+                        if(id<local&&hello.value("to","")==local&&hello.value("version",0)==2&&link!=links.end()&&link->second.channel->adopt(uintptr_t(it->socket),now))it->socket=INVALID_SOCKET;
                     }catch(const std::exception &){}
                 }
             }
@@ -252,6 +262,7 @@ struct InputHub::Impl
         for(auto &[id,link]:links){
             std::vector<InputFrame> frames,received;for(auto &f:out)if(f.peer==id&&(!f.epoch||f.epoch==link.epoch))enqueueInput(frames,f.frame);
             link.channel->poll(link.endpoint.address,frames,received,now);
+            auto state=link.channel->status();if(state!=link.lastState){link.lastState=state;log(L"LAN input peer "+wide(id.substr(0,8))+L": "+wide(state));}
             if(link.generation!=link.channel->generation()){link.generation=link.channel->generation();link.epoch=++epoch;}
             for(auto &f:received)in.push_back({id,f,link.epoch});
         }

src/ui_lan.inl

@@ -36,7 +36,13 @@ void refreshLan(HWND w,LanView &v)
     for(const auto &peer:next["peers"])
     {
         auto id=peer.at("id").get<std::string>();ids.push_back(id);
-        auto state=peer.at("paired").get<bool>() ? L"Paired" : L"Not paired";
+        std::wstring state=L"Not paired";
+        if(peer.at("paired").get<bool>()){
+            bool connected=next.value("inputReady",nlohmann::json::object()).contains(id);
+            state=connected?L"Pair saved — input connected":
+                !next.value("shareInput",false)?L"Pair saved — input disabled here":
+                !peer.value("online",false)?L"Pair saved — computer offline":L"Pair saved — input not connected";
+        }
         rows.push_back(wide(peer.at("name").get<std::string>())+L"  ["+wide(id.substr(0,8))+L"]  — "+state);
     }
     // Presence/challenge refreshes must not repaint or reset the pairing list.

src/update.h

@@ -2,7 +2,7 @@
 #include "platform.h"
 namespace ks
 {
-inline constexpr wchar_t AppVersion[] = L"0.6.57";
+inline constexpr wchar_t AppVersion[] = L"0.6.58";
 inline constexpr UINT UpdateMessage = WM_APP + 7;
 inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000;
 inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000;