changeset 1789:249681d9ecda default tip main

Use buf_eatstring instead
author Matt Johnston <matt@ucc.asn.au>
date Thu, 10 Dec 2020 23:18:48 +0800
parents 1fc0012b9c38
children
files cli-session.c svr-tcpfwd.c
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/cli-session.c	Thu Dec 10 16:13:13 2020 +0100
+++ b/cli-session.c	Thu Dec 10 23:18:48 2020 +0800
@@ -408,11 +408,9 @@
 }
 
 static void recv_msg_global_request_cli(void) {
-	unsigned int len = 0;
 	unsigned int wantreply = 0;
 
-	len = buf_getint(ses.payload);
-	buf_incrpos(ses.payload, len);
+	buf_eatstring(ses.payload);
 	wantreply = buf_getbool(ses.payload);
 
 	TRACE(("recv_msg_global_request_cli: want_reply: %u", wantreply));
--- a/svr-tcpfwd.c	Thu Dec 10 16:13:13 2020 +0100
+++ b/svr-tcpfwd.c	Thu Dec 10 23:18:48 2020 +0800
@@ -39,13 +39,11 @@
 
 /* This is better than SSH_MSG_UNIMPLEMENTED */
 void recv_msg_global_request_remotetcp() {
-	unsigned int len = 0;
 	unsigned int wantreply = 0;
 
 	TRACE(("recv_msg_global_request_remotetcp: remote tcp forwarding not compiled in"))
 
-	len = buf_getint(ses.payload);
-	buf_incrpos(ses.payload, len);
+	buf_eatstring(ses.payload);
 	wantreply = buf_getbool(ses.payload);
 	if (wantreply) {
 		send_msg_request_failure();