Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 06:42:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

netlink: Implement netlink_connect and netlink_getpeername

Browse Source 
and refine netlink_bind and netlink_send implmentation

Change-Id: I2b3e7980eac01dc42927cfaa0a64874df52d6bf5
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2020-04-08 02:31:57 +08:00
committed by patacongo
parent 5708015674
commit 16dbe373c0
2 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/netlink/netlink.h
+2
View File
@@ -71,6 +71,8 @@ struct netlink_conn_s
uint32_t pid; /* Port ID (if bound) */ uint32_t pid; /* Port ID (if bound) */
uint32_t groups; /* Multicast groups mask (if bound) */ uint32_t groups; /* Multicast groups mask (if bound) */
uint32_t dst_pid; /* Destination port ID */
uint32_t dst_groups; /* Destination multicast groups mask */
uint8_t crefs; /* Reference counts on this instance */ uint8_t crefs; /* Reference counts on this instance */
uint8_t protocol; /* See NETLINK_* definitions */ uint8_t protocol; /* See NETLINK_* definitions */
net/netlink/netlink_sockif.c
+58 -49
View File
@@ -281,11 +281,11 @@ static int netlink_bind(FAR struct socket *psock,
/* Save the address information in the connection structure */ /* Save the address information in the connection structure */
nladdr = (FAR struct sockaddr_nl *)addr; nladdr = (FAR struct sockaddr_nl *)addr;
conn = (FAR struct netlink_conn_s *)psock->s_conn; conn = (FAR struct netlink_conn_s *)psock->s_conn;
conn->pid = nladdr->nl_pid; conn->pid = nladdr->nl_pid ? nladdr->nl_pid : getpid();
conn->groups = nladdr->nl_groups; conn->groups = nladdr->nl_groups;
return OK; return OK;
} }
@@ -317,25 +317,21 @@ static int netlink_getsockname(FAR struct socket *psock,
FAR socklen_t *addrlen) FAR socklen_t *addrlen)
{ {
FAR struct sockaddr_nl *nladdr; FAR struct sockaddr_nl *nladdr;
FAR struct netlink_conn_s *conn;
DEBUGASSERT(psock != NULL && psock->s_conn != NULL && addr != NULL && DEBUGASSERT(psock != NULL && psock->s_conn != NULL && addr != NULL &&
addrlen != NULL && *addrlen >= sizeof(struct sockaddr_nl)); addrlen != NULL && *addrlen >= sizeof(struct sockaddr_nl));
conn = (FAR struct netlink_conn_s *)psock->s_conn;
/* Return the address information in the address structure */ /* Return the address information in the address structure */
nladdr = (FAR struct sockaddr_nl *)addr; nladdr = (FAR struct sockaddr_nl *)addr;
memset(nladdr, 0, sizeof(struct sockaddr_nl)); memset(nladdr, 0, sizeof(struct sockaddr_nl));
nladdr->nl_family = AF_NETLINK; nladdr->nl_family = AF_NETLINK;
nladdr->nl_pid = conn->pid;
if (_SS_ISBOUND(psock->s_flags)) nladdr->nl_groups = conn->groups;
{
FAR struct netlink_conn_s *conn;
conn = (FAR struct netlink_conn_s *)psock->s_conn;
nladdr->nl_pid = conn->pid;
nladdr->nl_groups = conn->groups;
}
*addrlen = sizeof(struct sockaddr_nl); *addrlen = sizeof(struct sockaddr_nl);
return OK; return OK;
@@ -373,8 +369,25 @@ static int netlink_getpeername(FAR struct socket *psock,
FAR struct sockaddr *addr, FAR struct sockaddr *addr,
FAR socklen_t *addrlen) FAR socklen_t *addrlen)
{ {
#warning Missing logic for NETLINK getsockname FAR struct sockaddr_nl *nladdr;
return -EOPNOTSUPP; /* Or maybe return -EAFNOSUPPORT; */ FAR struct netlink_conn_s *conn;
DEBUGASSERT(psock != NULL && psock->s_conn != NULL && addr != NULL &&
addrlen != NULL && *addrlen >= sizeof(struct sockaddr_nl));
conn = (FAR struct netlink_conn_s *)psock->s_conn;
/* Return the address information in the address structure */
nladdr = (FAR struct sockaddr_nl *)addr;
memset(nladdr, 0, sizeof(struct sockaddr_nl));
nladdr->nl_family = AF_NETLINK;
nladdr->nl_pid = conn->dst_pid;
nladdr->nl_groups = conn->dst_groups;
*addrlen = sizeof(struct sockaddr_nl);
return OK;
} }
/**************************************************************************** /****************************************************************************
@@ -405,7 +418,6 @@ static int netlink_getpeername(FAR struct socket *psock,
static int netlink_listen(FAR struct socket *psock, int backlog) static int netlink_listen(FAR struct socket *psock, int backlog)
{ {
#warning Missing logic for NETLINK listen
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@@ -431,8 +443,21 @@ static int netlink_connect(FAR struct socket *psock,
FAR const struct sockaddr *addr, FAR const struct sockaddr *addr,
socklen_t addrlen) socklen_t addrlen)
{ {
#warning Missing logic for NETLINK connect FAR struct sockaddr_nl *nladdr;
return -EOPNOTSUPP; FAR struct netlink_conn_s *conn;
DEBUGASSERT(psock != NULL && psock->s_conn != NULL && addr != NULL &&
addrlen >= sizeof(struct sockaddr_nl));
/* Save the address information in the connection structure */
nladdr = (FAR struct sockaddr_nl *)addr;
conn = (FAR struct netlink_conn_s *)psock->s_conn;
conn->dst_pid = nladdr->nl_pid;
conn->dst_groups = nladdr->nl_groups;
return OK;
} }
/**************************************************************************** /****************************************************************************
@@ -482,7 +507,6 @@ static int netlink_connect(FAR struct socket *psock,
static int netlink_accept(FAR struct socket *psock, FAR struct sockaddr *addr, static int netlink_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
FAR socklen_t *addrlen, FAR struct socket *newsock) FAR socklen_t *addrlen, FAR struct socket *newsock)
{ {
#warning Missing logic for NETLINK accept
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@@ -665,38 +689,27 @@ static int netlink_poll(FAR struct socket *psock, FAR struct pollfd *fds,
static ssize_t netlink_send(FAR struct socket *psock, FAR const void *buf, static ssize_t netlink_send(FAR struct socket *psock, FAR const void *buf,
size_t len, int flags) size_t len, int flags)
{ {
FAR struct netlink_conn_s *conn;
struct sockaddr_nl nladdr;
DEBUGASSERT(psock != NULL && psock->s_conn != NULL && buf != NULL); DEBUGASSERT(psock != NULL && psock->s_conn != NULL && buf != NULL);
/* The socket must be connected in order to use send */ /* Get the underlying connection structure */
if (_SS_ISBOUND(psock->s_flags)) conn = (FAR struct netlink_conn_s *)psock->s_conn;
{
FAR struct netlink_conn_s *conn;
struct sockaddr_nl nladdr;
/* Get the underlying connection structure */ /* Format the address */
conn = (FAR struct netlink_conn_s *)psock->s_conn; nladdr.nl_family = AF_NETLINK;
nladdr.nl_pad = 0;
nladdr.nl_pid = conn->dst_pid;
nladdr.nl_groups = conn->dst_groups;
/* Format the address */ /* Then let sendto() perform the actual send operation */
nladdr.nl_family = AF_NETLINK; return netlink_sendto(psock, buf, len, flags,
nladdr.nl_pad = 0; (FAR const struct sockaddr *)&nladdr,
nladdr.nl_pid = conn->pid; sizeof(struct sockaddr_nl));
nladdr.nl_groups = conn->groups;
/* Then let sendto() perform the actual send operation */
return netlink_sendto(psock, buf, len, flags,
(FAR const struct sockaddr *)&nladdr,
sizeof(struct sockaddr_nl));
}
/* EDESTADDRREQ. Signifies that the socket is not connection-mode and no
* peer address is set.
*/
return -EDESTADDRREQ;
} }
/**************************************************************************** /****************************************************************************
@@ -851,10 +864,6 @@ static int netlink_close(FAR struct socket *psock)
if (conn->crefs <= 1) if (conn->crefs <= 1)
{ {
/* Yes... inform user-space daemon of socket close. */
#warning Missing logic in NETLINK close()
/* Free the connection structure */ /* Free the connection structure */
conn->crefs = 0; conn->crefs = 0;