daemon: Remove bytes_sent

When it fails to send a log message to connected client, daemon
tries to store the remaining partial message to internal ring
buffer and send again later. When calculating the number of bytes
which were sent to client, it had a bug which it keeps on
incrementing instead of initializing the variable on every message,
which never reached to the condition mentioned above and had a
possibility to overflow and access invalid memory. On the other hand,
daemon doesn't need to store the unsent partial message, as the socket
to the client will be closed on failure and the sent partial message
will be dropped anyways.

This commit removes the lines where the daemon tries to store the
partial message to ring buffer. With this, variable bytes_sent is
now removed.

Related commit: 2262f8b Made socket send reliable

Signed-off-by: Saya Sugiura <ssugiura@jp.adit-jv.com>

1 files changed, 4 insertions, 8 deletions

diff --git a/src/daemon/dlt_daemon_socket.c b/src/daemon/dlt_daemon_socket.c
index f35346d..f9c4ab2 100644
--- a/src/daemon/dlt_daemon_socket.c
+++ b/src/daemon/dlt_daemon_socket.c
@@ -152,14 +152,12 @@ int dlt_daemon_socket_close(int sock)
 int dlt_daemon_socket_send(int sock, void *data1, int size1, void *data2, int size2, char serialheader)
 {
     int ret = DLT_RETURN_OK;
-    int bytes_sent = 0;
 
     /* Optional: Send serial header, if requested */
     if (serialheader) {
         ret = dlt_daemon_socket_sendreliable(sock,
                                              (void *)dltSerialHeader,
-                                             sizeof(dltSerialHeader),
-                                             &bytes_sent);
+                                             sizeof(dltSerialHeader));
 
         if (ret != DLT_RETURN_OK)
             return ret;
@@ -167,14 +165,14 @@ int dlt_daemon_socket_send(int sock, void *data1, int size1, void *data2, int si
 
     /* Send data */
     if ((data1 != NULL) && (size1 > 0)) {
-        ret = dlt_daemon_socket_sendreliable(sock, data1, size1, &bytes_sent);
+        ret = dlt_daemon_socket_sendreliable(sock, data1, size1);
 
         if (ret != DLT_RETURN_OK)
             return ret;
     }
 
     if ((data2 != NULL) && (size2 > 0))
-        ret = dlt_daemon_socket_sendreliable(sock, data2, size2, &bytes_sent);
+        ret = dlt_daemon_socket_sendreliable(sock, data2, size2);
 
     return ret;
 }
@@ -188,7 +186,7 @@ int dlt_daemon_socket_get_send_qeue_max_size(int sock)
     return n;
 }
 
-int dlt_daemon_socket_sendreliable(int sock, void *data_buffer, int message_size, int *bytes_sent)
+int dlt_daemon_socket_sendreliable(int sock, void *data_buffer, int message_size)
 {
     int data_sent = 0;
 
@@ -199,7 +197,6 @@ int dlt_daemon_socket_sendreliable(int sock, void *data_buffer, int message_size
             dlt_vlog(LOG_WARNING,
                      "dlt_daemon_socket_sendreliable: socket send failed [errno: %d]!\n",
                      errno);
-            *bytes_sent = data_sent;
             return DLT_DAEMON_ERROR_SEND_FAILED;
         }
         else {
@@ -207,7 +204,6 @@ int dlt_daemon_socket_sendreliable(int sock, void *data_buffer, int message_size
         }
     }
 
-    *bytes_sent = data_sent;
     return DLT_DAEMON_ERROR_OK;
 }