Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Reconnect passive dlt-daemon when passive dlt-daemon becomes unrespon… #581

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+147 −0
Open

Reconnect passive dlt-daemon when passive dlt-daemon becomes unrespon… #581

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 94 additions & 0 deletions src/gateway/dlt_gateway.c
View file
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@
#include "dlt_daemon_connection.h"
#include "dlt_daemon_client.h"
#include "dlt_daemon_offline_logstorage.h"
#include "dlt_heart_beat.h"

/**
* Check if given string is a valid IP address
@@ -347,6 +348,38 @@ DLT_STATIC DltReturnValue dlt_gateway_check_control_messages(DltGatewayConnectio
return DLT_RETURN_OK;
}


/**
* Initialize the heart beat message
*
* @param control_message the control message
* @param interval the interval to send heart beat signal
* @return true if it is initialized
*/
bool init_heart_beat(DltPassiveControlMessage *control_message, int interval)
{
if(control_message == NULL || control_message->id != DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL )
{
return false;
}
control_message->interval = interval;

return true;
}

/**
* reset heart beat in connection
*
* @param con the DltGatewayConnection
*/
void reset_conn_heart_beat(DltGatewayConnection *con)
{
if(con){
con->heart_beat_flag = 0;
con->heart_beat_wait = HEART_BEAT_WAIT;
}
}

/**
* Check the specified periodic control messages identifier
*
@@ -361,6 +394,7 @@ DLT_STATIC DltReturnValue dlt_gateway_check_periodic_control_messages(
char *token = NULL;
char *rest = NULL;
DltPassiveControlMessage *head = NULL;
bool heart_beat_initialized = false;

if ((con == NULL) || (value == NULL)) {
dlt_vlog(LOG_ERR, "%s: wrong parameter\n", __func__);
@@ -394,6 +428,9 @@ DLT_STATIC DltReturnValue dlt_gateway_check_periodic_control_messages(
if (con->p_control_msgs->id == id) {
con->p_control_msgs->type = CONTROL_MESSAGE_BOTH;
con->p_control_msgs->interval = strtol(p_rest, NULL, 10);
if(heart_beat_initialized == false) {
heart_beat_initialized = init_heart_beat(con->p_control_msgs, HEART_BEAT_INTERVAL);
}

if (con->p_control_msgs->interval <= 0)
dlt_vlog(LOG_WARNING,
@@ -432,6 +469,10 @@ DLT_STATIC DltReturnValue dlt_gateway_check_periodic_control_messages(
con->p_control_msgs->req = CONTROL_MESSAGE_NOT_REQUESTED;
con->p_control_msgs->interval = strtol(p_rest, NULL, 10);

if(heart_beat_initialized == false) {
heart_beat_initialized = init_heart_beat(con->p_control_msgs, HEART_BEAT_INTERVAL);
}

if (con->p_control_msgs->interval <= 0)
dlt_vlog(LOG_WARNING,
"%s interval is %d. It won't be send periodically.\n",
@@ -461,6 +502,23 @@ DLT_STATIC DltReturnValue dlt_gateway_check_periodic_control_messages(
token = strtok_r(NULL, ",", &rest);
}

if(heart_beat_initialized == false)
{
/* go to last pointer */
SLIST_LAST(con->p_control_msgs, head);

if (dlt_gateway_allocate_control_messages(con) != DLT_RETURN_OK) {
dlt_log(LOG_ERR, "Passive Control Message could not be allocated\n");
return DLT_RETURN_ERROR;
}

con->p_control_msgs->id = DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL;
con->p_control_msgs->user_id = DLT_SERVICE_ID_PASSIVE_NODE_CONNECT;
con->p_control_msgs->type = CONTROL_MESSAGE_PERIODIC;
con->p_control_msgs->req = CONTROL_MESSAGE_NOT_REQUESTED;
heart_beat_initialized = init_heart_beat(con->p_control_msgs, HEART_BEAT_INTERVAL);
}

/* get back to head */
con->p_control_msgs = head;
con->head = head;
@@ -719,6 +777,7 @@ int dlt_gateway_configure(DltGateway *gateway, char *config_file, int verbose)
/* Set default */
tmp.send_serial = gateway->send_serial;
tmp.port = DLT_DAEMON_TCP_PORT;
reset_conn_heart_beat(&tmp);

