Commit 122a7763 authored by Pawel Wodkowski's avatar Pawel Wodkowski Committed by Jim Harris
Browse files

jsonrpc: process all requests in buffer 



If more than one full request is received by a single recv() call only
first one will be parsed. Then next time we call recv() is called it
will return EAGAIN and next request won't be parsed. Fix this by always
parsing all requests in the buffer.

Change-Id: I0a2c72fd0ad6184834b9831bda520a28ab815f0d
Signed-off-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/437161


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Reviewed-by: default avatarwuzhouhui <wuzhouhui@kingsoft.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 63978010

lib/jsonrpc/jsonrpc_server_tcp.c

+17 −12
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ spdk_jsonrpc_server_handle_error(struct spdk_jsonrpc_request *request, int error 
static int

spdk_jsonrpc_server_conn_recv(struct spdk_jsonrpc_server_conn *conn)

{

	ssize_t rc;

	ssize_t rc, offset;

	size_t recv_avail = SPDK_JSONRPC_RECV_BUF_SIZE - conn->recv_len;



	rc = recv(conn->sockfd, conn->recv_buf + conn->recv_len, recv_avail, 0);
@@ -279,20 +279,25 @@ spdk_jsonrpc_server_conn_recv(struct spdk_jsonrpc_server_conn *conn) 


	conn->recv_len += rc;



	rc = spdk_jsonrpc_parse_request(conn, conn->recv_buf, conn->recv_len);

	offset = 0;

	do {

		rc = spdk_jsonrpc_parse_request(conn, conn->recv_buf + offset, conn->recv_len - offset);

		if (rc < 0) {

			SPDK_ERRLOG("jsonrpc parse request failed\n");

			return -1;

		}



	if (rc > 0) {

		offset += rc;

	} while (rc > 0);



	if (offset > 0) {

		/*

		 * Successfully parsed a request - move any data past the end of the

		 * parsed request down to the beginning.

		 * Successfully parsed a requests - move any data past the end of the

		 * parsed requests down to the beginning.

		 */

		assert((size_t)rc <= conn->recv_len);

		memmove(conn->recv_buf, conn->recv_buf + rc, conn->recv_len - rc);

		conn->recv_len -= rc;

		assert((size_t)offset <= conn->recv_len);

		memmove(conn->recv_buf, conn->recv_buf + offset, conn->recv_len - offset);

		conn->recv_len -= offset;

	}



	return 0;