Merging upstream version 10.2.

Signed-off-by: Daniel Baumann <daniel@debian.org>

1 files changed, 28 insertions, 2 deletions

diff --git a/lib/vty.c b/lib/vty.c
index d0bbf0e6..256a3bb3 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -345,8 +345,17 @@ int vty_out(struct vty *vty, const char *format, ...)
 	case VTY_SHELL_SERV:
 	case VTY_FILE:
 	default:
+		vty->vty_buf_size_accumulated += strlen(filtered);
 		/* print without crlf replacement */
 		buffer_put(vty->obuf, (uint8_t *)filtered, strlen(filtered));
+		/* For every chunk of memory, we invoke vtysh_flush where we
+		 * put the data of collective vty->obuf Linked List items on the
+		 * socket and free the vty->obuf data.
+		 */
+		if (vty->vty_buf_size_accumulated >= VTY_MAX_INTERMEDIATE_FLUSH) {
+			vty->vty_buf_size_accumulated = 0;
+			vtysh_flush(vty);
+		}
 		break;
 	}
 
@@ -2118,6 +2127,8 @@ static void vtysh_accept(struct event *thread)
 	int client_len;
 	struct sockaddr_un client;
 	struct vty *vty;
+	int ret = 0;
+	uint32_t sndbufsize = VTY_SEND_BUF_MAX;
 
 	vty_event_serv(VTYSH_SERV, vtyserv);
 
@@ -2141,6 +2152,20 @@ static void vtysh_accept(struct event *thread)
 		close(sock);
 		return;
 	}
+
+	/*
+	 * Increasing the SEND socket buffer size so that the socket can hold
+	 * before sending it to VTY shell.
+	 */
+	ret = setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char *)&sndbufsize,
+			 sizeof(sndbufsize));
+	if (ret < 0) {
+		flog_err(EC_LIB_SOCKET,
+			 "Cannot set socket %d send buffer size, %s", sock,
+			 safe_strerror(errno));
+		close(sock);
+		return;
+	}
 	set_cloexec(sock);
 
 #ifdef VTYSH_DEBUG
@@ -2227,6 +2252,7 @@ static int vtysh_flush(struct vty *vty)
 		vty_close(vty);
 		return -1;
 	case BUFFER_EMPTY:
+		vty->vty_buf_size_accumulated = 0;
 		break;
 	}
 	return 0;
@@ -3903,7 +3929,7 @@ static int vty_mgmt_error_notified(struct mgmt_fe_client *client,
 	const char *cname = mgmt_fe_client_name(client);
 
 	if (!vty->mgmt_req_pending_cmd) {
-		debug_fe_client("Erorr with no pending command: %d returned for client %s 0x%" PRIx64
+		debug_fe_client("Error with no pending command: %d returned for client %s 0x%" PRIx64
 				" session-id %" PRIu64 " req-id %" PRIu64
 				"error-str %s",
 				error, cname, client_id, session_id, req_id,
@@ -3914,7 +3940,7 @@ static int vty_mgmt_error_notified(struct mgmt_fe_client *client,
 		return CMD_WARNING;
 	}
 
-	debug_fe_client("Erorr %d returned for client %s 0x%" PRIx64
+	debug_fe_client("Error %d returned for client %s 0x%" PRIx64
 			" session-id %" PRIu64 " req-id %" PRIu64 "error-str %s",
 			error, cname, client_id, session_id, req_id, errstr);