UDP Multicast implementation (COVESA#155)

The feature can be enabled by setting WITH_UDP_CONNECTION to ON.

Signed-off-by: sunil.s <[email protected]>

Author: Sunil-K-S

CMakeLists.txt

@@ -78,6 +78,7 @@ option(WITH_DLT_LOGSTORAGE_CTRL_UDEV "PROTOTYPE! Set to ON to build logstorage c
 option(WITH_DLT_USE_IPv6      "Set to ON for IPv6 support"                                                       ON)
 option(WITH_DLT_KPI           "Set to ON to build src/kpi binaries"                                              OFF)
 option(WITH_DLT_FATAL_LOG_TRAP "Set to ON to enable DLT_LOG_FATAL trap(trigger segv inside dlt-user library)"    OFF)
+option(WITH_UDP_CONNECTION     "Set to ON to enable dlt UDP multicast SUPPORT"                                   ON)
 
 # RPM settings
 set(GENIVI_RPM_RELEASE "1")  # ${DLT_REVISION}")
@@ -262,6 +263,7 @@ message(STATUS "CMAKE_HOST_SYSTEM_PROCESSOR = ${CMAKE_HOST_SYSTEM_PROCESSOR}")
 message(STATUS "CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}")
 message(STATUS "WITH_DLT_LOGSTORAGE_CTRL_UDEV = ${WITH_DLT_LOGSTORAGE_CTRL_UDEV}")
 message(STATUS "DLT_IPC = ${DLT_IPC}(Path: ${DLT_USER_IPC_PATH})")
+message(STATUS "WITH_UDP_CONNECTION = ${WITH_UDP_CONNECTION}")
 message(STATUS "Change a value with: cmake -D<Variable>=<Value>")
 message(STATUS "-------------------------------------------------------------------------------")
 message(STATUS)

README.md

@@ -63,6 +63,7 @@ DLT\_USER                         | genivi         | Set user for process not ru
 WITH\_CHECK\_CONFIG\_FILE         | OFF            | Set to ON to create a configure file of CheckIncludeFiles and CheckFunctionExists
 CMAKE\_INSTALL\_PREFIX            | /usr/local
 CMAKE\_BUILD\_TYPE                | RelWithDebInfo
+WITH\_UDP\_CONNECTION             | ON             | Set to ON to enable dlt UDP multicast SUPPORT
 
 #### Command Line Tool Options
 

doc/dlt.conf.5.md

@@ -321,6 +321,18 @@ Maximal used memory for log storage cache in KB.
 
     Default: 30000 KB
 
+## UDPConnectionSetup
+
+Enable or disable UDP connection. 0 = disabled, 1 = enabled
+
+## UDPMulticastIPAddress
+
+The address on which daemon multicasts the log messages
+
+## UDPMulticastIPPort
+
+The Multicase IP port. Default: 3491
+
 # AUTHOR
 
 Alexander Wenzel (alexander.aw.wenzel (at) bmw (dot) de)

src/daemon/CMakeLists.txt

@@ -45,8 +45,6 @@ if(WITH_DLT_SHM_ENABLE)
         ${PROJECT_SOURCE_DIR}/src/shared/dlt_shm.c)
 endif()
 
-add_executable(dlt-daemon ${dlt_daemon_SRCS} ${systemd_SRCS})
-
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(RT_LIBRARY rt)
     set(SOCKET_LIBRARY "")
@@ -55,6 +53,13 @@ else()
     set(SOCKET_LIBRARY socket)
 endif()
 
+if(WITH_UDP_CONNECTION)
+    include_directories(${PROJECT_SOURCE_DIR}/src/daemon/udp_connection)
+    add_definitions(-DUDP_CONNECTION_SUPPORT)
+    set(dlt_daemon_SRCS ${dlt_daemon_SRCS} ${PROJECT_SOURCE_DIR}/src/daemon/udp_connection/dlt_daemon_udp_socket.c)
+endif(WITH_UDP_CONNECTION)
+
+add_executable(dlt-daemon ${dlt_daemon_SRCS} ${systemd_SRCS})
 target_link_libraries(dlt-daemon ${RT_LIBRARY} ${SOCKET_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
 
 install(TARGETS dlt-daemon

src/daemon/dlt-daemon.c

@@ -65,6 +65,9 @@
 #include "dlt_daemon_offline_logstorage.h"
 #include "dlt_gateway.h"
 
+#ifdef UDP_CONNECTION_SUPPORT
+#   include "dlt_daemon_udp_socket.h"
+#endif
 #if defined(DLT_SYSTEMD_WATCHDOG_ENABLE) || defined(DLT_SYSTEMD_ENABLE)
 #   include "sd-daemon.h"
 #endif
@@ -289,6 +292,11 @@ int option_file_parser(DltDaemonLocal *daemon_local)
     daemon_local->flags.contextLogLevel = DLT_LOG_INFO;
     daemon_local->flags.contextTraceStatus = DLT_TRACE_STATUS_OFF;
     daemon_local->flags.enforceContextLLAndTS = 0; /* default is off */
+#ifdef UDP_CONNECTION_SUPPORT
+    daemon_local->UDPConnectionSetup = MULTICAST_CONNECTION_ENABLED;
+    strncpy(daemon_local->UDPMulticastIPAddress, MULTICASTIPADDRESS, MULTICASTIP_MAX_SIZE - 1);
+    daemon_local->UDPMulticastIPPort = MULTICASTIPPORT;
+#endif
 
     /* open configuration file */
     if (daemon_local->flags.cvalue[0])
@@ -597,6 +605,33 @@ int option_file_parser(DltDaemonLocal *daemon_local)
                         strncpy(daemon_local->flags.daemonFifoGroup, value, NAME_MAX);
                         daemon_local->flags.daemonFifoGroup[NAME_MAX] = 0;
                     }
+#endif
+#ifdef UDP_CONNECTION_SUPPORT
+                    else if (strcmp(token, "UDPConnectionSetup") == 0)
+                    {
+                        const long longval = strtol(value, NULL, 10);
+
+                        if ((longval == MULTICAST_CONNECTION_DISABLED)
+                            || (longval == MULTICAST_CONNECTION_ENABLED)) {
+                            daemon_local->UDPConnectionSetup = longval;
+                            printf("Option: %s=%s\n", token, value);
+                        }
+                        else {
+                            daemon_local->UDPConnectionSetup = MULTICAST_CONNECTION_DISABLED;
+                            fprintf(stderr,
+                                    "Invalid value for UDPConnectionSetup set to default %ld\n",
+                                    longval);
+                        }
+                    }
+                    else if (strcmp(token, "UDPMulticastIPAddress") == 0)
+                    {
+                        strncpy(daemon_local->UDPMulticastIPAddress, value,
+                                MULTICASTIP_MAX_SIZE - 1);
+                    }
+                    else if (strcmp(token, "UDPMulticastIPPort") == 0)
+                    {
+                        daemon_local->UDPMulticastIPPort = strtol(value, NULL, 10);
+                    }
 #endif
                     else {
                         fprintf(stderr, "Unknown option: %s=%s\n", token, value);
@@ -1204,6 +1239,20 @@ int dlt_daemon_local_connection_init(DltDaemon *daemon,
         return DLT_RETURN_ERROR;
     }
 
+#ifdef UDP_CONNECTION_SUPPORT
+
+    if (daemon_local->UDPConnectionSetup == MULTICAST_CONNECTION_ENABLED) {
+        if (dlt_daemon_udp_connection_setup(daemon_local) < 0) {
+            dlt_log(LOG_ERR, "UDP fd creation and register in epoll failed\n");
+            return DLT_RETURN_ERROR;
+        }
+        else {
+            dlt_log(LOG_INFO, "UDP fd creation and register in epoll success\n");
+        }
+    }
+
+#endif
+
     /* create and open unix socket to receive incoming connections from
      * control application
      * socket access permission set to srw-rw---- (660)  */

src/daemon/dlt-daemon.h

@@ -157,6 +157,11 @@ typedef struct
     unsigned long RingbufferMaxSize;
     unsigned long RingbufferStepSize;
     unsigned long daemonFifoSize;
+#ifdef UDP_CONNECTION_SUPPORT
+    int UDPConnectionSetup; /* enable/disable the UDP connection */
+    char UDPMulticastIPAddress[MULTICASTIP_MAX_SIZE]; /* multicast ip addres */
+    int UDPMulticastIPPort; /* multicast port */
+#endif
 } DltDaemonLocal;
 
 typedef struct

src/daemon/dlt.conf

@@ -183,3 +183,15 @@ ControlSocketPath = /tmp/dlt-ctrl.sock
 
 # Maximal used memory for Logstorage Cache in KB (Default: 30000 KB)
 # OfflineLogstorageCacheSize = 30000
+
+##############################################################################
+# UDP Multicast Configuration                                                #
+##############################################################################
+# Enable UDP connection support for daemon(Control Message/Multicast is enabled)
+UDPConnectionSetup = 1
+
+# UDP multicast address(default:225.0.0.37)
+UDPMulticastIPAddress = 225.0.0.37
+
+# UDP multicast port(default:3491)
+UDPMulticastIPPort = 3491

src/daemon/dlt_daemon_client.c

@@ -81,6 +81,10 @@ static inline int8_t getStatus(uint8_t request_log, int context_log)
     return (request_log <= context_log) ? request_log : context_log;
 }
 
+#ifdef UDP_CONNECTION_SUPPORT
+#   include "dlt_daemon_udp_socket.h"
+#endif
+
 /** @brief Sends up to 2 messages to all the clients.
  *
  * Runs through the client list and sends the messages to them. If the message
@@ -284,6 +288,17 @@ int dlt_daemon_client_send(int sock,
 
     /* send messages to daemon socket */
     if ((daemon->mode == DLT_USER_MODE_EXTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH)) {
+#ifdef UDP_CONNECTION_SUPPORT
+
+        if (daemon_local->UDPConnectionSetup == MULTICAST_CONNECTION_ENABLED)
+            dlt_daemon_udp_dltmsg_multicast(data1,
+                                            size1,
+                                            data2,
+                                            size2,
+                                            verbose);
+
+#endif
+
         if ((sock == DLT_DAEMON_SEND_FORCE) || (daemon->state == DLT_DAEMON_STATE_SEND_DIRECT)) {
             sent = dlt_daemon_client_send_all_multiple(daemon,
                                                        daemon_local,

src/daemon/dlt_daemon_common.h

@@ -104,6 +104,15 @@ extern "C" {
 #define DLT_DAEMON_SEM_FREE() { sem_post(&dlt_daemon_mutex); }
 extern sem_t dlt_daemon_mutex;
 
+/* UDPMulticart Default IP and Port */
+#   ifdef UDP_CONNECTION_SUPPORT
+    #      define MULTICASTIPADDRESS "225.0.0.37"
+    #      define MULTICASTIPPORT 3491
+    #      define MULTICASTIP_MAX_SIZE 256
+    #      define MULTICAST_CONNECTION_DISABLED 0
+    #      define MULTICAST_CONNECTION_ENABLED 1
+#   endif
+
 /**
  * Definitions of DLT daemon logging states
  */

src/daemon/udp_connection/dlt_daemon_udp_common_socket.h

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2019 LG Electronics Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * For further information see http://www.genivi.org/.
+ */
+
+/*!
+ * \author
+ * Guruprasad KN <[email protected]>
+ * Sachin Sudhakar Shetty <[email protected]>
+ * Sunil Kovila Sampath <[email protected]>
+ *
+ * \Copyright (c) 2019 LG Electronics Inc.
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt_daemon_udp_common_socket.h
+ */
+
+#ifndef DLT_DAEMON_UDP_COMMON_SOCKET_H
+#define DLT_DAEMON_UDP_COMMON_SOCKET_H
+
+#include <arpa/inet.h>  /* for sockaddr_in and inet_addr() */
+#include <errno.h>
+#include <net/if.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <stdlib.h>     /* for atoi() and exit() */
+#include <string.h>     /* for memset() */
+#include <syslog.h>
+#include <sys/socket.h> /* for socket(), connect(), (), and recv() */
+#include <sys/ioctl.h>
+#include <sys/epoll.h>
+#include <unistd.h>     /* for close() */
+
+#include "dlt_common.h"
+#include "dlt-daemon.h"
+#include "dlt_daemon_common_cfg.h"
+#include "dlt_daemon_client.h"
+#include "dlt_daemon_connection.h"
+#include "dlt_daemon_udp_socket.h"
+#include "dlt_types.h"
+
+/* #define variables */
+#define ADDRESS_VALID 1
+#define ADDRESS_INVALID 0
+#define SOCKPORT_MAX_LEN 6 /* port range 0-65535 */
+#define SYSTEM_CALL_ERROR -1
+#define ZERO_BYTE_RECIEVED 0
+#define ONE_BYTE_RECIEVED 0
+
+typedef struct sockaddr_storage CLIENT_ADDR_STRUCT;
+typedef socklen_t CLIENT_ADDR_STRUCT_SIZE;
+
+/* udp strutures */
+typedef struct
+{
+    CLIENT_ADDR_STRUCT clientaddr;
+    CLIENT_ADDR_STRUCT_SIZE clientaddr_size;
+    int isvalidflag;
+} DltDaemonClientSockInfo;
+
+/* Function prototype declaration */
+void dlt_daemon_udp_init_clientstruct(DltDaemonClientSockInfo *clientinfo_struct);
+DltReturnValue dlt_daemon_udp_socket_open(int *sock, unsigned int servPort);
+void dlt_daemon_udp_setmulticast_addr(DltDaemonLocal *daemon_local);
+
+#endif /* DLT_DAEMON_UDP_COMMON_SOCKET_H */
+