3c54d82d81
When a task needs to send data, a callback is allocated and the transmission is happening in a worker task through devif_send. Synchronization between the two tasks (sender & worker) is achieved by a semaphore. If devif_send fails, this semaphore was never posted, leaving the sending task blocked indefinitely. This commit fixes this by checking the return code of netif_send, and posting this semaphore in case of failure. Polling then stops, and execution is resumed on the sending task.
116 lines
3.1 KiB
C
116 lines
3.1 KiB
C
/****************************************************************************
|
|
* net/devif/devif_iobsend.c
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership. The
|
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance with the
|
|
* License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
#include <debug.h>
|
|
#include <errno.h>
|
|
|
|
#include <nuttx/mm/iob.h>
|
|
#include <nuttx/net/netdev.h>
|
|
|
|
#ifdef CONFIG_MM_IOB
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: devif_iob_send
|
|
*
|
|
* Description:
|
|
* Called from socket logic in response to a xmit or poll request from the
|
|
* the network interface driver.
|
|
*
|
|
* This is identical to calling devif_send() except that the data is
|
|
* in an I/O buffer chain, rather than a flat buffer.
|
|
*
|
|
* Assumptions:
|
|
* Called with the network locked.
|
|
*
|
|
****************************************************************************/
|
|
|
|
int devif_iob_send(FAR struct net_driver_s *dev, FAR struct iob_s *iob,
|
|
unsigned int len, unsigned int offset,
|
|
unsigned int target_offset)
|
|
{
|
|
int ret;
|
|
|
|
if (dev == NULL)
|
|
{
|
|
ret = -ENODEV;
|
|
goto errout;
|
|
}
|
|
|
|
if (len == 0)
|
|
{
|
|
ret = -EINVAL;
|
|
goto errout;
|
|
}
|
|
|
|
#ifndef CONFIG_NET_IPFRAG
|
|
if (len > NETDEV_PKTSIZE(dev) - NET_LL_HDRLEN(dev) - target_offset)
|
|
{
|
|
ret = -EMSGSIZE;
|
|
goto errout;
|
|
}
|
|
#endif
|
|
|
|
/* Append the send buffer after device buffer */
|
|
|
|
if (len > iob_navail(false) * CONFIG_IOB_BUFSIZE)
|
|
{
|
|
ret = -ENOMEM;
|
|
goto errout;
|
|
}
|
|
|
|
/* Clone the iob to target device buffer */
|
|
|
|
ret = iob_clone_partial(iob, len, offset, dev->d_iob,
|
|
target_offset, false, false);
|
|
if (ret != OK)
|
|
{
|
|
netdev_iob_release(dev);
|
|
goto errout;
|
|
}
|
|
|
|
dev->d_sndlen = len;
|
|
|
|
#ifdef CONFIG_NET_TCP_WRBUFFER_DUMP
|
|
/* Dump the outgoing device buffer */
|
|
|
|
lib_dumpbuffer("devif_iob_send", dev->d_appdata, len);
|
|
#endif
|
|
|
|
return dev->d_sndlen;
|
|
|
|
errout:
|
|
nerr("ERROR: devif_iob_send error: %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
#endif /* CONFIG_MM_IOB */
|