generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert Curl_ssh_connect() to run in a state machine for

Browse Source 
LIBSSH2_APINO >= 200706012030.  More to come...
This commit is contained in:
James Housley
2007-06-12 12:31:10 +00:00
parent 3247ac1918
commit 99e0597c7b
3 changed files with 591 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/urldata.h
View File

@@ -406,6 +406,29 @@ struct ftp_conn {
ftpstate state; /* always use ftp.c:state() to change state! */
};
/****************************************************************************
* SSH unique setup
***************************************************************************/
typedef enum {
SSH_STOP, /* do nothing state, stops the state machine */
SSH_S_STARTUP, /* Session startup */
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,
SSH_GET_WORKINGPATH,
SSH_QUIT,
SSH_LAST /* never used */
} sshstate;
struct SSHPROTO {
curl_off_t *bytecountp;
char *user;
@@ -421,6 +444,17 @@ struct SSHPROTO {
#endif /* USE_LIBSSH2 */
};
/* 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 */
const char *passphrase;
char rsa_pub[PATH_MAX];
char rsa[PATH_MAX];
bool authed;
sshstate state; /* always use ssh.c:state() to change state! */
};
/****************************************************************************
* FILE unique setup
@@ -900,6 +934,7 @@ struct connectdata {
union {
struct ftp_conn ftpc;
struct ssh_conn sshc;
} proto;
int cselect_bits; /* bitmask of socket events */