iox-eclipse-iceoryx#33 added un.hpp platform header for socket support; some casting for mmap return value type deduction

Signed-off-by: Christian Eltzschig <[email protected]>

Author: elfenpiff

iceoryx_utils/include/iceoryx_utils/internal/posix_wrapper/unix_domain_socket.hpp

@@ -21,10 +21,10 @@
 #include "iceoryx_utils/internal/units/duration.hpp"
 #include "iceoryx_utils/platform/mqueue.hpp"
 #include "iceoryx_utils/platform/stat.hpp"
+#include "iceoryx_utils/platform/un.hpp"
 
 #include <fcntl.h>
 #include <iostream>
-#include <sys/un.h>
 
 namespace iox
 {

iceoryx_utils/platform/linux/include/iceoryx_utils/platform/un.hpp

@@ -0,0 +1,17 @@
+// Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <sys/un.h>

iceoryx_utils/platform/mac/include/iceoryx_utils/platform/un.hpp

@@ -0,0 +1,15 @@
+// Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once

iceoryx_utils/platform/qnx/include/iceoryx_utils/platform/un.hpp

@@ -0,0 +1,15 @@
+// Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once

iceoryx_utils/platform/win/include/iceoryx_utils/platform/socket.hpp

@@ -16,6 +16,11 @@
 
 #define AF_INET 0
 #define SOCK_STREAM 1
+#define SOL_SOCKET 2
+#define SO_SNDTIMEO 3
+#define SO_RCVTIMEO 4
+#define AF_LOCAL 5
+#define SOCK_DGRAM 6
 
 using in_port_t = int;
 using sa_family_t = int;
@@ -59,3 +64,19 @@ inline int socket(int domain, int type, int protocol)
 {
     return 0;
 }
+
+inline int setsockopt(int sockfd, int level, int optname, const void* optval, socklen_t optlen)
+{
+    return 0;
+}
+
+inline ssize_t
+sendto(int sockfd, const void* buf, size_t len, int flags, const struct sockaddr* dest_addr, socklen_t addrlen)
+{
+    return 0;
+}
+
+inline ssize_t recvfrom(int sockfd, void* buf, size_t len, int flags, struct sockaddr* src_addr, socklen_t* addrlen)
+{
+    return 0;
+}

iceoryx_utils/platform/win/include/iceoryx_utils/platform/types.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include <sys/types.h>
+
 using gid_t = int;
 using uid_t = int;
 using mode_t = int;
@@ -22,9 +24,9 @@ using pid_t = int;
 using nlink_t = int;
 using blksize_t = int;
 using blkcnt_t = int;
-// using off_t   = int;
+// using off_t = int;
 
-mode_t umask(mode_t mask)
-{
-    return mode_t();
-}
+// mode_t umask(mode_t mask)
+//{
+//    return mode_t();
+//}

iceoryx_utils/platform/win/include/iceoryx_utils/platform/un.hpp

@@ -0,0 +1,23 @@
+// Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include "iceoryx_utils/platform/socket.hpp"
+
+struct sockaddr_un
+{
+    sa_family_t sun_family;
+    char sun_path[108];
+};

iceoryx_utils/source/posix_wrapper/shared_memory_object/memory_map.cpp

@@ -57,9 +57,11 @@ MemoryMap::MemoryMap(const void* f_baseAddressHint,
         l_memoryProtection = PROT_READ | PROT_WRITE;
         break;
     }
-    auto mmapCall = cxx::makeSmartC(mmap,
+    auto mmapCall = cxx::makeSmartC(static_cast<void* (*)(void*, size_t, int, int, int, off_t)>(mmap),
                                     cxx::ReturnMode::PRE_DEFINED_ERROR_CODE,
-                                    {MAP_FAILED},
+                                    // we have to perform reinterpret cast since mmap returns MAP_FAILED on error which
+                                    // is defined as (void*) -1; see man mmap for that definition
+                                    {reinterpret_cast<void*>(MAP_FAILED)},
                                     {},
                                     const_cast<void*>(f_baseAddressHint),
                                     f_length,

iceoryx_utils/source/posix_wrapper/unix_domain_socket.cpp

@@ -14,11 +14,11 @@
 
 #include "iceoryx_utils/internal/posix_wrapper/unix_domain_socket.hpp"
 #include "iceoryx_utils/cxx/smart_c.hpp"
+#include "iceoryx_utils/platform/socket.hpp"
+#include "iceoryx_utils/platform/unistd.hpp"
 
 #include <chrono>
 #include <cstdlib>
-#include <sys/socket.h>
-#include <unistd.h>
 
 namespace iox
 {