Attachment 153 Details for Bug 406 – s/msg_send/ssh_msg_send/

[patch] s/msg_send/ssh_msg_send/

ssh_msg.diff (text/plain), 3.52 KB, created by Damien Miller on 2002-10-03 12:49:51 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2002-10-03 12:49:51 AEST

Size: 3.52 KB

patch

obsolete

>Index: msg.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/msg.c,v
>retrieving revision 1.4
>diff -u -r1.4 msg.c
>--- msg.c	1 Jul 2002 16:15:25 -0000	1.4
>+++ msg.c	3 Oct 2002 02:27:02 -0000
>@@ -31,43 +31,43 @@
> #include "msg.h"
> 
> void
>-msg_send(int fd, u_char type, Buffer *m)
>+ssh_msg_send(int fd, u_char type, Buffer *m)
> {
> 	u_char buf[5];
> 	u_int mlen = buffer_len(m);
> 
>-	debug3("msg_send: type %u", (unsigned int)type & 0xff);
>+	debug3("ssh_msg_send: type %u", (unsigned int)type & 0xff);
> 
> 	PUT_32BIT(buf, mlen + 1);
> 	buf[4] = type;		/* 1st byte of payload is mesg-type */
> 	if (atomicio(write, fd, buf, sizeof(buf)) != sizeof(buf))
>-		fatal("msg_send: write");
>+		fatal("ssh_msg_send: write");
> 	if (atomicio(write, fd, buffer_ptr(m), mlen) != mlen)
>-		fatal("msg_send: write");
>+		fatal("ssh_msg_send: write");
> }
> 
> int
>-msg_recv(int fd, Buffer *m)
>+ssh_msg_recv(int fd, Buffer *m)
> {
> 	u_char buf[4];
> 	ssize_t res;
> 	u_int msg_len;
> 
>-	debug3("msg_recv entering");
>+	debug3("ssh_msg_recv entering");
> 
> 	res = atomicio(read, fd, buf, sizeof(buf));
> 	if (res != sizeof(buf)) {
> 		if (res == 0)
> 			return -1;
>-		fatal("msg_recv: read: header %ld", (long)res);
>+		fatal("ssh_msg_recv: read: header %ld", (long)res);
> 	}
> 	msg_len = GET_32BIT(buf);
> 	if (msg_len > 256 * 1024)
>-		fatal("msg_recv: read: bad msg_len %u", msg_len);
>+		fatal("ssh_msg_recv: read: bad msg_len %u", msg_len);
> 	buffer_clear(m);
> 	buffer_append_space(m, msg_len);
> 	res = atomicio(read, fd, buffer_ptr(m), msg_len);
> 	if (res != msg_len)
>-		fatal("msg_recv: read: %ld != msg_len", (long)res);
>+		fatal("ssh_msg_recv: read: %ld != msg_len", (long)res);
> 	return 0;
> }
>Index: msg.h
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/msg.h,v
>retrieving revision 1.1
>diff -u -r1.1 msg.h
>--- msg.h	23 May 2002 19:24:30 -0000	1.1
>+++ msg.h	3 Oct 2002 02:27:02 -0000
>@@ -25,7 +25,7 @@
> #ifndef SSH_MSG_H
> #define SSH_MSG_H
> 
>-void	 msg_send(int, u_char, Buffer *);
>-int	 msg_recv(int, Buffer *);
>+void	 ssh_msg_send(int, u_char, Buffer *);
>+int	 ssh_msg_recv(int, Buffer *);
> 
> #endif
>Index: ssh-keysign.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/ssh-keysign.c,v
>retrieving revision 1.7
>diff -u -r1.7 ssh-keysign.c
>--- ssh-keysign.c	3 Jul 2002 14:21:05 -0000	1.7
>+++ ssh-keysign.c	3 Oct 2002 02:27:06 -0000
>@@ -196,8 +196,8 @@
> 		fatal("no hostkey found");
> 
> 	buffer_init(&b);
>-	if (msg_recv(STDIN_FILENO, &b) < 0)
>-		fatal("msg_recv failed");
>+	if (ssh_msg_recv(STDIN_FILENO, &b) < 0)
>+		fatal("ssh_msg_recv failed");
> 	if (buffer_get_char(&b) != version)
> 		fatal("bad version");
> 	fd = buffer_get_int(&b);
>@@ -229,7 +229,7 @@
> 	/* send reply */
> 	buffer_clear(&b);
> 	buffer_put_string(&b, signature, slen);
>-	msg_send(STDOUT_FILENO, version, &b);
>+	ssh_msg_send(STDOUT_FILENO, version, &b);
> 
> 	return (0);
> }
>Index: sshconnect2.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/sshconnect2.c,v
>retrieving revision 1.107
>diff -u -r1.107 sshconnect2.c
>--- sshconnect2.c	1 Jul 2002 19:48:46 -0000	1.107
>+++ sshconnect2.c	3 Oct 2002 02:27:07 -0000
>@@ -947,9 +947,9 @@
> 	buffer_init(&b);
> 	buffer_put_int(&b, packet_get_connection_in()); /* send # of socket */
> 	buffer_put_string(&b, data, datalen);
>-	msg_send(to[1], version, &b);
>+	ssh_msg_send(to[1], version, &b);
> 
>-	if (msg_recv(from[0], &b) < 0) {
>+	if (ssh_msg_recv(from[0], &b) < 0) {
> 		error("ssh_keysign: no reply");
> 		buffer_clear(&b);
> 		return -1;

Actions: View | Diff

Attachments on bug 406: 153