From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E0F02A0C45; Mon, 22 Nov 2021 08:31:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5F0BA4014E; Mon, 22 Nov 2021 08:31:25 +0100 (CET) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by mails.dpdk.org (Postfix) with ESMTP id E8D584003C; Mon, 22 Nov 2021 08:31:24 +0100 (CET) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id BC226203D17; Mon, 22 Nov 2021 08:31:24 +0100 (CET) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 8441B200256; Mon, 22 Nov 2021 08:31:24 +0100 (CET) Received: from lsv03379.swis.in-blr01.nxp.com (lsv03379.swis.in-blr01.nxp.com [92.120.147.188]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 8A372183AC4E; Mon, 22 Nov 2021 15:31:23 +0800 (+08) From: vanshika.shukla@nxp.com To: dev@dpdk.org, thomas@monjalon.net Cc: nipun.gupta@nxp.com, david.marchand@redhat.com, stable@dpdk.org, Vanshika Shukla Subject: [PATCH v2] examples/ptpclient: fix delay request message Date: Mon, 22 Nov 2021 13:01:22 +0530 Message-Id: <20211122073122.10052-1-vanshika.shukla@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211117061853.20979-1-vanshika.shukla@nxp.com> References: <20211117061853.20979-1-vanshika.shukla@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Vanshika Shukla The size of delay request message sent out by the DPDK ptpclient application was observed to have extra length than expected. Due to this, bad messages were observed on the master side and delay response was not received. This patch fixes this bug. Fixes: ab129e9065a5 ("examples/ptpclient: add minimal PTP client") Cc: stable@dpdk.org Signed-off-by: Vanshika Shukla --- Changes in v2: - Added a check on available size in allocated buffer - Created the right type of pointer when sending DELAY_REQ packet examples/ptpclient/ptpclient.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index 354c7b2c90..de799f698b 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -386,6 +386,7 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) struct ptp_header *ptp_hdr; struct clock_id *client_clkid; struct ptp_message *ptp_msg; + struct delay_req_msg *req_msg; struct rte_mbuf *created_pkt; struct tstamp *origin_tstamp; struct rte_ether_addr eth_multicast = ether_multicast; @@ -423,7 +424,12 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) created_pkt = rte_pktmbuf_alloc(mbuf_pool); pkt_size = sizeof(struct rte_ether_hdr) + - sizeof(struct ptp_message); + sizeof(struct delay_req_msg); + + if (rte_pktmbuf_append(created_pkt, pkt_size) == NULL) { + rte_pktmbuf_free(created_pkt); + return; + } created_pkt->data_len = pkt_size; created_pkt->pkt_len = pkt_size; eth_hdr = rte_pktmbuf_mtod(created_pkt, struct rte_ether_hdr *); @@ -433,22 +439,22 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) rte_ether_addr_copy(ð_multicast, ð_hdr->dst_addr); eth_hdr->ether_type = htons(PTP_PROTOCOL); - ptp_msg = (struct ptp_message *) - (rte_pktmbuf_mtod(created_pkt, char *) + - sizeof(struct rte_ether_hdr)); - - ptp_msg->delay_req.hdr.seq_id = htons(ptp_data->seqID_SYNC); - ptp_msg->delay_req.hdr.msg_type = DELAY_REQ; - ptp_msg->delay_req.hdr.ver = 2; - ptp_msg->delay_req.hdr.control = 1; - ptp_msg->delay_req.hdr.log_message_interval = 127; - ptp_msg->delay_req.hdr.message_length = + req_msg = rte_pktmbuf_mtod_offset(created_pkt, + struct delay_req_msg *, sizeof(struct + rte_ether_hdr)); + + req_msg->hdr.seq_id = htons(ptp_data->seqID_SYNC); + req_msg->hdr.msg_type = DELAY_REQ; + req_msg->hdr.ver = 2; + req_msg->hdr.control = 1; + req_msg->hdr.log_message_interval = 127; + req_msg->hdr.message_length = htons(sizeof(struct delay_req_msg)); - ptp_msg->delay_req.hdr.domain_number = ptp_hdr->domain_number; + req_msg->hdr.domain_number = ptp_hdr->domain_number; /* Set up clock id. */ client_clkid = - &ptp_msg->delay_req.hdr.source_port_id.clock_id; + &req_msg->hdr.source_port_id.clock_id; client_clkid->id[0] = eth_hdr->src_addr.addr_bytes[0]; client_clkid->id[1] = eth_hdr->src_addr.addr_bytes[1]; -- 2.17.1