From 156374a0eef30f33e77d4b765a718dd84a4d6df2 Mon Sep 17 00:00:00 2001 From: Slawomir Bochenski Date: Thu, 9 Dec 2010 08:08:00 +0100 Subject: [PATCH] obexd: Change obex_service_driver put() signature This API change is needed for implementing Message Access Profile, as MAP uses application parameters in puts also (for example SetMessageStatus function, see MAP specification, chapter 5.7) and in order to access application parameters headers, access to obex object is required. --- obexd/plugins/ftp.c | 3 ++- obexd/plugins/opp.c | 3 ++- obexd/plugins/syncevolution.c | 3 ++- obexd/src/obex.c | 2 +- obexd/src/service.h | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c index 91c77a327..a952f64ff 100644 --- a/obexd/plugins/ftp.c +++ b/obexd/plugins/ftp.c @@ -258,7 +258,8 @@ static int ftp_chkput(struct obex_session *os, void *user_data) return ret; } -static int ftp_put(struct obex_session *os, void *user_data) +static int ftp_put(struct obex_session *os, obex_object_t *obj, + void *user_data) { struct ftp_session *ftp = user_data; const char *name = obex_get_name(os); diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c index 05f944fc5..17c43560e 100644 --- a/obexd/plugins/opp.c +++ b/obexd/plugins/opp.c @@ -155,7 +155,8 @@ skip_auth: return ret; } -static int opp_put(struct obex_session *os, void *user_data) +static int opp_put(struct obex_session *os, obex_object_t *obj, + void *user_data) { const char *name = obex_get_name(os); const char *folder = obex_get_root_folder(os); diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c index bf436a912..8041df640 100644 --- a/obexd/plugins/syncevolution.c +++ b/obexd/plugins/syncevolution.c @@ -243,7 +243,8 @@ failed: return NULL; } -static int synce_put(struct obex_session *os, void *user_data) +static int synce_put(struct obex_session *os, obex_object_t *obj, + void *user_data) { return 0; } diff --git a/obexd/src/obex.c b/obexd/src/obex.c index effb81eaa..e7d40dd1e 100644 --- a/obexd/src/obex.c +++ b/obexd/src/obex.c @@ -1090,7 +1090,7 @@ static void cmd_put(struct obex_session *os, obex_t *obex, obex_object_t *obj) return; } - err = os->service->put(os, os->service_data); + err = os->service->put(os, obj, os->service_data); if (err < 0) os_set_response(obj, err); } diff --git a/obexd/src/service.h b/obexd/src/service.h index 1726c432d..a84488552 100644 --- a/obexd/src/service.h +++ b/obexd/src/service.h @@ -34,7 +34,8 @@ struct obex_service_driver { void (*progress) (struct obex_session *os, void *user_data); int (*get) (struct obex_session *os, obex_object_t *obj, gboolean *stream, void *user_data); - int (*put) (struct obex_session *os, 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); int (*setpath) (struct obex_session *os, obex_object_t *obj, void *user_data); -- 2.47.3