sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpmsg_usrsock: Support the wireless ioctl which contain pointer 2/2

Browse Source 
Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
This commit is contained in:
zhanghongyu 2022-03-26 16:53:41 +08:00 committed by Xiang Xiao
parent 3a42d849f5
commit a6c986d516
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
View File

@ -35,7 +35,9 @@
#include <nuttx/net/dns.h> #include <nuttx/net/dns.h>
#include <nuttx/net/net.h> #include <nuttx/net/net.h>
#include <nuttx/rptun/openamp.h> #include <nuttx/rptun/openamp.h>
#ifdef CONFIG_NETDEV_WIRELESS_IOCTL
# include <nuttx/wireless/wireless.h>
#endif
#include "usrsock_rpmsg.h" #include "usrsock_rpmsg.h"
struct usrsock_rpmsg_s struct usrsock_rpmsg_s
@ -712,6 +714,10 @@ static int usrsock_rpmsg_ioctl_handler(struct rpmsg_endpoint *ept,
struct usrsock_request_ioctl_s *req = data; struct usrsock_request_ioctl_s *req = data;
struct usrsock_message_datareq_ack_s *ack; struct usrsock_message_datareq_ack_s *ack;
struct usrsock_rpmsg_s *priv = priv_; struct usrsock_rpmsg_s *priv = priv_;
#ifdef CONFIG_NETDEV_WIRELESS_IOCTL
struct iwreq *wlreq;
struct iwreq *wlack;
#endif
int ret = -EBADF; int ret = -EBADF;
uint32_t len; uint32_t len;
@ -719,9 +725,30 @@ static int usrsock_rpmsg_ioctl_handler(struct rpmsg_endpoint *ept,
if (req->usockid >= 0 && if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS) req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
memcpy(ack + 1, req + 1, req->arglen); memcpy(ack + 1, req + 1, len_ - sizeof(*req));
#ifdef CONFIG_NETDEV_WIRELESS_IOCTL
wlreq = (struct iwreq *)(req + 1);
wlack = (struct iwreq *)(ack + 1);
if (WL_IS80211POINTERCMD(req->cmd))
{
wlack->u.data.pointer = wlack + 1;
}
#endif
ret = psock_ioctl(&priv->socks[req->usockid], ret = psock_ioctl(&priv->socks[req->usockid],
req->cmd, (unsigned long)(ack + 1)); req->cmd, (unsigned long)(ack + 1));
#ifdef CONFIG_NETDEV_WIRELESS_IOCTL
if (WL_IS80211POINTERCMD(req->cmd))
{
if (ret >= 0)
{
ret = wlreq->u.data.length;
}
wlack->u.data.pointer = wlreq->u.data.pointer;
}
#endif
} }
return usrsock_rpmsg_send_data_ack(ept, return usrsock_rpmsg_send_data_ack(ept,