Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-21 13:13:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

net: make the sendmsg param type consistent with posix specification

Browse Source 
To ensure consistency, in all places where the "sendmsg" function is used
either directly or indirectly, the type of the "struct msghdr *msg" parameter
needs to be modified to "const struct msghdr *msg".

Signed-off-by: guoshichao <guoshichao@xiaomi.com>
This commit is contained in:
guoshichao
2025-01-14 15:12:30 +08:00
committed by GUIDINGLI
parent 9de3b79e2c
commit 57637e5927
23 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/net/net.h
+2 -2
View File
@@ -162,7 +162,7 @@ struct sock_intf_s
CODE int (*si_poll)(FAR struct socket *psock,
FAR struct pollfd *fds, bool setup);
CODE ssize_t (*si_sendmsg)(FAR struct socket *psock,
FAR struct msghdr *msg, int flags);
FAR const struct msghdr *msg, int flags);
CODE ssize_t (*si_recvmsg)(FAR struct socket *psock,
FAR struct msghdr *msg, int flags);
CODE int (*si_close)(FAR struct socket *psock);
@@ -880,7 +880,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
*
****************************************************************************/
ssize_t psock_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
ssize_t psock_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
int flags);
/****************************************************************************
include/sys/socket.h
+2 -2
View File
@@ -412,7 +412,7 @@ static inline FAR struct cmsghdr *__cmsg_nxthdr(FAR void *__ctl,
return __ptr;
}
static inline FAR struct cmsghdr *cmsg_nxthdr(FAR struct msghdr *__msg,
static inline FAR struct cmsghdr *cmsg_nxthdr(FAR const struct msghdr *__msg,
FAR struct cmsghdr *__cmsg)
{
return __cmsg_nxthdr(__msg->msg_control, __msg->msg_controllen, __cmsg);
@@ -462,7 +462,7 @@ int getpeername(int sockfd, FAR struct sockaddr *addr,
FAR socklen_t *addrlen);
ssize_t recvmsg(int sockfd, FAR struct msghdr *msg, int flags);
ssize_t sendmsg(int sockfd, FAR struct msghdr *msg, int flags);
ssize_t sendmsg(int sockfd, FAR const struct msghdr *msg, int flags);
#if CONFIG_FORTIFY_SOURCE > 0
fortify_function(send) ssize_t send(int sockfd, FAR const void *buf,
net/bluetooth/bluetooth.h
+2 -2
View File
@@ -387,8 +387,8 @@ void bluetooth_poll(FAR struct net_driver_s *dev,
*
****************************************************************************/
ssize_t bluetooth_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
int flags);
ssize_t bluetooth_sendmsg(FAR struct socket *psock,
FAR const struct msghdr *msg, int flags);
/****************************************************************************
* Name: bluetooth_container_initialize
net/bluetooth/bluetooth_sendmsg.c
+2 -2
View File
@@ -549,8 +549,8 @@ static ssize_t bluetooth_send(FAR struct socket *psock, FAR const void *buf,
*
****************************************************************************/
ssize_t bluetooth_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
int flags)
ssize_t bluetooth_sendmsg(FAR struct socket *psock,
FAR const struct msghdr *msg, int flags)
{
FAR const void *buf = msg->msg_iov->iov_base;
size_t len = msg->msg_iov->iov_len;
net/can/can.h
+1 -1
View File
@@ -354,7 +354,7 @@ int psock_can_cansend(FAR struct socket *psock);
*
****************************************************************************/
ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
ssize_t can_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
int flags);
/****************************************************************************
net/can/can_sendmsg.c
+1 -1
View File
@@ -166,7 +166,7 @@ end_wait:
*
****************************************************************************/
ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
ssize_t can_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
int flags)
{
FAR struct net_driver_s *dev;
net/icmp/icmp.h
+1 -1
View File
@@ -315,7 +315,7 @@ void icmp_poll(FAR struct net_driver_s *dev, FAR struct icmp_conn_s *conn);
****************************************************************************/
#ifdef CONFIG_NET_ICMP_SOCKET
ssize_t icmp_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
ssize_t icmp_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
int flags);
#endif
net/icmp/icmp_sendmsg.c
+1 -1
View File
@@ -265,7 +265,7 @@ end_wait:
*
****************************************************************************/
ssize_t icmp_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
ssize_t icmp_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
int flags)
{
FAR const void *buf = msg->msg_iov->iov_base;
net/icmpv6/icmpv6.h
+2 -2
View File
@@ -663,8 +663,8 @@ int icmpv6_foreach(icmpv6_callback_t callback, FAR void *arg);
****************************************************************************/
#ifdef CONFIG_NET_ICMPv6_SOCKET
ssize_t icmpv6_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
int flags);
ssize_t icmpv6_sendmsg(FAR struct socket *psock,
FAR const struct msghdr *msg, int flags);
#endif
/****************************************************************************
net/icmpv6/icmpv6_sendmsg.c
+2 -2
View File
@@ -262,8 +262,8 @@ end_wait:
*
****************************************************************************/
ssize_t icmpv6_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
int flags)
ssize_t icmpv6_sendmsg(FAR struct socket *psock,
FAR const struct msghdr *msg, int flags)
{
FAR const void *buf = msg->msg_iov->iov_base;
size_t len = msg->msg_iov->iov_len;
net/ieee802154/ieee802154.h
+2 -2
View File
@@ -401,8 +401,8 @@ void ieee802154_poll(FAR struct net_driver_s *dev,
*
****************************************************************************/
ssize_t ieee802154_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
int flags);
ssize_t ieee802154_sendmsg(FAR struct socket *psock,
FAR const struct msghdr *msg, int flags);
/****************************************************************************
* Name: ieee802154_container_initialize
net/ieee802154/ieee802154_sendmsg.c
+2 -2
View File
@@ -627,8 +627,8 @@ static ssize_t ieee802154_send(FAR struct socket *psock, FAR const void *buf,
*
****************************************************************************/
ssize_t ieee802154_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
int flags)
ssize_t ieee802154_sendmsg(FAR struct socket *psock,
FAR const struct msghdr *msg, int flags)
{
FAR const void *buf = msg->msg_iov->iov_base;
size_t len = msg->msg_iov->iov_len;
net/inet/inet_sockif.c
+2 -2
View File
@@ -95,7 +95,7 @@ static ssize_t inet_sendto(FAR struct socket *psock, FAR const void *buf,
FAR const struct sockaddr *to,
socklen_t tolen);
static ssize_t inet_sendmsg(FAR struct socket *psock,
FAR struct msghdr *msg, int flags);
FAR const struct msghdr *msg, int flags);
static ssize_t inet_recvmsg(FAR struct socket *psock,
FAR struct msghdr *msg, int flags);
static int inet_ioctl(FAR struct socket *psock,
@@ -1867,7 +1867,7 @@ static ssize_t inet_sendto(FAR struct socket *psock, FAR const void *buf,
****************************************************************************/
static ssize_t inet_sendmsg(FAR struct socket *psock,
FAR struct msghdr *msg, int flags)
FAR const struct msghdr *msg, int flags)
{
FAR void *buf = msg->msg_iov->iov_base;
size_t len = msg->msg_iov->iov_len;
net/local/local.h
+1 -1
View File
@@ -473,7 +473,7 @@ int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
*
****************************************************************************/
ssize_t local_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
ssize_t local_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
int flags);
/****************************************************************************
net/local/local_sendmsg.c
+2 -2
View File
@@ -71,7 +71,7 @@ static void local_freectl(FAR struct local_conn_s *conn, int count)
}
static int local_sendctl(FAR struct local_conn_s *conn,
FAR struct msghdr *msg)
FAR const struct msghdr *msg)
{
FAR struct local_conn_s *peer;
FAR struct file *filep;
@@ -410,7 +410,7 @@ errout_with_lock:
*
****************************************************************************/
ssize_t local_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
ssize_t local_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
int flags)
{
FAR const struct sockaddr *to = msg->msg_name;
net/netlink/netlink_sockif.c
+2 -2
View File
@@ -67,7 +67,7 @@ static int netlink_connect(FAR struct socket *psock,
static int netlink_poll(FAR struct socket *psock, FAR struct pollfd *fds,
bool setup);
static ssize_t netlink_sendmsg(FAR struct socket *psock,
FAR struct msghdr *msg, int flags);
FAR const struct msghdr *msg, int flags);
static ssize_t netlink_recvmsg(FAR struct socket *psock,
FAR struct msghdr *msg, int flags);
static int netlink_close(FAR struct socket *psock);
@@ -575,7 +575,7 @@ static int netlink_poll(FAR struct socket *psock, FAR struct pollfd *fds,
****************************************************************************/
static ssize_t netlink_sendmsg(FAR struct socket *psock,
FAR struct msghdr *msg, int flags)
FAR const struct msghdr *msg, int flags)
{
FAR const void *buf = msg->msg_iov->iov_base;
FAR const struct sockaddr *to = msg->msg_name;
net/pkt/pkt.h
+1 -1
View File
@@ -397,7 +397,7 @@ int pkt_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds);
*
****************************************************************************/
ssize_t pkt_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
ssize_t pkt_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
int flags);
#ifdef CONFIG_NET_PKTPROTO_OPTIONS
net/pkt/pkt_sendmsg_unbuffered.c
+1 -1
View File
@@ -180,7 +180,7 @@ end_wait:
*
****************************************************************************/
ssize_t pkt_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
ssize_t pkt_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
int flags)
{
FAR const void *buf = msg->msg_iov->iov_base;
net/rpmsg/rpmsg_sockif.c
+3 -2
View File
@@ -171,7 +171,8 @@ static int rpmsg_socket_accept(FAR struct socket *psock,
static int rpmsg_socket_poll(FAR struct socket *psock,
FAR struct pollfd *fds, bool setup);
static ssize_t rpmsg_socket_sendmsg(FAR struct socket *psock,
FAR struct msghdr *msg, int flags);
FAR const struct msghdr *msg,
int flags);
static ssize_t rpmsg_socket_recvmsg(FAR struct socket *psock,
FAR struct msghdr *msg, int flags);
static int rpmsg_socket_close(FAR struct socket *psock);
@@ -1182,7 +1183,7 @@ static ssize_t rpmsg_socket_send_single(FAR struct socket *psock,
}
static ssize_t rpmsg_socket_sendmsg(FAR struct socket *psock,
FAR struct msghdr *msg, int flags)
FAR const struct msghdr *msg, int flags)
{
FAR struct rpmsg_socket_conn_s *conn = psock->s_conn;
FAR const struct iovec *buf = msg->msg_iov;
net/socket/sendmsg.c
+2 -2
View File
@@ -69,7 +69,7 @@
*
****************************************************************************/
ssize_t psock_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
ssize_t psock_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
int flags)
{
/* Verify that non-NULL pointers were passed */
@@ -140,7 +140,7 @@ ssize_t psock_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
*
****************************************************************************/
ssize_t sendmsg(int sockfd, FAR struct msghdr *msg, int flags)
ssize_t sendmsg(int sockfd, FAR const struct msghdr *msg, int flags)
{
FAR struct socket *psock;
FAR struct file *filep;
net/usrsock/usrsock.h
+2 -2
View File
@@ -495,8 +495,8 @@ int usrsock_poll(FAR struct socket *psock, FAR struct pollfd *fds,
*
****************************************************************************/
ssize_t usrsock_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
int flags);
ssize_t usrsock_sendmsg(FAR struct socket *psock,
FAR const struct msghdr *msg, int flags);
/****************************************************************************
* Name: usrsock_recvmsg
net/usrsock/usrsock_sendmsg.c
+7 -6
View File
@@ -136,18 +136,19 @@ static uint32_t sendto_event(FAR struct net_driver_s *dev,
****************************************************************************/
static int do_sendto_request(FAR struct usrsock_conn_s *conn,
FAR struct msghdr *msg, int flags)
FAR const struct msghdr *msg, int flags)
{
struct usrsock_request_sendto_s req =
{
};
struct iovec bufs[2 + msg->msg_iovlen];
socklen_t msg_namelen = msg->msg_namelen;
int i;
if (msg->msg_namelen > UINT16_MAX)
if (msg_namelen > UINT16_MAX)
{
msg->msg_namelen = UINT16_MAX;
msg_namelen = UINT16_MAX;
}
/* Prepare request for daemon to read. */
@@ -155,7 +156,7 @@ static int do_sendto_request(FAR struct usrsock_conn_s *conn,
req.head.reqid = USRSOCK_REQUEST_SENDTO;
req.usockid = conn->usockid;
req.flags = flags;
req.addrlen = msg->msg_namelen;
req.addrlen = msg_namelen;
for (i = 0; i < msg->msg_iovlen; i++)
{
@@ -170,7 +171,7 @@ static int do_sendto_request(FAR struct usrsock_conn_s *conn,
bufs[0].iov_base = (FAR void *)&req;
bufs[0].iov_len = sizeof(req);
bufs[1].iov_base = msg->msg_name;
bufs[1].iov_len = msg->msg_namelen;
bufs[1].iov_len = msg_namelen;
memcpy(&bufs[2], msg->msg_iov, sizeof(struct iovec) * msg->msg_iovlen);
@@ -202,7 +203,7 @@ static int do_sendto_request(FAR struct usrsock_conn_s *conn,
****************************************************************************/
ssize_t usrsock_sendmsg(FAR struct socket *psock,
FAR struct msghdr *msg, int flags)
FAR const struct msghdr *msg, int flags)
{
FAR struct usrsock_conn_s *conn = psock->s_conn;
struct usrsock_reqstate_s state =
syscall/syscall.csv
+1 -1
View File
@@ -155,7 +155,7 @@
"select","sys/select.h","","int","int","FAR fd_set *","FAR fd_set *","FAR fd_set *","FAR struct timeval *"
"send","sys/socket.h","defined(CONFIG_NET)","ssize_t","int","FAR const void *","size_t","int"
"sendfile","sys/sendfile.h","","ssize_t","int","int","FAR off_t *","size_t"
"sendmsg","sys/socket.h","defined(CONFIG_NET)","ssize_t","int","FAR struct msghdr *","int"
"sendmsg","sys/socket.h","defined(CONFIG_NET)","ssize_t","int","FAR const struct msghdr *","int"
"sendto","sys/socket.h","defined(CONFIG_NET)","ssize_t","int","FAR const void *","size_t","int","FAR const struct sockaddr *","socklen_t"
"setegid","unistd.h","defined(CONFIG_SCHED_USER_IDENTITY)","int","gid_t"
"setenv","stdlib.h","!defined(CONFIG_DISABLE_ENVIRON)","int","FAR const char *","FAR const char *","int"
1 _assert assert.h void FAR const char * int FAR const char * FAR void *
155 select sys/select.h int int FAR fd_set * FAR fd_set * FAR fd_set *
156 send sys/socket.h defined(CONFIG_NET) ssize_t int FAR const void * size_t int
157 sendfile sys/sendfile.h ssize_t int int FAR off_t * size_t
158 sendmsg sys/socket.h defined(CONFIG_NET) ssize_t int FAR struct msghdr * FAR const struct msghdr * int
159 sendto sys/socket.h defined(CONFIG_NET) ssize_t int FAR const void * size_t int
160 setegid unistd.h defined(CONFIG_SCHED_USER_IDENTITY) int gid_t
161 setenv stdlib.h !defined(CONFIG_DISABLE_ENVIRON) int FAR const char * FAR const char * int