Merge pull request #8 from jh1979-park/receiver2

refines receiver and receiver udp module

2 files changed, 508 insertions, 104 deletions

diff --git a/src/receiver.c b/src/receiver.c
index a77edd9..4841afd 100644
--- a/src/receiver.c
+++ b/src/receiver.c
@@ -15,64 +15,314 @@
  */
 
 #include <stdlib.h>
+#include <glib.h>
 #include "log.h"
+#include "receiver_type.h"
 #include "receiver_internal.h"
+#include "receiver_udp.h"
 
 typedef struct __receiver_h {
 	receiver_type_e receiver_type;
 	/* TODO */
 } receiver_h;
 
-static receiver_h *ghandle = NULL;
+struct __receiver_module_h {
+	receiver_type_e receiver_type;
+	void *module_data;
+	receiver_init_func init;
+	receiver_fini_func fini;
+	receiver_start_func start;
+	receiver_stop_func stop;
+	receiver_get_state_func get_state;
+	receiver_state_changed_cb state_change_cb;
+	void *state_change_data;
+};
+
+static GHashTable *receiver_module_hash = NULL;
+
+static void ___module_hash_destroy(gpointer data)
+{
+	receiver_module_h *module_h = data;
+
+	module_h->fini(module_h);
+	free(module_h);
+
+	return;
+}
 
 int receiver_init(receiver_type_e type)
 {
 	int ret = 0;
+	receiver_module_h *handle = NULL;
 
-	if (ghandle) {
-		_E("receiver is already initialized");
-		return -1;
+	if (!receiver_module_hash) {
+		receiver_module_hash = g_hash_table_new_full(g_direct_hash,
+			g_direct_equal, NULL, ___module_hash_destroy);
+
+		if (!receiver_module_hash) {
+			_E("failed to create hash table");
+			return -1;
+		}
+	} else {
+		handle = g_hash_table_lookup(receiver_module_hash,
+			GUINT_TO_POINTER(type));
+
+		if (handle) {
+			_D("receiver [%d] type is already initialized", type);
+			return 0;
+		}
 	}
 
-	ghandle = (receiver_h *)malloc(sizeof(receiver_h));
-	if (!ghandle) {
-		_E("failed to malloc handle");
+	handle = calloc(1, sizeof(struct __receiver_module_h));
+	if (!handle) {
+		_D("failed to alloc handle memory");
 		return -1;
 	}
 
+	handle->receiver_type = type;
+
 	switch (type) {
 	case RECEIVER_TYPE_UDP:
-		ghandle->receiver_type = type;
-		ret = receiver_udp_start();
+		/* TODO */
+		ret = receiver_udp_module_register(handle);
 		if (ret)
 			goto ERROR;
 		break;
 	case RECEIVER_TYPE_BLUETOOTH:
-		/* TODO */
+		/* TODO : for bluetooth module */
+		// ret = receiver_bluetooth_module_register(handle);
+		// if (ret)
+		//	goto ERROR;
 		break;
 	}
+
+	if (handle->init) {
+		ret = handle->init(handle);
+		if (ret) {
+			_E("failed to initialized type[%d]", type);
+			goto ERROR;
+		}
+	} else {
+		_W("receiver [%d] type is not implemented init func", type);
+		goto ERROR;
+	}
+
+	g_hash_table_insert(receiver_module_hash, GUINT_TO_POINTER(type), handle);
+
 	return 0;
 
 ERROR:
-	free(ghandle);
-	ghandle = NULL;
+	free(handle);
 	return -1;
 }
 
-void receiver_fini(void)
+void receiver_fini(receiver_type_e type)
 {
-	if (ghandle) {
-		switch (ghandle->receiver_type) {
-		case RECEIVER_TYPE_UDP:
-			receiver_udp_stop();
-			break;
-		case RECEIVER_TYPE_BLUETOOTH:
-			/* TODO */
-			break;
-		}
+	receiver_module_h *handle = NULL;
+	guint hash_size = 0;
+
+	if (!receiver_module_hash)
+		return;
+
+	handle = g_hash_table_lookup(receiver_module_hash,
+		GUINT_TO_POINTER(type));
 
-		free(ghandle);
-		ghandle = NULL;
+	if (!handle) {
+		_D("receiver [%d] type is not initialized", type);
+		return;
 	}
+
+	if (!handle->fini)
+		handle->fini(handle);
+
+	g_hash_table_remove(receiver_module_hash, GUINT_TO_POINTER(type));
+
+	hash_size = g_hash_table_size(receiver_module_hash);
+	if (hash_size == 0) {
+		g_hash_table_unref(receiver_module_hash);
+		receiver_module_hash = NULL;
+	}
+
+	return;
+}
+
+int receiver_start(receiver_type_e type)
+{
+	receiver_module_h *handle = NULL;
+
+	if (!receiver_module_hash) {
+		_E("receiver is not initialized");
+		return -1;
+	}
+
+	handle = g_hash_table_lookup(receiver_module_hash,
+		GUINT_TO_POINTER(type));
+
+	if (!handle) {
+		_E("receiver [%d] type is not initialized", type);
+		return -1;
+	}
+
+	if (!handle->start) {
+		_D("receiver [%d] type is not implemented start func", type);
+		return -1;
+	}
+
+	return handle->start(handle);
+}
+
+int receiver_stop(receiver_type_e type)
+{
+	receiver_module_h *handle = NULL;
+
+	if (!receiver_module_hash) {
+		_E("receiver is not initialized");
+		return -1;
+	}
+
+	handle = g_hash_table_lookup(receiver_module_hash,
+		GUINT_TO_POINTER(type));
+
+	if (!handle) {
+		_E("receiver [%d] type is not initialized", type);
+		return -1;
+	}
+
+	if (!handle->stop) {
+		_D("receiver [%d] type is not implemented stop func", type);
+		return -1;
+	}
+
+	return handle->stop(handle);
+}
+
+receiver_state_e receiver_get_state(receiver_type_e type)
+{
+	receiver_module_h *handle = NULL;
+
+	if (!receiver_module_hash) {
+		_E("receiver is not initialized");
+		return RECEIVER_STATE_NONE;
+	}
+
+	handle = g_hash_table_lookup(receiver_module_hash,
+		GUINT_TO_POINTER(type));
+
+	if (!handle) {
+		_E("receiver [%d] type is not initialized", type);
+		return RECEIVER_STATE_NONE;
+	}
+
+	if (!handle->get_state) {
+		_D("receiver [%d] type is not implemented get_state func", type);
+		return RECEIVER_STATE_NONE;
+	}
+
+	return handle->get_state(handle);
+}
+
+int receiver_set_state_changed_cb(receiver_type_e type,
+	receiver_state_changed_cb callback, void *user_data)
+{
+	receiver_module_h *handle = NULL;
+
+	if (!receiver_module_hash) {
+		_E("receiver is not initialized");
+		return -1;
+	}
+
+	handle = g_hash_table_lookup(receiver_module_hash,
+		GUINT_TO_POINTER(type));
+
+	if (!handle) {
+		_E("receiver [%d] type is not initialized", type);
+		return -1;
+	}
+
+	handle->state_change_cb = callback;
+
+	if (callback)
+		handle->state_change_data = user_data;
+	else
+		handle->state_change_data = NULL;
+
+	return 0;
+}
+
+int receiver_set_module_data(receiver_module_h *handle, void *module_data)
+{
+	retv_if(!handle, -1);
+
+	handle->module_data = module_data;
+
+	return 0;
+}
+
+void *receiver_get_module_data(receiver_module_h *handle)
+{
+	retv_if(!handle, NULL);
+
+	return handle->module_data;
+}
+
+int receiver_set_module_init_function(
+	receiver_module_h *handle, receiver_init_func func)
+{
+	retv_if(!handle, -1);
+
+	handle->init = func;
+
+	return 0;
+}
+
+int receiver_set_module_fini_function(
+	receiver_module_h *handle, receiver_fini_func func)
+{
+	retv_if(!handle, -1);
+
+	handle->fini = func;
+
+	return 0;
+}
+
+int receiver_set_module_start_function(
+	receiver_module_h *handle, receiver_start_func func)
+{
+	retv_if(!handle, -1);
+
+	handle->start = func;
+
+	return 0;
+}
+
+int receiver_set_module_stop_function(
+	receiver_module_h *handle, receiver_stop_func func)
+{
+	retv_if(!handle, -1);
+
+	handle->stop = func;
+
+	return 0;
+}
+
+int receiver_set_module_get_state_function(
+	receiver_module_h *handle, receiver_get_state_func func)
+{
+	retv_if(!handle, -1);
+
+	handle->get_state = func;
+
+	return 0;
+}
+
+void receiver_module_state_changed(
+	receiver_module_h *handle, receiver_state_e state)
+{
+	ret_if(!handle);
+
+	if (handle->state_change_cb)
+		handle->state_change_cb(handle->receiver_type,
+			state, handle->state_change_data);
+
 	return;
 }
diff --git a/src/receiver_udp.c b/src/receiver_udp.c
index 306a628..07c2028 100644
--- a/src/receiver_udp.c
+++ b/src/receiver_udp.c
@@ -25,12 +25,14 @@
 
 #include "log.h"
 #include "receiver_internal.h"
+#include "message.h"
 
 #define RECEIVER_UDP_PORT 57984
 #define RECEIVER_UDP_WAIT_TIMEOUT 3
 
 typedef enum __receiver_udp_state_e {
 	RECEIVER_UDP_STATE_NONE,
+	RECEIVER_UDP_STATE_INIT,
 	RECEIVER_UDP_STATE_READY,
 	RECEIVER_UDP_STATE_CONNECTED,
 } receiver_udp_state_e;
@@ -42,7 +44,7 @@ typedef struct __receiver_udp_h {
 	GSocket *socket;
 } receiver_udp_h;
 
-static receiver_udp_h *udp_handle = NULL;
+// static receiver_udp_h *udp_handle = NULL;
 
 static gchar *__socket_address_to_string(GSocketAddress *address)
 {
@@ -62,57 +64,58 @@ static gchar *__socket_address_to_string(GSocketAddress *address)
 	return res;
 }
 
-static int __receiver_udp_init(void)
+static receiver_state_e ___state_convert(receiver_udp_state_e state)
 {
-	if (udp_handle) {
-		_E("receiver udp is already initialized");
-		return -1;
+	receiver_state_e r_state = RECEIVER_STATE_NONE;
+
+	switch (state) {
+	case RECEIVER_UDP_STATE_NONE:
+		r_state = RECEIVER_STATE_NONE;
+		break;
+	case RECEIVER_UDP_STATE_INIT:
+		r_state = RECEIVER_STATE_INIT;
+		break;
+	case RECEIVER_UDP_STATE_READY:
+		r_state = RECEIVER_STATE_READY;
+		break;
+	case RECEIVER_UDP_STATE_CONNECTED:
+		r_state = RECEIVER_STATE_CONNECTED;
+		break;
 	}
-
-	udp_handle = malloc(sizeof(receiver_udp_h));
-	if (!udp_handle) {
-		_E("failed to alloc receiver udp handle");
-		return -1;
-	}
-
-	udp_handle->state = RECEIVER_UDP_STATE_NONE;
-	udp_handle->io_watch_id = 0;
-	udp_handle->wait_timer_id = 0;
-	udp_handle->socket = NULL;
-
-	return 0;
+	return r_state;
 }
 
-static int __receiver_udp_fini(void)
+static void __receiver_udp_state_set(
+	receiver_module_h *handle, receiver_udp_state_e state)
 {
-	if (udp_handle) {
-		if (udp_handle->io_watch_id)
-			g_source_remove(udp_handle->io_watch_id);
+	receiver_udp_h *udp_handle = NULL;
 
-		if (udp_handle->wait_timer_id)
-			g_source_remove(udp_handle->wait_timer_id);
+	ret_if(!handle);
 
-		if (udp_handle->socket) {
-			g_socket_close(udp_handle->socket, NULL);
-			g_object_unref(udp_handle->socket);
-		}
+	udp_handle = receiver_get_module_data(handle);
+	ret_if(!udp_handle);
 
-		free(udp_handle);
-		udp_handle = NULL;
-	}
+	udp_handle->state = state;
 
-	return 0;
+	receiver_module_state_changed(handle, ___state_convert(state));
+
+	return;
 }
 
 /* Uses system call, because glib socket API doesn't support unset connect
  * Please carefully use this function, and after use this function,
  * DO NOT use g_socket_is_connected().
  */
-static int __receiver_udp_unset_connection(void)
+static int __receiver_udp_unset_connection(receiver_module_h *handle)
 {
+	receiver_udp_h *udp_handle = NULL;
 	struct sockaddr addr;
 	int s_fd = 0;
 
+	retv_if(!handle, -1);
+
+	udp_handle = receiver_get_module_data(handle);
+
 	retvm_if(!udp_handle, -1, "handle is not created");
 	retvm_if(!udp_handle->socket, -1, "socket is not created");
 
@@ -125,17 +128,23 @@ static int __receiver_udp_unset_connection(void)
 		/* re-create socket or not ??? */
 		return -1;
 	}
-	udp_handle->state = RECEIVER_UDP_STATE_READY;
-	_D("unset connection");
+
+	__receiver_udp_state_set(handle, RECEIVER_UDP_STATE_READY);
 
 	return 0;
 }
 
-static int __receiver_udp_set_connection(GSocketAddress *sender_a)
+static int __receiver_udp_set_connection(
+	receiver_module_h *handle, GSocketAddress *sender_a)
 {
 	GError *error = NULL;
+	receiver_udp_h *udp_handle = NULL;
 
+	retv_if(!handle, -1);
 	retv_if(!sender_a, -1);
+
+	udp_handle = receiver_get_module_data(handle);
+
 	retvm_if(!udp_handle, -1, "handle is not created");
 	retvm_if(!udp_handle->socket, -1, "socket is not created");
 
@@ -150,21 +159,31 @@ static int __receiver_udp_set_connection(GSocketAddress *sender_a)
 		g_error_free(error);
 		return -1;
 	}
-	udp_handle->state = RECEIVER_UDP_STATE_CONNECTED;
-	_D("set connection");
+
+	__receiver_udp_state_set(handle, RECEIVER_UDP_STATE_CONNECTED);
 
 	return 0;
 }
 
 static gboolean __wait_time_out(gpointer user_data)
 {
-	__receiver_udp_unset_connection();
+	receiver_module_h *handle = user_data;
+
+	retv_if(!handle, FALSE);
+
+	__receiver_udp_unset_connection(handle);
 
 	return FALSE;
 }
 
-static void __receiver_udp_update_wait_timer(void)
+static void __receiver_udp_update_wait_timer(receiver_module_h *handle)
 {
+	receiver_udp_h *udp_handle = NULL;
+
+	ret_if(!handle);
+
+	udp_handle = receiver_get_module_data(handle);
+
 	if (udp_handle) {
 		if (udp_handle->wait_timer_id) {
 			g_source_remove(udp_handle->wait_timer_id);
@@ -172,8 +191,9 @@ static void __receiver_udp_update_wait_timer(void)
 		}
 		udp_handle->wait_timer_id =
 			g_timeout_add_seconds(RECEIVER_UDP_WAIT_TIMEOUT,
-				(GSourceFunc)__wait_time_out, NULL);
+				(GSourceFunc)__wait_time_out, handle);
 	}
+
 	return;
 }
 
@@ -181,53 +201,67 @@ static gboolean __read_socket(GIOChannel *channel,
 		GIOCondition condition,
 		gpointer data)
 {
-	gssize size = 0;
-	receiver_udp_h *handle = (receiver_udp_h *)data;
+	receiver_module_h *handle = data;
+	receiver_udp_h *udp_handle = NULL;
 	GError *error = NULL;
-
-	char buf[1024] = {0, }; /* temp */
+	message_s *r_msg = NULL;
+	gssize size = 0;
 
 	retv_if(!handle, TRUE);
-	retv_if(!handle->socket, TRUE);
 
-	if (handle->state == RECEIVER_UDP_STATE_NONE) {
+	udp_handle = receiver_get_module_data(handle);
+
+	retv_if(!udp_handle, TRUE);
+	retv_if(!udp_handle->socket, TRUE);
+
+	if (udp_handle->state < RECEIVER_UDP_STATE_READY) {
 		_E("receiver udp is not ready yet");
 		return TRUE;
 	}
 
-	if (handle->state == RECEIVER_UDP_STATE_READY) {
+	r_msg = malloc(sizeof(message_s));
+	retv_if(!r_msg, TRUE);
+
+	if (udp_handle->state == RECEIVER_UDP_STATE_READY) {
 		char *s_addr = NULL;
 		GSocketAddress *address = NULL;
 
-		size = g_socket_receive_from(handle->socket, &address,
-			buf, sizeof(buf), NULL, &error);
+		size = g_socket_receive_from(udp_handle->socket, &address,
+			(gchar *)r_msg, sizeof(message_s), NULL, &error);
 
 		if (size < 0) {
 			_D("Error receiving from socket: %s", error->message);
 			g_error_free(error);
+			free(r_msg);
+			r_msg = NULL;
 		}
 
 		s_addr = __socket_address_to_string(address);
 		_D("received first data from [%s]", s_addr);
 
+		message_push_to_inqueue(r_msg);
 
-		if (!__receiver_udp_set_connection(address))
-			__receiver_udp_update_wait_timer();
+		if (!__receiver_udp_set_connection(handle, address))
+			__receiver_udp_update_wait_timer(handle);
 		else
 			_E("failed to set connection with [%s]", s_addr);
 
 		free(s_addr);
 		g_object_unref(address);
 	} else { /* state is RECEIVER_UDP_STATE_CONNECTED */
-		size = g_socket_receive(handle->socket,
-			buf, sizeof(buf), NULL, &error);
+		size = g_socket_receive(udp_handle->socket,
+			(gchar *)r_msg, sizeof(message_s), NULL, &error);
 
 		if (size < 0) {
 			_D("Error receiving from socket: %s", error->message);
 			g_error_free(error);
+			free(r_msg);
+			r_msg = NULL;
 		}
 		_D("received data");
-		__receiver_udp_update_wait_timer();
+		message_push_to_inqueue(r_msg);
+
+		__receiver_udp_update_wait_timer(handle);
 	}
 
 	/* TODO : what should I do after receiveing some data? */
@@ -235,24 +269,90 @@ static gboolean __read_socket(GIOChannel *channel,
 	return TRUE;
 }
 
-int receiver_udp_start(void)
+static int _receiver_udp_start(void *data)
 {
-	GError *error = NULL;
-	GSocketAddress *address = NULL;
-	GInetAddress *i_addr = NULL;
+	receiver_module_h *handle = data;
+	receiver_udp_h *udp_handle = NULL;
 	int socket_fd = 0;
 	GIOChannel *ch = NULL;
-	int ret = 0;
 
-	if (!udp_handle) {
-		ret = __receiver_udp_init();
-		if (ret)
+	retv_if(!handle, -1);
+
+	udp_handle = receiver_get_module_data(handle);
+
+	retv_if(!udp_handle, -1);
+	retv_if(!udp_handle->socket, -1);
+
+	if (udp_handle->state != RECEIVER_UDP_STATE_INIT) {
+		if (udp_handle->state == RECEIVER_UDP_STATE_READY) {
+			_E("receiver udp is already started");
+			return 0;
+		} else {
+			_E("receiver udp is invalid state [%d]", udp_handle->state);
 			return -1;
+		}
 	}
 
-	if (udp_handle->state >= RECEIVER_UDP_STATE_READY) {
-		_W("receiver udp is already started");
-		return 0;
+	socket_fd = g_socket_get_fd(udp_handle->socket);
+	ch = g_io_channel_unix_new(socket_fd);
+	udp_handle->io_watch_id =
+		g_io_add_watch(ch, G_IO_IN, __read_socket, handle);
+	g_io_channel_unref(ch);
+	ch = NULL;
+
+	__receiver_udp_state_set(handle, RECEIVER_UDP_STATE_READY);
+
+	return 0;
+}
+
+static int _receiver_udp_stop(void *data)
+{
+	receiver_module_h *handle = data;
+	receiver_udp_h *udp_handle = NULL;
+
+	retv_if(!handle, -1);
+
+	udp_handle = receiver_get_module_data(handle);
+
+	retv_if(!udp_handle, -1);
+	retv_if(!udp_handle->socket, -1);
+
+	if (udp_handle->state < RECEIVER_UDP_STATE_READY) {
+		_E("receiver udp is invalid state [%d]", udp_handle->state);
+		return -1;
+	}
+
+	if (udp_handle->wait_timer_id) {
+		g_source_remove(udp_handle->wait_timer_id);
+		udp_handle->wait_timer_id = 0;
+	}
+
+	if (udp_handle->io_watch_id) {
+		g_source_remove(udp_handle->io_watch_id);
+		udp_handle->io_watch_id = 0;
+	}
+
+	__receiver_udp_state_set(handle, RECEIVER_UDP_STATE_INIT);
+
+	return 0;
+}
+
+static int _receiver_udp_init(void *data)
+{
+	receiver_module_h *handle = data;
+	receiver_udp_h *udp_handle = NULL;
+	GError *error = NULL;
+	GSocketAddress *address = NULL;
+	GInetAddress *i_addr = NULL;
+
+	retv_if(!handle, -1);
+
+	udp_handle = receiver_get_module_data(handle);
+	retv_if(!udp_handle, -1);
+
+	if (udp_handle->state != RECEIVER_UDP_STATE_NONE) {
+		_E("receiver udp is invalid state [%d]", udp_handle->state);
+		return -1;
 	}
 
 	udp_handle->socket = g_socket_new(G_SOCKET_FAMILY_IPV4,
@@ -287,15 +387,7 @@ int receiver_udp_start(void)
 	g_object_unref(address);
 	address = NULL;
 
-	socket_fd = g_socket_get_fd(udp_handle->socket);
-	ch = g_io_channel_unix_new(socket_fd);
-	udp_handle->io_watch_id =
-		g_io_add_watch(ch, G_IO_IN, __read_socket, udp_handle);
-	g_io_channel_unref(ch);
-	ch = NULL;
-
-	udp_handle->state = RECEIVER_UDP_STATE_READY;
-	_D("receiver udp started");
+	__receiver_udp_state_set(handle, RECEIVER_UDP_STATE_INIT);
 
 	return 0;
 
@@ -309,15 +401,77 @@ ERROR:
 	if (i_addr)
 		g_object_unref(i_addr);
 
-	__receiver_udp_fini();
-
 	return -1;
 }
 
-int receiver_udp_stop(void)
+static int _receiver_udp_fini(void *data)
+{
+	receiver_module_h *handle = data;
+	receiver_udp_h *udp_handle = NULL;
+
+	retv_if(!handle, -1);
+
+	udp_handle = receiver_get_module_data(handle);
+	retv_if(!udp_handle, -1);
+
+	if (udp_handle) {
+		if (udp_handle->io_watch_id)
+			g_source_remove(udp_handle->io_watch_id);
+
+		if (udp_handle->wait_timer_id)
+			g_source_remove(udp_handle->wait_timer_id);
+
+		if (udp_handle->socket) {
+			g_socket_close(udp_handle->socket, NULL);
+			g_object_unref(udp_handle->socket);
+		}
+
+		__receiver_udp_state_set(handle, RECEIVER_UDP_STATE_NONE);
+
+		free(udp_handle);
+		udp_handle = NULL;
+	}
+
+	return 0;
+}
+
+static receiver_state_e _receiver_udp_get_state(void *data)
 {
-	__receiver_udp_fini();
-	_D("receiver udp stopped");
+	receiver_module_h *handle = data;
+	receiver_udp_h *udp_handle = NULL;
+
+	retv_if(!handle, RECEIVER_STATE_NONE);
+
+	udp_handle = receiver_get_module_data(handle);
+	retv_if(!udp_handle, RECEIVER_STATE_NONE);
+
+	return ___state_convert(udp_handle->state);
+}
+
+/* Keep it here??? or move to new file??? */
+int receiver_udp_module_register(receiver_module_h *handle)
+{
+	receiver_udp_h *udp_handle = NULL;
+
+	retv_if(!handle, -1);
+
+	udp_handle = malloc(sizeof(receiver_udp_h));
+	if (!udp_handle) {
+		_E("failed to alloc receiver udp handle");
+		return -1;
+	}
+
+	udp_handle->state = RECEIVER_UDP_STATE_NONE;
+	udp_handle->io_watch_id = 0;
+	udp_handle->wait_timer_id = 0;
+	udp_handle->socket = NULL;
+
+	receiver_set_module_data(handle, udp_handle);
+	receiver_set_module_init_function(handle, _receiver_udp_init);
+	receiver_set_module_fini_function(handle, _receiver_udp_fini);
+	receiver_set_module_start_function(handle, _receiver_udp_start);
+	receiver_set_module_stop_function(handle, _receiver_udp_stop);
+	receiver_set_module_get_state_function(handle, _receiver_udp_get_state);
 
 	return 0;
 }