ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-29 15:44:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vfs/lxip: support connect(...AF_UNSPEC..) on UDP sockets

Browse Source 
Note, Linux supports connection reset via this mechanism for UDP as well
as TCP sockets and vfs_lxip retains this feature.

Issue #5031
This commit is contained in:
Sebastian Sumpf 2023-10-10 21:02:27 +02:00 committed by Christian Helmuth
parent 5261fe626d
commit 83d4fcdf27
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
repos/dde_linux/src/lib/vfs/lxip/vfs.cc
View File

@ -95,8 +95,22 @@ unsigned get_addr(char const *p)
return (to[0]<<0)|(to[1]<<8)|(to[2]<<16)|(to[3]<<24);
}
long get_family(char const *p)
{
long tmp = -1;
while (*p) {
if (*p == ';') {
Genode::ascii_to_unsigned(++p, tmp, 1);
break;
}
p++;
}
return tmp;
}
} /* unnamed namespace */
namespace Lxip {
@ -704,17 +718,25 @@ class Vfs::Lxip_connect_file final : public Vfs::Lxip_file
if (!handle.write_content_line(src)) return -1;
long const port = get_port(handle.content_buffer);
if (port == -1) return -1;
long const family = get_family(handle.content_buffer);
if (port == -1 && family) return -1;
sockaddr_storage addr_storage;
sockaddr_in *addr = (sockaddr_in *)&addr_storage;
addr->sin_port = htons(port);
addr->sin_addr.s_addr = get_addr(handle.content_buffer);
addr->sin_family = AF_INET;
addr->sin_family = family == 0 ? AF_UNSPEC : AF_INET;
_write_err = _sock.ops->connect(&_sock, (sockaddr *)addr, sizeof(addr_storage), O_NONBLOCK);
if (family == AF_UNSPEC) {
_is_connected = false;
_connecting = false;
_parent.connect(false);
return src.num_bytes;
}
switch (_write_err) {
case Lxip::Io_result::LINUX_EINPROGRESS:
_connecting = true;
@ -769,6 +791,8 @@ class Vfs::Lxip_connect_file final : public Vfs::Lxip_file
return Format::snprintf(dst.start, dst.num_bytes, "connected");
case Linux::ECONNREFUSED:
return Format::snprintf(dst.start, dst.num_bytes, "connection refused");
case 65: /* Linux::ENOPKG */
return Format::snprintf(dst.start, dst.num_bytes, "package not installed");
default:
return Format::snprintf(dst.start, dst.num_bytes, "unknown error");
}