ret = dlt_config_file_get_section_name(file, i, section);
if (ret != 0) {
@@ -1019,14 +1078,46 @@ int dlt_gateway_establish_connections(DltGateway *gateway,
/* immediately send periodic configured control messages */
control_msg = con->p_control_msgs;

if(con->heart_beat_flag == 1)
{
if(con->heart_beat_wait == 0){

/* disconnect from passive node */
con->status = DLT_GATEWAY_DISCONNECTED;
con->trigger = DLT_GATEWAY_ON_STARTUP;

if (dlt_event_handler_unregister_connection(&daemon_local->pEvent,
daemon_local,
con->client.sock) != 0) {
dlt_log(LOG_ERR, "heart beat unregister connection failed\n");
}

dlt_log(LOG_WARNING, "heart beat detection failed\n");

reset_conn_heart_beat(con);
}
else {
con->heart_beat_wait--;
dlt_log(LOG_DEBUG, "heart beat detection wait\n");
}

return DLT_RETURN_OK;
}

while (control_msg != NULL) {
if ((control_msg->type == CONTROL_MESSAGE_PERIODIC) ||
(control_msg->type == CONTROL_MESSAGE_BOTH)) {
if (dlt_gateway_send_control_message(con,
control_msg,
NULL,
verbose) == DLT_RETURN_OK)
{
control_msg->req = CONTROL_MESSAGE_REQUESTED;
if(control_msg->id == DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL) {
con->heart_beat_flag = 1;
dlt_log(LOG_DEBUG, "heart beat detection start\n");
}
}
}

control_msg = control_msg->next;
@@ -1398,6 +1489,9 @@ DltReturnValue dlt_gateway_process_passive_node_messages(DltDaemon *daemon,
}
else if (id == DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL)
{
reset_conn_heart_beat(con);
dlt_log(LOG_DEBUG, "heart beat detection clear\n");

if (dlt_gateway_parse_get_default_log_level(
daemon,
daemon_local,
2 changes: 2 additions & 0 deletions src/gateway/dlt_gateway_types.h
View file
Original file line number Diff line number Diff line change
@@ -132,6 +132,8 @@ typedef struct {
int send_serial; /* Send serial header with control messages */
DltClient client; /* DltClient structure */
int default_log_level; /* Default Log Level on passive node */
int heart_beat_flag; /* heart beat signal send flag. 0 no heart beat signal */
int heart_beat_wait; /* the wait seconds to close connection without response */
} DltGatewayConnection;

/* DltGateway structure */
51 changes: 51 additions & 0 deletions src/gateway/dlt_heart_beat.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* SPDX license identifier: MPL-2.0
*
* Copyright (C) 2022, Daimler TSS GmbH
*
* This file is part of COVESA Project DLT - Diagnostic Log and Trace.
*
* This Source Code Form is subject to the terms of the
* Mozilla Public License (MPL), v. 2.0.
* 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 https://www.covesa.global/.
*
* \file dlt_heart_beat.h
*
*/


#ifndef AUTOMOTIVE_DLT_SRC_GATEWAY_DLT_HEART_BEAT_H_
#define AUTOMOTIVE_DLT_SRC_GATEWAY_DLT_HEART_BEAT_H_

#define HEART_BEAT_INTERVAL 1 // send heart beat every second
#define HEART_BEAT_WAIT 3 //the interval to wait heart beat response


/*
* List access methods
*/
#define SLIST_FIRST(head) (head)
#define SLIST_END(head) NULL
#define SLIST_EMPTY(head) (LIST_FIRST(head) == LIST_END(head))
#define SLIST_NEXT(elm) ((elm)->next)


#define SLIST_FOREACH(var, head) \
for((var) = SLIST_FIRST(head); \
(var)!= SLIST_END(head); \
(var) = SLIST_NEXT(var))


#define SLIST_LAST(var, hear) do { \
SLIST_FOREACH(var, head) { \
if(SLIST_NEXT(var) == SLIST_END(head)) { \
break; \
} \
}\
} while(0)


#endif //AUTOMOTIVE_DLT_SRC_GATEWAY_DLT_HEART_BEAT_H_