Commit 83a6b348 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

split out more protocol-specific structs from urldata.h into their own 

protocol-specific header files
parent 43fefab2

lib/file.h

+13 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -23,6 +23,18 @@ 
 *

 * $Id$

 ***************************************************************************/





/****************************************************************************

 * FILE unique setup

 ***************************************************************************/

struct FILEPROTO {

  char *path; /* the path we operate on */

  char *freepath; /* pointer to the allocated block we must free, this might

                     differ from the 'path' pointer */

  int fd;     /* open file descriptor to read from! */

};



#ifndef CURL_DISABLE_FILE

extern const struct Curl_handler Curl_handler_file;

#endif

lib/http.h

+37 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -87,5 +87,40 @@ int Curl_http_should_fail(struct connectdata *conn); 
#define TINY_INITIAL_POST_SIZE 1024

#endif



#endif

#endif /* CURL_DISABLE_HTTP */



/****************************************************************************

 * HTTP unique setup

 ***************************************************************************/

struct HTTP {

  struct FormData *sendit;

  curl_off_t postsize; /* off_t to handle large file sizes */

  const char *postdata;



  const char *p_pragma;      /* Pragma: string */

  const char *p_accept;      /* Accept: string */

  curl_off_t readbytecount;

  curl_off_t writebytecount;



  /* For FORM posting */

  struct Form form;



  struct back {

    curl_read_callback fread_func; /* backup storage for fread pointer */

    void *fread_in;           /* backup storage for fread_in pointer */

    const char *postdata;

    curl_off_t postsize;

  } backup;



  enum {

    HTTPSEND_NADA,    /* init */

    HTTPSEND_REQUEST, /* sending a request */

    HTTPSEND_BODY,    /* sending body */

    HTTPSEND_LAST     /* never use this */

  } sending;



  void *send_buffer; /* used if the request couldn't be sent in one chunk,

                        points to an allocated send_buffer struct */

};



#endif

lib/ssh.h

+122 −0
Original line number Diff line number Diff line
@@ -23,6 +23,128 @@ 
 * $Id$

 ***************************************************************************/



#include "setup.h"



#ifdef HAVE_LIBSSH2_H

#include <libssh2.h>

#include <libssh2_sftp.h>

#endif /* HAVE_LIBSSH2_H */



/****************************************************************************

 * SSH unique setup

 ***************************************************************************/

