Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions source/InterDeviceManager/Idm_msg_process.c
Original file line number Diff line number Diff line change
Expand Up @@ -498,32 +498,42 @@ char* IDM_Incoming_FT_Response(connection_info_t* conn_info,payload_t* payload)
while(length<total_bytes){
#ifndef IDM_DEBUG
if(conn_info->enc.ssl != NULL){
bytes = SSL_read(conn_info->enc.ssl, buf, total_bytes-bytes);
bytes = SSL_read(conn_info->enc.ssl, buf, total_bytes - length);
}
else{
CcspTraceError(("%s:%d ssl session is null\n",__FUNCTION__,__LINE__));
remove(req->output_location);
fclose(fptr);
free(buf);
free(req);
return FT_ERROR;
}
#else
bytes = read( conn_info->conn , buf, total_bytes-bytes);
bytes = read( conn_info->conn , buf, total_bytes - length);
#endif
CcspTraceInfo(("bytes transfered : %d\n",bytes));
if(bytes > 0){
fwrite(buf,1,bytes,fptr);
length+=bytes;
}
else{
CcspTraceError(("(%s:%d) Data encryption failed (Err: %d)\n", __FUNCTION__, __LINE__,bytes));
CcspTraceError(("(%s:%d) Socket Read Error (bytes read: %d)\n", __FUNCTION__, __LINE__,bytes));
// Exit from loop if socket is not usable or broken
break;
Comment thread
biju-vi marked this conversation as resolved.
}
}
if(buf){
free(buf);
}
}
fclose(fptr);
if(length < total_bytes)
{
// we couldn't read full bytes
remove(req->output_location);
free(req);
return FT_ERROR;
}
free(req);
return FT_SUCCESS;
}
Expand Down Expand Up @@ -856,26 +866,31 @@ char* IDM_SFT_receive(connection_info_t* conn_info,void* payload)
while(length<total_bytes){
#ifndef IDM_DEBUG
if(conn_info->enc.ssl != NULL){
bytes = SSL_read(conn_info->enc.ssl, buf, total_bytes-bytes);
// read remaining bytes
bytes = SSL_read(conn_info->enc.ssl, buf, total_bytes - length);
}
else{
CcspTraceError(("%s:%d ssl session is null\n",__FUNCTION__,__LINE__));
remove(Data->param_name);
fclose(fptr);
if(buf){
free(buf);
}
return FT_ERROR;
}
#else
bytes = read( conn_info->conn , buf, total_bytes-bytes);
// read remaining bytes
bytes = read( conn_info->conn , buf, total_bytes - length);
#endif
CcspTraceInfo(("bytes transfered : %d\n",bytes));
if(bytes > 0){
fwrite(buf,1,bytes,fptr);
length+=bytes;
}
else{
CcspTraceError(("(%s:%d) Data encryption failed (Err: %d)\n", __FUNCTION__, __LINE__,bytes));
CcspTraceError(("(%s:%d) Socket Read Error (bytes read: %d)\n", __FUNCTION__, __LINE__,bytes));
// Exit from loop if socket is not usable or broken
break;
}
}
if(buf){
Expand All @@ -890,6 +905,12 @@ char* IDM_SFT_receive(connection_info_t* conn_info,void* payload)
IdmMgrDml_GetConfigData_release(pidmDmlInfo);
return FT_ERROR;
}
if(length < total_bytes)
{
// we couldn't read full bytes. Remove partially written file
remove(Data->param_name);
return FT_ERROR;
}
return FT_SUCCESS;
}

Expand Down