From 95767262caa6692eff1e1565be1f5cb297949a89 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Mon, 7 Mar 2016 19:02:43 +0000 Subject: 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 --- packet.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'packet.h') diff --git a/packet.h b/packet.h index 28516a55..464d83b1 100644 --- a/packet.h +++ b/packet.h @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.h,v 1.70 2016/02/08 10:57:07 djm Exp $ */ +/* $OpenBSD: packet.h,v 1.71 2016/03/07 19:02:43 djm Exp $ */ /* * Author: Tatu Ylonen @@ -56,9 +56,11 @@ struct ssh { /* Key exchange */ struct kex *kex; - /* cached remote ip address and port*/ + /* cached local and remote ip addresses and ports */ char *remote_ipaddr; int remote_port; + char *local_ipaddr; + int local_port; /* Dispatcher table */ dispatch_fn *dispatch[DISPATCH_MAX]; @@ -145,6 +147,8 @@ int ssh_packet_set_state(struct ssh *, struct sshbuf *); const char *ssh_remote_ipaddr(struct ssh *); int ssh_remote_port(struct ssh *); +const char *ssh_local_ipaddr(struct ssh *); +int ssh_local_port(struct ssh *); void ssh_packet_set_rekey_limits(struct ssh *, u_int64_t, time_t); time_t ssh_packet_get_rekey_timeout(struct ssh *); -- cgit v1.2.1