ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-24 07:46:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VFS lwIP: support opening a handle on the root directory

Browse Source 
The "nameserver" file cannot be opened through a VFS File_system client
if the plugin does not support opening the parent directory of
"/nameserver", which would be "/".

Ref #3269
This commit is contained in:
Emery Hemingway 2019-03-22 13:44:03 +01:00 committed by Christian Helmuth
parent a635873568
commit 66f49e6c42
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
repos/libports/src/lib/vfs/lwip/vfs.cc
View File

@ -343,13 +343,9 @@ struct Lwip::Socket_dir : Lwip::Directory
return Open_result::OPEN_OK; return Open_result::OPEN_OK;
} }
Read_result readdir(char *dst, file_size count, Read_result readdir(char *, file_size, file_size &) override
file_size &out_count) override
{ {
Genode::warning(__func__, " NOT_IMPLEMENTED"); Genode::warning(__func__, " NOT_IMPLEMENTED");
(void)dst;
(void)count;
(void)out_count;
return Read_result::READ_ERR_INVALID; return Read_result::READ_ERR_INVALID;
} }
@ -579,13 +575,9 @@ class Lwip::Protocol_dir_impl final : public Protocol_dir
return Directory_service::STAT_ERR_NO_ENTRY; return Directory_service::STAT_ERR_NO_ENTRY;
} }
Read_result readdir(char *dst, file_size count, Read_result readdir(char *, file_size, file_size &) override
file_size &out_count) override
{ {
Genode::warning(__func__, " NOT_IMPLEMENTED"); Genode::warning(__func__, " NOT_IMPLEMENTED");
(void)dst;
(void)count;
(void)out_count;
return Read_result::READ_ERR_INVALID; return Read_result::READ_ERR_INVALID;
}; };
@ -1602,7 +1594,7 @@ void tcp_err_callback(void *arg, err_t)
** VFS file-system ** ** VFS file-system **
*********************/ *********************/
class Lwip::File_system final : public Vfs::File_system class Lwip::File_system final : public Vfs::File_system, public Lwip::Directory
{ {
private: private:
@ -1678,8 +1670,6 @@ class Lwip::File_system final : public Vfs::File_system
template <typename PROC> template <typename PROC>
void apply_walk(char const *path, PROC const proc) void apply_walk(char const *path, PROC const proc)
{ {
if (*path == '/') ++path;
if (Genode::strcmp(path, "tcp", 3) == 0) if (Genode::strcmp(path, "tcp", 3) == 0)
proc(path+3, _netif.tcp_dir); proc(path+3, _netif.tcp_dir);
else else
@ -1703,6 +1693,16 @@ class Lwip::File_system final : public Vfs::File_system
_netif.configure(node); } _netif.configure(node); }
/*********************
** Lwip::Directory **
*********************/
Read_result readdir(char *, file_size, file_size &) override
{
Genode::warning(__func__, " NOT_IMPLEMENTED");
return Read_result::READ_ERR_INVALID;
};
/*********************** /***********************
** Directory_service ** ** Directory_service **
***********************/ ***********************/
@ -1786,12 +1786,23 @@ class Lwip::File_system final : public Vfs::File_system
*/ */
if (create) return OPENDIR_ERR_PERMISSION_DENIED; if (create) return OPENDIR_ERR_PERMISSION_DENIED;
if (*path == '/') ++path;
try {
if (*path == '\0') {
*out_handle = new (alloc) Lwip_dir_handle(*this, alloc, *this);
return OPENDIR_OK;
}
Opendir_result r = OPENDIR_ERR_LOOKUP_FAILED; Opendir_result r = OPENDIR_ERR_LOOKUP_FAILED;
apply_walk(path, [&] (char const *subpath, Protocol_dir &dir) { apply_walk(path, [&] (char const *subpath, Protocol_dir &dir) {
r = dir.opendir(*this, subpath, out_handle, alloc); r = dir.opendir(*this, subpath, out_handle, alloc);
}); });
return r; return r;
} }
catch (Genode::Out_of_ram) { return OPENDIR_ERR_OUT_OF_RAM; }
catch (Genode::Out_of_caps) { return OPENDIR_ERR_OUT_OF_CAPS; }
}
void close(Vfs_handle *vfs_handle) override void close(Vfs_handle *vfs_handle) override
{ {