fixup! simple-ipc: preparations for supporting binary messages.

This reverts commit 15b44c3.

Signed-off-by: Jeff Hostetler <[email protected]>

Author: jeffhostetler

compat/simple-ipc/ipc-unix-socket.c

@@ -168,16 +168,15 @@ void ipc_client_close_connection(struct ipc_client_connection *connection)
 
 int ipc_client_send_command_to_connection(
 	struct ipc_client_connection *connection,
-	const char *message, size_t message_len,
-	struct strbuf *answer)
+	const char *message, struct strbuf *answer)
 {
 	int ret = 0;
 
 	strbuf_setlen(answer, 0);
 
 	trace2_region_enter("ipc-client", "send-command", NULL);
 
-	if (write_packetized_from_buf_no_flush(message, message_len,
+	if (write_packetized_from_buf_no_flush(message, strlen(message),
 					       connection->fd) < 0 ||
 	    packet_flush_gently(connection->fd) < 0) {
 		ret = error(_("could not send IPC command"));
@@ -198,8 +197,7 @@ int ipc_client_send_command_to_connection(
 
 int ipc_client_send_command(const char *path,
 			    const struct ipc_client_connect_options *options,
-			    const char *message, size_t message_len,
-			    struct strbuf *answer)
+			    const char *message, struct strbuf *answer)
 {
 	int ret = -1;
 	enum ipc_active_state state;
@@ -210,9 +208,7 @@ int ipc_client_send_command(const char *path,
 	if (state != IPC_STATE__LISTENING)
 		return ret;
 
-	ret = ipc_client_send_command_to_connection(connection,
-						    message, message_len,
-						    answer);
+	ret = ipc_client_send_command_to_connection(connection, message, answer);
 
 	ipc_client_close_connection(connection);
 
@@ -507,7 +503,7 @@ static int worker_thread__do_io(
 	if (ret >= 0) {
 		ret = worker_thread_data->server_data->application_cb(
 			worker_thread_data->server_data->application_data,
-			buf.buf, buf.len, do_io_reply_callback, &reply_data);
+			buf.buf, do_io_reply_callback, &reply_data);
 
 		packet_flush_gently(reply_data.fd);
 	}

compat/simple-ipc/ipc-win32.c

@@ -208,16 +208,15 @@ void ipc_client_close_connection(struct ipc_client_connection *connection)
 
 int ipc_client_send_command_to_connection(
 	struct ipc_client_connection *connection,
-	const char *message, size_t message_len,
-	struct strbuf *answer)
+	const char *message, struct strbuf *answer)
 {
 	int ret = 0;
 
 	strbuf_setlen(answer, 0);
 
 	trace2_region_enter("ipc-client", "send-command", NULL);
 
-	if (write_packetized_from_buf_no_flush(message, message_len,
+	if (write_packetized_from_buf_no_flush(message, strlen(message),
 					       connection->fd) < 0 ||
 	    packet_flush_gently(connection->fd) < 0) {
 		ret = error(_("could not send IPC command"));
@@ -240,8 +239,7 @@ int ipc_client_send_command_to_connection(
 
 int ipc_client_send_command(const char *path,
 			    const struct ipc_client_connect_options *options,
-			    const char *message, size_t message_len,
-			    struct strbuf *response)
+			    const char *message, struct strbuf *response)
 {
 	int ret = -1;
 	enum ipc_active_state state;
@@ -252,9 +250,7 @@ int ipc_client_send_command(const char *path,
 	if (state != IPC_STATE__LISTENING)
 		return ret;
 
-	ret = ipc_client_send_command_to_connection(connection,
-						    message, message_len,
-						    response);
+	ret = ipc_client_send_command_to_connection(connection, message, response);
 
 	ipc_client_close_connection(connection);
 
@@ -462,7 +458,7 @@ static int do_io(struct ipc_server_thread_data *server_thread_data)
 	if (ret >= 0) {
 		ret = server_thread_data->server_data->application_cb(
 			server_thread_data->server_data->application_data,
-			buf.buf, buf.len, do_io_reply_callback, &reply_data);
+			buf.buf, do_io_reply_callback, &reply_data);
 
 		packet_flush_gently(reply_data.fd);
 

simple-ipc.h

@@ -107,8 +107,7 @@ void ipc_client_close_connection(struct ipc_client_connection *connection);
  */
 int ipc_client_send_command_to_connection(
 	struct ipc_client_connection *connection,
-	const char *message, size_t message_len,
-	struct strbuf *answer);
+	const char *message, struct strbuf *answer);
 
 /*
  * Used by the client to synchronously connect and send and receive a
@@ -120,8 +119,7 @@ int ipc_client_send_command_to_connection(
  */
 int ipc_client_send_command(const char *path,
 			    const struct ipc_client_connect_options *options,
-			    const char *message, size_t message_len,
-			    struct strbuf *answer);
+			    const char *message, struct strbuf *answer);
 
 /*
  * Simple IPC Server Side API.
@@ -146,7 +144,6 @@ typedef int (ipc_server_reply_cb)(struct ipc_server_reply_data *,
  */
 typedef int (ipc_server_application_cb)(void *application_data,
 					const char *request,
-					size_t request_len,
 					ipc_server_reply_cb *reply_cb,
 					struct ipc_server_reply_data *reply_data);
 

t/helper/test-simple-ipc.c

@@ -112,7 +112,7 @@ static int app__slow_command(ipc_server_reply_cb *reply_cb,
 /*
  * The client sent a command followed by a (possibly very) large buffer.
  */
-static int app__sendbytes_command(const char *received, size_t received_len,
+static int app__sendbytes_command(const char *received,
 				  ipc_server_reply_cb *reply_cb,
 				  struct ipc_server_reply_data *reply_data)
 {
@@ -123,13 +123,6 @@ static int app__sendbytes_command(const char *received, size_t received_len,
 	int errs = 0;
 	int ret;
 
-	/*
-	 * The test is setup to send:
-	 *     "sendbytes" SP <n * char>
-	 */
-	if (received_len < strlen("sendbytes "))
-		BUG("received_len is short in app__sendbytes_command");
-
 	if (skip_prefix(received, "sendbytes ", &p))
 		len_ballast = strlen(p);
 
@@ -167,7 +160,7 @@ static ipc_server_application_cb test_app_cb;
  * by this application.
  */
 static int test_app_cb(void *application_data,
-		       const char *command, size_t command_len,
+		       const char *command,
 		       ipc_server_reply_cb *reply_cb,
 		       struct ipc_server_reply_data *reply_data)
 {
@@ -180,7 +173,7 @@ static int test_app_cb(void *application_data,
 	if (application_data != (void*)&my_app_data)
 		BUG("application_cb: application_data pointer wrong");
 
-	if (command_len == 4 && !strncmp(command, "quit", 4)) {
+	if (!strcmp(command, "quit")) {
 		/*
 		 * The client sent a "quit" command.  This is an async
 		 * request for the server to shutdown.
@@ -200,23 +193,22 @@ static int test_app_cb(void *application_data,
 		return SIMPLE_IPC_QUIT;
 	}
 
-	if (command_len == 4 && !strncmp(command, "ping", 4)) {
+	if (!strcmp(command, "ping")) {
 		const char *answer = "pong";
 		return reply_cb(reply_data, answer, strlen(answer));
 	}
 
-	if (command_len == 3 && !strncmp(command, "big", 3))
+	if (!strcmp(command, "big"))
 		return app__big_command(reply_cb, reply_data);
 
-	if (command_len == 5 && !strncmp(command, "chunk", 5))
+	if (!strcmp(command, "chunk"))
 		return app__chunk_command(reply_cb, reply_data);
 
-	if (command_len == 4 && !strncmp(command, "slow", 4))
+	if (!strcmp(command, "slow"))
 		return app__slow_command(reply_cb, reply_data);
 
-	if (command_len >= 10 && starts_with(command, "sendbytes "))
-		return app__sendbytes_command(command, command_len,
-					      reply_cb, reply_data);
+	if (starts_with(command, "sendbytes "))
+		return app__sendbytes_command(command, reply_cb, reply_data);
 
 	return app__unhandled_command(command, reply_cb, reply_data);
 }
@@ -496,9 +488,7 @@ static int client__send_ipc(void)
 	options.wait_if_busy = 1;
 	options.wait_if_not_found = 0;
 
-	if (!ipc_client_send_command(cl_args.path, &options,
-				     command, strlen(command),
-				     &buf)) {
+	if (!ipc_client_send_command(cl_args.path, &options, command, &buf)) {
 		if (buf.len) {
 			printf("%s\n", buf.buf);
 			fflush(stdout);
@@ -566,9 +556,7 @@ static int do_sendbytes(int bytecount, char byte, const char *path,
 	strbuf_addstr(&buf_send, "sendbytes ");
 	strbuf_addchars(&buf_send, byte, bytecount);
 
-	if (!ipc_client_send_command(path, options,
-				     buf_send.buf, buf_send.len,
-				     &buf_resp)) {
+	if (!ipc_client_send_command(path, options, buf_send.buf, &buf_resp)) {
 		strbuf_rtrim(&buf_resp);
 		printf("sent:%c%08d %s\n", byte, bytecount, buf_resp.buf);
 		fflush(stdout);