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 /monitor_wrap.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 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index bd3a01a2b..10a79c035 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.26 2003/04/07 08:29:57 markus Exp $"); | 28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.27 2003/06/28 16:23:06 deraadt Exp $"); |
29 | 29 | ||
30 | #include <openssl/bn.h> | 30 | #include <openssl/bn.h> |
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
@@ -72,9 +72,9 @@ mm_request_send(int socket, enum monitor_reqtype type, Buffer *m) | |||
72 | 72 | ||
73 | PUT_32BIT(buf, mlen + 1); | 73 | PUT_32BIT(buf, mlen + 1); |
74 | buf[4] = (u_char) type; /* 1st byte of payload is mesg-type */ | 74 | buf[4] = (u_char) type; /* 1st byte of payload is mesg-type */ |
75 | if (atomicio(write, socket, buf, sizeof(buf)) != sizeof(buf)) | 75 | if (atomicio(vwrite, socket, buf, sizeof(buf)) != sizeof(buf)) |
76 | fatal("%s: write", __func__); | 76 | fatal("%s: write", __func__); |
77 | if (atomicio(write, socket, buffer_ptr(m), mlen) != mlen) | 77 | if (atomicio(vwrite, socket, buffer_ptr(m), mlen) != mlen) |
78 | fatal("%s: write", __func__); | 78 | fatal("%s: write", __func__); |
79 | } | 79 | } |
80 | 80 | ||