service: callbacks should return a boolean

To decide whether retry or not.

1 files changed, 23 insertions, 18 deletions

diff --git a/src/service.c b/src/service.c
index 70b3dda..e577198 100644
--- a/src/service.c
+++ b/src/service.c
@@ -68,7 +68,7 @@ static const char *sep_chars = "()<>@,;:\\\"/[]?={} \t";
 
 struct mms_request;
 
-typedef void (*mms_request_result_cb_t) (struct mms_request *request);
+typedef gboolean (*mms_request_result_cb_t) (struct mms_request *request);
 
 struct mms_service {
 	gint refcount;
@@ -581,7 +581,7 @@ static inline char *create_transaction_id(void)
 					"0123456789ABCDEF0123456789ABCDEF");
 }
 
-static void result_request_send_conf(struct mms_request *request)
+static gboolean result_request_send_conf(struct mms_request *request)
 {
 	struct mms_message *msg;
 	struct mms_service *service = request->service;
@@ -592,15 +592,15 @@ static void result_request_send_conf(struct mms_request *request)
 	char *path;
 
 	if (request->status != 200)
-		return;
+		return FALSE;
 
 	msg = g_try_new0(struct mms_message, 1);
 	if (msg == NULL)
-		return;
+		return FALSE;
 
 	if (mmap_file(request->data_path, &pdu, &len) == FALSE) {
 		mms_message_free(msg);
-		return;
+		return FALSE;
 	}
 
 	if (mms_message_decode(pdu, len, msg) == FALSE) {
@@ -610,7 +610,7 @@ static void result_request_send_conf(struct mms_request *request)
 
 		mms_message_free(msg);
 
-		return;
+		return FALSE;
 	}
 
 	mms_debug("response status : %d", msg->sc.rsp_status);
@@ -622,13 +622,13 @@ static void result_request_send_conf(struct mms_request *request)
 	unlink(request->data_path);
 
 	if (request->msg == NULL)
-		return;
+		return FALSE;
 
 	uuid = request->msg->uuid;
 
 	meta = mms_store_meta_open(service->identity, uuid);
 	if (meta == NULL)
-		return;
+		return FALSE;
 
 	g_key_file_set_string(meta, "info", "state", "sent");
 
@@ -639,6 +639,8 @@ static void result_request_send_conf(struct mms_request *request)
 	emit_msg_status_changed(path, "sent");
 
 	g_free(path);
+
+	return TRUE;
 }
 
 static void append_message(const char *path, const struct mms_service *service,
@@ -1031,8 +1033,8 @@ out:
 	return success;
 }
 
-static void result_request_retrieve_conf(struct mms_request *request);
-static void result_request_notify_resp(struct mms_request *request);
+static gboolean result_request_retrieve_conf(struct mms_request *request);
+static gboolean result_request_notify_resp(struct mms_request *request);
 
 static struct mms_request *build_notify_resp_ind(struct mms_service *service,
 					enum mms_message_notify_status status,
@@ -1695,7 +1697,7 @@ static gboolean bearer_idle_timeout(gpointer user_data)
 	return FALSE;
 }
 
-static void result_request_notify_resp(struct mms_request *request)
+static gboolean result_request_notify_resp(struct mms_request *request)
 {
 	struct mms_message *msg;
 	GKeyFile *meta;
@@ -1705,17 +1707,17 @@ static void result_request_notify_resp(struct mms_request *request)
 	if (request->status != 200) {
 		mms_error("POST m.notify.resp.ind failed with status %d",
 						request->status);
-		return;
+		return FALSE;
 	}
 
 	if (request->msg == NULL)
-		return;
+		return FALSE;
 
 	msg = mms_request_steal_message(request);
 
 	if (mms_message_register(request->service, msg) != 0) {
 		mms_message_free(msg);
-		return;
+		return FALSE;
 	}
 
 	emit_message_added(request->service, msg);
@@ -1723,15 +1725,17 @@ static void result_request_notify_resp(struct mms_request *request)
 	meta = mms_store_meta_open(request->service->identity,
 					msg->uuid);
 	if (meta == NULL)
-		return;
+		return FALSE;
 
 	g_key_file_set_string(meta, "info", "state", "received");
 
 	mms_store_meta_close(request->service->identity,
 				msg->uuid, meta, TRUE);
+
+	return TRUE;
 }
 
-static void result_request_retrieve_conf(struct mms_request *request)
+static gboolean result_request_retrieve_conf(struct mms_request *request)
 {
 	struct mms_message *msg;
 	struct mms_service *service = request->service;
@@ -1743,10 +1747,10 @@ static void result_request_retrieve_conf(struct mms_request *request)
 	gboolean decode_success;
 
 	if (request->status != 200)
-		return;
+		return FALSE;
 
 	if (mmap_file(request->data_path, &pdu, &len) == FALSE)
-		return;
+		return FALSE;
 
 	uuid = mms_store_file(service->identity, request->data_path);
 	if (uuid == NULL)
@@ -1800,6 +1804,7 @@ error:
 
 exit:
 	munmap(pdu, len);
+	return TRUE;
 }
 
 static gboolean web_get_cb(GWebResult *result, gpointer user_data)