Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-10-05 05:07:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usrsock_server: combine response and events when socket setup case

Browse source 
Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
This commit is contained in:
zhanghongyu 2022-10-08 10:54:12 +08:00 • committed by Masayuki Ishikawa
parent 8a2f29c9b5
commit 6e8ea78d70
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
View file

@ -234,6 +234,7 @@ static int usrsock_rpmsg_socket_handler(struct rpmsg_endpoint *ept,
{
struct usrsock_request_socket_s *req = data;
struct usrsock_rpmsg_s *priv = priv_;
uint16_t events = 0;
int i;
int retr;
int ret = -ENFILE;
@ -250,6 +251,10 @@ static int usrsock_rpmsg_socket_handler(struct rpmsg_endpoint *ept,
{
priv->epts[i] = ept;
ret = i; /* Return index as the usockid */
if (req->type != SOCK_STREAM && req->type != SOCK_SEQPACKET)
{
events = USRSOCK_EVENT_SENDTO_READY;
}
}
break;
@ -258,7 +263,7 @@ static int usrsock_rpmsg_socket_handler(struct rpmsg_endpoint *ept,
pthread_mutex_unlock(&priv->mutex);
}
retr = usrsock_rpmsg_send_ack(ept, 0, req->head.xid, ret);
retr = usrsock_rpmsg_send_ack(ept, events, req->head.xid, ret);
if (retr >= 0 && ret >= 0 &&
req->type != SOCK_STREAM && req->type != SOCK_SEQPACKET)
{
@ -267,7 +272,6 @@ static int usrsock_rpmsg_socket_handler(struct rpmsg_endpoint *ept,
priv->pfds[ret].events = POLLIN;
usrsock_rpmsg_notify_poll(priv);
pthread_mutex_unlock(&priv->mutex);
retr = usrsock_rpmsg_send_event(ept, ret, USRSOCK_EVENT_SENDTO_READY);
}
return retr;