summaryrefslogtreecommitdiff
path: root/packet.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-02-29 12:15:15 +0000
committerColin Watson <cjwatson@debian.org>2016-03-08 11:51:22 +0000
commit46961f5704f8e86cea3e99253faad55aef4d8f35 (patch)
tree0dd97fa4fb649a62b4639fe2674380872b1f3e98 /packet.h
parentc753fe267efb1b027424fa8706cf0385fc3d14c1 (diff)
parent85e40e87a75fb80a0bf893ac05a417d6c353537d (diff)
New upstream release (7.2).
Diffstat (limited to 'packet.h')
-rw-r--r--packet.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/packet.h b/packet.h
index 7b06544e8..28516a553 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.h,v 1.66 2015/01/30 01:13:33 djm Exp $ */ 1/* $OpenBSD: packet.h,v 1.70 2016/02/08 10:57:07 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -86,6 +86,7 @@ int ssh_packet_get_connection_in(struct ssh *);
86int ssh_packet_get_connection_out(struct ssh *); 86int ssh_packet_get_connection_out(struct ssh *);
87void ssh_packet_close(struct ssh *); 87void ssh_packet_close(struct ssh *);
88void ssh_packet_set_encryption_key(struct ssh *, const u_char *, u_int, int); 88void ssh_packet_set_encryption_key(struct ssh *, const u_char *, u_int, int);
89int ssh_packet_is_rekeying(struct ssh *);
89void ssh_packet_set_protocol_flags(struct ssh *, u_int); 90void ssh_packet_set_protocol_flags(struct ssh *, u_int);
90u_int ssh_packet_get_protocol_flags(struct ssh *); 91u_int ssh_packet_get_protocol_flags(struct ssh *);
91int ssh_packet_start_compression(struct ssh *, int); 92int ssh_packet_start_compression(struct ssh *, int);
@@ -143,15 +144,11 @@ int ssh_packet_get_state(struct ssh *, struct sshbuf *);
143int ssh_packet_set_state(struct ssh *, struct sshbuf *); 144int ssh_packet_set_state(struct ssh *, struct sshbuf *);
144 145
145const char *ssh_remote_ipaddr(struct ssh *); 146const char *ssh_remote_ipaddr(struct ssh *);
147int ssh_remote_port(struct ssh *);
146 148
147int ssh_packet_need_rekeying(struct ssh *); 149void ssh_packet_set_rekey_limits(struct ssh *, u_int64_t, time_t);
148void ssh_packet_set_rekey_limits(struct ssh *, u_int32_t, time_t);
149time_t ssh_packet_get_rekey_timeout(struct ssh *); 150time_t ssh_packet_get_rekey_timeout(struct ssh *);
150 151
151/* XXX FIXME */
152void ssh_packet_backup_state(struct ssh *, struct ssh *);
153void ssh_packet_restore_state(struct ssh *, struct ssh *);
154
155void *ssh_packet_get_input(struct ssh *); 152void *ssh_packet_get_input(struct ssh *);
156void *ssh_packet_get_output(struct ssh *); 153void *ssh_packet_get_output(struct ssh *);
157 154