This removes stream argument from service driver get() function. Now the
streaming is started automatically when first portion of data is
received.
Additionally the possibility to not send body header at all is added. This
can be achieved by returning -ENOSTR from mime plugin read() function.
---
plugins/ftp.c | 6 +-----
plugins/ftp.h | 3 +--
plugins/irmc.c | 3 +--
plugins/mas.c | 5 +----
plugins/opp.c | 6 +-----
plugins/pbap.c | 11 ++++-------
plugins/pcsuite.c | 4 ++--
plugins/syncevolution.c | 5 +----
src/obex-priv.h | 1 +
src/obex.c | 24 +++++++++++++++---------
src/service.h | 2 +-
11 files changed, 29 insertions(+), 41 deletions(-)
diff --git a/plugins/ftp.c b/plugins/ftp.c
index 79223bf..4962326 100644
--- a/plugins/ftp.c
+++ b/plugins/ftp.c
@@ -213,8 +213,7 @@ void *ftp_connect(struct obex_session *os, int *err)
return ftp;
}
-int ftp_get(struct obex_session *os, obex_object_t *obj, gboolean *stream,
- void *user_data)
+int ftp_get(struct obex_session *os, obex_object_t *obj, void *user_data)
{
struct ftp_session *ftp = user_data;
const char *type = obex_get_type(os);
@@ -229,9 +228,6 @@ int ftp_get(struct obex_session *os, obex_object_t *obj, gboolean *stream,
if (ret < 0)
return ret;
- if (stream)
- *stream = TRUE;
-
return 0;
}
diff --git a/plugins/ftp.h b/plugins/ftp.h
index 2374125..d929cde 100644
--- a/plugins/ftp.h
+++ b/plugins/ftp.h
@@ -22,8 +22,7 @@
*/
void *ftp_connect(struct obex_session *os, int *err);
-int ftp_get(struct obex_session *os, obex_object_t *obj, gboolean *stream,
- void *user_data);
+int ftp_get(struct obex_session *os, obex_object_t *obj, void *user_data);
int ftp_chkput(struct obex_session *os, void *user_data);
int ftp_put(struct obex_session *os, obex_object_t *obj, void *user_data);
int ftp_setpath(struct obex_session *os, obex_object_t *obj, void *user_data);
diff --git a/plugins/irmc.c b/plugins/irmc.c
index cd7f386..cc0b9db 100644
--- a/plugins/irmc.c
+++ b/plugins/irmc.c
@@ -233,7 +233,7 @@ static void *irmc_connect(struct obex_session *os, int *err)
}
static int irmc_get(struct obex_session *os, obex_object_t *obj,
- gboolean *stream, void *user_data)
+ void *user_data)
{
struct irmc_session *irmc = user_data;
const char *type = obex_get_type(os);
@@ -244,7 +244,6 @@ static int irmc_get(struct obex_session *os, obex_object_t *obj,
DBG("name %s type %s irmc %p", name, type ? type : "NA", irmc);
path = g_strdup(name);
- *stream = TRUE;
ret = obex_get_stream_start(os, path);
diff --git a/plugins/mas.c b/plugins/mas.c
index d13625c..08e47a2 100644
--- a/plugins/mas.c
+++ b/plugins/mas.c
@@ -134,8 +134,7 @@ static void mas_disconnect(struct obex_session *os, void *user_data)
mas_clean(mas);
}
-static int mas_get(struct obex_session *os, obex_object_t *obj,
- gboolean *stream, void *user_data)
+static int mas_get(struct obex_session *os, obex_object_t *obj, void *user_data)
{
struct mas_session *mas = user_data;
const char *type = obex_get_type(os);
@@ -148,8 +147,6 @@ static int mas_get(struct obex_session *os, obex_object_t *obj,
if (type == NULL)
return -EBADR;
- *stream = FALSE;
-
ret = obex_get_stream_start(os, name);
if (ret < 0)
goto failed;
diff --git a/plugins/opp.c b/plugins/opp.c
index 17c4356..4f0ed08 100644
--- a/plugins/opp.c
+++ b/plugins/opp.c
@@ -170,8 +170,7 @@ static int opp_put(struct obex_session *os, obex_object_t *obj,
return 0;
}
-static int opp_get(struct obex_session *os, obex_object_t *obj,
- gboolean *stream, void *user_data)
+static int opp_get(struct obex_session *os, obex_object_t *obj, void *user_data)
{
const char *type;
@@ -190,9 +189,6 @@ static int opp_get(struct obex_session *os, obex_object_t *obj,
} else
return -EPERM;
- if (stream)
- *stream = TRUE;
-
return 0;
}
diff --git a/plugins/pbap.c b/plugins/pbap.c
index 0356ae7..0208731 100644
--- a/plugins/pbap.c
+++ b/plugins/pbap.c
@@ -625,7 +625,7 @@ static void *pbap_connect(struct obex_session *os, int *err)
}
static int pbap_get(struct obex_session *os, obex_object_t *obj,
- gboolean *stream, void *user_data)
+ void *user_data)
{
struct pbap_session *pbap = user_data;
const char *type = obex_get_type(os);
@@ -663,7 +663,6 @@ static int pbap_get(struct obex_session *os, obex_object_t *obj,
else
path = g_build_filename("/", name, NULL);
- *stream = (params->maxlistcount == 0 ? FALSE : TRUE);
} else if (strcmp(type, VCARDLISTING_TYPE) == 0) {
/* Always relative */
if (!name || strlen(name) == 0)
@@ -673,11 +672,9 @@ static int pbap_get(struct obex_session *os, obex_object_t *obj,
/* Current folder + relative path */
path = g_build_filename(pbap->folder, name, NULL);
- *stream = (params->maxlistcount == 0 ? FALSE : TRUE);
} else if (strcmp(type, VCARDENTRY_TYPE) == 0) {
/* File name only */
path = g_strdup(name);
- *stream = TRUE;
} else
return -EBADR;
@@ -981,11 +978,11 @@ static ssize_t vobject_pull_read(void *object, void *buf, size_t count,
if (pbap->params->maxlistcount == 0) {
/* PhoneBookSize */
- *hi = OBEX_HDR_APPARAM;
+ *hi = obj->aparams->len ? OBEX_HDR_APPARAM : OBEX_HDR_BODY;
return array_read(obj->aparams, buf, count);
} else if (obj->firstpacket) {
/* NewMissedCalls */
- *hi = OBEX_HDR_APPARAM;
+ *hi = obj->aparams->len ? OBEX_HDR_APPARAM : OBEX_HDR_BODY;
obj->firstpacket = FALSE;
return array_read(obj->aparams, buf, count);
} else {
@@ -1022,7 +1019,7 @@ static ssize_t vobject_list_read(void *object, void *buf, size_t count,
return -EAGAIN;
if (pbap->params->maxlistcount == 0) {
- *hi = OBEX_HDR_APPARAM;
+ *hi = obj->aparams->len ? OBEX_HDR_APPARAM : OBEX_HDR_BODY;
return array_read(obj->aparams, buf, count);
} else {
*hi = OBEX_HDR_BODY;
diff --git a/plugins/pcsuite.c b/plugins/pcsuite.c
index 5545917..18a3ee7 100644
--- a/plugins/pcsuite.c
+++ b/plugins/pcsuite.c
@@ -181,13 +181,13 @@ fail:
}
static int pcsuite_get(struct obex_session *os, obex_object_t *obj,
- gboolean *stream, void *user_data)
+ void *user_data)
{
struct pcsuite_session *pcsuite = user_data;
DBG("%p", pcsuite);
- return ftp_get(os, obj, stream, pcsuite->ftp);
+ return ftp_get(os, obj, pcsuite->ftp);
}
static int pcsuite_chkput(struct obex_session *os, void *user_data)
diff --git a/plugins/syncevolution.c b/plugins/syncevolution.c
index ea3eb7a..77c1bd6 100644
--- a/plugins/syncevolution.c
+++ b/plugins/syncevolution.c
@@ -250,11 +250,8 @@ static int synce_put(struct obex_session *os, obex_object_t *obj,
}
static int synce_get(struct obex_session *os, obex_object_t *obj,
- gboolean *stream, void *user_data)
+ void *user_data)
{
- if (stream)
- *stream = TRUE;
-
return obex_get_stream_start(os, NULL);
}
diff --git a/src/obex-priv.h b/src/obex-priv.h
index 0caa0dd..8c722dc 100644
--- a/src/obex-priv.h
+++ b/src/obex-priv.h
@@ -45,6 +45,7 @@ struct obex_session {
obex_t *obex;
obex_object_t *obj;
struct obex_mime_type_driver *driver;
+ gboolean streaming;
};
int obex_session_start(GIOChannel *io, uint16_t tx_mtu, uint16_t rx_mtu,
diff --git a/src/obex.c b/src/obex.c
index 064fe4b..3ab81d4 100644
--- a/src/obex.c
+++ b/src/obex.c
@@ -310,6 +310,7 @@ static void os_reset_session(struct obex_session *os)
os->pending = 0;
os->offset = 0;
os->size = OBJECT_SIZE_DELETE;
+ os->streaming = FALSE;
}
static void obex_session_free(struct obex_session *os)
@@ -643,14 +644,23 @@ static int obex_write_stream(struct obex_session *os,
error("read(): %s (%zd)", strerror(-len), -len);
if (len == -EAGAIN)
return len;
- else if (len == -ENOSTR)
- return 0;
g_free(os->buf);
os->buf = NULL;
+
+ if (len == -ENOSTR)
+ return 0;
+
return len;
}
+ if (!os->streaming) {
+ hd.bs = NULL;
+ OBEX_ObjectAddHeader(obex, obj, OBEX_HDR_BODY, hd, 0,
+ OBEX_FL_STREAM_START);
+ os->streaming = TRUE;
+ }
+
hd.bs = os->buf;
switch (hi) {
@@ -704,7 +714,6 @@ proceed:
static void cmd_get(struct obex_session *os, obex_t *obex, obex_object_t *obj)
{
obex_headerdata_t hd;
- gboolean stream;
unsigned int hlen;
uint8_t hi;
int err;
@@ -720,6 +729,8 @@ static void cmd_get(struct obex_session *os, obex_t *obex, obex_object_t *obj)
g_return_if_fail(chk_cid(obex, obj, os->cid));
+ os->streaming = FALSE;
+
while (OBEX_ObjectGetNextHeader(obex, obj, &hi, &hd, &hlen)) {
switch (hi) {
case OBEX_HDR_NAME:
@@ -781,7 +792,7 @@ static void cmd_get(struct obex_session *os, obex_t *obex, obex_object_t *obj)
return;
}
- err = os->service->get(os, obj, &stream, os->service_data);
+ err = os->service->get(os, obj, os->service_data);
if (err < 0)
goto done;
@@ -800,11 +811,6 @@ static void cmd_get(struct obex_session *os, obex_t *obex, obex_object_t *obj)
goto done;
}
- if (stream)
- /* Standard data stream */
- OBEX_ObjectAddHeader(obex, obj, OBEX_HDR_BODY, hd, 0,
- OBEX_FL_STREAM_START);
-
/* Try to write to stream and suspend the stream immediately
* if no data available to send. */
err = obex_write_stream(os, obex, obj);
diff --git a/src/service.h b/src/service.h
index a844885..4d9d683 100644
--- a/src/service.h
+++ b/src/service.h
@@ -33,7 +33,7 @@ struct obex_service_driver {
void *(*connect) (struct obex_session *os, int *err);
void (*progress) (struct obex_session *os, void *user_data);
int (*get) (struct obex_session *os, obex_object_t *obj,
- gboolean *stream, void *user_data);
+ void *user_data);
int (*put) (struct obex_session *os, obex_object_t *obj,
void *user_data);
int (*chkput) (struct obex_session *os, void *user_data);
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
