|
|
|
@ -489,12 +489,6 @@ RunFileDownloadThread(void* client)
|
|
|
|
|
if(rfbWriteExact(cl, fileDownloadMsg.data, fileDownloadMsg.length) < 0) { |
|
|
|
|
rfbLog("File [%s]: Method [%s]: Error while writing to socket \n" |
|
|
|
|
, __FILE__, __FUNCTION__); |
|
|
|
|
|
|
|
|
|
if(cl != NULL) { |
|
|
|
|
rfbCloseClient(cl); |
|
|
|
|
CloseUndoneFileTransfer(cl, rtcp); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
FreeFileTransferMsg(fileDownloadMsg); |
|
|
|
|
return NULL; |
|
|
|
|
} |
|
|
|
@ -508,7 +502,6 @@ RunFileDownloadThread(void* client)
|
|
|
|
|
void |
|
|
|
|
HandleFileDownload(rfbClientPtr cl, rfbTightClientPtr rtcp) |
|
|
|
|
{ |
|
|
|
|
pthread_t fileDownloadThread; |
|
|
|
|
FileTransferMsg fileDownloadMsg; |
|
|
|
|
|
|
|
|
|
memset(&fileDownloadMsg, 0, sizeof(FileTransferMsg)); |
|
|
|
@ -518,10 +511,9 @@ HandleFileDownload(rfbClientPtr cl, rfbTightClientPtr rtcp)
|
|
|
|
|
FreeFileTransferMsg(fileDownloadMsg); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
rtcp->rcft.rcfd.downloadInProgress = FALSE; |
|
|
|
|
rtcp->rcft.rcfd.downloadFD = -1; |
|
|
|
|
CloseUndoneFileDownload(cl, rtcp); |
|
|
|
|
|
|
|
|
|
if(pthread_create(&fileDownloadThread, NULL, RunFileDownloadThread, (void*)
|
|
|
|
|
if(pthread_create(&rtcp->rcft.rcfd.downloadThread, NULL, RunFileDownloadThread, (void*) |
|
|
|
|
cl) != 0) { |
|
|
|
|
FileTransferMsg ftm = GetFileDownLoadErrMsg(); |
|
|
|
|
|
|
|
|
@ -593,7 +585,7 @@ HandleFileDownloadCancelRequest(rfbClientPtr cl, rfbTightClientPtr rtcp)
|
|
|
|
|
" reason <%s>\n", __FILE__, __FUNCTION__, reason); |
|
|
|
|
|
|
|
|
|
pthread_mutex_lock(&fileDownloadMutex); |
|
|
|
|
CloseUndoneFileTransfer(cl, rtcp); |
|
|
|
|
CloseUndoneFileDownload(cl, rtcp); |
|
|
|
|
pthread_mutex_unlock(&fileDownloadMutex); |
|
|
|
|
|
|
|
|
|
if(reason != NULL) { |
|
|
|
@ -836,7 +828,7 @@ HandleFileUploadDataRequest(rfbClientPtr cl, rfbTightClientPtr rtcp)
|
|
|
|
|
FreeFileTransferMsg(ftm); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
CloseUndoneFileTransfer(cl, rtcp); |
|
|
|
|
CloseUndoneFileUpload(cl, rtcp); |
|
|
|
|
|
|
|
|
|
if(pBuf != NULL) { |
|
|
|
|
free(pBuf); |
|
|
|
@ -936,7 +928,7 @@ HandleFileUploadFailedRequest(rfbClientPtr cl, rfbTightClientPtr rtcp)
|
|
|
|
|
rfbLog("File [%s]: Method [%s]: File Upload Failed Request received:" |
|
|
|
|
" reason <%s>\n", __FILE__, __FUNCTION__, reason); |
|
|
|
|
|
|
|
|
|
CloseUndoneFileTransfer(cl, rtcp); |
|
|
|
|
CloseUndoneFileUpload(cl, rtcp); |
|
|
|
|
|
|
|
|
|
if(reason != NULL) { |
|
|
|
|
free(reason); |
|
|
|
|