d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples/ptpclient: fix delay request message

Browse Source 
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: ab129e9065 ("examples/ptpclient: add minimal PTP client")
Cc: stable@dpdk.org

Signed-off-by: Vanshika Shukla <vanshika.shukla@nxp.com>
Acked-by: Nipun Gupta <nipun.gupta@nxp.com>
This commit is contained in:
Vanshika Shukla 2021-11-22 13:01:22 +05:30 committed by David Marchand
parent 926629e3f3
commit 21ba4d572a
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
examples/ptpclient/ptpclient.c
View File

@ -386,6 +386,7 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data)
struct ptp_header *ptp_hdr; struct ptp_header *ptp_hdr;
struct clock_id *client_clkid; struct clock_id *client_clkid;
struct ptp_message *ptp_msg; struct ptp_message *ptp_msg;
struct delay_req_msg *req_msg;
struct rte_mbuf *created_pkt; struct rte_mbuf *created_pkt;
struct tstamp *origin_tstamp; struct tstamp *origin_tstamp;
struct rte_ether_addr eth_multicast = ether_multicast; 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); created_pkt = rte_pktmbuf_alloc(mbuf_pool);
pkt_size = sizeof(struct rte_ether_hdr) + 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->data_len = pkt_size;
created_pkt->pkt_len = pkt_size; created_pkt->pkt_len = pkt_size;
eth_hdr = rte_pktmbuf_mtod(created_pkt, struct rte_ether_hdr *); 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(&eth_multicast, &eth_hdr->dst_addr); rte_ether_addr_copy(&eth_multicast, &eth_hdr->dst_addr);
eth_hdr->ether_type = htons(PTP_PROTOCOL); eth_hdr->ether_type = htons(PTP_PROTOCOL);
ptp_msg = (struct ptp_message *) req_msg = rte_pktmbuf_mtod_offset(created_pkt,
(rte_pktmbuf_mtod(created_pkt, char *) + struct delay_req_msg *, sizeof(struct
sizeof(struct rte_ether_hdr)); rte_ether_hdr));
ptp_msg->delay_req.hdr.seq_id = htons(ptp_data->seqID_SYNC); req_msg->hdr.seq_id = htons(ptp_data->seqID_SYNC);
ptp_msg->delay_req.hdr.msg_type = DELAY_REQ; req_msg->hdr.msg_type = DELAY_REQ;
ptp_msg->delay_req.hdr.ver = 2; req_msg->hdr.ver = 2;
ptp_msg->delay_req.hdr.control = 1; req_msg->hdr.control = 1;
ptp_msg->delay_req.hdr.log_message_interval = 127; req_msg->hdr.log_message_interval = 127;
ptp_msg->delay_req.hdr.message_length = req_msg->hdr.message_length =
htons(sizeof(struct delay_req_msg)); 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. */ /* Set up clock id. */
client_clkid = 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[0] = eth_hdr->src_addr.addr_bytes[0];
client_clkid->id[1] = eth_hdr->src_addr.addr_bytes[1]; client_clkid->id[1] = eth_hdr->src_addr.addr_bytes[1];