diff --git a/iceoryx_hoofs/posix/auth/include/iox/posix_group.hpp b/iceoryx_hoofs/posix/auth/include/iox/posix_group.hpp index 8fb70e0f10..8b873d803b 100644 --- a/iceoryx_hoofs/posix/auth/include/iox/posix_group.hpp +++ b/iceoryx_hoofs/posix/auth/include/iox/posix_group.hpp @@ -31,23 +31,23 @@ class PosixGroup { public: using groupName_t = string; - explicit PosixGroup(const gid_t id) noexcept; + explicit PosixGroup(const iox_gid_t id) noexcept; explicit PosixGroup(const groupName_t& name) noexcept; bool operator==(const PosixGroup& other) const noexcept; groupName_t getName() const noexcept; - gid_t getID() const noexcept; + iox_gid_t getID() const noexcept; bool doesExist() const noexcept; static PosixGroup getGroupOfCurrentProcess() noexcept; - static optional getGroupID(const groupName_t& name) noexcept; - static optional getGroupName(gid_t id) noexcept; + static optional getGroupID(const groupName_t& name) noexcept; + static optional getGroupName(iox_gid_t id) noexcept; private: - gid_t m_id; + iox_gid_t m_id; bool m_doesExist{false}; }; diff --git a/iceoryx_hoofs/posix/auth/include/iox/posix_user.hpp b/iceoryx_hoofs/posix/auth/include/iox/posix_user.hpp index 4737d46761..3c232fce5f 100644 --- a/iceoryx_hoofs/posix/auth/include/iox/posix_user.hpp +++ b/iceoryx_hoofs/posix/auth/include/iox/posix_user.hpp @@ -37,22 +37,22 @@ class PosixUser using userName_t = string; - explicit PosixUser(const uid_t id) noexcept; + explicit PosixUser(const iox_uid_t id) noexcept; explicit PosixUser(const userName_t& name) noexcept; groupVector_t getGroups() const noexcept; userName_t getName() const noexcept; - uid_t getID() const noexcept; + iox_uid_t getID() const noexcept; bool doesExist() const noexcept; static PosixUser getUserOfCurrentProcess() noexcept; - static optional getUserID(const userName_t& name) noexcept; - static optional getUserName(uid_t id) noexcept; + static optional getUserID(const userName_t& name) noexcept; + static optional getUserName(iox_uid_t id) noexcept; private: - uid_t m_id; + iox_uid_t m_id; bool m_doesExist{false}; }; diff --git a/iceoryx_hoofs/posix/auth/source/posix_group.cpp b/iceoryx_hoofs/posix/auth/source/posix_group.cpp index 3df228f393..dd5213d32c 100644 --- a/iceoryx_hoofs/posix/auth/source/posix_group.cpp +++ b/iceoryx_hoofs/posix/auth/source/posix_group.cpp @@ -27,7 +27,7 @@ namespace iox { -PosixGroup::PosixGroup(gid_t id) noexcept +PosixGroup::PosixGroup(iox_gid_t id) noexcept : m_id(id) , m_doesExist(getGroupName(id).has_value()) { @@ -43,7 +43,7 @@ PosixGroup::PosixGroup(const PosixGroup::groupName_t& name) noexcept else { IOX_LOG(ERROR, "Error: Group name not found"); - m_id = std::numeric_limits::max(); + m_id = std::numeric_limits::max(); } } @@ -54,10 +54,10 @@ bool PosixGroup::operator==(const PosixGroup& other) const noexcept PosixGroup PosixGroup::getGroupOfCurrentProcess() noexcept { - return PosixGroup(getgid()); + return PosixGroup(iox_getgid()); } -optional PosixGroup::getGroupID(const PosixGroup::groupName_t& name) noexcept +optional PosixGroup::getGroupID(const PosixGroup::groupName_t& name) noexcept { auto getgrnamCall = IOX_POSIX_CALL(getgrnam)(name.c_str()).failureReturnValue(nullptr).evaluate(); @@ -67,10 +67,10 @@ optional PosixGroup::getGroupID(const PosixGroup::groupName_t& name) noex return nullopt_t(); } - return make_optional(getgrnamCall->value->gr_gid); + return make_optional(getgrnamCall->value->gr_gid); } -optional PosixGroup::getGroupName(gid_t id) noexcept +optional PosixGroup::getGroupName(iox_gid_t id) noexcept { auto getgrgidCall = IOX_POSIX_CALL(getgrgid)(id).failureReturnValue(nullptr).evaluate(); @@ -94,7 +94,7 @@ PosixGroup::groupName_t PosixGroup::getName() const noexcept return groupName_t(); } -gid_t PosixGroup::getID() const noexcept +iox_gid_t PosixGroup::getID() const noexcept { return m_id; } diff --git a/iceoryx_hoofs/posix/auth/source/posix_user.cpp b/iceoryx_hoofs/posix/auth/source/posix_user.cpp index 2f7b3dcfe3..186eda6a6d 100644 --- a/iceoryx_hoofs/posix/auth/source/posix_user.cpp +++ b/iceoryx_hoofs/posix/auth/source/posix_user.cpp @@ -20,6 +20,7 @@ #include "iceoryx_platform/platform_correction.hpp" #include "iceoryx_platform/pwd.hpp" #include "iceoryx_platform/types.hpp" +#include "iceoryx_platform/unistd.hpp" #include "iox/logging.hpp" #include "iox/posix_call.hpp" #include "iox/uninitialized_array.hpp" @@ -28,7 +29,7 @@ namespace iox { -optional PosixUser::getUserID(const userName_t& name) noexcept +optional PosixUser::getUserID(const userName_t& name) noexcept { auto getpwnamCall = IOX_POSIX_CALL(getpwnam)(name.c_str()).failureReturnValue(nullptr).evaluate(); @@ -37,10 +38,10 @@ optional PosixUser::getUserID(const userName_t& name) noexcept IOX_LOG(ERROR, "Error: Could not find user '" << name << "'."); return nullopt_t(); } - return make_optional(getpwnamCall->value->pw_uid); + return make_optional(getpwnamCall->value->pw_uid); } -optional PosixUser::getUserName(uid_t id) noexcept +optional PosixUser::getUserName(iox_uid_t id) noexcept { auto getpwuidCall = IOX_POSIX_CALL(getpwuid)(id).failureReturnValue(nullptr).evaluate(); @@ -67,8 +68,8 @@ PosixUser::groupVector_t PosixUser::getGroups() const noexcept return groupVector_t(); } - gid_t userDefaultGroup = getpwnamCall->value->pw_gid; - UninitializedArray groups{}; // groups is initialized in iox_getgrouplist + iox_gid_t userDefaultGroup = getpwnamCall->value->pw_gid; + UninitializedArray groups{}; // groups is initialized in iox_getgrouplist int numGroups = MAX_NUMBER_OF_GROUPS; auto getgrouplistCall = @@ -96,7 +97,7 @@ PosixUser::groupVector_t PosixUser::getGroups() const noexcept return vec; } -PosixUser::PosixUser(uid_t id) noexcept +PosixUser::PosixUser(iox_uid_t id) noexcept : m_id(id) , m_doesExist(getUserName(id).has_value()) { @@ -112,7 +113,7 @@ PosixUser::PosixUser(const PosixUser::userName_t& name) noexcept else { IOX_LOG(ERROR, "Error: User name not found"); - m_id = std::numeric_limits::max(); + m_id = std::numeric_limits::max(); } } @@ -127,7 +128,7 @@ PosixUser::userName_t PosixUser::getName() const noexcept return userName_t(); } -uid_t PosixUser::getID() const noexcept +iox_uid_t PosixUser::getID() const noexcept { return m_id; } @@ -139,7 +140,7 @@ bool PosixUser::doesExist() const noexcept PosixUser PosixUser::getUserOfCurrentProcess() noexcept { - return PosixUser(geteuid()); + return PosixUser(iox_geteuid()); } } // namespace iox diff --git a/iceoryx_hoofs/posix/design/include/iox/file_management_interface.hpp b/iceoryx_hoofs/posix/design/include/iox/file_management_interface.hpp index d99e13d896..d97fdf52d9 100644 --- a/iceoryx_hoofs/posix/design/include/iox/file_management_interface.hpp +++ b/iceoryx_hoofs/posix/design/include/iox/file_management_interface.hpp @@ -61,7 +61,7 @@ enum class FileSetPermissionError : uint8_t namespace details { expected get_file_status(const int fildes) noexcept; -expected set_owner(const int fildes, const uid_t uid, const gid_t gid) noexcept; +expected set_owner(const int fildes, const iox_uid_t uid, const iox_gid_t gid) noexcept; expected set_permissions(const int fildes, const access_rights perms) noexcept; } // namespace details @@ -71,16 +71,16 @@ class Ownership public: /// @brief Acquire the user id /// @returns uid - uid_t uid() const noexcept; + iox_uid_t uid() const noexcept; /// @brief Acquire the group id /// @returns gid - gid_t gid() const noexcept; + iox_gid_t gid() const noexcept; /// @brief Constructs a ownership object from a uid and a gid. /// @returns If the user or group does not exist it returns 'iox::nullopt' otherwise an Ownership object /// with existing user and group - static optional from_user_and_group(const uid_t uid, const gid_t gid) noexcept; + static optional from_user_and_group(const iox_uid_t uid, const iox_gid_t gid) noexcept; /// @brief Constructs a ownership object from a user name and a group name. /// @returns If the user or group does not exist it returns 'iox::nullopt' otherwise an Ownership object @@ -93,11 +93,11 @@ class Ownership private: template friend struct FileManagementInterface; - Ownership(const uid_t uid, const gid_t gid) noexcept; + Ownership(const iox_uid_t uid, const iox_gid_t gid) noexcept; private: - uid_t m_uid{std::numeric_limits::max()}; - gid_t m_gid{std::numeric_limits::max()}; + iox_uid_t m_uid{std::numeric_limits::max()}; + iox_gid_t m_gid{std::numeric_limits::max()}; }; /// @brief Abstract implementation to manage things common to all file descriptor diff --git a/iceoryx_hoofs/posix/design/source/file_management_interface.cpp b/iceoryx_hoofs/posix/design/source/file_management_interface.cpp index 41e7092400..50d6162052 100644 --- a/iceoryx_hoofs/posix/design/source/file_management_interface.cpp +++ b/iceoryx_hoofs/posix/design/source/file_management_interface.cpp @@ -52,7 +52,7 @@ expected get_file_status(const int fildes) noexcept return ok(file_status); } -expected set_owner(const int fildes, const uid_t uid, const gid_t gid) noexcept +expected set_owner(const int fildes, const iox_uid_t uid, const iox_gid_t gid) noexcept { auto result = IOX_POSIX_CALL(iox_fchown)(fildes, uid, gid).failureReturnValue(-1).evaluate(); @@ -118,17 +118,17 @@ expected set_permissions(const int fildes, const a } // namespace details -uid_t Ownership::uid() const noexcept +iox_uid_t Ownership::uid() const noexcept { return m_uid; } -gid_t Ownership::gid() const noexcept +iox_gid_t Ownership::gid() const noexcept { return m_gid; } -optional Ownership::from_user_and_group(const uid_t uid, const gid_t gid) noexcept +optional Ownership::from_user_and_group(const iox_uid_t uid, const iox_gid_t gid) noexcept { if (!PosixUser(uid).doesExist() || !PosixGroup(gid).doesExist()) { @@ -156,7 +156,7 @@ Ownership Ownership::from_process() noexcept return Ownership(PosixUser::getUserOfCurrentProcess().getID(), PosixGroup::getGroupOfCurrentProcess().getID()); } -Ownership::Ownership(const uid_t uid, const gid_t gid) noexcept +Ownership::Ownership(const iox_uid_t uid, const iox_gid_t gid) noexcept : m_uid{uid} , m_gid{gid} { diff --git a/iceoryx_hoofs/posix/filesystem/source/file.cpp b/iceoryx_hoofs/posix/filesystem/source/file.cpp index 8e2ad3e456..2219e2da70 100644 --- a/iceoryx_hoofs/posix/filesystem/source/file.cpp +++ b/iceoryx_hoofs/posix/filesystem/source/file.cpp @@ -203,7 +203,7 @@ void File::close_fd() noexcept expected File::does_exist(const FilePath& file) noexcept { - auto result = IOX_POSIX_CALL(iox_access)(file.as_string().c_str(), F_OK).failureReturnValue(-1).evaluate(); + auto result = IOX_POSIX_CALL(iox_access)(file.as_string().c_str(), IOX_F_OK).failureReturnValue(-1).evaluate(); if (!result.has_error()) { diff --git a/iceoryx_hoofs/posix/ipc/source/posix_shared_memory.cpp b/iceoryx_hoofs/posix/ipc/source/posix_shared_memory.cpp index 436dee8472..0d4c0022b6 100644 --- a/iceoryx_hoofs/posix/ipc/source/posix_shared_memory.cpp +++ b/iceoryx_hoofs/posix/ipc/source/posix_shared_memory.cpp @@ -129,7 +129,7 @@ expected PosixSharedMemoryBuilder::cr if (hasOwnership) { - auto result = IOX_POSIX_CALL(ftruncate)(sharedMemoryFileHandle, static_cast(m_size)) + auto result = IOX_POSIX_CALL(iox_ftruncate)(sharedMemoryFileHandle, static_cast(m_size)) .failureReturnValue(PosixSharedMemory::INVALID_HANDLE) .evaluate(); if (result.has_error()) diff --git a/iceoryx_hoofs/posix/utility/source/system_configuration.cpp b/iceoryx_hoofs/posix/utility/source/system_configuration.cpp index b30a140d5f..65cceddabc 100644 --- a/iceoryx_hoofs/posix/utility/source/system_configuration.cpp +++ b/iceoryx_hoofs/posix/utility/source/system_configuration.cpp @@ -29,7 +29,7 @@ uint64_t pageSize() noexcept { // sysconf fails when one provides an invalid name parameter. _SC_PAGESIZE // is a valid name parameter therefore it should never fail. - return static_cast(IOX_POSIX_CALL(sysconf)(_SC_PAGESIZE) + return static_cast(IOX_POSIX_CALL(iox_sysconf)(IOX_SC_PAGESIZE) .failureReturnValue(-1) .evaluate() .or_else([](auto& r) { diff --git a/iceoryx_hoofs/test/moduletests/test_posix_filesystem_posix_acl.cpp b/iceoryx_hoofs/test/moduletests/test_posix_filesystem_posix_acl.cpp index b4f97db4d6..12b4bbbd56 100644 --- a/iceoryx_hoofs/test/moduletests/test_posix_filesystem_posix_acl.cpp +++ b/iceoryx_hoofs/test/moduletests/test_posix_filesystem_posix_acl.cpp @@ -60,7 +60,7 @@ struct PwUidResult char buff[BUFFER_SIZE]; }; -std::unique_ptr iox_getpwuid(const uid_t uid) +std::unique_ptr iox_getpwuid(const iox_uid_t uid) { passwd* resultPtr = nullptr; std::unique_ptr result = std::make_unique(); @@ -126,7 +126,7 @@ TEST_F(PosixAcl_test, writeSpecialUserPermissions) // no name specified EXPECT_FALSE(entryAdded); - auto name = iox_getpwuid(geteuid()); + auto name = iox_getpwuid(iox_geteuid()); ASSERT_TRUE(name); PosixUser::userName_t currentUserName(iox::TruncateToCapacity, name->pwd.pw_name); @@ -209,11 +209,11 @@ TEST_F(PosixAcl_test, writeSpecialPermissionsWithID) { ::testing::Test::RecordProperty("TEST_ID", "ef0c7e17-de0e-4cfb-aafa-3e68580660e5"); - auto name = iox_getpwuid(geteuid()); + auto name = iox_getpwuid(iox_geteuid()); ASSERT_TRUE(name); std::string currentUserName(name->pwd.pw_name); - uid_t currentUserId(name->pwd.pw_uid); - gid_t groupId = 0; // root + iox_uid_t currentUserId(name->pwd.pw_uid); + iox_gid_t groupId = 0; // root bool entryAdded = m_accessController.addPermissionEntry( PosixAcl::Category::SPECIFIC_USER, PosixAcl::Permission::READWRITE, currentUserId); @@ -254,7 +254,7 @@ TEST_F(PosixAcl_test, writeSpecialPermissionsWithID) TEST_F(PosixAcl_test, addNameInWrongPlace) { ::testing::Test::RecordProperty("TEST_ID", "2d2dbb0d-1fb6-4569-8651-d341a4525ea6"); - auto name = iox_getpwuid(geteuid()); + auto name = iox_getpwuid(iox_geteuid()); ASSERT_TRUE(name); m_accessController.addPermissionEntry(PosixAcl::Category::GROUP, PosixAcl::Permission::READ); diff --git a/iceoryx_platform/freertos/include/iceoryx_platform/grp.hpp b/iceoryx_platform/freertos/include/iceoryx_platform/grp.hpp index f22c0727ba..275d12b7f8 100644 --- a/iceoryx_platform/freertos/include/iceoryx_platform/grp.hpp +++ b/iceoryx_platform/freertos/include/iceoryx_platform/grp.hpp @@ -19,11 +19,13 @@ #ifndef IOX_HOOFS_FREERTOS_PLATFORM_GRP_HPP #define IOX_HOOFS_FREERTOS_PLATFORM_GRP_HPP +#include "iceoryx_platform/types.hpp" + struct group { const char* gr_name; const char* gr_passwd; - gid_t gr_gid; + iox_gid_t gr_gid; const char** gr_mem; }; @@ -39,7 +41,7 @@ inline struct group* getgrnam(const char*) return &dummy; } -inline struct group* getgrgid(gid_t) +inline struct group* getgrgid(iox_gid_t) { static const char* groupName = "iceoryx_freertos_group"; static const char* groupPasswd = "iceoryx_freertos_passwd"; @@ -51,7 +53,7 @@ inline struct group* getgrgid(gid_t) return &dummy; } -inline int iox_getgrouplist(const char*, gid_t, gid_t* groups, int* ngroups) +inline int iox_getgrouplist(const char*, iox_gid_t, iox_gid_t* groups, int* ngroups) { groups[0] = 0; *ngroups = 1; diff --git a/iceoryx_platform/freertos/include/iceoryx_platform/types.hpp b/iceoryx_platform/freertos/include/iceoryx_platform/types.hpp index 4dc66346f8..9f4d746880 100644 --- a/iceoryx_platform/freertos/include/iceoryx_platform/types.hpp +++ b/iceoryx_platform/freertos/include/iceoryx_platform/types.hpp @@ -19,4 +19,9 @@ #ifndef IOX_HOOFS_FREERTOS_PLATFORM_TYPES_HPP #define IOX_HOOFS_FREERTOS_PLATFORM_TYPES_HPP +#include + +using iox_gid_t = gid_t; +using iox_uid_t = uid_t; + #endif // IOX_HOOFS_FREERTOS_PLATFORM_TYPES_HPP diff --git a/iceoryx_platform/freertos/include/iceoryx_platform/unistd.hpp b/iceoryx_platform/freertos/include/iceoryx_platform/unistd.hpp index 71fd853f26..72569a1222 100644 --- a/iceoryx_platform/freertos/include/iceoryx_platform/unistd.hpp +++ b/iceoryx_platform/freertos/include/iceoryx_platform/unistd.hpp @@ -19,20 +19,32 @@ #ifndef IOX_HOOFS_FREERTOS_PLATFORM_UNISTD_HPP #define IOX_HOOFS_FREERTOS_PLATFORM_UNISTD_HPP +#include "iceoryx_platform/types.hpp" + #include #define IOX_SEEK_SET SEEK_SET +#define IOX_SC_PAGESIZE _SC_PAGESIZE using iox_off_t = off_t; using iox_ssize_t = ssize_t; +#define IOX_F_OK F_OK +#define IOX_X_OK X_OK +#define IOX_W_OK W_OK +#define IOX_R_OK R_OK + +int iox_ftruncate(int fildes, off_t length); +long iox_sysconf(int name); int iox_close(int fd); int iox_ext_close(int fd); -int iox_fchown(int fd, uid_t owner, gid_t group); +int iox_fchown(int fd, iox_uid_t owner, iox_gid_t group); int iox_access(const char* pathname, int mode); int iox_unlink(const char* pathname); iox_off_t iox_lseek(int fd, iox_off_t offset, int whence); iox_ssize_t iox_read(int fd, void* buf, size_t count); iox_ssize_t iox_write(int fd, const void* buf, size_t count); +iox_gid_t iox_getgid(void); +iox_uid_t iox_geteuid(void); #endif // IOX_HOOFS_FREERTOS_PLATFORM_UNISTD_HPP diff --git a/iceoryx_platform/freertos/source/pwd.cpp b/iceoryx_platform/freertos/source/pwd.cpp index eefca7349e..463d9e9ef6 100644 --- a/iceoryx_platform/freertos/source/pwd.cpp +++ b/iceoryx_platform/freertos/source/pwd.cpp @@ -32,7 +32,7 @@ struct passwd* getpwnam(const char*) return &dummy; } -struct passwd* getpwuid(uid_t) +struct passwd* getpwuid(iox_uid_t) { static char value[] = "iceoryx_freertos_dummy"; static struct passwd dummy; diff --git a/iceoryx_platform/freertos/source/unistd.cpp b/iceoryx_platform/freertos/source/unistd.cpp index 728941f549..40f089e5f8 100644 --- a/iceoryx_platform/freertos/source/unistd.cpp +++ b/iceoryx_platform/freertos/source/unistd.cpp @@ -35,7 +35,7 @@ int iox_ext_close(int) return 0; } -int ftruncate(int fd, off_t length) +int iox_ftruncate(int fd, off_t length) { std::lock_guard lock{ShmFile::openFilesMutex}; const auto iter = std::find_if( @@ -44,32 +44,14 @@ int ftruncate(int fd, off_t length) return iter->ftruncate(length) ? 0 : -1; } -gid_t getgid(void) -{ - // Lets just say that on FreeRTOS, all group IDs are 1 - return 1; -} - -gid_t getegid(void) -{ - // Lets just say that on FreeRTOS, all effective group IDs are 1 - return 1; -} - -uid_t geteuid(void) -{ - // Lets just say that on FreeRTOS, all user IDs are 1 - return 1; -} - -long sysconf(int) +long iox_sysconf(int) { // This is only ever used to find the page size. Lets just return 4 kB as usual, even though there is no paging on // FreeRTOS return 4096; } -int iox_fchown(int, uid_t, gid_t) +int iox_fchown(int, iox_uid_t, iox_gid_t) { return 0; } @@ -98,3 +80,15 @@ iox_ssize_t iox_write(int, const void*, size_t) { return 0; } + +iox_gid_t iox_getgid(void) +{ + // Lets just say that on FreeRTOS, all group IDs are 1 + return 1; +} + +iox_uid_t iox_geteuid(void) +{ + // Lets just say that on FreeRTOS, all user IDs are 1 + return 1; +} diff --git a/iceoryx_platform/linux/include/iceoryx_platform/grp.hpp b/iceoryx_platform/linux/include/iceoryx_platform/grp.hpp index 8f171012d4..e03dbf87d8 100644 --- a/iceoryx_platform/linux/include/iceoryx_platform/grp.hpp +++ b/iceoryx_platform/linux/include/iceoryx_platform/grp.hpp @@ -17,8 +17,10 @@ #ifndef IOX_HOOFS_LINUX_PLATFORM_GRP_HPP #define IOX_HOOFS_LINUX_PLATFORM_GRP_HPP +#include "iceoryx_platform/types.hpp" + #include -int iox_getgrouplist(const char* user, gid_t group, gid_t* groups, int* ngroups); +int iox_getgrouplist(const char* user, iox_gid_t group, iox_gid_t* groups, int* ngroups); -#endif // IOX_HOOFS_LINUX_PLATFORM_GRP_HPP \ No newline at end of file +#endif // IOX_HOOFS_LINUX_PLATFORM_GRP_HPP diff --git a/iceoryx_platform/linux/include/iceoryx_platform/types.hpp b/iceoryx_platform/linux/include/iceoryx_platform/types.hpp index 180600b3da..3b247b4be5 100644 --- a/iceoryx_platform/linux/include/iceoryx_platform/types.hpp +++ b/iceoryx_platform/linux/include/iceoryx_platform/types.hpp @@ -19,4 +19,7 @@ #include +using iox_gid_t = gid_t; +using iox_uid_t = uid_t; + #endif // IOX_HOOFS_LINUX_PLATFORM_TYPES_HPP diff --git a/iceoryx_platform/linux/include/iceoryx_platform/unistd.hpp b/iceoryx_platform/linux/include/iceoryx_platform/unistd.hpp index 21e9493e90..3f69ac9239 100644 --- a/iceoryx_platform/linux/include/iceoryx_platform/unistd.hpp +++ b/iceoryx_platform/linux/include/iceoryx_platform/unistd.hpp @@ -17,20 +17,32 @@ #ifndef IOX_HOOFS_LINUX_PLATFORM_UNISTD_HPP #define IOX_HOOFS_LINUX_PLATFORM_UNISTD_HPP +#include "iceoryx_platform/types.hpp" + #include #define IOX_SEEK_SET SEEK_SET +#define IOX_SC_PAGESIZE _SC_PAGESIZE using iox_off_t = off_t; using iox_ssize_t = ssize_t; +#define IOX_F_OK F_OK +#define IOX_X_OK X_OK +#define IOX_W_OK W_OK +#define IOX_R_OK R_OK + +int iox_ftruncate(int fildes, off_t length); +long iox_sysconf(int name); int iox_close(int fd); int iox_ext_close(int fd); -int iox_fchown(int fd, uid_t owner, gid_t group); +int iox_fchown(int fd, iox_uid_t owner, iox_gid_t group); int iox_access(const char* pathname, int mode); int iox_unlink(const char* pathname); iox_off_t iox_lseek(int fd, iox_off_t offset, int whence); iox_ssize_t iox_read(int fd, void* buf, size_t count); iox_ssize_t iox_write(int fd, const void* buf, size_t count); +iox_gid_t iox_getgid(void); +iox_uid_t iox_geteuid(void); #endif // IOX_HOOFS_LINUX_PLATFORM_UNISTD_HPP diff --git a/iceoryx_platform/linux/source/grp.cpp b/iceoryx_platform/linux/source/grp.cpp index 250a2f3c8e..e9f01673f2 100644 --- a/iceoryx_platform/linux/source/grp.cpp +++ b/iceoryx_platform/linux/source/grp.cpp @@ -17,7 +17,7 @@ #include "iceoryx_platform/grp.hpp" // NOLINTNEXTLINE(readability-function-size,readability-identifier-naming) -int iox_getgrouplist(const char* user, gid_t group, gid_t* groups, int* ngroups) +int iox_getgrouplist(const char* user, iox_gid_t group, iox_gid_t* groups, int* ngroups) { return getgrouplist(user, group, groups, ngroups); } diff --git a/iceoryx_platform/linux/source/unistd.cpp b/iceoryx_platform/linux/source/unistd.cpp index 1ce62b9ed8..391668ce93 100644 --- a/iceoryx_platform/linux/source/unistd.cpp +++ b/iceoryx_platform/linux/source/unistd.cpp @@ -18,6 +18,16 @@ #include "iceoryx_platform/unistd.hpp" // NOLINTNEXTLINE(readability-identifier-naming) +int iox_ftruncate(int fildes, off_t length) +{ + return ftruncate(fildes, length); +} + +long iox_sysconf(int name) +{ + return sysconf(name); +} + int iox_close(int fd) { return close(fd); @@ -28,7 +38,7 @@ int iox_ext_close(int fd) return close(fd); } -int iox_fchown(int fd, uid_t owner, gid_t group) +int iox_fchown(int fd, iox_uid_t owner, iox_gid_t group) { return fchown(fd, owner, group); } @@ -57,3 +67,13 @@ iox_ssize_t iox_write(int fd, const void* buf, size_t count) { return write(fd, buf, count); } + +iox_gid_t iox_getgid(void) +{ + return getgid(); +} + +iox_uid_t iox_geteuid(void) +{ + return geteuid(); +} diff --git a/iceoryx_platform/mac/include/iceoryx_platform/grp.hpp b/iceoryx_platform/mac/include/iceoryx_platform/grp.hpp index be1ff9ddd0..7a562c137f 100644 --- a/iceoryx_platform/mac/include/iceoryx_platform/grp.hpp +++ b/iceoryx_platform/mac/include/iceoryx_platform/grp.hpp @@ -17,9 +17,11 @@ #ifndef IOX_HOOFS_MAC_PLATFORM_GRP_HPP #define IOX_HOOFS_MAC_PLATFORM_GRP_HPP +#include "iceoryx_platform/types.hpp" + #include #include -int iox_getgrouplist(const char* user, gid_t group, gid_t* groups, int* ngroups); +int iox_getgrouplist(const char* user, iox_gid_t group, iox_gid_t* groups, int* ngroups); #endif // IOX_HOOFS_MAC_PLATFORM_GRP_HPP diff --git a/iceoryx_platform/mac/include/iceoryx_platform/types.hpp b/iceoryx_platform/mac/include/iceoryx_platform/types.hpp index f663a6bafa..0c3929f71a 100644 --- a/iceoryx_platform/mac/include/iceoryx_platform/types.hpp +++ b/iceoryx_platform/mac/include/iceoryx_platform/types.hpp @@ -19,4 +19,7 @@ #include +using iox_gid_t = gid_t; +using iox_uid_t = uid_t; + #endif // IOX_HOOFS_MAC_PLATFORM_TYPES_HPP diff --git a/iceoryx_platform/mac/include/iceoryx_platform/unistd.hpp b/iceoryx_platform/mac/include/iceoryx_platform/unistd.hpp index 81c592b917..6b7947f2b9 100644 --- a/iceoryx_platform/mac/include/iceoryx_platform/unistd.hpp +++ b/iceoryx_platform/mac/include/iceoryx_platform/unistd.hpp @@ -17,19 +17,32 @@ #ifndef IOX_HOOFS_MAC_PLATFORM_UNISTD_HPP #define IOX_HOOFS_MAC_PLATFORM_UNISTD_HPP +#include "iceoryx_platform/types.hpp" + #include #define IOX_SEEK_SET SEEK_SET +#define IOX_SC_PAGESIZE _SC_PAGESIZE + using iox_off_t = off_t; using iox_ssize_t = ssize_t; +#define IOX_F_OK F_OK +#define IOX_X_OK X_OK +#define IOX_W_OK W_OK +#define IOX_R_OK R_OK + +int iox_ftruncate(int fildes, off_t length); +long iox_sysconf(int name); int iox_close(int fd); int iox_ext_close(int fd); -int iox_fchown(int fd, uid_t owner, gid_t group); +int iox_fchown(int fd, iox_uid_t owner, iox_gid_t group); int iox_access(const char* pathname, int mode); int iox_unlink(const char* pathname); iox_off_t iox_lseek(int fd, iox_off_t offset, int whence); iox_ssize_t iox_read(int fd, void* buf, size_t count); iox_ssize_t iox_write(int fd, const void* buf, size_t count); +iox_gid_t iox_getgid(void); +iox_uid_t iox_geteuid(void); #endif // IOX_HOOFS_MAC_PLATFORM_UNISTD_HPP diff --git a/iceoryx_platform/mac/source/grp.cpp b/iceoryx_platform/mac/source/grp.cpp index 9502717f7a..80de309c4a 100644 --- a/iceoryx_platform/mac/source/grp.cpp +++ b/iceoryx_platform/mac/source/grp.cpp @@ -16,7 +16,7 @@ #include "iceoryx_platform/grp.hpp" -int iox_getgrouplist(const char* user, gid_t group, gid_t* groups, int* ngroups) +int iox_getgrouplist(const char* user, iox_gid_t group, iox_gid_t* groups, int* ngroups) { return getgrouplist(user, static_cast(group), reinterpret_cast(groups), ngroups); } diff --git a/iceoryx_platform/mac/source/unistd.cpp b/iceoryx_platform/mac/source/unistd.cpp index 770ff909ca..ba1d685fbe 100644 --- a/iceoryx_platform/mac/source/unistd.cpp +++ b/iceoryx_platform/mac/source/unistd.cpp @@ -17,6 +17,16 @@ #include "iceoryx_platform/unistd.hpp" +int iox_ftruncate(int fildes, off_t length) +{ + return ftruncate(fildes, length); +} + +long iox_sysconf(int name) +{ + return sysconf(name); +} + int iox_close(int fd) { return close(fd); @@ -27,7 +37,7 @@ int iox_ext_close(int fd) return close(fd); } -int iox_fchown(int fd, uid_t owner, gid_t group) +int iox_fchown(int fd, iox_uid_t owner, iox_gid_t group) { return fchown(fd, owner, group); } @@ -56,3 +66,13 @@ iox_ssize_t iox_write(int fd, const void* buf, size_t count) { return write(fd, buf, count); } + +iox_gid_t iox_getgid(void) +{ + return getgid(); +} + +iox_uid_t iox_geteuid(void) +{ + return geteuid(); +} diff --git a/iceoryx_platform/qnx/include/iceoryx_platform/grp.hpp b/iceoryx_platform/qnx/include/iceoryx_platform/grp.hpp index dc425629ec..98851edbeb 100644 --- a/iceoryx_platform/qnx/include/iceoryx_platform/grp.hpp +++ b/iceoryx_platform/qnx/include/iceoryx_platform/grp.hpp @@ -17,9 +17,10 @@ #ifndef IOX_HOOFS_QNX_PLATFORM_GRP_HPP #define IOX_HOOFS_QNX_PLATFORM_GRP_HPP +#include "iceoryx_platform/types.hpp" + #include -#include -int iox_getgrouplist(const char* user, gid_t group, gid_t* groups, int* ngroups); +int iox_getgrouplist(const char* user, iox_gid_t group, iox_gid_t* groups, int* ngroups); -#endif // IOX_HOOFS_QNX_PLATFORM_GRP_HPP \ No newline at end of file +#endif // IOX_HOOFS_QNX_PLATFORM_GRP_HPP diff --git a/iceoryx_platform/qnx/include/iceoryx_platform/types.hpp b/iceoryx_platform/qnx/include/iceoryx_platform/types.hpp index d9bdad0271..b90aa4b9ea 100644 --- a/iceoryx_platform/qnx/include/iceoryx_platform/types.hpp +++ b/iceoryx_platform/qnx/include/iceoryx_platform/types.hpp @@ -19,4 +19,7 @@ #include +using iox_gid_t = gid_t; +using iox_uid_t = uid_t; + #endif // IOX_HOOFS_QNX_PLATFORM_TYPES_HPP diff --git a/iceoryx_platform/qnx/include/iceoryx_platform/unistd.hpp b/iceoryx_platform/qnx/include/iceoryx_platform/unistd.hpp index 06bf696c0c..2a699e5b31 100644 --- a/iceoryx_platform/qnx/include/iceoryx_platform/unistd.hpp +++ b/iceoryx_platform/qnx/include/iceoryx_platform/unistd.hpp @@ -17,19 +17,32 @@ #ifndef IOX_HOOFS_QNX_PLATFORM_UNISTD_HPP #define IOX_HOOFS_QNX_PLATFORM_UNISTD_HPP +#include "iceoryx_platform/types.hpp" + #include #define IOX_SEEK_SET SEEK_SET +#define IOX_SC_PAGESIZE _SC_PAGESIZE + using iox_off_t = off_t; using iox_ssize_t = ssize_t; +#define IOX_F_OK F_OK +#define IOX_X_OK X_OK +#define IOX_W_OK W_OK +#define IOX_R_OK R_OK + +int iox_ftruncate(int fildes, off_t length); +long iox_sysconf(int name); int iox_close(int fd); int iox_ext_close(int fd); -int iox_fchown(int fd, uid_t owner, gid_t group); +int iox_fchown(int fd, iox_uid_t owner, iox_gid_t group); int iox_access(const char* pathname, int mode); int iox_unlink(const char* pathname); iox_off_t iox_lseek(int fd, iox_off_t offset, int whence); iox_ssize_t iox_read(int fd, void* buf, size_t count); iox_ssize_t iox_write(int fd, const void* buf, size_t count); +iox_gid_t iox_getgid(void); +iox_uid_t iox_geteuid(void); #endif // IOX_HOOFS_QNX_PLATFORM_UNISTD_HPP diff --git a/iceoryx_platform/qnx/source/grp.cpp b/iceoryx_platform/qnx/source/grp.cpp index be498c9b1a..8727ec52c0 100644 --- a/iceoryx_platform/qnx/source/grp.cpp +++ b/iceoryx_platform/qnx/source/grp.cpp @@ -16,7 +16,7 @@ #include "iceoryx_platform/grp.hpp" -int iox_getgrouplist(const char* user, gid_t group, gid_t* groups, int* ngroups) +int iox_getgrouplist(const char* user, iox_gid_t group, iox_gid_t* groups, int* ngroups) { return getgrouplist(user, group, groups, ngroups); } diff --git a/iceoryx_platform/qnx/source/unistd.cpp b/iceoryx_platform/qnx/source/unistd.cpp index 770ff909ca..ba1d685fbe 100644 --- a/iceoryx_platform/qnx/source/unistd.cpp +++ b/iceoryx_platform/qnx/source/unistd.cpp @@ -17,6 +17,16 @@ #include "iceoryx_platform/unistd.hpp" +int iox_ftruncate(int fildes, off_t length) +{ + return ftruncate(fildes, length); +} + +long iox_sysconf(int name) +{ + return sysconf(name); +} + int iox_close(int fd) { return close(fd); @@ -27,7 +37,7 @@ int iox_ext_close(int fd) return close(fd); } -int iox_fchown(int fd, uid_t owner, gid_t group) +int iox_fchown(int fd, iox_uid_t owner, iox_gid_t group) { return fchown(fd, owner, group); } @@ -56,3 +66,13 @@ iox_ssize_t iox_write(int fd, const void* buf, size_t count) { return write(fd, buf, count); } + +iox_gid_t iox_getgid(void) +{ + return getgid(); +} + +iox_uid_t iox_geteuid(void) +{ + return geteuid(); +} diff --git a/iceoryx_platform/unix/include/iceoryx_platform/grp.hpp b/iceoryx_platform/unix/include/iceoryx_platform/grp.hpp index b94df72d2a..7dee5ee00c 100644 --- a/iceoryx_platform/unix/include/iceoryx_platform/grp.hpp +++ b/iceoryx_platform/unix/include/iceoryx_platform/grp.hpp @@ -17,8 +17,10 @@ #ifndef IOX_HOOFS_UNIX_PLATFORM_GRP_HPP #define IOX_HOOFS_UNIX_PLATFORM_GRP_HPP +#include "iceoryx_platform/types.hpp" + #include -int iox_getgrouplist(const char* user, gid_t group, gid_t* groups, int* ngroups); +int iox_getgrouplist(const char* user, iox_gid_t group, iox_gid_t* groups, int* ngroups); #endif // IOX_HOOFS_UNIX_PLATFORM_GRP_HPP diff --git a/iceoryx_platform/unix/include/iceoryx_platform/types.hpp b/iceoryx_platform/unix/include/iceoryx_platform/types.hpp index f6fb9678c9..612942deab 100644 --- a/iceoryx_platform/unix/include/iceoryx_platform/types.hpp +++ b/iceoryx_platform/unix/include/iceoryx_platform/types.hpp @@ -19,4 +19,7 @@ #include +using iox_gid_t = gid_t; +using iox_uid_t = uid_t; + #endif // IOX_HOOFS_UNIX_PLATFORM_TYPES_HPP diff --git a/iceoryx_platform/unix/include/iceoryx_platform/unistd.hpp b/iceoryx_platform/unix/include/iceoryx_platform/unistd.hpp index 738cba7d44..cd4b959c3a 100644 --- a/iceoryx_platform/unix/include/iceoryx_platform/unistd.hpp +++ b/iceoryx_platform/unix/include/iceoryx_platform/unistd.hpp @@ -17,19 +17,32 @@ #ifndef IOX_HOOFS_UNIX_PLATFORM_UNISTD_HPP #define IOX_HOOFS_UNIX_PLATFORM_UNISTD_HPP +#include "iceoryx_platform/types.hpp" + #include #define IOX_SEEK_SET SEEK_SET +#define IOX_SC_PAGESIZE _SC_PAGESIZE + using iox_off_t = off_t; using iox_ssize_t = ssize_t; +#define IOX_F_OK F_OK +#define IOX_X_OK X_OK +#define IOX_W_OK W_OK +#define IOX_R_OK R_OK + +int iox_ftruncate(int fildes, off_t length); +long iox_sysconf(int name); int iox_close(int fd); int iox_ext_close(int fd); -int iox_fchown(int fd, uid_t owner, gid_t group); +int iox_fchown(int fd, iox_uid_t owner, iox_gid_t group); int iox_access(const char* pathname, int mode); int iox_unlink(const char* pathname); iox_off_t iox_lseek(int fd, iox_off_t offset, int whence); iox_ssize_t iox_read(int fd, void* buf, size_t count); iox_ssize_t iox_write(int fd, const void* buf, size_t count); +iox_gid_t iox_getgid(void); +iox_uid_t iox_geteuid(void); #endif // IOX_HOOFS_UNIX_PLATFORM_UNISTD_HPP diff --git a/iceoryx_platform/unix/source/grp.cpp b/iceoryx_platform/unix/source/grp.cpp index c92b8579f1..e9f01673f2 100644 --- a/iceoryx_platform/unix/source/grp.cpp +++ b/iceoryx_platform/unix/source/grp.cpp @@ -15,10 +15,9 @@ // SPDX-License-Identifier: Apache-2.0 #include "iceoryx_platform/grp.hpp" -#include // NOLINTNEXTLINE(readability-function-size,readability-identifier-naming) -int iox_getgrouplist(const char* user, gid_t group, gid_t* groups, int* ngroups) +int iox_getgrouplist(const char* user, iox_gid_t group, iox_gid_t* groups, int* ngroups) { return getgrouplist(user, group, groups, ngroups); } diff --git a/iceoryx_platform/unix/source/unistd.cpp b/iceoryx_platform/unix/source/unistd.cpp index 1ce62b9ed8..391668ce93 100644 --- a/iceoryx_platform/unix/source/unistd.cpp +++ b/iceoryx_platform/unix/source/unistd.cpp @@ -18,6 +18,16 @@ #include "iceoryx_platform/unistd.hpp" // NOLINTNEXTLINE(readability-identifier-naming) +int iox_ftruncate(int fildes, off_t length) +{ + return ftruncate(fildes, length); +} + +long iox_sysconf(int name) +{ + return sysconf(name); +} + int iox_close(int fd) { return close(fd); @@ -28,7 +38,7 @@ int iox_ext_close(int fd) return close(fd); } -int iox_fchown(int fd, uid_t owner, gid_t group) +int iox_fchown(int fd, iox_uid_t owner, iox_gid_t group) { return fchown(fd, owner, group); } @@ -57,3 +67,13 @@ iox_ssize_t iox_write(int fd, const void* buf, size_t count) { return write(fd, buf, count); } + +iox_gid_t iox_getgid(void) +{ + return getgid(); +} + +iox_uid_t iox_geteuid(void) +{ + return geteuid(); +} diff --git a/iceoryx_platform/win/include/iceoryx_platform/grp.hpp b/iceoryx_platform/win/include/iceoryx_platform/grp.hpp index f6a34b3535..b03682681b 100644 --- a/iceoryx_platform/win/include/iceoryx_platform/grp.hpp +++ b/iceoryx_platform/win/include/iceoryx_platform/grp.hpp @@ -17,21 +17,16 @@ #ifndef IOX_HOOFS_WIN_PLATFORM_GRP_HPP #define IOX_HOOFS_WIN_PLATFORM_GRP_HPP -#include "iceoryx_platform/grp.hpp" +#include "iceoryx_platform/types.hpp" struct group { const char* gr_name; const char* gr_passwd; - gid_t gr_gid; + iox_gid_t gr_gid; const char** gr_mem; }; -inline gid_t getegid(void) -{ - return 0; -} - inline struct group* getgrnam(const char* name) { static const char* groupName = "iceoryx_windows_group"; @@ -44,7 +39,7 @@ inline struct group* getgrnam(const char* name) return &dummy; } -inline struct group* getgrgid(gid_t gid) +inline struct group* getgrgid(iox_gid_t gid) { static const char* groupName = "iceoryx_windows_group"; static const char* groupPasswd = "iceoryx_windows_passwd"; @@ -56,7 +51,7 @@ inline struct group* getgrgid(gid_t gid) return &dummy; } -inline int iox_getgrouplist(const char* user, gid_t group, gid_t* groups, int* ngroups) +inline int iox_getgrouplist(const char* user, iox_gid_t group, iox_gid_t* groups, int* ngroups) { groups[0] = 0; *ngroups = 1; diff --git a/iceoryx_platform/win/include/iceoryx_platform/pwd.hpp b/iceoryx_platform/win/include/iceoryx_platform/pwd.hpp index b32fe60634..a10e60ff40 100644 --- a/iceoryx_platform/win/include/iceoryx_platform/pwd.hpp +++ b/iceoryx_platform/win/include/iceoryx_platform/pwd.hpp @@ -23,8 +23,8 @@ struct passwd { const char* pw_name; const char* pw_passwd; - uid_t pw_uid; - gid_t pw_gid; + iox_uid_t pw_uid; + iox_gid_t pw_gid; const char* pw_gecos; const char* pw_dir; const char* pw_shell; @@ -45,7 +45,7 @@ inline struct passwd* getpwnam(const char* name) return &dummy; } -inline struct passwd* getpwuid(uid_t uid) +inline struct passwd* getpwuid(iox_uid_t uid) { static const char* value = "iceoryx_windows_dummy"; static struct passwd dummy; @@ -59,9 +59,4 @@ inline struct passwd* getpwuid(uid_t uid) return &dummy; } -inline uid_t geteuid() -{ - return 0; -} - #endif // IOX_HOOFS_WIN_PLATFORM_PWD_HPP diff --git a/iceoryx_platform/win/include/iceoryx_platform/types.hpp b/iceoryx_platform/win/include/iceoryx_platform/types.hpp index f017c373cd..4cd6937c6a 100644 --- a/iceoryx_platform/win/include/iceoryx_platform/types.hpp +++ b/iceoryx_platform/win/include/iceoryx_platform/types.hpp @@ -19,8 +19,8 @@ #include -using gid_t = int; -using uid_t = int; +using iox_gid_t = int; +using iox_uid_t = int; #if defined(_MSC_VER) using mode_t = int; using ssize_t = size_t; diff --git a/iceoryx_platform/win/include/iceoryx_platform/unistd.hpp b/iceoryx_platform/win/include/iceoryx_platform/unistd.hpp index 9b8e6dc304..c4719fd4cf 100644 --- a/iceoryx_platform/win/include/iceoryx_platform/unistd.hpp +++ b/iceoryx_platform/win/include/iceoryx_platform/unistd.hpp @@ -26,7 +26,7 @@ #include #define IOX_SEEK_SET SEEK_SET -#define _SC_PAGESIZE 1 +#define IOX_SC_PAGESIZE 1 #ifndef STDOUT_FILENO #define STDOUT_FILENO 1 #endif @@ -34,25 +34,25 @@ #define STDERR_FILENO 2 #endif -using uid_t = int; -using gid_t = int; using iox_off_t = long; using iox_ssize_t = int; -#define F_OK 0 -#define W_OK 2 -#define R_OK 4 +#define IOX_F_OK 0 +#define IOX_X_OK 1 +#define IOX_W_OK 2 +#define IOX_R_OK 4 -int ftruncate(int fildes, off_t length); -long sysconf(int name); +int iox_ftruncate(int fildes, off_t length); +long iox_sysconf(int name); int iox_close(int fd); int iox_ext_close(int fd); -int iox_fchown(int fd, uid_t owner, gid_t group); +int iox_fchown(int fd, iox_uid_t owner, iox_gid_t group); int iox_access(const char* pathname, int mode); int iox_unlink(const char* pathname); iox_off_t iox_lseek(int fd, iox_off_t offset, int whence); iox_ssize_t iox_read(int fd, void* buf, size_t count); iox_ssize_t iox_write(int fd, const void* buf, size_t count); -gid_t getgid(); +iox_gid_t iox_getgid(void); +iox_uid_t iox_geteuid(void); #endif // IOX_HOOFS_WIN_PLATFORM_UNISTD_HPP diff --git a/iceoryx_platform/win/source/unistd.cpp b/iceoryx_platform/win/source/unistd.cpp index 194ad29e8a..534801fe63 100644 --- a/iceoryx_platform/win/source/unistd.cpp +++ b/iceoryx_platform/win/source/unistd.cpp @@ -20,7 +20,7 @@ #include "iceoryx_platform/mman.hpp" #include "iceoryx_platform/win32_errorHandling.hpp" -int ftruncate(int fildes, off_t length) +int iox_ftruncate(int fildes, off_t length) { internal_iox_shm_set_size(fildes, length); return 0; @@ -36,9 +36,9 @@ int iox_unlink(const char* pathname) return _unlink(pathname); } -long sysconf(int name) +long iox_sysconf(int name) { - if (name == _SC_PAGESIZE) + if (name == IOX_SC_PAGESIZE) { SYSTEM_INFO systemInfo; GetSystemInfo(&systemInfo); @@ -69,7 +69,7 @@ int iox_ext_close(int fd) return 0; } -int iox_fchown(int fd, uid_t owner, gid_t group) +int iox_fchown(int fd, iox_uid_t owner, iox_gid_t group) { return 0; } @@ -89,7 +89,12 @@ iox_ssize_t iox_write(int fd, const void* buf, size_t count) return _write(fd, buf, count); } -gid_t getgid() +iox_gid_t iox_getgid(void) +{ + return 0; +} + +iox_uid_t iox_geteuid(void) { return 0; } diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp b/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp index bc5656ed45..57b8e1303b 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp @@ -76,7 +76,7 @@ class RouDi version::VersionInfo parseRegisterMessage(const runtime::IpcMessage& message, uint32_t& pid, - uid_t& userId, + iox_uid_t& userId, int64_t& transmissionTimestamp) noexcept; /// @brief Handles the registration request from process diff --git a/iceoryx_posh/source/roudi/roudi.cpp b/iceoryx_posh/source/roudi/roudi.cpp index e76bf1df5e..2289913c59 100644 --- a/iceoryx_posh/source/roudi/roudi.cpp +++ b/iceoryx_posh/source/roudi/roudi.cpp @@ -270,7 +270,7 @@ void RouDi::processRuntimeMessages(runtime::IpcInterfaceCreator&& roudiIpcInterf version::VersionInfo RouDi::parseRegisterMessage(const runtime::IpcMessage& message, uint32_t& pid, - uid_t& userId, + iox_uid_t& userId, int64_t& transmissionTimestamp) noexcept { convert::from_string(message.getElementAtIndex(2).c_str()).and_then([&pid](const auto value) { @@ -319,7 +319,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, else { uint32_t pid{0U}; - uid_t userId{0}; + iox_uid_t userId{0}; int64_t transmissionTimestamp{0}; version::VersionInfo versionInfo = parseRegisterMessage(message, pid, userId, transmissionTimestamp);