diff options
author | Damien Miller <djm@mindrot.org> | 2003-11-17 21:20:47 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-11-17 21:20:47 +1100 |
commit | 51bf11fcc9be7b101d0aee71da80a739f87e0608 (patch) | |
tree | e0c8ff3fa3799d92e1ceb74783bb673041ef5ad6 /msg.c | |
parent | 91c6aa4468a1a8b8e76fbf1c64719055c6acdffa (diff) |
- djm@cvs.openbsd.org 2003/11/17 09:45:39
[msg.c msg.h sshconnect2.c ssh-keysign.c]
return error on msg send/receive failure (rather than fatal); ok markus@
Diffstat (limited to 'msg.c')
-rw-r--r-- | msg.c | 37 |
1 files changed, 23 insertions, 14 deletions
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: msg.c,v 1.6 2003/06/28 16:23:06 deraadt Exp $"); | 25 | RCSID("$OpenBSD: msg.c,v 1.7 2003/11/17 09:45:39 djm Exp $"); |
26 | 26 | ||
27 | #include "buffer.h" | 27 | #include "buffer.h" |
28 | #include "getput.h" | 28 | #include "getput.h" |
@@ -30,7 +30,7 @@ RCSID("$OpenBSD: msg.c,v 1.6 2003/06/28 16:23:06 deraadt Exp $"); | |||
30 | #include "atomicio.h" | 30 | #include "atomicio.h" |
31 | #include "msg.h" | 31 | #include "msg.h" |
32 | 32 | ||
33 | void | 33 | int |
34 | ssh_msg_send(int fd, u_char type, Buffer *m) | 34 | ssh_msg_send(int fd, u_char type, Buffer *m) |
35 | { | 35 | { |
36 | u_char buf[5]; | 36 | u_char buf[5]; |
@@ -40,10 +40,15 @@ ssh_msg_send(int fd, u_char type, Buffer *m) | |||
40 | 40 | ||
41 | PUT_32BIT(buf, mlen + 1); | 41 | PUT_32BIT(buf, mlen + 1); |
42 | buf[4] = type; /* 1st byte of payload is mesg-type */ | 42 | buf[4] = type; /* 1st byte of payload is mesg-type */ |
43 | if (atomicio(vwrite, fd, buf, sizeof(buf)) != sizeof(buf)) | 43 | if (atomicio(vwrite, fd, buf, sizeof(buf)) != sizeof(buf)) { |
44 | fatal("ssh_msg_send: write"); | 44 | error("ssh_msg_send: write"); |
45 | if (atomicio(vwrite, fd, buffer_ptr(m), mlen) != mlen) | 45 | return (-1); |
46 | fatal("ssh_msg_send: write"); | 46 | } |
47 | if (atomicio(vwrite, fd, buffer_ptr(m), mlen) != mlen) { | ||
48 | error("ssh_msg_send: write"); | ||
49 | return (-1); | ||
50 | } | ||
51 | return (0); | ||
47 | } | 52 | } |
48 | 53 | ||
49 | int | 54 | int |
@@ -57,17 +62,21 @@ ssh_msg_recv(int fd, Buffer *m) | |||
57 | 62 | ||
58 | res = atomicio(read, fd, buf, sizeof(buf)); | 63 | res = atomicio(read, fd, buf, sizeof(buf)); |
59 | if (res != sizeof(buf)) { | 64 | if (res != sizeof(buf)) { |
60 | if (res == 0) | 65 | if (res != 0) |
61 | return -1; | 66 | error("ssh_msg_recv: read: header %ld", (long)res); |
62 | fatal("ssh_msg_recv: read: header %ld", (long)res); | 67 | return (-1); |
63 | } | 68 | } |
64 | msg_len = GET_32BIT(buf); | 69 | msg_len = GET_32BIT(buf); |
65 | if (msg_len > 256 * 1024) | 70 | if (msg_len > 256 * 1024) { |
66 | fatal("ssh_msg_recv: read: bad msg_len %u", msg_len); | 71 | error("ssh_msg_recv: read: bad msg_len %u", msg_len); |
72 | return (-1); | ||
73 | } | ||
67 | buffer_clear(m); | 74 | buffer_clear(m); |
68 | buffer_append_space(m, msg_len); | 75 | buffer_append_space(m, msg_len); |
69 | res = atomicio(read, fd, buffer_ptr(m), msg_len); | 76 | res = atomicio(read, fd, buffer_ptr(m), msg_len); |
70 | if (res != msg_len) | 77 | if (res != msg_len) { |
71 | fatal("ssh_msg_recv: read: %ld != msg_len", (long)res); | 78 | error("ssh_msg_recv: read: %ld != msg_len", (long)res); |
72 | return 0; | 79 | return (-1); |
80 | } | ||
81 | return (0); | ||
73 | } | 82 | } |