From 25894c2cf420d3b8a286cfe84988670b61794875 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Wed, 11 Jan 2012 15:22:03 +0200
Subject: [PATCH] obexd: Fix not responding SUCCESS code to GET in some
 conditions

When there is no body to be transfer obexd is responding with CONTINUE.
---
 obexd/src/obex.c | 75 ++++++++++++------------------------------------
 1 file changed, 19 insertions(+), 56 deletions(-)

diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index eb91f4cdc..baa5904da 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -574,33 +574,13 @@ static void transfer_complete(GObex *obex, GError *err, gpointer user_data)
 	}
 }
 
-static void cmd_get_rsp(GObex *obex, GObexPacket *req, gpointer user_data)
-{
-	struct obex_session *os = user_data;
-
-	DBG("");
-
-	print_event(G_OBEX_OP_GET, -1);
-
-	if (os->size != OBJECT_SIZE_UNKNOWN && os->size < UINT32_MAX)
-		g_obex_get_rsp(os->obex, send_data, transfer_complete,
-						os, NULL,
-						G_OBEX_HDR_LENGTH, os->size,
-						G_OBEX_HDR_INVALID);
-	else
-		g_obex_get_rsp(os->obex, send_data, transfer_complete,
-						os, NULL,
-						G_OBEX_HDR_INVALID);
-
-	print_event(G_OBEX_OP_GET, G_OBEX_RSP_CONTINUE);
-}
-
-static gssize driver_get_headers(struct obex_session *os)
+static int driver_get_headers(struct obex_session *os)
 {
 	GObexPacket *rsp;
-	gssize len, total = 0;
+	gssize len;
 	guint8 data[255];
 	guint8 id;
+	GObexHeader *hdr;
 
 	DBG("name=%s type=%s object=%p", os->name, os->type, os->object);
 
@@ -613,16 +593,13 @@ static gssize driver_get_headers(struct obex_session *os)
 	if (os->headers_sent)
 		return 0;
 
-	if (os->driver->get_next_header == NULL) {
-		os->headers_sent = TRUE;
-		return 0;
-	}
-
 	rsp = g_obex_packet_new(G_OBEX_RSP_CONTINUE, TRUE, G_OBEX_HDR_INVALID);
+
+	if (os->driver->get_next_header == NULL)
+		goto done;
+
 	while ((len = os->driver->get_next_header(os->object, &data,
 							sizeof(data), &id))) {
-		GObexHeader *hdr;
-
 		if (len < 0) {
 			error("get_next_header(): %s (%zd)", strerror(-len),
 								-len);
@@ -640,34 +617,22 @@ static gssize driver_get_headers(struct obex_session *os)
 
 		hdr = g_obex_header_new_bytes(id, data, len);
 		g_obex_packet_add_header(rsp, hdr);
-		total += len;
 	}
 
-	if (total != 0) {
-		g_obex_send(os->obex, rsp, NULL);
-		os->get_rsp = g_obex_add_request_function(os->obex,
-							G_OBEX_OP_GET,
-							cmd_get_rsp, os);
-		goto done;
-	}
-
-	g_obex_packet_free(rsp);
-	if (os->size != OBJECT_SIZE_UNKNOWN && os->size < UINT32_MAX)
-		g_obex_get_rsp(os->obex, send_data, transfer_complete,
-						os, NULL,
-						G_OBEX_HDR_LENGTH, os->size,
-						G_OBEX_HDR_INVALID);
-	else
-		g_obex_get_rsp(os->obex, send_data, transfer_complete,
-						os, NULL,
-						G_OBEX_HDR_INVALID);
-
 done:
+	if (os->size != OBJECT_SIZE_UNKNOWN && os->size < UINT32_MAX) {
+		hdr = g_obex_header_new_uint32(G_OBEX_HDR_LENGTH, os->size);
+		g_obex_packet_add_header(rsp, hdr);
+	}
+
+	g_obex_get_rsp_pkt(os->obex, rsp, send_data, transfer_complete, os,
+									NULL);
+
 	os->headers_sent = TRUE;
 
 	print_event(-1, G_OBEX_RSP_CONTINUE);
 
-	return total;
+	return 0;
 }
 
 static gboolean handle_async_io(void *object, int flags, int err,
@@ -893,13 +858,11 @@ int obex_get_stream_start(struct obex_session *os, const char *filename)
 	os->size = size;
 
 	err = driver_get_headers(os);
-	if (err == -EAGAIN) {
-		g_obex_suspend(os->obex);
-		os->driver->set_io_watch(os->object, handle_async_io, os);
-		return 0;
-	} else if (err < 0)
+	if (err != -EAGAIN)
 		return err;
 
+	g_obex_suspend(os->obex);
+	os->driver->set_io_watch(os->object, handle_async_io, os);
 	return 0;
 }