typedef enum {

  SSH_NO_STATE = -1,  /* Used for "nextState" so say there is none */

  SSH_STOP = 0,       /* do nothing state, stops the state machine */



  SSH_S_STARTUP,      /* Session startup, First state in SSH-CONNECT */

  SSH_HOSTKEY,        /* verify hostkey */

  SSH_AUTHLIST,

  SSH_AUTH_PKEY_INIT,

  SSH_AUTH_PKEY,

  SSH_AUTH_PASS_INIT,

  SSH_AUTH_PASS,

  SSH_AUTH_HOST_INIT,

  SSH_AUTH_HOST,

  SSH_AUTH_KEY_INIT,

  SSH_AUTH_KEY,

  SSH_AUTH_DONE,

  SSH_SFTP_INIT,

  SSH_SFTP_REALPATH,   /* Last state in SSH-CONNECT */



  SSH_SFTP_QUOTE_INIT, /* First state in SFTP-DO */

  SSH_SFTP_POSTQUOTE_INIT, /* (Possibly) First state in SFTP-DONE */

  SSH_SFTP_QUOTE,

  SSH_SFTP_NEXT_QUOTE,

  SSH_SFTP_QUOTE_STAT,

  SSH_SFTP_QUOTE_SETSTAT,

  SSH_SFTP_QUOTE_SYMLINK,

  SSH_SFTP_QUOTE_MKDIR,

  SSH_SFTP_QUOTE_RENAME,

  SSH_SFTP_QUOTE_RMDIR,

  SSH_SFTP_QUOTE_UNLINK,

  SSH_SFTP_TRANS_INIT,

  SSH_SFTP_UPLOAD_INIT,

  SSH_SFTP_CREATE_DIRS_INIT,

  SSH_SFTP_CREATE_DIRS,

  SSH_SFTP_CREATE_DIRS_MKDIR,

  SSH_SFTP_READDIR_INIT,

  SSH_SFTP_READDIR,

  SSH_SFTP_READDIR_LINK,

  SSH_SFTP_READDIR_BOTTOM,

  SSH_SFTP_READDIR_DONE,

  SSH_SFTP_DOWNLOAD_INIT,

  SSH_SFTP_DOWNLOAD_STAT, /* Last state in SFTP-DO */

  SSH_SFTP_CLOSE,    /* Last state in SFTP-DONE */

  SSH_SFTP_SHUTDOWN, /* First state in SFTP-DISCONNECT */

  SSH_SCP_TRANS_INIT, /* First state in SCP-DO */

  SSH_SCP_UPLOAD_INIT,

  SSH_SCP_DOWNLOAD_INIT,

  SSH_SCP_DONE,

  SSH_SCP_SEND_EOF,

  SSH_SCP_WAIT_EOF,

  SSH_SCP_WAIT_CLOSE,

  SSH_SCP_CHANNEL_FREE,   /* Last state in SCP-DONE */

  SSH_SESSION_DISCONNECT, /* First state in SCP-DISCONNECT */

  SSH_SESSION_FREE,       /* Last state in SCP/SFTP-DISCONNECT */

  SSH_QUIT,

  SSH_LAST  /* never used */

} sshstate;



/* this struct is used in the HandleData struct which is part of the

   SessionHandle, which means this is used on a per-easy handle basis.

   Everything that is strictly related to a connection is banned from this

   struct. */

struct SSHPROTO {

  char *path;                  /* the path we operate on */

};



/* ssh_conn is used for struct connection-oriented data in the connectdata

   struct */

struct ssh_conn {

  const char *authlist;       /* List of auth. methods, managed by libssh2 */

#ifdef USE_LIBSSH2

  const char *passphrase;     /* pass-phrase to use */

  char *rsa_pub;              /* path name */

  char *rsa;                  /* path name */

  bool authed;                /* the connection has been authenticated fine */

  sshstate state;             /* always use ssh.c:state() to change state! */

  sshstate nextstate;         /* the state to goto after stopping */

  CURLcode actualcode;        /* the actual error code */

  struct curl_slist *quote_item; /* for the quote option */

  char *quote_path1;          /* two generic pointers for the QUOTE stuff */

  char *quote_path2;

  LIBSSH2_SFTP_ATTRIBUTES quote_attrs; /* used by the SFTP_QUOTE state */

  char *homedir;              /* when doing SFTP we figure out home dir in the

                                 connect phase */



  /* Here's a set of struct members used by the SFTP_READDIR state */

  LIBSSH2_SFTP_ATTRIBUTES readdir_attrs;

  char *readdir_filename;

  char *readdir_longentry;

  int readdir_len, readdir_totalLen, readdir_currLen;

  char *readdir_line;

  char *readdir_linkPath;

  /* end of READDIR stuff */



  int secondCreateDirs;         /* counter use by the code to see if the

                                   second attempt has been made to change

                                   to/create a directory */

  char *slash_pos;              /* used by the SFTP_CREATE_DIRS state */

  LIBSSH2_SESSION *ssh_session; /* Secure Shell session */

  LIBSSH2_CHANNEL *ssh_channel; /* Secure Shell channel handle */

  LIBSSH2_SFTP *sftp_session;   /* SFTP handle */

  LIBSSH2_SFTP_HANDLE *sftp_handle;

  int orig_waitfor;             /* default READ/WRITE bits wait for */



  /* note that HAVE_LIBSSH2_KNOWNHOST_API is a define set in the libssh2.h

     header */

#ifdef HAVE_LIBSSH2_KNOWNHOST_API

