90c52e6f8f
Author: Gregory Nutt <gnutt@nuttx.org> Run all .h and .c files modified in last PR through nxstyle. Author: Xiang Xiao <xiaoxiang@xiaomi.com> Net cleanup (#17) * Fix the semaphore usage issue found in tcp/udp 1. The count semaphore need disable priority inheritance 2. Loop again if net_lockedwait return -EINTR 3. Call nxsem_trywait to avoid the race condition 4. Call nxsem_post instead of sem_post * Put the work notifier into free list to avoid the heap fragment in the long run. Since the allocation strategy is encapsulated internally, we can even refine the implementation later. * Network stack shouldn't allocate memory in the poll implementation to avoid the heap fragment in the long run, other modification include: 1. Select MM_IOB automatically since ICMP[v6] socket can't work without the read ahead buffer 2. Remove the net lock since xxx_callback_free already do the same thing 3. TCP/UDP poll should work even the read ahead buffer isn't enabled at all * Add NET_ prefix for UDP_NOTIFIER and TCP_NOTIFIER option to align with other UDP/TCP option convention * Remove the unused _SF_[IDLE|ACCEPT|SEND|RECV|MASK] flags since there are code to set/clear these flags, but nobody check them.
293 lines
8.3 KiB
C
293 lines
8.3 KiB
C
/****************************************************************************
|
|
* net/icmpv6/icmpv6_netpoll.c
|
|
*
|
|
* Copyright (C) 2017-2018 Gregory Nutt. All rights reserved.
|
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* 3. Neither the name NuttX nor the names of its contributors may be
|
|
* used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
|
|
#include <stdint.h>
|
|
#include <poll.h>
|
|
#include <debug.h>
|
|
|
|
#include <nuttx/net/net.h>
|
|
|
|
#include "devif/devif.h"
|
|
#include "netdev/netdev.h"
|
|
#include "icmpv6/icmpv6.h"
|
|
|
|
/****************************************************************************
|
|
* Private Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: icmpv6_poll_eventhandler
|
|
*
|
|
* Description:
|
|
* This function is called to perform the actual UDP receive operation
|
|
* via the device interface layer.
|
|
*
|
|
* Input Parameters:
|
|
* dev The structure of the network driver that caused the event
|
|
* conn The connection structure associated with the socket
|
|
* flags Set of events describing why the callback was invoked
|
|
*
|
|
* Returned Value:
|
|
* None
|
|
*
|
|
* Assumptions:
|
|
* This function must be called with the network locked.
|
|
*
|
|
****************************************************************************/
|
|
|
|
static uint16_t icmpv6_poll_eventhandler(FAR struct net_driver_s *dev,
|
|
FAR void *pvconn,
|
|
FAR void *pvpriv, uint16_t flags)
|
|
{
|
|
FAR struct icmpv6_poll_s *info = (FAR struct icmpv6_poll_s *)pvpriv;
|
|
FAR struct icmpv6_conn_s *conn;
|
|
FAR struct socket *psock;
|
|
pollevent_t eventset;
|
|
|
|
ninfo("flags: %04x\n", flags);
|
|
|
|
DEBUGASSERT(info == NULL || info->fds != NULL);
|
|
|
|
/* 'priv' might be null in some race conditions (?). Only process the
|
|
* the event if this poll is from the same device that the request was
|
|
* sent out on.
|
|
*/
|
|
|
|
if (info != NULL)
|
|
{
|
|
/* Is this a response on the same device that we sent the request out
|
|
* on?
|
|
*/
|
|
|
|
psock = info->psock;
|
|
DEBUGASSERT(psock != NULL && psock->s_conn != NULL);
|
|
conn = psock->s_conn;
|
|
if (dev != conn->dev)
|
|
{
|
|
ninfo("Wrong device\n");
|
|
return flags;
|
|
}
|
|
|
|
/* Check for data or connection availability events. */
|
|
|
|
eventset = 0;
|
|
if ((flags & ICMPv6_NEWDATA) != 0)
|
|
{
|
|
eventset |= (POLLIN & info->fds->events);
|
|
}
|
|
|
|
/* Check for loss of connection events. */
|
|
|
|
if ((flags & NETDEV_DOWN) != 0)
|
|
{
|
|
eventset |= (POLLHUP | POLLERR);
|
|
}
|
|
|
|
/* Awaken the caller of poll() is requested event occurred. */
|
|
|
|
if (eventset)
|
|
{
|
|
info->fds->revents |= eventset;
|
|
nxsem_post(info->fds->sem);
|
|
}
|
|
}
|
|
|
|
return flags;
|
|
}
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: icmpv6_pollsetup
|
|
*
|
|
* Description:
|
|
* Setup to monitor events on one ICMP socket
|
|
*
|
|
* Input Parameters:
|
|
* psock - The IPPROTO_ICMP socket of interest
|
|
* fds - The structure describing the events to be monitored, OR NULL if
|
|
* this is a request to stop monitoring events.
|
|
*
|
|
* Returned Value:
|
|
* 0: Success; Negated errno on failure
|
|
*
|
|
****************************************************************************/
|
|
|
|
int icmpv6_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
|
|
{
|
|
FAR struct icmpv6_conn_s *conn = psock->s_conn;
|
|
FAR struct icmpv6_poll_s *info;
|
|
FAR struct devif_callback_s *cb;
|
|
int ret;
|
|
|
|
DEBUGASSERT(conn != NULL && fds != NULL);
|
|
|
|
/* Some of the following must be atomic */
|
|
|
|
net_lock();
|
|
|
|
/* Find a container to hold the poll information */
|
|
|
|
info = conn->pollinfo;
|
|
while (info->psock != NULL)
|
|
{
|
|
if (++info >= &conn->pollinfo[CONFIG_NET_ICMPv6_NPOLLWAITERS])
|
|
{
|
|
ret = -ENOMEM;
|
|
goto errout_with_lock;
|
|
}
|
|
}
|
|
|
|
/* Allocate a ICMP callback structure */
|
|
|
|
cb = icmpv6_callback_alloc(conn->dev, conn);
|
|
if (cb == NULL)
|
|
{
|
|
ret = -EBUSY;
|
|
goto errout_with_lock;
|
|
}
|
|
|
|
/* Initialize the poll info container */
|
|
|
|
info->psock = psock;
|
|
info->fds = fds;
|
|
info->cb = cb;
|
|
|
|
/* Initialize the callback structure. Save the reference to the info
|
|
* structure as callback private data so that it will be available during
|
|
* callback processing.
|
|
*/
|
|
|
|
cb->flags = NETDEV_DOWN;
|
|
cb->priv = (FAR void *)info;
|
|
cb->event = icmpv6_poll_eventhandler;
|
|
|
|
if ((fds->events & POLLIN) != 0)
|
|
{
|
|
cb->flags |= ICMPv6_NEWDATA;
|
|
}
|
|
|
|
/* Save the reference in the poll info structure as fds private as well
|
|
* for use during poll teardown as well.
|
|
*/
|
|
|
|
fds->priv = (FAR void *)info;
|
|
|
|
/* Check for read data availability now */
|
|
|
|
if (!IOB_QEMPTY(&conn->readahead))
|
|
{
|
|
/* Normal data may be read without blocking. */
|
|
|
|
fds->revents |= (POLLRDNORM & fds->events);
|
|
}
|
|
|
|
/* Always report POLLWRNORM if caller request it because we don't utilize
|
|
* IOB buffer for sending.
|
|
*/
|
|
|
|
fds->revents |= (POLLWRNORM & fds->events);
|
|
|
|
/* Check if any requested events are already in effect */
|
|
|
|
if (fds->revents != 0)
|
|
{
|
|
/* Yes.. then signal the poll logic */
|
|
|
|
nxsem_post(fds->sem);
|
|
}
|
|
|
|
errout_with_lock:
|
|
net_unlock();
|
|
return ret;
|
|
}
|
|
|
|
/****************************************************************************
|
|
* Name: icmpv6_pollteardown
|
|
*
|
|
* Description:
|
|
* Teardown monitoring of events on an ICMP socket
|
|
*
|
|
* Input Parameters:
|
|
* psock - The IPPROTO_ICMP socket of interest
|
|
* fds - The structure describing the events to be monitored, OR NULL if
|
|
* this is a request to stop monitoring events.
|
|
*
|
|
* Returned Value:
|
|
* 0: Success; Negated errno on failure
|
|
*
|
|
****************************************************************************/
|
|
|
|
int icmpv6_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
|
|
{
|
|
FAR struct icmpv6_conn_s *conn;
|
|
FAR struct icmpv6_poll_s *info;
|
|
|
|
DEBUGASSERT(psock != NULL && psock->s_conn != NULL &&
|
|
fds != NULL && fds->priv != NULL);
|
|
|
|
conn = psock->s_conn;
|
|
|
|
/* Recover the socket descriptor poll state info from the poll structure */
|
|
|
|
info = (FAR struct icmpv6_poll_s *)fds->priv;
|
|
DEBUGASSERT(info != NULL && info->fds != NULL && info->cb != NULL);
|
|
|
|
if (info != NULL)
|
|
{
|
|
/* Release the callback */
|
|
|
|
icmpv6_callback_free(conn->dev, conn, info->cb);
|
|
|
|
/* Release the poll/select data slot */
|
|
|
|
info->fds->priv = NULL;
|
|
|
|
/* Then free the poll info container */
|
|
|
|
info->psock = NULL;
|
|
}
|
|
|
|
return OK;
|
|
}
|