[BACK]Return to nchan.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/nchan.c between version 1.17 and 1.17.2.3

version 1.17, 2000/05/08 17:44:54 version 1.17.2.3, 2001/03/12 15:44:12
Line 9 
Line 9 
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software  
  *    must display the following acknowledgement:  
  *      This product includes software developed by Markus Friedl.  
  * 4. The name of the author may not be used to endorse or promote products  
  *    derived from this software without specific prior written permission.  
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR   * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES   * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Line 28 
Line 23 
  */   */
   
 #include "includes.h"  #include "includes.h"
 RCSID("$Id$");  RCSID("$OpenBSD$");
   
 #include "ssh.h"  #include "ssh1.h"
   #include "ssh2.h"
 #include "buffer.h"  #include "buffer.h"
 #include "packet.h"  #include "packet.h"
 #include "channels.h"  #include "channels.h"
 #include "nchan.h"  #include "nchan.h"
   
 #include "ssh2.h"  
 #include "compat.h"  #include "compat.h"
   #include "log.h"
   
 /* functions manipulating channel states */  /* functions manipulating channel states */
 /*  /*
Line 258 
Line 252 
 static void  static void
 chan_delete_if_full_closed1(Channel *c)  chan_delete_if_full_closed1(Channel *c)
 {  {
           debug3("channel %d: chan_delete_if_full_closed1: istate %d ostate %d",
               c->self, c->istate, c->ostate);
         if (c->istate == CHAN_INPUT_CLOSED && c->ostate == CHAN_OUTPUT_CLOSED) {          if (c->istate == CHAN_INPUT_CLOSED && c->ostate == CHAN_OUTPUT_CLOSED) {
                 debug("channel %d: full closed", c->self);                  debug("channel %d: full closed", c->self);
                 channel_free(c->self);                  channel_free(c->self);
Line 408 
Line 404 
 static void  static void
 chan_delete_if_full_closed2(Channel *c)  chan_delete_if_full_closed2(Channel *c)
 {  {
           debug3("channel %d: chan_delete_if_full_closed2: istate %d ostate %d",
               c->self, c->istate, c->ostate);
         if (c->istate == CHAN_INPUT_CLOSED && c->ostate == CHAN_OUTPUT_CLOSED) {          if (c->istate == CHAN_INPUT_CLOSED && c->ostate == CHAN_OUTPUT_CLOSED) {
                 if (!(c->flags & CHAN_CLOSE_SENT)) {                  if (!(c->flags & CHAN_CLOSE_SENT)) {
                         chan_send_close2(c);                          chan_send_close2(c);

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.17.2.3