diff mbox series

[BlueZ,v5] obex: Move size emit signal to plugins instead of obex.c

Message ID 20240703093133.9423-1-quic_amisjain@quicinc.com (mailing list archive)
State Superseded
Headers show
Series [BlueZ,v5] obex: Move size emit signal to plugins instead of obex.c | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch success CheckPatch PASS
tedd_an/GitLint success Gitlint PASS
tedd_an/BuildEll success Build ELL PASS
tedd_an/BluezMake success Bluez Make PASS
tedd_an/MakeCheck success Bluez Make Check PASS
tedd_an/MakeDistcheck success Make Distcheck PASS
tedd_an/CheckValgrind success Check Valgrind PASS
tedd_an/CheckSmatch success CheckSparse PASS
tedd_an/bluezmakeextell success Make External ELL PASS
tedd_an/IncrementalBuild success Incremental Build PASS
tedd_an/ScanBuild success Scan Build PASS

Commit Message

Amisha Jain July 3, 2024, 9:31 a.m. UTC 
Instead of emitting the property "Size" from obex_put_stream_start(),
Call the function manager_emit_transfer_property() from plugins/*.c
wherever plugin has transfer object present.
Remove the code from obex.c which is generic for all profiles.

This change resolves the type mismatch issue when calling the
manager_emit_transfer_property from obex.c. We are passing
'os->service_data' of plugin session type but the
manager_emit_transfer_property() expects the 'obex_transfer'
type, therefore size is not set properly and might cause
crash/disconnection.

---
 obexd/plugins/ftp.c | 5 +++++
 obexd/plugins/opp.c | 5 +++++
 obexd/src/obex.c    | 3 ---
 3 files changed, 10 insertions(+), 3 deletions(-)

Comments

bluez.test.bot@gmail.com July 3, 2024, 11:39 a.m. UTC | #1 
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=867906

---Test result---

Test Summary:
CheckPatch                    PASS      0.26 seconds
GitLint                       PASS      0.19 seconds
BuildEll                      PASS      24.36 seconds
BluezMake                     PASS      1645.76 seconds
MakeCheck                     PASS      13.08 seconds
MakeDistcheck                 PASS      177.29 seconds
CheckValgrind                 PASS      251.47 seconds
CheckSmatch                   PASS      352.37 seconds
bluezmakeextell               PASS      119.11 seconds
IncrementalBuild              PASS      1385.18 seconds
ScanBuild                     PASS      998.38 seconds



---
Regards,
Linux Bluetooth
Amisha Jain July 8, 2024, 6:30 a.m. UTC | #2 
Hi Team,
Please review the below the change.
Do comment for any concerns.

Thanks,
Amisha

On 7/3/2024 3:01 PM, Amisha Jain wrote:
> Instead of emitting the property "Size" from obex_put_stream_start(),
> Call the function manager_emit_transfer_property() from plugins/*.c
> wherever plugin has transfer object present.
> Remove the code from obex.c which is generic for all profiles.
> 
> This change resolves the type mismatch issue when calling the
> manager_emit_transfer_property from obex.c. We are passing
> 'os->service_data' of plugin session type but the
> manager_emit_transfer_property() expects the 'obex_transfer'
> type, therefore size is not set properly and might cause
> crash/disconnection.
> 
> ---
>   obexd/plugins/ftp.c | 5 +++++
>   obexd/plugins/opp.c | 5 +++++
>   obexd/src/obex.c    | 3 ---
>   3 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
> index 874fe2b8b..127bb9aaf 100644
> --- a/obexd/plugins/ftp.c
> +++ b/obexd/plugins/ftp.c
> @@ -175,6 +175,11 @@ int ftp_chkput(struct obex_session *os, void *user_data)
>   
>   	ret = obex_put_stream_start(os, path);
>   
> +	if (obex_get_size(os) != OBJECT_SIZE_DELETE &&
> +				obex_get_size(os) != OBJECT_SIZE_UNKNOWN) {
> +		manager_emit_transfer_property(ftp->transfer, "Size");
> +	}
> +
>   	if (ret == 0)
>   		manager_emit_transfer_started(ftp->transfer);
>   
> diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
> index 777f5f8ed..74b2f805b 100644
> --- a/obexd/plugins/opp.c
> +++ b/obexd/plugins/opp.c
> @@ -87,6 +87,11 @@ skip_auth:
>   
>   	err = obex_put_stream_start(os, path);
>   
> +	if (obex_get_size(os) != OBJECT_SIZE_DELETE &&
> +				obex_get_size(os) != OBJECT_SIZE_UNKNOWN) {
> +		manager_emit_transfer_property(user_data, "Size");
> +	}
> +
>   	g_free(path);
>   
>   	if (err < 0)
> diff --git a/obexd/src/obex.c b/obexd/src/obex.c
> index 98d6245a4..370bfac9e 100644
> --- a/obexd/src/obex.c
> +++ b/obexd/src/obex.c
> @@ -716,9 +716,6 @@ int obex_put_stream_start(struct obex_session *os, const char *filename)
>   		return err;
>   	}
>   
> -	if (os->size != OBJECT_SIZE_DELETE && os->size != OBJECT_SIZE_UNKNOWN)
> -		manager_emit_transfer_property(os->service_data, "Size");
> -
>   	os->path = g_strdup(filename);
>   
>   	return 0;
Amisha Jain July 11, 2024, 11:37 a.m. UTC | #3 
Hi,
Please review the below change.
Do comment for any concerns.

On 7/8/2024 12:00 PM, Amisha Jain wrote:
> Hi Team,
> Please review the below the change.
> Do comment for any concerns.
> 
> Thanks,
> Amisha
> 
> On 7/3/2024 3:01 PM, Amisha Jain wrote:
>> Instead of emitting the property "Size" from obex_put_stream_start(),
>> Call the function manager_emit_transfer_property() from plugins/*.c
>> wherever plugin has transfer object present.
>> Remove the code from obex.c which is generic for all profiles.
>>
>> This change resolves the type mismatch issue when calling the
>> manager_emit_transfer_property from obex.c. We are passing
>> 'os->service_data' of plugin session type but the
>> manager_emit_transfer_property() expects the 'obex_transfer'
>> type, therefore size is not set properly and might cause
>> crash/disconnection.
>>
>> ---
>>   obexd/plugins/ftp.c | 5 +++++
>>   obexd/plugins/opp.c | 5 +++++
>>   obexd/src/obex.c    | 3 ---
>>   3 files changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
>> index 874fe2b8b..127bb9aaf 100644
>> --- a/obexd/plugins/ftp.c
>> +++ b/obexd/plugins/ftp.c
>> @@ -175,6 +175,11 @@ int ftp_chkput(struct obex_session *os, void 
>> *user_data)
>>       ret = obex_put_stream_start(os, path);
>> +    if (obex_get_size(os) != OBJECT_SIZE_DELETE &&
>> +                obex_get_size(os) != OBJECT_SIZE_UNKNOWN) {
>> +        manager_emit_transfer_property(ftp->transfer, "Size");
>> +    }
>> +
>>       if (ret == 0)
>>           manager_emit_transfer_started(ftp->transfer);
>> diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
>> index 777f5f8ed..74b2f805b 100644
>> --- a/obexd/plugins/opp.c
>> +++ b/obexd/plugins/opp.c
>> @@ -87,6 +87,11 @@ skip_auth:
>>       err = obex_put_stream_start(os, path);
>> +    if (obex_get_size(os) != OBJECT_SIZE_DELETE &&
>> +                obex_get_size(os) != OBJECT_SIZE_UNKNOWN) {
>> +        manager_emit_transfer_property(user_data, "Size");
>> +    }
>> +
>>       g_free(path);
>>       if (err < 0)
>> diff --git a/obexd/src/obex.c b/obexd/src/obex.c
>> index 98d6245a4..370bfac9e 100644
>> --- a/obexd/src/obex.c
>> +++ b/obexd/src/obex.c
>> @@ -716,9 +716,6 @@ int obex_put_stream_start(struct obex_session *os, 
>> const char *filename)
>>           return err;
>>       }
>> -    if (os->size != OBJECT_SIZE_DELETE && os->size != 
>> OBJECT_SIZE_UNKNOWN)
>> -        manager_emit_transfer_property(os->service_data, "Size");
>> -
>>       os->path = g_strdup(filename);
>>       return 0;
Amisha Jain July 15, 2024, 6:23 a.m. UTC | #4 
Hi ,
Please review and comment for any concern.

Thanks,
Amisha

On 7/3/2024 3:01 PM, Amisha Jain wrote:
> Instead of emitting the property "Size" from obex_put_stream_start(),
> Call the function manager_emit_transfer_property() from plugins/*.c
> wherever plugin has transfer object present.
> Remove the code from obex.c which is generic for all profiles.
> 
> This change resolves the type mismatch issue when calling the
> manager_emit_transfer_property from obex.c. We are passing
> 'os->service_data' of plugin session type but the
> manager_emit_transfer_property() expects the 'obex_transfer'
> type, therefore size is not set properly and might cause
> crash/disconnection.
> 
> ---
>   obexd/plugins/ftp.c | 5 +++++
>   obexd/plugins/opp.c | 5 +++++
>   obexd/src/obex.c    | 3 ---
>   3 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
> index 874fe2b8b..127bb9aaf 100644
> --- a/obexd/plugins/ftp.c
> +++ b/obexd/plugins/ftp.c
> @@ -175,6 +175,11 @@ int ftp_chkput(struct obex_session *os, void *user_data)
>   
>   	ret = obex_put_stream_start(os, path);
>   
> +	if (obex_get_size(os) != OBJECT_SIZE_DELETE &&
> +				obex_get_size(os) != OBJECT_SIZE_UNKNOWN) {
> +		manager_emit_transfer_property(ftp->transfer, "Size");
> +	}
> +
>   	if (ret == 0)
>   		manager_emit_transfer_started(ftp->transfer);
>   
> diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
> index 777f5f8ed..74b2f805b 100644
> --- a/obexd/plugins/opp.c
> +++ b/obexd/plugins/opp.c
> @@ -87,6 +87,11 @@ skip_auth:
>   
>   	err = obex_put_stream_start(os, path);
>   
> +	if (obex_get_size(os) != OBJECT_SIZE_DELETE &&
> +				obex_get_size(os) != OBJECT_SIZE_UNKNOWN) {
> +		manager_emit_transfer_property(user_data, "Size");
> +	}
> +
>   	g_free(path);
>   
>   	if (err < 0)
> diff --git a/obexd/src/obex.c b/obexd/src/obex.c
> index 98d6245a4..370bfac9e 100644
> --- a/obexd/src/obex.c
> +++ b/obexd/src/obex.c
> @@ -716,9 +716,6 @@ int obex_put_stream_start(struct obex_session *os, const char *filename)
>   		return err;
>   	}
>   
> -	if (os->size != OBJECT_SIZE_DELETE && os->size != OBJECT_SIZE_UNKNOWN)
> -		manager_emit_transfer_property(os->service_data, "Size");
> -
>   	os->path = g_strdup(filename);
>   
>   	return 0;
diff mbox series

Patch

diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
index 874fe2b8b..127bb9aaf 100644
--- a/obexd/plugins/ftp.c
+++ b/obexd/plugins/ftp.c
@@ -175,6 +175,11 @@  int ftp_chkput(struct obex_session *os, void *user_data)
 
 	ret = obex_put_stream_start(os, path);
 
+	if (obex_get_size(os) != OBJECT_SIZE_DELETE &&
+				obex_get_size(os) != OBJECT_SIZE_UNKNOWN) {
+		manager_emit_transfer_property(ftp->transfer, "Size");
+	}
+
 	if (ret == 0)
 		manager_emit_transfer_started(ftp->transfer);
 
diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
index 777f5f8ed..74b2f805b 100644
--- a/obexd/plugins/opp.c
+++ b/obexd/plugins/opp.c
@@ -87,6 +87,11 @@  skip_auth:
 
 	err = obex_put_stream_start(os, path);
 
+	if (obex_get_size(os) != OBJECT_SIZE_DELETE &&
+				obex_get_size(os) != OBJECT_SIZE_UNKNOWN) {
+		manager_emit_transfer_property(user_data, "Size");
+	}
+
 	g_free(path);
 
 	if (err < 0)
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 98d6245a4..370bfac9e 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -716,9 +716,6 @@  int obex_put_stream_start(struct obex_session *os, const char *filename)
 		return err;
 	}
 
-	if (os->size != OBJECT_SIZE_DELETE && os->size != OBJECT_SIZE_UNKNOWN)
-		manager_emit_transfer_property(os->service_data, "Size");
-
 	os->path = g_strdup(filename);
 
 	return 0;