passive mode

[oftp] / src / ftp.h

diff --git a/src/ftp.h b/src/ftp.h
index c9ebbe2..faf057b 100644 (file)
--- a/src/ftp.h
+++ b/src/ftp.h
@@ -6,6 +6,7 @@ enum {FTP_DIR, FTP_FILE};       /* ftp_dirent type */
 enum {
        FTP_PWD,
        FTP_CHDIR,
+       FTP_CDUP,
        FTP_MKDIR,
        FTP_RMDIR,
        FTP_DEL,
@@ -14,35 +15,57 @@ enum {
        FTP_STORE
 };
 
+enum {
+       FTP_DISC,
+       FTP_CONN_PASV,
+       FTP_CONN_ACT
+};
+
+enum {
+       FTP_REMOTE,
+       FTP_LOCAL
+};
+
+enum {
+       FTP_MOD_REMDIR  = 0x100,
+       FTP_MOD_LOCDIR  = 0x200
+};
+
 struct ftp_op {
        int op;
        char *arg;
+
+       struct ftp_op *next;
 };
 
 struct ftp_dirent {
        char *name;
        int type;
+       long size;
 };
 
 struct ftp {
-       int ctl, data;  /* sockets */
+       int ctl, lis, data;     /* sockets */
+       int lis_port;
 
-       int status;
+       int status, busy;
        char *user, *pass;
+       int passive;
+
+       struct ftp_op *qhead, *qtail;
 
-       void (*cproc)(struct ftp *ftp, int code, const char *buf, void *cls);
+       int (*cproc)(struct ftp *ftp, int code, const char *buf, void *cls);
        void (*dproc)(struct ftp *ftp, const char *buf, int sz, void *cls);
        void *cproc_cls, *dproc_cls;
 
        char crecv[256];
        int num_crecv;
        char drecv[256];
-       int num_drecv;
 
-       char *curdir_rem, *curdir_loc;
-       struct ftp_dirent *dent;
-       int num_dent;
+       char *curdir[2];
+       struct ftp_dirent *dirent[2];           /* dynamic array */
 
+       int last_resp;
        int modified;
 };
 
@@ -55,13 +78,25 @@ int ftp_connect(struct ftp *ftp, const char *host, int port);
 void ftp_close(struct ftp *ftp);
 
 int ftp_sockets(struct ftp *ftp, int *sockv, int maxsize);
-int ftp_pending(struct ftp *ftp);
 
 int ftp_handle(struct ftp *ftp, int s);
 
+int ftp_queue(struct ftp *ftp, int op, const char *arg);
+int ftp_waitresp(struct ftp *ftp, time_t timeout);
+
 int ftp_update(struct ftp *ftp);
 int ftp_pwd(struct ftp *ftp);
 int ftp_chdir(struct ftp *ftp, const char *dirname);
+int ftp_mkdir(struct ftp *ftp, const char *dirname);
+int ftp_rmdir(struct ftp *ftp, const char *dirname);
+int ftp_delete(struct ftp *ftp, const char *fname);
+int ftp_list(struct ftp *ftp);
+int ftp_retrieve(struct ftp *ftp, const char *fname);
+int ftp_store(struct ftp *ftp, const char *fname);
+
+const char *ftp_curdir(struct ftp *ftp, int whichdir);
+int ftp_num_dirent(struct ftp *ftp, int whichdir);
+struct ftp_dirent *ftp_dirent(struct ftp *ftp, int whichdir, int idx);
 
 
 #endif /* FTP_H_ */