From 5a8fc22727bc20624dd915f1e6fd805ba5e0f85f Mon Sep 17 00:00:00 2001 From: Nathan Straz Date: Thu, 29 Aug 2013 16:47:14 -0400 Subject: Remove complicated remote file descriptor code Only handle one file transfer at a time so we don't need an array to track multiple transfers or know the remote's fd number. Loop in recv_packet until we read a whole packet. --- qarsh_packet.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qarsh_packet.h') diff --git a/qarsh_packet.h b/qarsh_packet.h index 8a74791..578fccb 100644 --- a/qarsh_packet.h +++ b/qarsh_packet.h @@ -83,7 +83,6 @@ struct qp_recvfile_pkt { struct qp_sendfile_pkt { char *qp_path; - int qp_remfd; /* file descriptor on client side */ }; struct qp_rstat_pkt { @@ -150,7 +149,7 @@ struct qa_packet *make_qp_cmdexit(pid_t pid, int status); struct qa_packet *make_qp_setuser(char *user, char *group); struct qa_packet *make_qp_kill(int sig); struct qa_packet *make_qp_recvfile(const char *path, off_t count, mode_t mode); -struct qa_packet *make_qp_sendfile(const char *path, int remfd); +struct qa_packet *make_qp_sendfile(const char *path); struct qa_packet *make_qp_rstat(const char *path, const struct stat *sb); struct qa_packet *make_qp_data(const int remfd, const off_t offset, const int count, void *blob); struct qa_packet *make_qp_data_allow(const int remfd, const int count); -- cgit