Mercurial > dropbear

comparison common-session.c @ 1068:9a6395ddb1b6 pam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve merge properly
author Matt Johnston <matt@ucc.asn.au>
date Fri, 23 Jan 2015 22:32:49 +0800
parents 73ea0dce9a57
children 2fa71c3b2827
comparison
equal deleted inserted replaced
989:73ea0dce9a57 1068:9a6395ddb1b6
220 220
221 /* process pipes etc for the channels, ses.dataallowed == 0 221 /* process pipes etc for the channels, ses.dataallowed == 0
222 * during rekeying ) */ 222 * during rekeying ) */
223 channelio(&readfd, &writefd); 223 channelio(&readfd, &writefd);
224 224
225 <<<<<<< local
226 if (ses.loop_handler) {
227 ses.loop_handler();
228 =======
229 /* process session socket's outgoing data */ 225 /* process session socket's outgoing data */
230 if (ses.sock_out != -1) { 226 if (ses.sock_out != -1) {
231 if (!isempty(&ses.writequeue)) { 227 if (!isempty(&ses.writequeue)) {
232 write_packet(); 228 write_packet();
233 } 229 }
234 } 230 }
235 231
236 232
237 if (loophandler) { 233 if (loophandler) {
238 loophandler(); 234 loophandler();
239 >>>>>>> other
240 } 235 }
241 236
242 } /* for(;;) */ 237 } /* for(;;) */
243 ses.recursion_count--; 238 ses.recursion_count--;
244 ses.exit_recursion = 0; 239 ses.exit_recursion = 0;