Skip to content

Commit 86f3671

Browse files
pkarashchenkoxiaoxiang781216
authored andcommitted
netutils/ptpd: add missing FAR
Signed-off-by: Petro Karashchenko <[email protected]>
1 parent 66b79a7 commit 86f3671

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

netutils/ptpd/ptpd.c

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ static int ptp_initialize_state(FAR struct ptp_state_s *state,
450450
return ERROR;
451451
}
452452

453-
state->interface_addr = *(struct sockaddr_in *)&req.ifr_ifru.ifru_addr;
453+
state->interface_addr = *(FAR struct sockaddr_in *)&req.ifr_ifru.ifru_addr;
454454

455455
/* Get hardware address to initialize the identity field in header.
456456
* Clock identity is EUI-64, which we make from EUI-48.
@@ -494,8 +494,7 @@ static int ptp_initialize_state(FAR struct ptp_state_s *state,
494494
clock_gettime(CLOCK_MONOTONIC, &state->last_received_multicast);
495495

496496
ret = ipmsfilter(&state->interface_addr.sin_addr,
497-
&bind_addr.sin_addr,
498-
MCAST_INCLUDE);
497+
&bind_addr.sin_addr, MCAST_INCLUDE);
499498
if (ret < 0)
500499
{
501500
ptperr("Failed to bind multicast address: %d\n", errno);
@@ -505,7 +504,7 @@ static int ptp_initialize_state(FAR struct ptp_state_s *state,
505504
/* Bind socket for events */
506505

507506
bind_addr.sin_port = HTONS(PTP_UDP_PORT_EVENT);
508-
ret = bind(state->event_socket, (struct sockaddr *)&bind_addr,
507+
ret = bind(state->event_socket, (FAR struct sockaddr *)&bind_addr,
509508
sizeof(bind_addr));
510509
if (ret < 0)
511510
{
@@ -529,7 +528,7 @@ static int ptp_initialize_state(FAR struct ptp_state_s *state,
529528
/* Bind socket for announcements */
530529

531530
bind_addr.sin_port = HTONS(PTP_UDP_PORT_INFO);
532-
ret = bind(state->info_socket, (struct sockaddr *)&bind_addr,
531+
ret = bind(state->info_socket, (FAR struct sockaddr *)&bind_addr,
533532
sizeof(bind_addr));
534533
if (ret < 0)
535534
{
@@ -540,7 +539,7 @@ static int ptp_initialize_state(FAR struct ptp_state_s *state,
540539
/* Bind TX socket to interface address (local addr cannot be multicast) */
541540

542541
bind_addr.sin_addr = state->interface_addr.sin_addr;
543-
ret = bind(state->tx_socket, (struct sockaddr *)&bind_addr,
542+
ret = bind(state->tx_socket, (FAR struct sockaddr *)&bind_addr,
544543
sizeof(bind_addr));
545544
if (ret < 0)
546545
{
@@ -559,8 +558,7 @@ static int ptp_destroy_state(FAR struct ptp_state_s *state)
559558

560559
mcast_addr.s_addr = HTONL(PTP_MULTICAST_ADDR);
561560
ipmsfilter(&state->interface_addr.sin_addr,
562-
&mcast_addr,
563-
MCAST_EXCLUDE);
561+
&mcast_addr, MCAST_EXCLUDE);
564562

565563
if (state->tx_socket > 0)
566564
{
@@ -645,7 +643,7 @@ static int ptp_send_announce(FAR struct ptp_state_s *state)
645643
timespec_to_ptp_format(&ts, msg.origintimestamp);
646644

647645
ret = sendto(state->tx_socket, &msg, sizeof(msg), 0,
648-
(struct sockaddr *)&addr, sizeof(addr));
646+
(FAR struct sockaddr *)&addr, sizeof(addr));
649647

650648
if (ret < 0)
651649
{
@@ -723,7 +721,7 @@ static int ptp_send_sync(FAR struct ptp_state_s *state)
723721
addr.sin_port = HTONS(PTP_UDP_PORT_INFO);
724722

725723
ret = sendto(state->tx_socket, &msg, sizeof(msg), 0,
726-
(struct sockaddr *)&addr, sizeof(addr));
724+
(FAR struct sockaddr *)&addr, sizeof(addr));
727725
if (ret < 0)
728726
{
729727
ptperr("sendto for follow-up message failed: %d\n", errno);
@@ -1087,8 +1085,8 @@ static int ptp_process_followup(FAR struct ptp_state_s *state,
10871085
{
10881086
ptpwarn("PTP follow-up packet sequence %ld does not match initial "
10891087
"sync packet sequence %ld, ignoring\n",
1090-
(long)ptp_get_sequence(&msg->header),
1091-
(long)ptp_get_sequence(&state->twostep_packet.header));
1088+
(long)ptp_get_sequence(&msg->header),
1089+
(long)ptp_get_sequence(&state->twostep_packet.header));
10921090
return OK;
10931091
}
10941092

@@ -1461,7 +1459,7 @@ static int ptp_daemon(int argc, FAR char** argv)
14611459
/* Receive non-time-critical packet. */
14621460

14631461
ret = recv(state->info_socket, &state->rxbuf, sizeof(state->rxbuf),
1464-
MSG_DONTWAIT);
1462+
MSG_DONTWAIT);
14651463
if (ret > 0)
14661464
{
14671465
ptp_process_rx_packet(state, ret);
@@ -1509,13 +1507,14 @@ static int ptp_daemon(int argc, FAR char** argv)
15091507
int ptpd_start(FAR const char *interface)
15101508
{
15111509
int pid;
1512-
FAR char *task_argv[] = {
1510+
FAR char *task_argv[] =
1511+
{
15131512
(FAR char *)interface,
15141513
NULL
15151514
};
15161515

15171516
pid = task_create("PTPD", CONFIG_NETUTILS_PTPD_SERVERPRIO,
1518-
CONFIG_NETUTILS_PTPD_STACKSIZE, ptp_daemon, task_argv);
1517+
CONFIG_NETUTILS_PTPD_STACKSIZE, ptp_daemon, task_argv);
15191518

15201519
/* Use kill with signal 0 to check if the process is still alive
15211520
* after initialization.

0 commit comments

Comments
 (0)