- markus@cvs.openbsd.org 2008/07/10 18:08:11

     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h sshd.c]
     sync v1 and v2 traffic accounting; add it to sshd, too;
     ok djm@, dtucker@

1 files changed, 8 insertions, 3 deletions

diff --git a/sshd.c b/sshd.c
index a6620a05a..6e5bb5476 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.363 2008/07/01 07:24:22 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.364 2008/07/10 18:08:11 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -677,7 +677,7 @@ privsep_postauth(Authctxt *authctxt)
         if (pmonitor->m_pid == -1)
                 fatal("fork of unprivileged child failed");
         else if (pmonitor->m_pid != 0) {
-                debug2("User child is on pid %ld", (long)pmonitor->m_pid);
+                verbose("User child is on pid %ld", (long)pmonitor->m_pid);
                 close(pmonitor->m_recvfd);
                 buffer_clear(&loginmsg);
                 monitor_child_postauth(pmonitor);
@@ -1248,6 +1248,7 @@ main(int ac, char **av)
         int remote_port;
         char *line, *p, *cp;
         int config_s[2] = { -1 , -1 };
+        u_int64_t ibytes, obytes;
         mode_t new_umask;
         Key *key;
         Authctxt *authctxt;
@@ -1919,7 +1920,11 @@ main(int ac, char **av)
         do_authenticated(authctxt);
 
         /* The connection has been terminated. */
-        verbose("Closing connection to %.100s", remote_ip);
+        packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes);
+        packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes);
+        verbose("Transferred: sent %llu, received %llu bytes", obytes, ibytes);
+
+        verbose("Closing connection to %.500s port %d", remote_ip, remote_port);
 
 #ifdef USE_PAM
         if (options.use_pam)