  LIBSSH2_KNOWNHOSTS *kh;

#endif

#endif /* USE_LIBSSH2 */

};



#ifdef USE_LIBSSH2



#if !defined(LIBSSH2_VERSION_NUM) || (LIBSSH2_VERSION_NUM < 0x001000)

lib/urldata.h

+3 −160
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ 
#include "pop3.h"

#include "smtp.h"

#include "ftp.h"

#include "file.h"

#include "ssh.h"

#include "http.h"



#ifdef HAVE_GSSAPI

# ifdef HAVE_GSSGNU
@@ -333,166 +336,6 @@ struct negotiatedata { 
};

#endif



/****************************************************************************

 * HTTP unique setup

 ***************************************************************************/

struct HTTP {

  struct FormData *sendit;

  curl_off_t postsize; /* off_t to handle large file sizes */

  const char *postdata;



  const char *p_pragma;      /* Pragma: string */

  const char *p_accept;      /* Accept: string */

  curl_off_t readbytecount;

  curl_off_t writebytecount;



  /* For FORM posting */

  struct Form form;



  struct back {

    curl_read_callback fread_func; /* backup storage for fread pointer */

    void *fread_in;           /* backup storage for fread_in pointer */

    const char *postdata;

    curl_off_t postsize;

  } backup;



  enum {

    HTTPSEND_NADA,    /* init */

    HTTPSEND_REQUEST, /* sending a request */

    HTTPSEND_BODY,    /* sending body */

    HTTPSEND_LAST     /* never use this */

  } sending;



  void *send_buffer; /* used if the request couldn't be sent in one chunk,

                        points to an allocated send_buffer struct */

};





/****************************************************************************

 * SSH unique setup

 ***************************************************************************/

typedef enum {

  SSH_NO_STATE = -1,  /* Used for "nextState" so say there is none */

  SSH_STOP = 0,       /* do nothing state, stops the state machine */



  SSH_S_STARTUP,      /* Session startup, First state in SSH-CONNECT */

  SSH_HOSTKEY,        /* verify hostkey */

  SSH_AUTHLIST,

  SSH_AUTH_PKEY_INIT,

  SSH_AUTH_PKEY,

  SSH_AUTH_PASS_INIT,

  SSH_AUTH_PASS,

  SSH_AUTH_HOST_INIT,

  SSH_AUTH_HOST,

  SSH_AUTH_KEY_INIT,

  SSH_AUTH_KEY,

  SSH_AUTH_DONE,

  SSH_SFTP_INIT,

  SSH_SFTP_REALPATH,   /* Last state in SSH-CONNECT */



  SSH_SFTP_QUOTE_INIT, /* First state in SFTP-DO */

  SSH_SFTP_POSTQUOTE_INIT, /* (Possibly) First state in SFTP-DONE */

  SSH_SFTP_QUOTE,

  SSH_SFTP_NEXT_QUOTE,

  SSH_SFTP_QUOTE_STAT,

  SSH_SFTP_QUOTE_SETSTAT,

  SSH_SFTP_QUOTE_SYMLINK,

  SSH_SFTP_QUOTE_MKDIR,

  SSH_SFTP_QUOTE_RENAME,

  SSH_SFTP_QUOTE_RMDIR,

  SSH_SFTP_QUOTE_UNLINK,

  SSH_SFTP_TRANS_INIT,

  SSH_SFTP_UPLOAD_INIT,

  SSH_SFTP_CREATE_DIRS_INIT,

  SSH_SFTP_CREATE_DIRS,

  SSH_SFTP_CREATE_DIRS_MKDIR,

  SSH_SFTP_READDIR_INIT,

  SSH_SFTP_READDIR,

  SSH_SFTP_READDIR_LINK,

  SSH_SFTP_READDIR_BOTTOM,

  SSH_SFTP_READDIR_DONE,

  SSH_SFTP_DOWNLOAD_INIT,

  SSH_SFTP_DOWNLOAD_STAT, /* Last state in SFTP-DO */

  SSH_SFTP_CLOSE,    /* Last state in SFTP-DONE */

  SSH_SFTP_SHUTDOWN, /* First state in SFTP-DISCONNECT */

  SSH_SCP_TRANS_INIT, /* First state in SCP-DO */

  SSH_SCP_UPLOAD_INIT,

  SSH_SCP_DOWNLOAD_INIT,

  SSH_SCP_DONE,

  SSH_SCP_SEND_EOF,

  SSH_SCP_WAIT_EOF,

  SSH_SCP_WAIT_CLOSE,

  SSH_SCP_CHANNEL_FREE,   /* Last state in SCP-DONE */

  SSH_SESSION_DISCONNECT, /* First state in SCP-DISCONNECT */

  SSH_SESSION_FREE,       /* Last state in SCP/SFTP-DISCONNECT */

  SSH_QUIT,

  SSH_LAST  /* never used */

} sshstate;



