From patchwork Thu Jul 25 10:52:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amisha Jain X-Patchwork-Id: 13741794 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C8937CF16 for ; Thu, 25 Jul 2024 10:52:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721904780; cv=none; b=dAgKM+w6+e3YE+EELcQG5b8j8+V4NZavHIBQkJ3pjswFEyMePxC7iQHJX4hZkE1hV2/TImPGOXwdkz1TM4lLvmI5o/j21rqkbeaIU9bYedCxHHWZ8SncYLZ39Pnn2wrNLwqNTdjWtZfX2mebo5yLVpwMpIlZGDqBAj+RuVv85G4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721904780; c=relaxed/simple; bh=JOKcwPJDfV+fJA0bpHnRw2qGQAco4WqAWj78op/mF5A=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=APrNGiRCj4TYXD/fmGOuHQ+un57KQaQhEx4neF11YIX0Ijpbm9ZWOj7AzCJBeWSaLZ4JWb/N56GJmOTSlRrvQm4iJsU1o4rBFWEGboMFRZA2mpdiFoJInDYkDmRXoXKSxfrrdj0OLFw57XRfpzsunatdR0QnJgbTjO3sPFEPgKQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=MW2GeOuh; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="MW2GeOuh" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46P8JN6H020524; Thu, 25 Jul 2024 10:52:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-type:date:from:message-id:mime-version:subject:to; s= qcppdkim1; bh=ZDccSqUflnQbL+vQiIzf0i0vn7ujLOsR+zXGgLP51sg=; b=MW 2GeOuhWS/TrEzih2ZBYfm6TsYuVBwTAQNdSIrEEULn8DoIlVlIpYAHM1He5cuAgx G9lTlWccSjaRV75qdbsfbM13BkhjKLyHejdrxC6NaxmVwLPo1MZs9lGWSDW/kiQl uTEQC6n6P457d5PvkDMqJuT/A6n+6houjSsYg6IcZ7+HLmzaO93ujU6G4ZyWVOTg ss7CknFRN8XWbY0L6DED884ZsVqYS7B7WyU/EyoLIirBpTP2pKW74EzuzqN128MD The5tza3R4NqJ6rTEzSeZ/nE/HUn8aCPowzoMtH3bIlcnTDqW0m2AnGwnVR2SV+5 K42FWqKFyx8AGxZY7DKg== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 40g2xen1ts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 Jul 2024 10:52:47 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA03.qualcomm.com (8.17.1.19/8.17.1.19) with ESMTPS id 46PAqkAj030556 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 Jul 2024 10:52:46 GMT Received: from hu-amisjain-hyd.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Thu, 25 Jul 2024 03:52:43 -0700 From: Amisha Jain To: , , CC: , , Subject: [PATCH v6] obex: Move size emit signal to plugins instead of obex.c Date: Thu, 25 Jul 2024 16:22:26 +0530 Message-ID: <20240725105226.3121-1-quic_amisjain@quicinc.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: g47Az2Ss8t6Ywjjn5pRDDS2_viI4xLUY X-Proofpoint-ORIG-GUID: g47Az2Ss8t6Ywjjn5pRDDS2_viI4xLUY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-25_11,2024-07-25_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 lowpriorityscore=0 bulkscore=0 mlxlogscore=999 mlxscore=0 adultscore=0 phishscore=0 priorityscore=1501 malwarescore=0 suspectscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2407110000 definitions=main-2407250073 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..1e4899a23 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 (ret==0 && 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..36bd19664 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 (err==0 && 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;