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)
{
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);
}
else
{
/* go back to last file position */
- if (fseek(file->handle,file->file_position,SEEK_SET) < 0)
+ if (0 != fseek(file->handle,file->file_position,SEEK_SET))
return -1;
}
}
return -1;
}
- fseek(file->handle,0,SEEK_END);
+ if (0 != fseek(file->handle,0,SEEK_END))
+ {
+ sprintf(str,"dlt_file_open: Seek failed to 0,SEEK_END");
+ dlt_log(LOG_ERR, str);
+ return -1;
+ }
file->file_length = ftell(file->handle);
- fseek(file->handle,0,SEEK_SET);
+
+ if (0 != fseek(file->handle,0,SEEK_SET))
+ {
+ sprintf(str,"dlt_file_open: Seek failed to 0,SEEK_SET");
+ dlt_log(LOG_ERR, str);
+ return -1;
+ }
if (verbose)
{
}
/* set to end of last succesful read message, because of conflicting calls to dlt_file_read and dlt_file_message */
- if ( fseek(file->handle,file->file_position,SEEK_SET) < 0 )
+ if (0 != fseek(file->handle,file->file_position,SEEK_SET))
{
sprintf(str,"Seek failed to file_position %ld \n",file->file_position);
dlt_log(LOG_ERR, str);
if (dlt_file_read_header_extended(file, verbose)<0)
{
/* go back to last position in file */
- if ( 0 != fseek(file->handle,file->file_position,SEEK_SET))
+ if (0 != fseek(file->handle,file->file_position,SEEK_SET))
{
sprintf(str,"Seek to last file pos failed!\n");
dlt_log(LOG_ERR, str);
}
/* set to end of last successful read message, because of conflicting calls to dlt_file_read and dlt_file_message */
- if (fseek(file->handle,file->file_position,SEEK_SET) < 0)
+ if (0 != fseek(file->handle,file->file_position,SEEK_SET))
return -1;
/* get file position at start of DLT message */