diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-07-03 13:46:56 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-07-03 13:46:56 +1000 |
commit | 9f63f22aa0ab13673f197642a66a98b09a18abd0 (patch) | |
tree | d0d0ef1e3802a533d3a935f87de175e9ea010cea /msg.c | |
parent | e53270481c279cb50cf31bc83dc6c91835f9a524 (diff) |
- deraadt@cvs.openbsd.org 2003/06/28 16:23:06
[atomicio.c atomicio.h authfd.c clientloop.c monitor_wrap.c msg.c
progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c
sshd.c]
deal with typing of write vs read in atomicio
Diffstat (limited to 'msg.c')
-rw-r--r-- | msg.c | 6 |
1 files changed, 3 insertions, 3 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.5 2002/12/19 00:07:02 djm Exp $"); | 25 | RCSID("$OpenBSD: msg.c,v 1.6 2003/06/28 16:23:06 deraadt Exp $"); |
26 | 26 | ||
27 | #include "buffer.h" | 27 | #include "buffer.h" |
28 | #include "getput.h" | 28 | #include "getput.h" |
@@ -40,9 +40,9 @@ 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(write, fd, buf, sizeof(buf)) != sizeof(buf)) | 43 | if (atomicio(vwrite, fd, buf, sizeof(buf)) != sizeof(buf)) |
44 | fatal("ssh_msg_send: write"); | 44 | fatal("ssh_msg_send: write"); |
45 | if (atomicio(write, fd, buffer_ptr(m), mlen) != mlen) | 45 | if (atomicio(vwrite, fd, buffer_ptr(m), mlen) != mlen) |
46 | fatal("ssh_msg_send: write"); | 46 | fatal("ssh_msg_send: write"); |
47 | } | 47 | } |
48 | 48 | ||