diff options
author | Frederic Berat <fberat@de.adit-jv.com> | 2016-03-21 15:40:53 +0900 |
---|---|---|
committer | Gernot Wirschal <gernot.wirschal@bmw.de> | 2016-04-27 09:23:56 +0200 |
commit | e1bdf1e7f1d2ac87a594abf8622f536d3ff4b0b9 (patch) | |
tree | ae58da225312880bab547191febf82691c20fea8 /src/lib | |
parent | cc4517dcffc6e5fd66791fca486586ae9b948174 (diff) | |
download | DLT-daemon-e1bdf1e7f1d2ac87a594abf8622f536d3ff4b0b9.tar.gz |
MultiNode: Add support for port configuration
Signed-off-by:Frederic Berat <fberat@de.adit-jv.com>
Change-Id: I9b387d5713f5ae7b6fcfadb22d804fdb97534e44
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/dlt_client.c | 45 |
1 files changed, 35 insertions, 10 deletions
diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c index 3de3845..20291d5 100644 --- a/src/lib/dlt_client.c +++ b/src/lib/dlt_client.c @@ -105,25 +105,44 @@ void dlt_client_register_message_callback(int (*registerd_callback) (DltMessage message_callback_function = registerd_callback; } -DltReturnValue dlt_client_init(DltClient *client, int verbose) +DltReturnValue dlt_client_init_port(DltClient *client, int port, int verbose) { if (verbose) - printf("Init dlt client struct\n"); + { + snprintf(str, DLT_CLIENT_TEXTBUFSIZE, + "Init dlt client struct with port %d\n", port); + dlt_log(LOG_INFO, str); + } if (client == NULL) + { return DLT_RETURN_ERROR; + } - client->sock = -1; - client->servIP = 0; - client->serialDevice = 0; - client->baudrate = DLT_CLIENT_INITIAL_BAUDRATE; + client->sock=-1; + client->servIP=0; + client->serialDevice=0; + client->baudrate=DLT_CLIENT_INITIAL_BAUDRATE; + client->port = port; client->socketPath = 0; client->mode=DLT_CLIENT_MODE_TCP; - client->receiver.buffer = 0; + client->receiver.buffer=0; return DLT_RETURN_OK; } +DltReturnValue dlt_client_init(DltClient *client, int verbose) +{ + if (verbose) + { + snprintf(str, DLT_CLIENT_TEXTBUFSIZE, + "Init dlt client struct with default port.\n"); + dlt_log(LOG_INFO, str); + } + + return dlt_client_init_port(client, DLT_DAEMON_TCP_PORT, verbose); +} + DltReturnValue dlt_client_connect(DltClient *client, int verbose) { char portnumbuffer[33]; @@ -163,12 +182,18 @@ DltReturnValue dlt_client_connect(DltClient *client, int verbose) for(p = servinfo; p != NULL; p = p->ai_next) { if ((client->sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) < 0) { - snprintf(str, DLT_CLIENT_TEXTBUFSIZE, "socket() failed!\n"); + snprintf(str, DLT_CLIENT_TEXTBUFSIZE, + "socket() failed! %s\n", + strerror(errno)); + dlt_log(LOG_WARNING, str); continue; } if (connect(client->sock, p->ai_addr, p->ai_addrlen) < 0) { + snprintf(str, DLT_CLIENT_TEXTBUFSIZE, + "connect() failed! %s\n", + strerror(errno)); close(client->sock); - snprintf(str, DLT_CLIENT_TEXTBUFSIZE, "connect() failed!\n"); + dlt_log(LOG_WARNING, str); continue; } @@ -178,7 +203,7 @@ DltReturnValue dlt_client_connect(DltClient *client, int verbose) freeaddrinfo(servinfo); if (p == NULL) { - fprintf(stderr, "ERROR: failed to connect - %s\n", str); + dlt_log(LOG_ERR, "ERROR: failed to connect.\n"); return DLT_RETURN_ERROR; } |