maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove check for download from open. Add tracking of file writes.

Browse Source
This commit is contained in:
Michael Jumper 2013-11-12 10:16:04 -08:00
parent 847f9451c1
commit ef8d8e3bc1
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/protocols/rdp/rdp_fs.c
View File

@ -169,7 +169,6 @@ int guac_rdp_fs_open(guac_rdp_fs* fs, const char* path,
guac_rdp_fs_file* file; guac_rdp_fs_file* file;
int flags = 0; int flags = 0;
int download_requested = 0;
GUAC_RDP_DEBUG(2, "path=\"%s\", access=0x%x, file_attributes=0x%x, " GUAC_RDP_DEBUG(2, "path=\"%s\", access=0x%x, file_attributes=0x%x, "
"create_disposition=0x%x, create_options=0x%x", "create_disposition=0x%x, create_options=0x%x",
@ -229,11 +228,6 @@ int guac_rdp_fs_open(guac_rdp_fs* fs, const char* path,
guac_rdp_fs_close(fs, download_id); guac_rdp_fs_close(fs, download_id);
} }
/* If creating file within Download, prepare for download */
else if (strncmp(normalized_path, "\\Download\\", 10) == 0) {
download_requested = 1;
}
/* Translate normalized path to real path */ /* Translate normalized path to real path */
__guac_rdp_fs_translate_path(fs, normalized_path, real_path); __guac_rdp_fs_translate_path(fs, normalized_path, real_path);
@ -313,6 +307,7 @@ int guac_rdp_fs_open(guac_rdp_fs* fs, const char* path,
file->dir_pattern[0] = '\0'; file->dir_pattern[0] = '\0';
file->absolute_path = strdup(normalized_path); file->absolute_path = strdup(normalized_path);
file->real_path = strdup(real_path); file->real_path = strdup(real_path);
file->bytes_written = 0;
GUAC_RDP_DEBUG(2, "Opened \"%s\" as file_id=%i", normalized_path, file_id); GUAC_RDP_DEBUG(2, "Opened \"%s\" as file_id=%i", normalized_path, file_id);
@ -347,12 +342,6 @@ int guac_rdp_fs_open(guac_rdp_fs* fs, const char* path,
fs->open_files++; fs->open_files++;
/* If download requested, start streaming */
if (download_requested) {
/* STUB */
GUAC_RDP_DEBUG(2, "Download starting: \"%s\"", real_path);
}
return file_id; return file_id;
} }
@ -399,6 +388,7 @@ int guac_rdp_fs_write(guac_rdp_fs* fs, int file_id, int offset,
if (bytes_written < 0) if (bytes_written < 0)
return guac_rdp_fs_get_errorcode(errno); return guac_rdp_fs_get_errorcode(errno);
file->bytes_written += bytes_written;
return bytes_written; return bytes_written;
} }

5
src/protocols/rdp/rdp_fs.h
View File

@ -255,6 +255,11 @@ typedef struct guac_rdp_fs_file {
*/ */
uint64_t atime; uint64_t atime;
/**
* The number of bytes written to the file.
*/
uint64_t bytes_written;
} guac_rdp_fs_file; } guac_rdp_fs_file;
/** /**