[BACK]Return to mux.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / crypto / external / bsd / openssh / dist

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/crypto/external/bsd/openssh/dist/mux.c between version 1.1.1.6 and 1.1.1.7

version 1.1.1.6, 2012/12/12 16:52:23 version 1.1.1.7, 2013/03/29 14:52:43
Line 1 
Line 1 
 /* $OpenBSD: mux.c,v 1.36 2012/07/06 01:37:21 djm Exp $ */  /* $OpenBSD: mux.c,v 1.38 2013/01/02 00:32:07 djm Exp $ */
 /*  /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>   * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *   *
Line 171  static const struct {
Line 171  static const struct {
   
 /* Cleanup callback fired on closure of mux slave _session_ channel */  /* Cleanup callback fired on closure of mux slave _session_ channel */
 /* ARGSUSED */  /* ARGSUSED */
 static void  void
 mux_master_session_cleanup_cb(int cid, void *unused)  mux_master_session_cleanup_cb(int cid, void *unused)
 {  {
         Channel *cc, *c = channel_by_id(cid);          Channel *cc, *c = channel_by_id(cid);
Line 721  process_mux_open_fwd(u_int rid, Channel 
Line 721  process_mux_open_fwd(u_int rid, Channel 
         }          }
   
         if (ftype == MUX_FWD_LOCAL || ftype == MUX_FWD_DYNAMIC) {          if (ftype == MUX_FWD_LOCAL || ftype == MUX_FWD_DYNAMIC) {
                 if (channel_setup_local_fwd_listener(fwd.listen_host,                  if (!channel_setup_local_fwd_listener(fwd.listen_host,
                     fwd.listen_port, fwd.connect_host, fwd.connect_port,                      fwd.listen_port, fwd.connect_host, fwd.connect_port,
                     options.gateway_ports) < 0) {                      options.gateway_ports)) {
  fail:   fail:
                         logit("slave-requested %s failed", fwd_desc);                          logit("slave-requested %s failed", fwd_desc);
                         buffer_put_int(r, MUX_S_FAILURE);                          buffer_put_int(r, MUX_S_FAILURE);

Legend:
Removed from v.1.1.1.6  
changed lines
  Added in v.1.1.1.7

CVSweb <webmaster@jp.NetBSD.org>