From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 30 Dec 2008 19:17:23 +0000 (+0100)
Subject: Add support for async events callbacks
X-Git-Tag: 0.6~80
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=eee11dfca5d8c21eaad3f1958a4db2483e634734;p=connman

Add support for async events callbacks
---

diff --git a/plugins/modem.c b/plugins/modem.c
index b770170..4668bd3 100644
--- a/plugins/modem.c
+++ b/plugins/modem.c
@@ -40,11 +40,18 @@
 struct modem_data {
 	char *device;
 	GIOChannel *channel;
+	GSList *callbacks;
 	GSList *commands;
 	char buf[1024];
 	int offset;
 };
 
+struct modem_callback {
+	char *command;
+	modem_cb_t function;
+	void *user_data;
+};
+
 struct modem_cmd {
 	char *cmd;
 	char *arg;
@@ -118,6 +125,7 @@ static gboolean modem_event(GIOChannel *channel,
 {
 	struct modem_data *modem = user_data;
 	struct modem_cmd *cmd;
+	GSList *list;
 	gsize len;
 	GIOError err;
 
@@ -134,12 +142,26 @@ static gboolean modem_event(GIOChannel *channel,
 
 	DBG("Read %d bytes (offset %d)", len, modem->offset);
 
+	if (g_str_has_suffix(modem->buf, "\r\n") == TRUE) {
+		for (list = modem->callbacks; list; list = list->next) {
+			struct modem_callback *callback = list->data;
+
+			if (callback->function == NULL)
+				continue;
+
+			if (g_strrstr(modem->buf, callback->command) != NULL)
+				callback->function(modem->buf,
+							callback->user_data);
+		}
+	}
+
 	if (g_strrstr(modem->buf, "\r\nERROR\r\n") == NULL &&
 				g_strrstr(modem->buf, "\r\nOK\r\n") == NULL) {
 		modem->offset += len;
 		return TRUE;
 	}
 
+	memset(modem->buf, 0, sizeof(modem->buf));
 	modem->offset = 0;
 
 	cmd = g_slist_nth_data(modem->commands, 0);
@@ -232,6 +254,24 @@ int modem_close(struct modem_data *modem)
 	return 0;
 }
 
+int modem_add_callback(struct modem_data *modem, const char *command,
+					modem_cb_t function, void *user_data)
+{
+	struct modem_callback *callback;
+
+	callback = g_try_new0(struct modem_callback, 1);
+	if (callback == NULL)
+		return -ENOMEM;
+
+	callback->command   = g_strdup(command);
+	callback->function  = function;
+	callback->user_data = user_data;
+
+	modem->callbacks = g_slist_append(modem->callbacks, callback);
+
+	return 0;
+}
+
 static int modem_command_valist(struct modem_data *modem, modem_cb_t callback,
 					void *user_data, const char *command,
 					const char *format, va_list var_args)
diff --git a/plugins/modem.h b/plugins/modem.h
index ef474d6..6fabcb3 100644
--- a/plugins/modem.h
+++ b/plugins/modem.h
@@ -31,6 +31,9 @@ int modem_close(struct modem_data *modem);
 
 typedef void (* modem_cb_t) (const char *buf, void *user_data);
 
+int modem_add_callback(struct modem_data *modem, const char *command,
+					modem_cb_t function, void *user_data);
+
 int modem_command(struct modem_data *modem,
 				modem_cb_t callback, void *user_data,
 				const char *command, const char *format, ...);