obexd: support to reply folder name to store file

The obex agent usually returns the full path by getting the default folder and filename from the Filename property of the transfer object which is not convenient.

The patch helps that the obex agent can return the folder name suffixed with '/' or new full path or even null which will use the default name if new_name is NULL and the default folder if the new_folder is NULL in opp_chkput().

---
  doc/obex-agent-api.txt |  9 +++++----
  obexd/src/manager.c    | 10 ++++++----
  2 files changed, 11 insertions(+), 8 deletions(-)

doc/obex-agent-api.txt +5 -4

index 3923da6df..5a9c6d417 100644
@@ -46,10 +46,11 @@ Methods		void Release()
  			This method gets called when the service daemon
  			needs to accept/reject a Bluetooth object push request.
 
-			Returns the full path (including the filename) where
-			the object shall be stored. The tranfer object will
-			contain a Filename property that contains the default
-			location and name that can be returned.
+			Returns the full path (including the filename) or
+			folder name suffixed with '/' where the object shall
+			be stored. The transfer object will contain a Filename
+			property that contains the default location and name
+			that can be returned.
 
  			Possible errors: org.bluez.obex.Error.Rejected
  			                 org.bluez.obex.Error.Canceled

obexd/src/manager.c +0 -0

index 849928603..73fd6b9af 100644

obexd/src/manager.c +5 -2

  		dbus_error_free(&derr);

@@ -651,7 +650,10 @@ static void agent_reply(DBusPendingCall *call, void *user_data)
  			agent->new_name = g_strdup(name);
  			agent->new_folder = NULL;
  		} else {
-			agent->new_name = g_strdup(slash + 1);
+			if (strlen(slash) == 1)
+				agent->new_name = NULL;
+			else
+				agent->new_name = g_strdup(slash + 1);
  			agent->new_folder = g_strndup(name, slash - name);
  		}
  	}

@@ -722,7 +724,7 @@ int manager_request_authorization(struct obex_transfer *transfer,
 
  	dbus_pending_call_unref(call);
 
-	if (!agent || !agent->new_name || agent->auth_reject)
+	if (!agent || agent->auth_reject)
  		return -EPERM;
 
  	*new_folder = agent->new_folder;

Dear Guiting,

Thank you for sending the fourth iteration. In the summary, I’d use also *return* instead of *reply*. Maybe:

obexd: AuthorizePush: Support to return folder name for file storage

Am 20.04.23 um 04:25 schrieb Guiting Shen:

Quoted 3 lines

The obex agent usually returns the full path by getting the default folder and filename from the Filename property of the transfer object which is not convenient.

Just a minor thing for the future, I’d add a blank line between paragraphs.

Quoted 34 lines

The patch helps that the obex agent can return the folder name suffixed with '/' or new full path or even null which will use the default name if new_name is NULL and the default folder if the new_folder is NULL in opp_chkput().
---
  doc/obex-agent-api.txt |  9 +++++----
  obexd/src/manager.c    | 10 ++++++----

  2 files changed, 11 insertions(+), 8 deletions(-)

doc/obex-agent-api.txt +0 -0

index 3923da6df..5a9c6d417 100644
@@ -46,10 +46,11 @@ Methods        void Release()

              This method gets called when the service daemon needs to accept/reject a Bluetooth object push request. -            Returns the full path (including the filename) where -            the object shall be stored. The tranfer object will -            contain a Filename property that contains the default -            location and name that can be returned.
+            Returns the full path (including the filename) or +            folder name suffixed with '/' where the object shall +            be stored. The transfer object will contain a Filename +            property that contains the default location and name +            that can be returned.
                Possible errors: org.bluez.obex.Error.Rejected org.bluez.obex.Error.Canceled

obexd/src/manager.c +0 -0

index 849928603..73fd6b9af 100644
@@ -632,8 +632,7 @@ static void agent_reply(DBusPendingCall *call, 
 void *user_data)

obexd/src/manager.c static void agent_reply(DBusPendingCall *call, void *user_data) · line 636

Quoted 6 lines

obexd/src/manager.c +1 -2

             if (dbus_error_has_name(&derr, DBUS_ERROR_NO_REPLY))
               agent_cancel();
-
-        if (dbus_error_has_name(&derr, OBEX_ERROR_REJECT))
+        else if (dbus_error_has_name(&derr, OBEX_ERROR_REJECT))
               agent->auth_reject = TRUE;

By the way, this looks like an unrelated change? I would do such changes in separate commits.

Kind regards,

Paul

Quoted 13 lines

obexd/src/manager.c +4 -1

             dbus_error_free(&derr);

@@ -651,7 +650,10 @@ static void agent_reply(DBusPendingCall *call, 
 void *user_data)
               agent->new_name = g_strdup(name);
               agent->new_folder = NULL;
           } else {
-            agent->new_name = g_strdup(slash + 1);
+            if (strlen(slash) == 1)
+                agent->new_name = NULL;
+            else
+                agent->new_name = g_strdup(slash + 1);
               agent->new_folder = g_strndup(name, slash - name);
           }

obexd/src/manager.c int manager_request_authorization(struct · line 729

Quoted 8 lines

      }

obexd/src/manager.c +1 -0

@@ -722,7 +724,7 @@ int manager_request_authorization(struct 
 obex_transfer *transfer,
         dbus_pending_call_unref(call);
   -    if (!agent || !agent->new_name || agent->auth_reject)
+    if (!agent || agent->auth_reject)
           return -EPERM;
         *new_folder = agent->new_folder;