/* this struct is used in the HandleData struct which is part of the

   SessionHandle, which means this is used on a per-easy handle basis.

   Everything that is strictly related to a connection is banned from this

   struct. */

struct SSHPROTO {

  char *path;                  /* the path we operate on */

};



/* ssh_conn is used for struct connection-oriented data in the connectdata

   struct */

struct ssh_conn {

  const char *authlist;       /* List of auth. methods, managed by libssh2 */

#ifdef USE_LIBSSH2

  const char *passphrase;     /* pass-phrase to use */

  char *rsa_pub;              /* path name */

  char *rsa;                  /* path name */

  bool authed;                /* the connection has been authenticated fine */

  sshstate state;             /* always use ssh.c:state() to change state! */

  sshstate nextstate;         /* the state to goto after stopping */

  CURLcode actualcode;        /* the actual error code */

  struct curl_slist *quote_item; /* for the quote option */

  char *quote_path1;          /* two generic pointers for the QUOTE stuff */

  char *quote_path2;

  LIBSSH2_SFTP_ATTRIBUTES quote_attrs; /* used by the SFTP_QUOTE state */

  char *homedir;              /* when doing SFTP we figure out home dir in the

                                 connect phase */



  /* Here's a set of struct members used by the SFTP_READDIR state */

  LIBSSH2_SFTP_ATTRIBUTES readdir_attrs;

  char *readdir_filename;

  char *readdir_longentry;

  int readdir_len, readdir_totalLen, readdir_currLen;

  char *readdir_line;

  char *readdir_linkPath;

  /* end of READDIR stuff */



  int secondCreateDirs;         /* counter use by the code to see if the

                                   second attempt has been made to change

                                   to/create a directory */

  char *slash_pos;              /* used by the SFTP_CREATE_DIRS state */

  LIBSSH2_SESSION *ssh_session; /* Secure Shell session */

  LIBSSH2_CHANNEL *ssh_channel; /* Secure Shell channel handle */

  LIBSSH2_SFTP *sftp_session;   /* SFTP handle */

  LIBSSH2_SFTP_HANDLE *sftp_handle;

  int orig_waitfor;             /* default READ/WRITE bits wait for */



  /* note that HAVE_LIBSSH2_KNOWNHOST_API is a define set in the libssh2.h

     header */

#ifdef HAVE_LIBSSH2_KNOWNHOST_API

  LIBSSH2_KNOWNHOSTS *kh;

#endif

#endif /* USE_LIBSSH2 */

};





/****************************************************************************

 * FILE unique setup

 ***************************************************************************/

struct FILEPROTO {

  char *path; /* the path we operate on */

  char *freepath; /* pointer to the allocated block we must free, this might

                     differ from the 'path' pointer */

  int fd;     /* open file descriptor to read from! */

};



/*

 * Boolean values that concerns this connection.