Revert "Remove ZephyrSocket"

This reverts commit f283940.
Also, fix things discussed with Damian-Nordic

Signed-off-by: Caldeira, Quentin <QuentinCaldeira@eaton.com>

Author: QuentinCaldeira-eaton

src/inet/BUILD.gn

@@ -162,6 +162,15 @@ static_library("inet") {
       "UDPEndPointImpl${chip_system_config_inet}.h",
       "UDPEndPointImpl.h",
     ]
+<<<<<<< HEAD
+=======
+
+    if (chip_system_config_inet == "Sockets") {
+      # TODO: dependency on this one is not clear as it is only ever
+      #       enabled through CMakeLists.txt. Added here for completeness
+      sources += [ "ZephyrSocket.h" ]
+    }
+>>>>>>> parent of f283940c03 (Remove ZephyrSocket)
   }
 
   if (chip_with_nlfaultinjection) {

src/inet/InetConfig.h

@@ -283,4 +283,16 @@
 #define HAVE_SO_BINDTODEVICE 0
 #endif
 
+/**
+ *  @def INET_CONFIG_UDP_SOCKET_MREQN 
+ * 
+ *  @brief 
+ *    Should be set to 1 if your platform can handle struct ip_mreqn,
+ *    mandatory in UDPEndPointSocket.cpp
+ */
+
+#ifndef INET_CONFIG_UDP_SOCKET_MREQN 
+#define INET_CONFIG_UDP_SOCKET_MREQN 0
+#endif
+
 // clang-format on

src/inet/UDPEndPointImplSockets.cpp

@@ -781,12 +781,12 @@ CHIP_ERROR UDPEndPointImplSockets::IPv4JoinLeaveMulticastGroupImpl(InterfaceId a
         interfaceAddr.s_addr = htonl(INADDR_ANY);
     }
 
-#ifdef SOCKET_ENABLE_MREQN
+#if INET_CONFIG_UDP_SOCKET_MREQN
     struct ip_mreqn lMulticastRequest;
     memset(&lMulticastRequest, 0, sizeof(lMulticastRequest));
-    lMulticastRequest.imr_ifindex   = -1;                /* Network interface index */
-    lMulticastRequest.imr_address   = interfaceAddr;     /* IP address of local interface */
-    lMulticastRequest.imr_multiaddr = aAddress.ToIPv4(); /* IP multicast group address*/
+    lMulticastRequest.imr_ifindex   = aInterfaceId.GetPlatformInterface();  /* Network interface index */
+    lMulticastRequest.imr_address   = interfaceAddr;                        /* IP address of local interface */
+    lMulticastRequest.imr_multiaddr = aAddress.ToIPv4();                    /* IP multicast group address*/
 
 #else
 

src/inet/ZephyrSocket.h

@@ -0,0 +1,53 @@
+#/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    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.
+ */
+
+/**
+ *    @file
+ *      This header file defines BSD socket API functions which for various
+ *      reasons have not (yet) been implemented or exposed in Zephyr.
+ */
+
+#pragma once
+
+#if CHIP_SYSTEM_CONFIG_USE_POSIX_SOCKETS
+#include <sys/select.h>
+#endif
+
+#if CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKETS
+#include <zephyr/net/socket.h>
+#endif
+
+static inline ssize_t recvmsg(int sock, struct msghdr * msg, int flags)
+{
+    // Zephyr doesn't implement recvmsg at all, but if the message vector size is > 0 we can simply
+    // translate recvmsg to recvfrom which fills only the first of the provided buffers (although
+    // we don't get control messages in such a case).
+
+    if (msg->msg_iovlen < 1)
+    {
+        errno = EMSGSIZE;
+        return -1;
+    }
+
+    ssize_t ret = recvfrom(sock, msg->msg_iov[0].iov_base, msg->msg_iov[0].iov_len, flags, static_cast<sockaddr *>(msg->msg_name),
+                           &msg->msg_namelen);
+
+    if (ret >= 0)
+        msg->msg_controllen = 0;
+
+    return ret;
+}

src/platform/Zephyr/BLEManagerImpl.cpp

@@ -802,20 +802,6 @@ bool BLEManagerImpl::SendWriteRequest(BLE_CONNECTION_OBJECT conId, const ChipBle
     return false;
 }
 
-bool BLEManagerImpl::SendReadRequest(BLE_CONNECTION_OBJECT conId, const ChipBleUUID * svcId, const ChipBleUUID * charId,
-                                     PacketBufferHandle pBuf)
-{
-    ChipLogDetail(DeviceLayer, "BLE central not implemented");
-    return false;
-}
-
-bool BLEManagerImpl::SendReadResponse(BLE_CONNECTION_OBJECT conId, BLE_READ_REQUEST_CONTEXT requestContext,
-                                      const ChipBleUUID * svcId, const ChipBleUUID * charId)
-{
-    ChipLogDetail(DeviceLayer, "BLE central not implemented");
-    return false;
-}
-
 void BLEManagerImpl::NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT conId)
 {
     CloseConnection(conId);

src/platform/Zephyr/BUILD.gn

@@ -38,6 +38,7 @@ static_library("Zephyr") {
     "ConnectivityManagerImpl.h",
     "DiagnosticDataProviderImpl.cpp",
     "DiagnosticDataProviderImpl.h",
+    "DiagnosticDataProviderImplGetter.cpp",
     "InetPlatformConfig.h",
     "KeyValueStoreManagerImpl.cpp",
     "KeyValueStoreManagerImpl.h",

src/platform/Zephyr/CHIPDevicePlatformConfig.h

@@ -104,12 +104,12 @@
 #endif // CHIP_DEVICE_CONFIG_SERVER_SHUTDOWN_ACTIONS_SLEEP_MS
 
 #ifndef CHIP_DEVICE_CONFIG_HEAP_STATISTICS_MALLINFO
-#if !defined(CONFIG_CHIP_MALLOC_SYS_HEAP) && (defined(CONFIG_NEWLIB_LIBC) || (defined(CONFIG_NEWLIB_LIBC_NANO)))
+#if !defined(CONFIG_CHIP_MALLOC_SYS_HEAP) && defined(CONFIG_NEWLIB_LIBC)
 /// Use mallinfo() to obtain the heap usage statistics exposed by SoftwareDiagnostics cluster attributes.
 #define CHIP_DEVICE_CONFIG_HEAP_STATISTICS_MALLINFO 1
 #else
 #define CHIP_DEVICE_CONFIG_HEAP_STATISTICS_MALLINFO 0
-#endif // !defined(CONFIG_CHIP_MALLOC_SYS_HEAP) && (defined(CONFIG_NEWLIB_LIBC) || (defined(CONFIG_NEWLIB_LIBC_NANO)))
+#endif // !defined(CONFIG_CHIP_MALLOC_SYS_HEAP) && defined(CONFIG_NEWLIB_LIBC)
 #endif // CHIP_DEVICE_CONFIG_HEAP_STATISTICS_MALLINFO
 
 #ifndef CHIP_DEVICE_BLE_ADVERTISING_PRIORITY

src/platform/Zephyr/CHIPPlatformConfig.h

@@ -53,6 +53,6 @@
 #ifndef CHIP_CONFIG_MAX_FABRICS
 #define CHIP_CONFIG_MAX_FABRICS 5
 
-#define SOCKET_ENABLE_MREQN
+#define INET_CONFIG_UDP_SOCKET_MREQN 1
 
 #endif

src/platform/Zephyr/DiagnosticDataProviderImpl.cpp

@@ -110,11 +110,6 @@ BootReasonType DetermineBootReason()
 
 } // namespace
 
-DiagnosticDataProvider & GetDiagnosticDataProviderImpl()
-{
-    return DiagnosticDataProviderImpl::GetDefaultInstance();
-}
-
 DiagnosticDataProviderImpl & DiagnosticDataProviderImpl::GetDefaultInstance()
 {
     static DiagnosticDataProviderImpl sInstance;