summaryrefslogtreecommitdiff
path: root/packet.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-01-28 21:15:47 +0000
committerDamien Miller <djm@mindrot.org>2015-01-29 09:08:07 +1100
commitfae7bbe544cba7a9e5e4ab47ff6faa3d978646eb (patch)
treea27a07031b600a1925a128bc0f5258a4b3ab2e8c /packet.h
parent1a3d14f6b44a494037c7deab485abe6496bf2c60 (diff)
upstream commit
avoid fatal() calls in packet code makes ssh-keyscan more reliable against server failures ok dtucker@ markus@
Diffstat (limited to 'packet.h')
-rw-r--r--packet.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/packet.h b/packet.h
index 069af2eae..8a9d0f6c6 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.h,v 1.64 2015/01/19 20:30:23 markus Exp $ */ 1/* $OpenBSD: packet.h,v 1.65 2015/01/28 21:15:47 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -94,7 +94,7 @@ void ssh_packet_read_expect(struct ssh *, int type);
94int ssh_packet_read_poll(struct ssh *); 94int ssh_packet_read_poll(struct ssh *);
95int ssh_packet_read_poll1(struct ssh *, u_char *); 95int ssh_packet_read_poll1(struct ssh *, u_char *);
96int ssh_packet_read_poll2(struct ssh *, u_char *, u_int32_t *seqnr_p); 96int ssh_packet_read_poll2(struct ssh *, u_char *, u_int32_t *seqnr_p);
97void ssh_packet_process_incoming(struct ssh *, const char *buf, u_int len); 97int ssh_packet_process_incoming(struct ssh *, const char *buf, u_int len);
98int ssh_packet_read_seqnr(struct ssh *, u_char *, u_int32_t *seqnr_p); 98int ssh_packet_read_seqnr(struct ssh *, u_char *, u_int32_t *seqnr_p);
99int ssh_packet_read_poll_seqnr(struct ssh *, u_char *, u_int32_t *seqnr_p); 99int ssh_packet_read_poll_seqnr(struct ssh *, u_char *, u_int32_t *seqnr_p);
100 100