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

Diff for /src/usr.bin/ssh/channels.c between version 1.258 and 1.259

version 1.258, 2006/07/21 12:43:36 version 1.259, 2006/07/21 21:13:30
Line 733 
Line 733 
 chan_fn *channel_pre[SSH_CHANNEL_MAX_TYPE];  chan_fn *channel_pre[SSH_CHANNEL_MAX_TYPE];
 chan_fn *channel_post[SSH_CHANNEL_MAX_TYPE];  chan_fn *channel_post[SSH_CHANNEL_MAX_TYPE];
   
   /* ARGSUSED */
 static void  static void
 channel_pre_listener(Channel *c, fd_set *readset, fd_set *writeset)  channel_pre_listener(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
         FD_SET(c->sock, readset);          FD_SET(c->sock, readset);
 }  }
   
   /* ARGSUSED */
 static void  static void
 channel_pre_connecting(Channel *c, fd_set *readset, fd_set *writeset)  channel_pre_connecting(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 793 
Line 795 
                 FD_SET(c->ctl_fd, readset);                  FD_SET(c->ctl_fd, readset);
 }  }
   
   /* ARGSUSED */
 static void  static void
 channel_pre_input_draining(Channel *c, fd_set *readset, fd_set *writeset)  channel_pre_input_draining(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 805 
Line 808 
         }          }
 }  }
   
   /* ARGSUSED */
 static void  static void
 channel_pre_output_draining(Channel *c, fd_set *readset, fd_set *writeset)  channel_pre_output_draining(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 934 
Line 938 
 }  }
   
 /* try to decode a socks4 header */  /* try to decode a socks4 header */
   /* ARGSUSED */
 static int  static int
 channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset)  channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 1012 
Line 1017 
 #define SSH_SOCKS5_CONNECT      0x01  #define SSH_SOCKS5_CONNECT      0x01
 #define SSH_SOCKS5_SUCCESS      0x00  #define SSH_SOCKS5_SUCCESS      0x00
   
   /* ARGSUSED */
 static int  static int
 channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)  channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 1162 
Line 1168 
 }  }
   
 /* This is our fake X11 server socket. */  /* This is our fake X11 server socket. */
   /* ARGSUSED */
 static void  static void
 channel_post_x11_listener(Channel *c, fd_set *readset, fd_set *writeset)  channel_post_x11_listener(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 1287 
Line 1294 
 /*  /*
  * This socket is listening for connections to a forwarded TCP/IP port.   * This socket is listening for connections to a forwarded TCP/IP port.
  */   */
   /* ARGSUSED */
 static void  static void
 channel_post_port_listener(Channel *c, fd_set *readset, fd_set *writeset)  channel_post_port_listener(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 1344 
Line 1352 
  * This is the authentication agent socket listening for connections from   * This is the authentication agent socket listening for connections from
  * clients.   * clients.
  */   */
   /* ARGSUSED */
 static void  static void
 channel_post_auth_listener(Channel *c, fd_set *readset, fd_set *writeset)  channel_post_auth_listener(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 1377 
Line 1386 
         }          }
 }  }
   
   /* ARGSUSED */
 static void  static void
 channel_post_connecting(Channel *c, fd_set *readset, fd_set *writeset)  channel_post_connecting(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 1423 
Line 1433 
         }          }
 }  }
   
   /* ARGSUSED */
 static int  static int
 channel_handle_rfd(Channel *c, fd_set *readset, fd_set *writeset)  channel_handle_rfd(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 1464 
Line 1475 
         return 1;          return 1;
 }  }
   
   /* ARGSUSED */
 static int  static int
 channel_handle_wfd(Channel *c, fd_set *readset, fd_set *writeset)  channel_handle_wfd(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 1591 
Line 1603 
         return 1;          return 1;
 }  }
   
   /* ARGSUSED */
 static int  static int
 channel_handle_ctl(Channel *c, fd_set *readset, fd_set *writeset)  channel_handle_ctl(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 1653 
Line 1666 
         channel_check_window(c);          channel_check_window(c);
 }  }
   
   /* ARGSUSED */
 static void  static void
 channel_post_output_drain_13(Channel *c, fd_set *readset, fd_set *writeset)  channel_post_output_drain_13(Channel *c, fd_set *readset, fd_set *writeset)
 {  {
Line 3012 
Line 3026 
  * with either SSH_MSG_OPEN_CONFIRMATION or SSH_MSG_OPEN_FAILURE.   * with either SSH_MSG_OPEN_CONFIRMATION or SSH_MSG_OPEN_FAILURE.
  */   */
   
   /* ARGSUSED */
 void  void
 x11_input_open(int type, u_int32_t seq, void *ctxt)  x11_input_open(int type, u_int32_t seq, void *ctxt)
 {  {
Line 3055 
Line 3070 
 }  }
   
 /* dummy protocol handler that denies SSH-1 requests (agent/x11) */  /* dummy protocol handler that denies SSH-1 requests (agent/x11) */
   /* ARGSUSED */
 void  void
 deny_input_open(int type, u_int32_t seq, void *ctxt)  deny_input_open(int type, u_int32_t seq, void *ctxt)
 {  {
Legend:
Removed from v.1.258  
changed lines
  Added in v.1.259