Skip to content

Commit 37ff1b2

Browse files
aescolarjhedberg
authored andcommitted
tracing: ctf: Fix arguments socket tracing functions
Zephyr's socklen_t was changed in c546c1c to be uint32_t instea of size_t. Let's fix accordingly the prototypes which expect it. Signed-off-by: Alberto Escolar Piedras <[email protected]>
1 parent 65e099b commit 37ff1b2

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

subsys/tracing/ctf/ctf_top.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ void sys_trace_socket_accept_enter(int sock)
443443
}
444444

445445
void sys_trace_socket_accept_exit(int sock, const struct sockaddr *addr,
446-
const size_t *addrlen, int ret)
446+
const uint32_t *addrlen, int ret)
447447
{
448448
ctf_net_bounded_string_t addr_str = { "unknown" };
449449
uint32_t addr_len = 0U;
@@ -463,7 +463,7 @@ void sys_trace_socket_accept_exit(int sock, const struct sockaddr *addr,
463463
}
464464

465465
void sys_trace_socket_sendto_enter(int sock, int len, int flags,
466-
const struct sockaddr *dest_addr, size_t addrlen)
466+
const struct sockaddr *dest_addr, uint32_t addrlen)
467467
{
468468
ctf_net_bounded_string_t addr_str = { "unknown" };
469469

@@ -504,15 +504,15 @@ void sys_trace_socket_sendmsg_exit(int sock, int ret)
504504
}
505505

506506
void sys_trace_socket_recvfrom_enter(int sock, int max_len, int flags,
507-
struct sockaddr *addr, size_t *addrlen)
507+
struct sockaddr *addr, uint32_t *addrlen)
508508
{
509509
ctf_top_socket_recvfrom_enter(sock, max_len, flags,
510510
(uint32_t)(uintptr_t)addr,
511511
(uint32_t)(uintptr_t)addrlen);
512512
}
513513

514514
void sys_trace_socket_recvfrom_exit(int sock, const struct sockaddr *src_addr,
515-
const size_t *addrlen, int ret)
515+
const uint32_t *addrlen, int ret)
516516
{
517517
ctf_net_bounded_string_t addr_str = { "unknown" };
518518
int len = 0;
@@ -631,7 +631,7 @@ void sys_trace_socket_getpeername_enter(int sock)
631631
}
632632

633633
void sys_trace_socket_getpeername_exit(int sock, struct sockaddr *addr,
634-
const size_t *addrlen, int ret)
634+
const uint32_t *addrlen, int ret)
635635
{
636636
ctf_net_bounded_string_t addr_str;
637637

@@ -647,7 +647,7 @@ void sys_trace_socket_getsockname_enter(int sock)
647647
}
648648

649649
void sys_trace_socket_getsockname_exit(int sock, const struct sockaddr *addr,
650-
const size_t *addrlen, int ret)
650+
const uint32_t *addrlen, int ret)
651651
{
652652
ctf_net_bounded_string_t addr_str;
653653

subsys/tracing/ctf/tracing_ctf.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -558,17 +558,17 @@ void sys_trace_socket_connect_exit(int sock, int ret);
558558
void sys_trace_socket_listen_enter(int sock, int backlog);
559559
void sys_trace_socket_listen_exit(int sock, int ret);
560560
void sys_trace_socket_accept_enter(int sock);
561-
void sys_trace_socket_accept_exit(int sock, const struct sockaddr *addr, const size_t *addrlen,
561+
void sys_trace_socket_accept_exit(int sock, const struct sockaddr *addr, const uint32_t *addrlen,
562562
int ret);
563563
void sys_trace_socket_sendto_enter(int sock, int len, int flags, const struct sockaddr *dest_addr,
564-
size_t addrlen);
564+
uint32_t addrlen);
565565
void sys_trace_socket_sendto_exit(int sock, int ret);
566566
void sys_trace_socket_sendmsg_enter(int sock, const struct msghdr *msg, int flags);
567567
void sys_trace_socket_sendmsg_exit(int sock, int ret);
568568
void sys_trace_socket_recvfrom_enter(int sock, int max_len, int flags, struct sockaddr *addr,
569-
size_t *addrlen);
569+
uint32_t *addrlen);
570570
void sys_trace_socket_recvfrom_exit(int sock, const struct sockaddr *src_addr,
571-
const size_t *addrlen, int ret);
571+
const uint32_t *addrlen, int ret);
572572
void sys_trace_socket_recvmsg_enter(int sock, const struct msghdr *msg, int flags);
573573
void sys_trace_socket_recvmsg_exit(int sock, const struct msghdr *msg, int ret);
574574
void sys_trace_socket_fcntl_enter(int sock, int cmd, int flags);
@@ -584,11 +584,11 @@ void sys_trace_socket_setsockopt_enter(int sock, int level, int optname, const v
584584
size_t optlen);
585585
void sys_trace_socket_setsockopt_exit(int sock, int ret);
586586
void sys_trace_socket_getpeername_enter(int sock);
587-
void sys_trace_socket_getpeername_exit(int sock, struct sockaddr *addr, const size_t *addrlen,
587+
void sys_trace_socket_getpeername_exit(int sock, struct sockaddr *addr, const uint32_t *addrlen,
588588
int ret);
589589
void sys_trace_socket_getsockname_enter(int sock);
590-
void sys_trace_socket_getsockname_exit(int sock, const struct sockaddr *addr, const size_t *addrlen,
591-
int ret);
590+
void sys_trace_socket_getsockname_exit(int sock, const struct sockaddr *addr,
591+
const uint32_t *addrlen, int ret);
592592
void sys_trace_socket_socketpair_enter(int family, int type, int proto, int *sv);
593593
void sys_trace_socket_socketpair_exit(int sock_A, int sock_B, int ret);
594594

0 commit comments

Comments
 (0)