Mercurial > dropbear

comparison svr-chansession.c @ 253:84925eceeb13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* rename infd/outfd to writefd/readfd, to avoid confusion
author Matt Johnston <matt@ucc.asn.au>
date Thu, 20 Oct 2005 16:53:12 +0000
parents c5d3ef11155f
children 541b14504870
comparison
equal deleted inserted replaced
251:b02e8eef3c3a 253:84925eceeb13
671 671
672 672
673 close(infds[FDIN]); 673 close(infds[FDIN]);
674 close(outfds[FDOUT]); 674 close(outfds[FDOUT]);
675 close(errfds[FDOUT]); 675 close(errfds[FDOUT]);
676 channel->infd = infds[FDOUT]; 676 channel->writefd = infds[FDOUT];
677 channel->outfd = outfds[FDIN]; 677 channel->readfd = outfds[FDIN];
678 channel->errfd = errfds[FDIN]; 678 channel->errfd = errfds[FDIN];
679 ses.maxfd = MAX(ses.maxfd, channel->infd); 679 ses.maxfd = MAX(ses.maxfd, channel->writefd);
680 ses.maxfd = MAX(ses.maxfd, channel->outfd); 680 ses.maxfd = MAX(ses.maxfd, channel->readfd);
681 ses.maxfd = MAX(ses.maxfd, channel->errfd); 681 ses.maxfd = MAX(ses.maxfd, channel->errfd);
682 682
683 setnonblocking(channel->outfd); 683 setnonblocking(channel->readfd);
684 setnonblocking(channel->infd); 684 setnonblocking(channel->writefd);
685 setnonblocking(channel->errfd); 685 setnonblocking(channel->errfd);
686 686
687 } 687 }
688 #undef FDIN 688 #undef FDIN
689 #undef FDOUT 689 #undef FDOUT
782 782
783 /* add a child pid */ 783 /* add a child pid */
784 addchildpid(chansess, pid); 784 addchildpid(chansess, pid);
785 785
786 close(chansess->slave); 786 close(chansess->slave);
787 channel->infd = chansess->master; 787 channel->writefd = chansess->master;
788 channel->outfd = chansess->master; 788 channel->readfd = chansess->master;
789 /* don't need to set stderr here */ 789 /* don't need to set stderr here */
790 ses.maxfd = MAX(ses.maxfd, chansess->master); 790 ses.maxfd = MAX(ses.maxfd, chansess->master);
791 791
792 setnonblocking(chansess->master); 792 setnonblocking(chansess->master);
793 793