Merge pull request #32 from lumag/buf

Extract message sending helpers

Author: konradybcio

cdb_assist.c

@@ -344,7 +344,6 @@ unsigned int cdb_vref(struct cdb_assist *cdb)
 void cdb_assist_print_status(struct device *dev)
 {
 	struct cdb_assist *cdb = dev->cdb;
-	struct msg hdr;
 	char buf[128];
 	int n;
 
@@ -358,10 +357,7 @@ void cdb_assist_print_status(struct device *dev)
 			 cdb->btn[2] ? " btn3" : "",
 			 cdb->vref);
 
-	hdr.type = MSG_STATUS_UPDATE;
-	hdr.len = n;
-	write(STDOUT_FILENO, &hdr, sizeof(hdr));
-	write(STDOUT_FILENO, buf, n);
+	cdba_send_buf(MSG_STATUS_UPDATE, n, buf);
 }
 
 void cdb_set_voltage(struct cdb_assist *cdb, unsigned mV)

cdba-server.c

@@ -82,16 +82,10 @@ int tty_open(const char *tty, struct termios *old)
 static void fastboot_opened(struct fastboot *fb, void *data)
 {
 	const uint8_t one = 1;
-	struct msg *msg;
 
 	warnx("fastboot connection opened");
 
-	msg = alloca(sizeof(*msg) + 1);
-	msg->type = MSG_FASTBOOT_PRESENT;
-	msg->len = 1;
-	memcpy(msg->data, &one, 1);
-
-	write(STDOUT_FILENO, msg, sizeof(*msg) + 1);
+	cdba_send_buf(MSG_FASTBOOT_PRESENT, 1, &one);
 }
 
 static void fastboot_info(struct fastboot *fb, const void *buf, size_t len)
