[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.379 and 1.380

version 1.379, 2018/02/05 05:36:49 version 1.380, 2018/04/10 00:10:49
Line 2568 
Line 2568 
  *      SSH_CHANNEL_MUX_PROXY channel and replace the mux clients ID   *      SSH_CHANNEL_MUX_PROXY channel and replace the mux clients ID
  *      with the newly allocated channel ID.   *      with the newly allocated channel ID.
  * 2) Upstream messages are received by matching SSH_CHANNEL_MUX_PROXY   * 2) Upstream messages are received by matching SSH_CHANNEL_MUX_PROXY
  *    channels and procesed by channel_proxy_upstream(). The local channel ID   *    channels and processed by channel_proxy_upstream(). The local channel ID
  *    is then translated back to the original mux client ID.   *    is then translated back to the original mux client ID.
  * 3) In both cases we need to keep track of matching SSH2_MSG_CHANNEL_CLOSE   * 3) In both cases we need to keep track of matching SSH2_MSG_CHANNEL_CLOSE
  *    messages so we can clean up SSH_CHANNEL_MUX_PROXY channels.   *    messages so we can clean up SSH_CHANNEL_MUX_PROXY channels.
Line 2579 
Line 2579 
  *    channel. E.g. client_request_forwarded_tcpip() needs to figure   *    channel. E.g. client_request_forwarded_tcpip() needs to figure
  *    out whether the request is addressed to the local client or a   *    out whether the request is addressed to the local client or a
  *    specific downstream client based on the listen-address/port.   *    specific downstream client based on the listen-address/port.
  * 6) Agent and X11-Forwarding have a similar problem and are currenly   * 6) Agent and X11-Forwarding have a similar problem and are currently
  *    not supported as the matching session/channel cannot be identified   *    not supported as the matching session/channel cannot be identified
  *    easily.   *    easily.
  */   */
Line 2756 
Line 2756 
         /*          /*
          * When receiving packets from the peer we need to check whether we           * When receiving packets from the peer we need to check whether we
          * need to forward the packets to the mux client. In this case we           * need to forward the packets to the mux client. In this case we
          * restore the orignal channel id and keep track of CLOSE messages,           * restore the original channel id and keep track of CLOSE messages,
          * so we can cleanup the channel.           * so we can cleanup the channel.
          */           */
         if (c == NULL || c->type != SSH_CHANNEL_MUX_PROXY)          if (c == NULL || c->type != SSH_CHANNEL_MUX_PROXY)
Legend:
Removed from v.1.379  
changed lines
  Added in v.1.380