From 20558ecd2b0b9e0d5a7878e4eaba8cc2dfde2f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= <p@janouch.name>
Date: Tue, 1 Sep 2020 20:55:22 +0200
Subject: [PATCH] json-rpc-test-server: make sure to set the id in responses

---
 json-rpc-test-server.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/json-rpc-test-server.c b/json-rpc-test-server.c
index 6bb1e07..8c51ac4 100644
--- a/json-rpc-test-server.c
+++ b/json-rpc-test-server.c
@@ -1428,6 +1428,8 @@ end:
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+/// Handlers must not set the `id` field in their responses, that will be filled
+/// in automatically according to whether the request is a notification or not.
 typedef json_t *(*json_rpc_handler_fn) (struct server_context *, json_t *);
 
 struct json_rpc_handler_info
@@ -1493,7 +1495,10 @@ process_json_rpc_request (struct server_context *ctx, json_t *request)
 
 	json_t *response = handler->handler (ctx, params);
 	if (id)
+	{
+		(void) json_object_set (response, "id", id);
 		return response;
+	}
 
 	// Notifications don't get responses
 	json_decref (response);