diff --git a/qrexec-lib/copy-file.c b/qrexec-lib/copy-file.c index d58a14c..805138f 100644 --- a/qrexec-lib/copy-file.c +++ b/qrexec-lib/copy-file.c @@ -1,6 +1,6 @@ #include #include -#include "filecopy.h" +#include "libqubes-rpc-filecopy.h" #include "crc32.h" extern void notify_progress(int, int); diff --git a/qrexec-lib/filecopy.h b/qrexec-lib/filecopy.h deleted file mode 100644 index c51d68e..0000000 --- a/qrexec-lib/filecopy.h +++ /dev/null @@ -1,32 +0,0 @@ -#define FILECOPY_SPOOL "/home/user/.filecopyspool" -#define FILECOPY_VMNAME_SIZE 32 -#define PROGRESS_NOTIFY_DELTA (15*1000*1000) -#define MAX_PATH_LENGTH 16384 - -#define LEGAL_EOF 31415926 - -struct file_header { - unsigned int namelen; - unsigned int mode; - unsigned long long filelen; - unsigned int atime; - unsigned int atime_nsec; - unsigned int mtime; - unsigned int mtime_nsec; -}; - -struct result_header { - unsigned int error_code; - unsigned long crc32; -}; - -enum { - COPY_FILE_OK, - COPY_FILE_READ_EOF, - COPY_FILE_READ_ERROR, - COPY_FILE_WRITE_ERROR -}; - -int copy_file(int outfd, int infd, long long size, unsigned long *crc32); -char *copy_file_status_to_str(int status); -void set_size_limit(long long new_bytes_limit, long long new_files_limit); diff --git a/qrexec-lib/unpack.c b/qrexec-lib/unpack.c index 3a8ce3b..ebf4d55 100644 --- a/qrexec-lib/unpack.c +++ b/qrexec-lib/unpack.c @@ -7,7 +7,7 @@ #include #include #include -#include "filecopy.h" +#include "libqubes-rpc-filecopy.h" #include "crc32.h" char untrusted_namebuf[MAX_PATH_LENGTH];