nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-27 02:02:26 +00:00
Code Issues Projects Releases Wiki Activity

Tweak to SSH coroutine code: put line number in the coroutine state

Browse Source 
structure, which is consistent with Simon's canonical version of the
macros.

[originally from svn r9607]
This commit is contained in:
Ben Harris 2012-08-18 09:30:01 +00:00
parent 1ac65ff017
commit e570820c74
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ssh.c
View File

@ -431,10 +431,12 @@ enum {
* Database for Edit and Continue'. * Database for Edit and Continue'.
*/ */
#define crBegin(v) { int *crLine = &v; switch(v) { case 0:; #define crBegin(v) { int *crLine = &v; switch(v) { case 0:;
#define crState(t) \ #define crBeginState crBegin(s->crLine)
#define crStateP(t, v) \
struct t *s; \ struct t *s; \
if (!ssh->t) ssh->t = snew(struct t); \ if (!(v)) { s = (v) = snew(struct t); s->crLine = 0; } \
s = ssh->t; s = (v);
#define crState(t) crStateP(t, ssh->t)
#define crFinish(z) } *crLine = 0; return (z); } #define crFinish(z) } *crLine = 0; return (z); }
#define crFinishV } *crLine = 0; return; } #define crFinishV } *crLine = 0; return; }
#define crReturn(z) \ #define crReturn(z) \
@ -888,12 +890,8 @@ struct ssh_tag {
int ssh1_rdpkt_crstate; int ssh1_rdpkt_crstate;
int ssh2_rdpkt_crstate; int ssh2_rdpkt_crstate;
int do_ssh_init_crstate;
int ssh_gotdata_crstate; int ssh_gotdata_crstate;
int do_ssh1_login_crstate;
int do_ssh1_connection_crstate; int do_ssh1_connection_crstate;
int do_ssh2_transport_crstate;
int do_ssh2_authconn_crstate;
void *do_ssh_init_state; void *do_ssh_init_state;
void *do_ssh1_login_state; void *do_ssh1_login_state;
@ -2659,6 +2657,7 @@ static void ssh_send_verstring(Ssh ssh, char *svers)
static int do_ssh_init(Ssh ssh, unsigned char c) static int do_ssh_init(Ssh ssh, unsigned char c)
{ {
struct do_ssh_init_state { struct do_ssh_init_state {
int crLine;
int vslen; int vslen;
char version[10]; char version[10];
char *vstring; char *vstring;
@ -2668,7 +2667,7 @@ static int do_ssh_init(Ssh ssh, unsigned char c)
}; };
crState(do_ssh_init_state); crState(do_ssh_init_state);
crBegin(ssh->do_ssh_init_crstate); crBeginState;
/* Search for a line beginning with the string "SSH-" in the input. */ /* Search for a line beginning with the string "SSH-" in the input. */
for (;;) { for (;;) {
@ -3257,6 +3256,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
struct RSAKey servkey, hostkey; struct RSAKey servkey, hostkey;
struct MD5Context md5c; struct MD5Context md5c;
struct do_ssh1_login_state { struct do_ssh1_login_state {
int crLine;
int len; int len;
unsigned char *rsabuf, *keystr1, *keystr2; unsigned char *rsabuf, *keystr1, *keystr2;
unsigned long supported_ciphers_mask, supported_auths_mask; unsigned long supported_ciphers_mask, supported_auths_mask;
@ -3284,7 +3284,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
}; };
crState(do_ssh1_login_state); crState(do_ssh1_login_state);
crBegin(ssh->do_ssh1_login_crstate); crBeginState;
if (!pktin) if (!pktin)
crWaitUntil(pktin); crWaitUntil(pktin);
@ -5475,6 +5475,7 @@ static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
{ {
unsigned char *in = (unsigned char *)vin; unsigned char *in = (unsigned char *)vin;
struct do_ssh2_transport_state { struct do_ssh2_transport_state {
int crLine;
int nbits, pbits, warn_kex, warn_cscipher, warn_sccipher; int nbits, pbits, warn_kex, warn_cscipher, warn_sccipher;
Bignum p, g, e, f, K; Bignum p, g, e, f, K;
void *our_kexinit; void *our_kexinit;
@ -5508,7 +5509,7 @@ static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
}; };
crState(do_ssh2_transport_state); crState(do_ssh2_transport_state);
crBegin(ssh->do_ssh2_transport_crstate); crBeginState;
s->cscipher_tobe = s->sccipher_tobe = NULL; s->cscipher_tobe = s->sccipher_tobe = NULL;
s->csmac_tobe = s->scmac_tobe = NULL; s->csmac_tobe = s->scmac_tobe = NULL;
@ -7474,6 +7475,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
struct Packet *pktin) struct Packet *pktin)
{ {
struct do_ssh2_authconn_state { struct do_ssh2_authconn_state {
int crLine;
enum { enum {
AUTH_TYPE_NONE, AUTH_TYPE_NONE,
AUTH_TYPE_PUBLICKEY, AUTH_TYPE_PUBLICKEY,
@ -7529,7 +7531,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
}; };
crState(do_ssh2_authconn_state); crState(do_ssh2_authconn_state);
crBegin(ssh->do_ssh2_authconn_crstate); crBeginState;
s->done_service_req = FALSE; s->done_service_req = FALSE;
s->we_are_in = s->userauth_success = FALSE; s->we_are_in = s->userauth_success = FALSE;
@ -9540,12 +9542,8 @@ static const char *ssh_init(void *frontend_handle, void **backend_handle,
ssh->v2_outgoing_sequence = 0; ssh->v2_outgoing_sequence = 0;
ssh->ssh1_rdpkt_crstate = 0; ssh->ssh1_rdpkt_crstate = 0;
ssh->ssh2_rdpkt_crstate = 0; ssh->ssh2_rdpkt_crstate = 0;
ssh->do_ssh_init_crstate = 0;
ssh->ssh_gotdata_crstate = 0; ssh->ssh_gotdata_crstate = 0;
ssh->do_ssh1_connection_crstate = 0; ssh->do_ssh1_connection_crstate = 0;
ssh->do_ssh1_login_crstate = 0;
ssh->do_ssh2_transport_crstate = 0;
ssh->do_ssh2_authconn_crstate = 0;
ssh->do_ssh_init_state = NULL; ssh->do_ssh_init_state = NULL;
ssh->do_ssh1_login_state = NULL; ssh->do_ssh1_login_state = NULL;
ssh->do_ssh2_transport_state = NULL; ssh->do_ssh2_transport_state = NULL;