fix: resolve merge conflicts and compile errors for transport layer
- Resolve stash conflicts in Cargo.toml, rpc/mod.rs, AppDetails.vue, Apps.vue - Fix ScopedIp conversion in LAN transport (mdns-sd compatibility) - Fix String vs &str in transport RPC send handler - Remove duplicate mod transport declaration - Remove stale mesh.discover route (replaced by mesh.peers/messages/send) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.6
parent
32f89fa8d5
commit
f42ff45475
@@ -89,7 +89,10 @@ impl LanTransport {
|
||||
|
||||
if let (Some(did), Some(pubkey)) = (did, pubkey) {
|
||||
if let Some(scoped_ip) = addresses.iter().next() {
|
||||
let ip: std::net::IpAddr = (*scoped_ip).into();
|
||||
let ip: std::net::IpAddr = match scoped_ip.to_string().parse() {
|
||||
Ok(ip) => ip,
|
||||
Err(_) => continue,
|
||||
};
|
||||
let socket_addr = std::net::SocketAddr::new(ip, info.get_port());
|
||||
info!(did = %did, addr = %socket_addr, "Discovered LAN peer via mDNS");
|
||||
registry_clone
|
||||
|
||||
Reference in New Issue
Block a user