xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sshnet: actually make sure ssh established connection before exiting main proc

Browse source 
this fixes password prompts and handles errors properly.
This commit is contained in:
cinap_lenrek 2019-04-02 17:28:56 +02:00
parent fdcb55d696
commit e0bdfe1e76
1 changed files with 59 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
sys/src/cmd/sshnet.c
View file

@ -32,6 +32,7 @@ enum
#define TYPE(path) ((int)(path) & 0xFF) #define TYPE(path) ((int)(path) & 0xFF)
#define NUM(path) ((uint)(path)>>8) #define NUM(path) ((uint)(path)>>8)
Channel *ssherrchan; /* chan(char*) */
Channel *sshmsgchan; /* chan(Msg*) */ Channel *sshmsgchan; /* chan(Msg*) */
Channel *fsreqchan; /* chan(Req*) */ Channel *fsreqchan; /* chan(Req*) */
Channel *fsreqwaitchan; /* chan(nil) */ Channel *fsreqwaitchan; /* chan(nil) */
@ -92,6 +93,8 @@ enum {
MaxPacket = 1<<15, MaxPacket = 1<<15,
WinPackets = 8, WinPackets = 8,
SESSIONCHAN = 1<<24,
}; };
struct Msg struct Msg
@ -1028,7 +1031,7 @@ fsflush(Req *r)
static void static void
handlemsg(Msg *m) handlemsg(Msg *m)
{ {
int chan, win, pkt, n; int chan, win, pkt, n, l;
Client *c; Client *c;
char *s; char *s;
@ -1075,6 +1078,10 @@ handlemsg(Msg *m)
case MSG_CHANNEL_OPEN_CONFIRMATION: case MSG_CHANNEL_OPEN_CONFIRMATION:
if(unpack(m, "_uuuu", &chan, &n, &win, &pkt) < 0) if(unpack(m, "_uuuu", &chan, &n, &win, &pkt) < 0)
break; break;
if(chan == SESSIONCHAN){
sendp(ssherrchan, nil);
break;
}
c = getclient(chan); c = getclient(chan);
if(c == nil || c->state != Dialing) if(c == nil || c->state != Dialing)
break; break;
@ -1087,8 +1094,12 @@ handlemsg(Msg *m)
dialedclient(c); dialedclient(c);
break; break;
case MSG_CHANNEL_OPEN_FAILURE: case MSG_CHANNEL_OPEN_FAILURE:
if(unpack(m, "_uu", &chan, &n) < 0) if(unpack(m, "_uus", &chan, &n, &s, &l) < 0)
break; break;
if(chan == SESSIONCHAN){
sendp(ssherrchan, smprint("%.*s", utfnlen(s, l), s));
break;
}
c = getclient(chan); c = getclient(chan);
if(c == nil || c->state != Dialing) if(c == nil || c->state != Dialing)
break; break;
@ -1227,6 +1238,48 @@ startssh(void *)
sysfatal("exec: %r"); sysfatal("exec: %r");
} }
void
ssh(int argc, char *argv[])
{
Alt a[3];
Waitmsg *w;
char *e;
sshargc = argc + 2;
sshargv = emalloc9p(sizeof(char *) * (sshargc + 1));
sshargv[0] = "ssh";
sshargv[1] = "-X";
memcpy(sshargv + 2, argv, argc * sizeof(char *));
pipe(pfd);
sshfd = pfd[0];
procrfork(startssh, nil, mainstacksize, RFFDG|RFNOTEG|RFNAMEG);
close(pfd[1]);
sendmsg(pack(nil, "bsuuu", MSG_CHANNEL_OPEN,
"session", 7,
SESSIONCHAN,
MaxPacket,
MaxPacket));
a[0].op = CHANRCV;
a[0].c = threadwaitchan();
a[0].v = &w;
a[1].op = CHANRCV;
a[1].c = ssherrchan;
a[1].v = &e;
a[2].op = CHANEND;
switch(alt(a)){
case 0:
sysfatal("ssh failed: %s", w->msg);
case 1:
if(e != nil)
sysfatal("ssh failed: %s", e);
}
chanclose(ssherrchan);
}
void void
usage(void) usage(void)
{ {
@ -1259,27 +1312,18 @@ threadmain(int argc, char **argv)
if(argc == 0) if(argc == 0)
usage(); usage();
sshargc = argc + 2;
sshargv = emalloc9p(sizeof(char *) * (sshargc + 1));
sshargv[0] = "ssh";
sshargv[1] = "-X";
memcpy(sshargv + 2, argv, argc * sizeof(char *));
pipe(pfd);
sshfd = pfd[0];
procrfork(startssh, nil, mainstacksize, RFFDG|RFNOTEG|RFNAMEG);
close(pfd[1]);
time0 = time(0); time0 = time(0);
ssherrchan = chancreate(sizeof(char*), 0);
sshmsgchan = chancreate(sizeof(Msg*), 16); sshmsgchan = chancreate(sizeof(Msg*), 16);
fsreqchan = chancreate(sizeof(Req*), 0); fsreqchan = chancreate(sizeof(Req*), 0);
fsreqwaitchan = chancreate(sizeof(void*), 0); fsreqwaitchan = chancreate(sizeof(void*), 0);
fsclunkchan = chancreate(sizeof(Fid*), 0); fsclunkchan = chancreate(sizeof(Fid*), 0);
fsclunkwaitchan = chancreate(sizeof(void*), 0); fsclunkwaitchan = chancreate(sizeof(void*), 0);
procrfork(sshreadproc, nil, mainstacksize, RFNAMEG|RFNOTEG);
procrfork(fsnetproc, nil, mainstacksize, RFNAMEG|RFNOTEG); procrfork(fsnetproc, nil, mainstacksize, RFNAMEG|RFNOTEG);
procrfork(sshreadproc, nil, mainstacksize, RFNAMEG|RFNOTEG);
ssh(argc, argv);
threadpostmountsrv(&fs, service, mtpt, MREPL); threadpostmountsrv(&fs, service, mtpt, MREPL);
exits(0); exits(0);