- andreas@cvs.openbsd.org 2009/05/28 16:50:16

     [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c
     monitor.c]
     Keep track of number of bytes read and written. Needed for upcoming
     changes. Most code from Martin Forssen, maf at appgate dot com.
     ok markus@

3 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index c5f2ce6f8..2f73a6bcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,12 @@
      Un-static ssh_exchange_identification(), part of a larger change from
      Martin Forssen and needed for upcoming changes.
      ok markus@
+   - andreas@cvs.openbsd.org 2009/05/28 16:50:16
+     [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c
+      monitor.c]
+     Keep track of number of bytes read and written. Needed for upcoming
+     changes. Most code from Martin Forssen, maf at appgate dot com.
+     ok markus@
 
 20090616
  - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
diff --git a/sshconnect.c b/sshconnect.c
index c04aa1057..dee3ba544 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.212 2008/10/14 18:11:33 stevesk Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.213 2009/05/27 06:38:16 andreas Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -413,7 +413,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
  * Waits for the server identification string, and sends our own
  * identification string.
  */
-static void
+void
 ssh_exchange_identification(int timeout_ms)
 {
         char buf[256], remote_version[256];     /* must be same size! */
diff --git a/sshconnect.h b/sshconnect.h
index 75bde1a4d..c59a097f4 100644
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.h,v 1.24 2007/09/04 11:15:56 djm Exp $ */
+/* $OpenBSD: sshconnect.h,v 1.25 2009/05/27 06:38:16 andreas Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -38,6 +38,8 @@ ssh_connect(const char *, struct sockaddr_storage *, u_short, int, int,
 void
 ssh_login(Sensitive *, const char *, struct sockaddr *, struct passwd *, int);
 
+void     ssh_exchange_identification(int);
+
 int      verify_host_key(char *, struct sockaddr *, Key *);
 
 void     ssh_kex(char *, struct sockaddr *);