merge functions, simplify.

3 files changed, 8 insertions, 13 deletions

diff --git a/usr.bin/ssh/channel.c b/usr.bin/ssh/channel.c
index ddacf0bf89d..2896562c246 100644
--- a/usr.bin/ssh/channel.c
+++ b/usr.bin/ssh/channel.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channel.c,v 1.1 2001/05/30 12:55:08 markus Exp $");
+RCSID("$OpenBSD: channel.c,v 1.2 2001/05/30 15:20:09 markus Exp $");
 
 #include "ssh2.h"
 #include "packet.h"
@@ -480,11 +480,11 @@ channel_open_message()
 }
 
 void
-channel_start_open(int id)
+channel_send_open(int id)
 {
 	Channel *c = channel_lookup(id);
 	if (c == NULL) {
-		log("channel_open: %d: bad id", id);
+		log("channel_send_open: %d: bad id", id);
 		return;
 	}
 	debug("send channel open %d", id);
@@ -493,14 +493,9 @@ channel_start_open(int id)
 	packet_put_int(c->self);
 	packet_put_int(c->local_window);
 	packet_put_int(c->local_maxpacket);
-}
-void
-channel_open(int id)
-{
-	/* XXX REMOVE ME */
-	channel_start_open(id);
 	packet_send();
 }
+
 void
 channel_request(int id, char *service, int wantconfirm)
 {
diff --git a/usr.bin/ssh/channel.h b/usr.bin/ssh/channel.h
index b7e57c0760e..2ab25d925df 100644
--- a/usr.bin/ssh/channel.h
+++ b/usr.bin/ssh/channel.h
@@ -32,7 +32,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: channel.h,v 1.1 2001/05/30 12:55:08 markus Exp $"); */
+/* RCSID("$OpenBSD: channel.h,v 1.2 2001/05/30 15:20:10 markus Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
@@ -151,7 +151,7 @@ channel_set_fds(int id, int rfd, int wfd, int efd,
     int extusage, int nonblock);
 void    channel_free(Channel *c);
 
-void	channel_open(int id);
+void	channel_send_open(int id);
 void	channel_request(int id, char *service, int wantconfirm);
 void	channel_request_start(int id, char *service, int wantconfirm);
 void	channel_register_callback(int id, int mtype, channel_callback_fn *fn, void *arg);
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index afb468eee69..f13a848e60f 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.121 2001/05/30 12:55:13 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.122 2001/05/30 15:20:10 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -1074,7 +1074,7 @@ ssh_session2_command(void)
 
 	debug3("ssh_session2_command: channel_new: %d", c->self);
 
-	channel_open(c->self);
+	channel_send_open(c->self);
 	channel_register_callback(c->self, SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
 	     ssh_session2_callback, (void *)0);