@@ -102,14 +96,8 @@ static void fastboot_info(struct fastboot *fb, const void *buf, size_t len)
 static void fastboot_disconnect(void *data)
 {
 	const uint8_t zero = 0;
-	struct msg *msg;
 
-	msg = alloca(sizeof(*msg) + 1);
-	msg->type = MSG_FASTBOOT_PRESENT;
-	msg->len = 1;
-	memcpy(msg->data, &zero, 1);
-
-	write(STDOUT_FILENO, msg, sizeof(*msg) + 1);
+	cdba_send_buf(MSG_FASTBOOT_PRESENT, 1, &zero);
 }
 
 static struct fastboot_ops fastboot_ops = {
@@ -120,23 +108,20 @@ static struct fastboot_ops fastboot_ops = {
 
 static void msg_select_board(const void *param)
 {
-	struct msg reply = { MSG_SELECT_BOARD, 0 };
-
 	selected_device = device_open(param, username, &fastboot_ops);
 	if (!selected_device) {
 		fprintf(stderr, "failed to open %s\n", (const char *)param);
 		quit_invoked = true;
 	}
 
-	write(STDOUT_FILENO, &reply, sizeof(reply));
+	cdba_send(MSG_SELECT_BOARD);
 }
 
 static void *fastboot_payload;
 static size_t fastboot_size;
 
 static void msg_fastboot_download(const void *data, size_t len)
 {
-	struct msg reply = { MSG_FASTBOOT_DOWNLOAD, };
 	size_t new_size = fastboot_size + len;
 	char *newp;
 
@@ -152,18 +137,23 @@ static void msg_fastboot_download(const void *data, size_t len)
 	if (!len) {
 		device_boot(selected_device, fastboot_payload, fastboot_size);
 
-		write(STDOUT_FILENO, &reply, sizeof(reply));
+		cdba_send(MSG_FASTBOOT_DOWNLOAD);
 		free(fastboot_payload);
 		fastboot_payload = NULL;
 		fastboot_size = 0;
 	}
 }
 
-static void invoke_reply(int reply)
+void cdba_send_buf(int type, size_t len, const void *buf)
 {
-	struct msg msg = { reply, };
+	struct msg msg = {
+		.type = type,
+		.len = len
+	};
 
 	write(STDOUT_FILENO, &msg, sizeof(msg));
+	if (len)
+		write(STDOUT_FILENO, buf, len);
 }
 
 static int handle_stdin(int fd, void *buf)
@@ -206,12 +196,12 @@ static int handle_stdin(int fd, void *buf)
 		case MSG_POWER_ON:
 			device_power(selected_device, true);
 
-			invoke_reply(MSG_POWER_ON);
+			cdba_send(MSG_POWER_ON);
 			break;
 		case MSG_POWER_OFF:
 			device_power(selected_device, false);
 
-			invoke_reply(MSG_POWER_OFF);
+			cdba_send(MSG_POWER_OFF);
 			break;
 		case MSG_FASTBOOT_DOWNLOAD:
 			msg_fastboot_download(msg->data, msg->len);

cdba-server.h

@@ -14,4 +14,7 @@ int watch_run(void);
 
 int tty_open(const char *tty, struct termios *old);
 
+void cdba_send_buf(int type, size_t len, const void *buf);
+#define cdba_send(type) cdba_send_buf(type, 0, NULL)
+
 #endif

cdba.c

@@ -144,10 +144,30 @@ static int fork_ssh(const char *host, const char *cmd, int *pipes)
 	return 0;
 }
 
+#define cdba_send(fd, type) cdba_send_buf(fd, type, 0, NULL)
+static int cdba_send_buf(int fd, int type, size_t len, const void *buf)
+{
+	int ret;
+
+	struct msg msg = {
+		.type = type,
+		.len = len
+	};
+
+	ret = write(fd, &msg, sizeof(msg));
+	if (ret < 0)
+		return ret;
+
+	if (len)
+		ret = write(fd, buf, len);
+
+	return ret < 0 ? ret : 0;
+}
+
 static int tty_callback(int *ssh_fds)
 {
+	static const char ctrl_a = 0x1;
 	static bool special;
-	struct msg hdr;
 	char buf[32];
 	ssize_t k;
 	ssize_t n;
@@ -157,59 +177,39 @@ static int tty_callback(int *ssh_fds)
 		return n;
 
 	for (k = 0; k < n; k++) {
-		if (buf[k] == 0x1) {
+		if (buf[k] == ctrl_a) {
 			special = true;
 		} else if (special) {
 			switch (buf[k]) {
 			case 'q':
 				quit = true;
 				break;
 			case 'P':
-				hdr.type = MSG_POWER_ON;
-				hdr.len = 0;
-				write(ssh_fds[0], &hdr, sizeof(hdr));
+				cdba_send(ssh_fds[0], MSG_POWER_ON);
 				break;
 			case 'p':
-				hdr.type = MSG_POWER_OFF;
-				hdr.len = 0;
-				write(ssh_fds[0], &hdr, sizeof(hdr));
+				cdba_send(ssh_fds[0], MSG_POWER_OFF);
 				break;
 			case 's':
-				hdr.type = MSG_STATUS_UPDATE;
-				hdr.len = 0;
-				write(ssh_fds[0], &hdr, sizeof(hdr));
+				cdba_send(ssh_fds[0], MSG_STATUS_UPDATE);
 				break;
 			case 'V':
-				hdr.type = MSG_VBUS_ON;
-				hdr.len = 0;
-				write(ssh_fds[0], &hdr, sizeof(hdr));
+				cdba_send(ssh_fds[0], MSG_VBUS_ON);
 				break;
 			case 'v':
-				hdr.type = MSG_VBUS_OFF;
-				hdr.len = 0;
-				write(ssh_fds[0], &hdr, sizeof(hdr));
+				cdba_send(ssh_fds[0], MSG_VBUS_OFF);
 				break;
 			case 'a':
-				hdr.type = MSG_CONSOLE;
-				hdr.len = 1;
-
-				write(ssh_fds[0], &hdr, sizeof(hdr));
-				write(ssh_fds[0], "\001", 1);
+				cdba_send_buf(ssh_fds[0], MSG_CONSOLE, 1, &ctrl_a);
 				break;
 			case 'B':
-				hdr.type = MSG_SEND_BREAK;
-				hdr.len = 0;
-				write(ssh_fds[0], &hdr, sizeof(hdr));
+				cdba_send(ssh_fds[0], MSG_SEND_BREAK);
 				break;
 			}
 
 			special = false;
 		} else {
-			hdr.type = MSG_CONSOLE;
-			hdr.len = 1;
-
-			write(ssh_fds[0], &hdr, sizeof(hdr));
-			write(ssh_fds[0], buf + k, 1);
+			cdba_send_buf(ssh_fds[0], MSG_CONSOLE, 1, buf + k);
 		}
 	}
 
@@ -226,14 +226,10 @@ static struct list_head work_items = LIST_INIT(work_items);
 
 static void list_boards_fn(struct work *work, int ssh_stdin)
 {
-	struct msg msg;
-	ssize_t n;
-
-	msg.type = MSG_LIST_DEVICES;
-	msg.len = 0;
+	int ret;
 
-	n = write(ssh_stdin, &msg, sizeof(msg));
-	if (n < 0)
+	ret = cdba_send(ssh_stdin, MSG_LIST_DEVICES);
+	if (ret < 0)
 		err(1, "failed to send board list request");
 
 	free(work);
@@ -257,17 +253,12 @@ struct board_info_request {
 static void board_info_fn(struct work *work, int ssh_stdin)
 {
 	struct board_info_request *board = container_of(work, struct board_info_request, work);
-	size_t blen = strlen(board->board) + 1;
-	struct msg *msg;
-	ssize_t n;
-
-	msg = alloca(sizeof(*msg) + blen);
-	msg->type = MSG_BOARD_INFO;
-	msg->len = blen;
-	memcpy(msg->data, board->board, blen);
+	int ret;
 
-	n = write(ssh_stdin, msg, sizeof(*msg) + blen);
-	if (n < 0)
+	ret = cdba_send_buf(ssh_stdin, MSG_BOARD_INFO,
+			    strlen(board->board) + 1,
+			    board->board);
+	if (ret < 0)
 		err(1, "failed to send board info request");
 
 	free(work);
@@ -293,17 +284,12 @@ struct select_board {
 static void select_board_fn(struct work *work, int ssh_stdin)
 {
 	struct select_board *board = container_of(work, struct select_board, work);
-	size_t blen = strlen(board->board) + 1;
-	struct msg *msg;
-	ssize_t n;
-
-	msg = alloca(sizeof(*msg) + blen);
-	msg->type = MSG_SELECT_BOARD;
-	msg->len = blen;
-	memcpy(msg->data, board->board, blen);
+	int ret;
 
-	n = write(ssh_stdin, msg, sizeof(*msg) + blen);
-	if (n < 0)
+	ret = cdba_send_buf(ssh_stdin, MSG_SELECT_BOARD,
+			    strlen(board->board) + 1,
+			    board->board);
+	if (ret < 0)
 		err(1, "failed to send power on request");
 
 	free(work);
@@ -322,21 +308,19 @@ static void request_select_board(const char *board)
 
 static void request_power_on_fn(struct work *work, int ssh_stdin)
 {
-	struct msg msg = { MSG_POWER_ON, };
-	ssize_t n;
+	int ret;
 
-	n = write(ssh_stdin, &msg, sizeof(msg));
-	if (n < 0)
+	ret = cdba_send(ssh_stdin, MSG_POWER_ON);
+	if (ret < 0)
 		err(1, "failed to send power on request");
 }
 
 static void request_power_off_fn(struct work *work, int ssh_stdin)
 {
-	struct msg msg = { MSG_POWER_OFF, };
-	ssize_t n;
+	int ret;
 
-	n = write(ssh_stdin, &msg, sizeof(msg));
-	if (n < 0)
+	ret = cdba_send(ssh_stdin, MSG_POWER_OFF);
+	if (ret < 0)
 		err(1, "failed to send power off request");
 }
 
@@ -365,29 +349,25 @@ struct fastboot_download_work {
 static void fastboot_work_fn(struct work *_work, int ssh_stdin)
 {
 	struct fastboot_download_work *work = container_of(_work, struct fastboot_download_work, work);
-	struct msg *msg;
-	size_t left;
-	ssize_t n;
+	ssize_t left;
+	int ret;
 
 	left = MIN(2048, work->size - work->offset);
 
-	msg = alloca(sizeof(*msg) + left);
-	msg->type = MSG_FASTBOOT_DOWNLOAD;
-	msg->len = left;
-	memcpy(msg->data, (char *)work->data + work->offset, left);
-
-	n = write(ssh_stdin, msg, sizeof(*msg) + msg->len);
-	if (n < 0 && errno == EAGAIN) {
+	ret = cdba_send_buf(ssh_stdin, MSG_FASTBOOT_DOWNLOAD,
+			    left,
+			    (char *)work->data + work->offset);
+	if (ret < 0 && errno == EAGAIN) {
 		list_add(&work_items, &_work->node);
 		return;
-	} else if (n < 0) {
+	} else if (ret < 0) {
 		err(1, "failed to write fastboot message");
 	}
 
-	work->offset += msg->len;
+	work->offset += left;
 
 	/* We've sent the entire image, and a zero length packet */
-	if (!msg->len)
+	if (!left)
 		free(work);
 	else
 		list_add(&work_items, &_work->node);

conmux.c

@@ -207,7 +207,6 @@ static int registry_lookup(const char *service, struct conmux_lookup *result)
 
 static int conmux_data(int fd, void *data)
 {
-	struct msg hdr;
 	char buf[128];
 	ssize_t n;
 
@@ -219,10 +218,7 @@ static int conmux_data(int fd, void *data)
 		fprintf(stderr, "Received EOF from conmux\n");
 		watch_quit();
 	} else {
-		hdr.type = MSG_CONSOLE;
-		hdr.len = n;
-		write(STDOUT_FILENO, &hdr, sizeof(hdr));
-		write(STDOUT_FILENO, buf, n);
+		cdba_send_buf(MSG_CONSOLE, n, buf);
 	}
 
 	return 0;