diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/daemon/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/gateway/dlt_gateway.c | 22 | ||||
-rw-r--r-- | src/gateway/dlt_gateway.h | 31 |
3 files changed, 50 insertions, 13 deletions
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index 7a04b64..cec9dc7 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -31,6 +31,16 @@ install(TARGETS dlt-daemon WORLD_EXECUTE WORLD_READ COMPONENT base) +if (WITH_DLT_UNIT_TESTS) + add_library(dlt_daemon ${dlt_daemon_SRCS}) + target_link_libraries(dlt_daemon rt ${CMAKE_THREAD_LIBS_INIT}) + install(TARGETS dlt_daemon + RUNTIME DESTINATION bin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static + COMPONENT base) +endif(WITH_DLT_UNIT_TESTS) + INSTALL(FILES dlt.conf DESTINATION ${CONFIGURATION_FILES_DIR} COMPONENT base) diff --git a/src/gateway/dlt_gateway.c b/src/gateway/dlt_gateway.c index 99eabd8..902822a 100644 --- a/src/gateway/dlt_gateway.c +++ b/src/gateway/dlt_gateway.c @@ -50,7 +50,7 @@ typedef struct { int (*func)(DltGatewayConnection *con, char *value); /* Conf handler */ int is_opt; /* If the configuration is optional or not */ } DltGatewayConf; - +#ifndef DLT_UNIT_TESTS typedef enum { GW_CONF_IP_ADDRESS = 0, GW_CONF_PORT, @@ -61,7 +61,7 @@ typedef enum { GW_CONF_SEND_SERIAL_HEADER, GW_CONF_COUNT } DltGatewayConfType; - +#endif /** * Check if given string is a valid IP address * @@ -69,7 +69,7 @@ typedef enum { * @param value string to be tested * @return 0 on success, -1 otherwise */ -static int dlt_gateway_check_ip(DltGatewayConnection *con, char *value) +STATIC int dlt_gateway_check_ip(DltGatewayConnection *con, char *value) { struct sockaddr_in sa; int ret = -1; @@ -109,7 +109,7 @@ static int dlt_gateway_check_ip(DltGatewayConnection *con, char *value) * @param value string to be tested * @return 0 on success, -1 otherwise */ -static int dlt_gateway_check_port(DltGatewayConnection *con, char *value) +STATIC int dlt_gateway_check_port(DltGatewayConnection *con, char *value) { int tmp = -1; @@ -141,7 +141,7 @@ static int dlt_gateway_check_port(DltGatewayConnection *con, char *value) * @param value string to be used as ECU identifier * @return 0 on success, -1 otherwise */ -static int dlt_gateway_check_ecu(DltGatewayConnection *con, char *value) +STATIC int dlt_gateway_check_ecu(DltGatewayConnection *con, char *value) { if (con == NULL || value == NULL) { @@ -165,7 +165,7 @@ static int dlt_gateway_check_ecu(DltGatewayConnection *con, char *value) * @param value string to be tested * @return 0 on success, -1 otherwise */ -static int dlt_gateway_check_connect_trigger(DltGatewayConnection *con, +STATIC int dlt_gateway_check_connect_trigger(DltGatewayConnection *con, char *value) { if (con == NULL || value == NULL) @@ -198,7 +198,7 @@ static int dlt_gateway_check_connect_trigger(DltGatewayConnection *con, * @param value string to be tested * @return 0 on success, -1 otherwise */ -static int dlt_gateway_check_timeout(DltGatewayConnection *con, char *value) +STATIC int dlt_gateway_check_timeout(DltGatewayConnection *con, char *value) { if (con == NULL || value == NULL) { @@ -222,7 +222,7 @@ static int dlt_gateway_check_timeout(DltGatewayConnection *con, char *value) * @param value string to be tested * @return 0 on success, -1 otherwise */ -static int dlt_gateway_check_send_serial(DltGatewayConnection *con, char *value) +STATIC int dlt_gateway_check_send_serial(DltGatewayConnection *con, char *value) { if (con == NULL || value == NULL) { @@ -241,7 +241,7 @@ static int dlt_gateway_check_send_serial(DltGatewayConnection *con, char *value) * @param value string to be tested * @return 0 on success, -1 otherwise */ -static int dlt_gateway_check_control_messages(DltGatewayConnection *con, +STATIC int dlt_gateway_check_control_messages(DltGatewayConnection *con, char *value) { /* list of allowed clients given */ @@ -299,7 +299,7 @@ static int dlt_gateway_check_control_messages(DltGatewayConnection *con, * Caution: after changing entries here, * dlt_gateway_check_param needs to be updated as well * */ -static DltGatewayConf configuration_entries[GW_CONF_COUNT] = +STATIC DltGatewayConf configuration_entries[GW_CONF_COUNT] = { [GW_CONF_IP_ADDRESS] = { .key = "IPaddress", @@ -342,7 +342,7 @@ static DltGatewayConf configuration_entries[GW_CONF_COUNT] = * @param value specified property value from configuration file * @return 0 on success, -1 otherwise */ -static int dlt_gateway_check_param(DltGateway *gateway, +STATIC int dlt_gateway_check_param(DltGateway *gateway, DltGatewayConnection *con, DltGatewayConfType ctype, char *value) diff --git a/src/gateway/dlt_gateway.h b/src/gateway/dlt_gateway.h index 255f855..9fa2d6a 100644 --- a/src/gateway/dlt_gateway.h +++ b/src/gateway/dlt_gateway.h @@ -60,7 +60,6 @@ #include "dlt-daemon.h" #include "dlt_gateway_types.h" - /** * Initialize the gateway to passive nodes * @@ -178,5 +177,33 @@ void dlt_gateway_send_control_message(DltGatewayConnection *con, /* _ONLY_ for development purposes */ void print_gateway_connection_details(const DltGateway *g); - +#ifdef DLT_UNIT_TESTS +typedef enum { + GW_CONF_IP_ADDRESS = 0, + GW_CONF_PORT, + GW_CONF_ECUID, + GW_CONF_CONNECT, + GW_CONF_TIMEOUT, + GW_CONF_SEND_CONTROL, + GW_CONF_SEND_SERIAL_HEADER, + GW_CONF_COUNT +} DltGatewayConfType; +int dlt_gateway_check_ip(DltGatewayConnection *con, char *value); +int dlt_gateway_check_port(DltGatewayConnection *con, char *value); +int dlt_gateway_check_ecu(DltGatewayConnection *con, char *value); +int dlt_gateway_check_connect_trigger(DltGatewayConnection *con, + char *value); +int dlt_gateway_check_timeout(DltGatewayConnection *con, char *value); +int dlt_gateway_check_send_serial(DltGatewayConnection *con, char *value); +int dlt_gateway_check_control_messages(DltGatewayConnection *con, + char *value); +int dlt_gateway_check_param(DltGateway *gateway, + DltGatewayConnection *con, + DltGatewayConfType ctype, + char *value); +int dlt_gateway_configure(DltGateway *gateway, char *config_file, int verbose); +int dlt_gateway_store_connection(DltGateway *gateway, + DltGatewayConnection *tmp, + int verbose); +#endif #endif |