upstream commit

refactor canohost.c: move functions that cache results closer
 to the places that use them (authn and session code). After this, no state is
 cached in canohost.c

feedback and ok markus@

Upstream-ID: 5f2e4df88d4803fc8ec59ec53629105e23ce625e

1 files changed, 6 insertions, 5 deletions

diff --git a/servconf.c b/servconf.c
index b19d30e18..ba39dce1d 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.285 2016/02/17 05:29:04 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.286 2016/03/07 19:02:43 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -706,14 +706,15 @@ process_queued_listen_addrs(ServerOptions *options)
 struct connection_info *
 get_connection_info(int populate, int use_dns)
 {
+        struct ssh *ssh = active_state; /* XXX */
         static struct connection_info ci;
 
         if (!populate)
                 return &ci;
-        ci.host = get_canonical_hostname(use_dns);
-        ci.address = get_remote_ipaddr();
-        ci.laddress = get_local_ipaddr(packet_get_connection_in());
-        ci.lport = get_local_port();
+        ci.host = auth_get_canonical_hostname(ssh, use_dns);
+        ci.address = ssh_remote_ipaddr(ssh);
+        ci.laddress = ssh_local_ipaddr(ssh);
+        ci.lport = ssh_local_port(ssh);
         return &ci;
 }