diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-01-28 22:15:47 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-28 23:08:07 +0100 |
| commit | fae7bbe544cba7a9e5e4ab47ff6faa3d978646eb (patch) | |
| tree | a27a07031b600a1925a128bc0f5258a4b3ab2e8c /packet.h | |
| parent | upstream commit (diff) | |
| download | openssh-fae7bbe544cba7a9e5e4ab47ff6faa3d978646eb.tar.xz openssh-fae7bbe544cba7a9e5e4ab47ff6faa3d978646eb.zip | |
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.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: packet.h,v 1.64 2015/01/19 20:30:23 markus Exp $ */ +/* $OpenBSD: packet.h,v 1.65 2015/01/28 21:15:47 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -94,7 +94,7 @@ void ssh_packet_read_expect(struct ssh *, int type); int ssh_packet_read_poll(struct ssh *); int ssh_packet_read_poll1(struct ssh *, u_char *); int ssh_packet_read_poll2(struct ssh *, u_char *, u_int32_t *seqnr_p); -void ssh_packet_process_incoming(struct ssh *, const char *buf, u_int len); +int ssh_packet_process_incoming(struct ssh *, const char *buf, u_int len); int ssh_packet_read_seqnr(struct ssh *, u_char *, u_int32_t *seqnr_p); int ssh_packet_read_poll_seqnr(struct ssh *, u_char *, u_int32_t *seqnr_p); |