summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--msg.c73
-rw-r--r--msg.h31
3 files changed, 106 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 70fdad614..0ac0c0d06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -130,6 +130,7 @@
130 - markus@cvs.openbsd.org 2002/06/06 17:30:11 130 - markus@cvs.openbsd.org 2002/06/06 17:30:11
131 [sftp-server.c] 131 [sftp-server.c]
132 use get_int() macro (hide iqueue) 132 use get_int() macro (hide iqueue)
133 - (bal) Missed msg.[ch] in merge. Required for ssh-keysign.
133 134
13420020604 13520020604
135 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed 136 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
@@ -814,4 +815,4 @@
814 - (stevesk) entropy.c: typo in debug message 815 - (stevesk) entropy.c: typo in debug message
815 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 816 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
816 817
817$Id: ChangeLog,v 1.2179 2002/06/06 21:58:35 mouring Exp $ 818$Id: ChangeLog,v 1.2180 2002/06/07 01:51:06 mouring Exp $
diff --git a/msg.c b/msg.c
new file mode 100644
index 000000000..a159aae84
--- /dev/null
+++ b/msg.c
@@ -0,0 +1,73 @@
1/*
2 * Copyright (c) 2002 Markus Friedl. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 *
13 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
14 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
15 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
16 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
17 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24#include "includes.h"
25RCSID("$OpenBSD: msg.c,v 1.1 2002/05/23 19:24:30 markus Exp $");
26
27#include "buffer.h"
28#include "getput.h"
29#include "log.h"
30#include "atomicio.h"
31#include "msg.h"
32
33void
34msg_send(int fd, u_char type, Buffer *m)
35{
36 u_char buf[5];
37 u_int mlen = buffer_len(m);
38
39 debug3("msg_send: type %d", type);
40
41 PUT_32BIT(buf, mlen + 1);
42 buf[4] = type; /* 1st byte of payload is mesg-type */
43 if (atomicio(write, fd, buf, sizeof(buf)) != sizeof(buf))
44 fatal("msg_send: write");
45 if (atomicio(write, fd, buffer_ptr(m), mlen) != mlen)
46 fatal("msg_send: write");
47}
48
49int
50msg_recv(int fd, Buffer *m)
51{
52 u_char buf[4];
53 ssize_t res;
54 u_int msg_len;
55
56 debug3("msg_recv entering");
57
58 res = atomicio(read, fd, buf, sizeof(buf));
59 if (res != sizeof(buf)) {
60 if (res == 0)
61 return -1;
62 fatal("msg_recv: read: header %d", res);
63 }
64 msg_len = GET_32BIT(buf);
65 if (msg_len > 256 * 1024)
66 fatal("msg_recv: read: bad msg_len %d", msg_len);
67 buffer_clear(m);
68 buffer_append_space(m, msg_len);
69 res = atomicio(read, fd, buffer_ptr(m), msg_len);
70 if (res != msg_len)
71 fatal("msg_recv: read: %ld != msg_len", (long)res);
72 return 0;
73}
diff --git a/msg.h b/msg.h
new file mode 100644
index 000000000..13fa95b27
--- /dev/null
+++ b/msg.h
@@ -0,0 +1,31 @@
1/* $OpenBSD: msg.h,v 1.1 2002/05/23 19:24:30 markus Exp $ */
2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 *
14 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
15 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
16 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
17 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25#ifndef SSH_MSG_H
26#define SSH_MSG_H
27
28void msg_send(int, u_char, Buffer *);
29int msg_recv(int, Buffer *);
30
31#endif