diff options
| author | Simon Brandner <simon.brandner@partner.bmw.de> | 2013-04-25 13:25:35 +0200 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2013-07-19 16:54:47 +0200 |
| commit | f524304ff10ce50259cc28ced0915ba47e294920 (patch) | |
| tree | e06d68656f882a44ca56084725679599c3ea833a /src/daemon/dlt-daemon.c | |
| parent | 205f941eabcac08cf66745e6527067077e57aaa7 (diff) | |
| download | DLT-daemon-f524304ff10ce50259cc28ced0915ba47e294920.tar.gz | |
Invalid Sock is set to -1 instead 0 (stdin). Consequent error handling in fseek failure cases
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src/daemon/dlt-daemon.c')
| -rw-r--r-- | src/daemon/dlt-daemon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 6871ca8..64a8acd 100644 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -1232,9 +1232,9 @@ int dlt_daemon_process_client_messages(DltDaemon *daemon, DltDaemonLocal *daemon if (dlt_receiver_receive_socket(&(daemon_local->receiverSock))<=0) { - close(daemon_local->receiverSock.fd); - daemon_local->receiverSock.fd = 0; + close(daemon_local->receiverSock.fd); FD_CLR(daemon_local->receiverSock.fd, &(daemon_local->master)); + daemon_local->receiverSock.fd = -1; if (daemon_local->client_connections) { @@ -1261,7 +1261,7 @@ int dlt_daemon_process_client_messages(DltDaemon *daemon, DltDaemonLocal *daemon while (dlt_message_read(&(daemon_local->msg),(uint8_t*)daemon_local->receiverSock.buf,daemon_local->receiverSock.bytesRcvd,daemon_local->flags.nflag,daemon_local->flags.vflag)==0) { /* Check for control message */ - if ( 0 != daemon_local->receiverSock.fd && DLT_MSG_IS_CONTROL_REQUEST(&(daemon_local->msg)) ) + if ( 0 < daemon_local->receiverSock.fd && DLT_MSG_IS_CONTROL_REQUEST(&(daemon_local->msg)) ) { dlt_daemon_control_process_control(daemon_local->receiverSock.fd, daemon, &(daemon_local->msg), daemon_local->flags.vflag); } |