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

net: Add FIOC_FILEPATH ioctl support for ICMP(v6)/RPMsg/Usrsock sockets

Browse Source 
Example of /proc/PID/group/fd in this case:

FD  OFLAGS  TYPE POS       PATH
3   3       9    0         icmp:[dev eth0, id 1, flg 1]
4   3       9    0         icmp6:[dev eth0, id 2, flg 1]
5   3       9    0         rpmsg:[ap:[test:0]<->remote] # server side
5   3       9    0         rpmsg:[remote<->ap:[test:0]] # client side

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng 2023-08-02 16:58:46 +08:00 committed by Xiang Xiao
parent 8e8d86a7bb
commit d3bca3c2cf
7 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/icmp/icmp_ioctl.c
View File

@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <stdio.h>
#include <stdbool.h>
#include <debug.h>
#include <errno.h>
@ -77,6 +78,12 @@ int icmp_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
case FIONSPACE:
*(FAR int *)((uintptr_t)arg) = MIN_UDP_MSS;
break;
case FIOC_FILEPATH:
snprintf((FAR char *)(uintptr_t)arg, PATH_MAX,
"icmp:[dev %s, id %" PRIu16 ", flg %" PRIx8 "]",
conn->dev ? conn->dev->d_ifname : "NULL",
NTOHS(conn->id), conn->sconn.s_flags);
break;
default:
ret = -ENOTTY;
break;

7
net/icmpv6/icmpv6_ioctl.c
View File

@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <stdio.h>
#include <stdbool.h>
#include <debug.h>
#include <errno.h>
@ -77,6 +78,12 @@ int icmpv6_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
case FIONSPACE:
*(FAR int *)((uintptr_t)arg) = MIN_UDP_MSS;
break;
case FIOC_FILEPATH:
snprintf((FAR char *)(uintptr_t)arg, PATH_MAX,
"icmp6:[dev %s, id %" PRIu16 ", flg %" PRIx8 "]",
conn->dev ? conn->dev->d_ifname : "NULL",
NTOHS(conn->id), conn->sconn.s_flags);
break;
default:
ret = -ENOTTY;
break;

1
net/local/local_sockif.c
View File

@ -885,7 +885,6 @@ static int local_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
case FIOC_FILEPATH:
snprintf((FAR char *)(uintptr_t)arg, PATH_MAX, "local:[%s]",
conn->lc_path);
ret = OK;
break;
case BIOC_FLUSH:
ret = -EINVAL;

3
net/netdev/netdev_ioctl.c
View File

@ -1591,6 +1591,9 @@ ssize_t net_ioctl_arglen(int cmd)
case FIONREAD:
return sizeof(int);
case FIOC_FILEPATH:
return PATH_MAX;
case SIOCGIFCONF:
return sizeof(struct ifconf);

23
net/rpmsg/rpmsg_sockif.c
View File

@ -1346,6 +1346,25 @@ static int rpmsg_socket_close(FAR struct socket *psock)
return 0;
}
static void rpmsg_socket_path(FAR struct rpmsg_socket_conn_s *conn,
FAR char *buf, size_t len)
{
if (conn->backlog) /* Server */
{
snprintf(buf, len,
"rpmsg:[%s:[%s%s]<->%s]",
CONFIG_RPTUN_LOCAL_CPUNAME, conn->rpaddr.rp_name,
conn->nameid, conn->rpaddr.rp_cpu);
}
else /* Client */
{
snprintf(buf, len,
"rpmsg:[%s<->%s:[%s%s]]",
CONFIG_RPTUN_LOCAL_CPUNAME, conn->rpaddr.rp_cpu,
conn->rpaddr.rp_name, conn->nameid);
}
}
static int rpmsg_socket_ioctl(FAR struct socket *psock,
int cmd, unsigned long arg)
{
@ -1362,6 +1381,10 @@ static int rpmsg_socket_ioctl(FAR struct socket *psock,
*(FAR int *)((uintptr_t)arg) = rpmsg_socket_get_space(conn);
break;
case FIOC_FILEPATH:
rpmsg_socket_path(conn, (FAR char *)(uintptr_t)arg, PATH_MAX);
break;
default:
ret = -ENOTTY;
break;

1
net/tcp/tcp_ioctl.c
View File

@ -154,7 +154,6 @@ int tcp_ioctl(FAR struct tcp_conn_s *conn, int cmd, unsigned long arg)
break;
case FIOC_FILEPATH:
tcp_path(conn, (FAR char *)(uintptr_t)arg, PATH_MAX);
ret = OK;
break;
default:
ret = -ENOTTY;

1
net/udp/udp_ioctl.c
View File

@ -149,7 +149,6 @@ int udp_ioctl(FAR struct udp_conn_s *conn, int cmd, unsigned long arg)
break;
case FIOC_FILEPATH:
udp_path(conn, (FAR char *)(uintptr_t)arg, PATH_MAX);
ret = OK;
break;
default:
ret = -ENOTTY;