From 35c1120a6069414dd279b988eb772f4eec0966f7 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 11 Mar 2015 12:11:02 +0100
Subject: Clear screen from GIP client (in login)

---
 src/lib/include/gip.h        |  2 +-
 src/lib/libkogata/gip.c      | 19 ++++++++++---------
 src/lib/libkogata/mainloop.c |  4 +++-
 3 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/include/gip.h b/src/lib/include/gip.h
index 98b4655..c2167c4 100644
--- a/src/lib/include/gip.h
+++ b/src/lib/include/gip.h
@@ -10,7 +10,7 @@
 typedef struct gip_handler gip_handler_t;
 
 typedef void (*noarg_gip_callback_t)(gip_handler_t *s, gip_msg_header *m);
-typedef void (*gip_reply_callback_t)(gip_handler_t *s, gip_msg_header *m, void* data);
+typedef void (*gip_reply_callback_t)(gip_handler_t *s, gip_msg_header *m, void* msg_data, void* cb_data);
 
 typedef struct {
 	noarg_gip_callback_t
diff --git a/src/lib/libkogata/gip.c b/src/lib/libkogata/gip.c
index 3b6084c..7fa1cca 100644
--- a/src/lib/libkogata/gip.c
+++ b/src/lib/libkogata/gip.c
@@ -123,30 +123,34 @@ bool gip_notify(gip_handler_t *h, gip_msg_header *msg, void* msg_data) {
 
 //  ---- Message handlers
 
-void giph_got_reply(gip_handler_t *h, gip_msg_header *msg) {
+void giph_got_reply(gip_handler_t *h, gip_msg_header *msg, void* msg_data) {
 	gip_cmd_t *c = (gip_cmd_t*)hashtbl_find(h->requests_in_progress, (void*)msg->req_id);;
 	if (c != 0) {
-		c->cb(h, msg, c->data);
+		ASSERT(c->cb != 0);
+		c->cb(h, msg, msg_data, c->data);
 		hashtbl_remove(h->requests_in_progress, (void*)msg->req_id);
 	}
 }
 
 void giph_msg_header(mainloop_fd_t *fd) {
 	gip_handler_t *h = (gip_handler_t*)fd->data;
+	ASSERT(fd == &h->mainloop_item);
 
 	int code = h->msg_buf.code;
+	dbg_printf("Got GIP header, code %d\n", code);
+
 	noarg_gip_callback_t use_cb = 0;
 	if (code ==	GIPC_RESET) {
 		use_cb = h->cb->reset;
 	} else if (code == GIPR_INITIATE) {
 		use_cb = h->cb->initiate;
-		giph_got_reply(h, &h->msg_buf);
+		giph_got_reply(h, &h->msg_buf, 0);
 	} else if (code == GIPR_OK) {
 		use_cb = h->cb->ok;
-		giph_got_reply(h, &h->msg_buf);
+		giph_got_reply(h, &h->msg_buf, 0);
 	} else if (code == GIPR_FAILURE) {
 		use_cb = h->cb->failure;
-		giph_got_reply(h, &h->msg_buf);
+		giph_got_reply(h, &h->msg_buf, 0);
 	} else if (code == GIPC_ENABLE_FEATURES) {
 		use_cb = h->cb->enable_features;
 	} else if (code == GIPC_DISABLE_FEATURES) {
@@ -161,8 +165,6 @@ void giph_msg_header(mainloop_fd_t *fd) {
 		mainloop_expect(fd, &h->buffer_info_msg_buf, sizeof(gip_buffer_info_msg), giph_buffer_info);
 	} else if (code == GIPR_MODE_INFO) {
 		mainloop_expect(fd, &h->mode_info_msg_buf, sizeof(gip_mode_info_msg), giph_mode_info);
-		// this is a reply but we cannot call giph_got_reply immediately since more data is needed
-		// giph_got_reply(h, id);
 	} else if (code == GIPN_BUFFER_DAMAGE) {
 		mainloop_expect(fd, &h->buffer_damage_msg_buf, sizeof(gip_buffer_damage_msg), giph_buffer_damage);
 	} else {
@@ -184,8 +186,7 @@ void giph_mode_info(mainloop_fd_t *fd) {
 	gip_handler_t *h = (gip_handler_t*)fd->data;
 
 	if (h->cb->mode_info) h->cb->mode_info(h, &h->msg_buf, &h->mode_info_msg_buf);
-
-	// call giph_got_reply with more data ?
+	giph_got_reply(h, &h->msg_buf, &h->mode_info_msg_buf);
 
 	mainloop_expect(&h->mainloop_item, &h->msg_buf, sizeof(gip_msg_header), giph_msg_header);
 }
diff --git a/src/lib/libkogata/mainloop.c b/src/lib/libkogata/mainloop.c
index d3c0c50..d8890e7 100644
--- a/src/lib/libkogata/mainloop.c
+++ b/src/lib/libkogata/mainloop.c
@@ -99,12 +99,14 @@ void mainloop_run() {
 			int i = 0;
 			for (mainloop_fd_t *fd = mainloop_fds; fd != 0 && !mainloop_fds_change; fd = fd->next) {
 				if (sel_arg[i].got_flags & SEL_ERROR) {
+					ASSERT(fd->on_error != 0);
 					fd->on_error(fd);
 				} else if ((sel_arg[i].got_flags & SEL_READ) && fd->rd_buf != 0) {
 					fd->rd_buf_filled +=
 						read(fd->fd, 0, fd->rd_buf_expect_size - fd->rd_buf_filled, fd->rd_buf + fd->rd_buf_filled);
 					if (fd->rd_buf_filled == fd->rd_buf_expect_size) {
 						fd->rd_buf_filled = 0;
+						ASSERT(fd->rd_on_full != 0);
 						fd->rd_on_full(fd);
 					}
 				} else if ((sel_arg[i].got_flags & SEL_WRITE) && fd->wr_bufs[0].buf != 0) {
@@ -118,7 +120,7 @@ void mainloop_run() {
 						for (int i = 1; i < MAINLOOP_MAX_WR_BUFS; i++) {
 							fd->wr_bufs[i-1] = fd->wr_bufs[i];
 						}
-						memset(&fd->wr_bufs[MAINLOOP_MAX_WR_BUFS-1].buf, 0, sizeof(mainloop_wr_buf_t));
+						fd->wr_bufs[MAINLOOP_MAX_WR_BUFS-1].buf = 0;
 					}
 				}
 				i++;
-- 
cgit v1.2.3