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

Add some missing NETDEV_DOWN support for ICMPv6 auto configuration and router support

Browse Source
This commit is contained in:
Gregory Nutt 2015-05-27 12:49:39 -06:00
parent 7d8e8bc188
commit 2ecff2a432
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
net/icmpv6/icmpv6_autoconfig.c
View File

@ -82,12 +82,33 @@ struct icmpv6_router_s
#ifdef CONFIG_NETDEV_MULTINIC
uint8_t snd_ifname[IFNAMSIZ]; /* Interface name */
#endif
int16_t snd_result; /* Result of the send */
};
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Name: icmpv6_router_terminate
****************************************************************************/
static void icmpv6_router_terminate(FAR struct icmpv6_router_s *state,
int result)
{
/* Don't allow any further call backs. */
state->snd_sent = true;
state->snd_result = (int16_t)result;
state->snd_cb->flags = 0;
state->snd_cb->priv = NULL;
state->snd_cb->event = NULL;
/* Wake up the waiting thread */
sem_post(&state->snd_sem);
}
/****************************************************************************
* Name: icmpv6_router_interrupt
****************************************************************************/
@ -102,26 +123,22 @@ static uint16_t icmpv6_router_interrupt(FAR struct net_driver_s *dev,
if (state)
{
#ifdef CONFIG_NETDEV_MULTINIC
/* Is this the device that we need to route this request? */
/* Check if the network is still up */
if (strncmp((FAR const char *)dev->d_ifname,
(FAR const char *)state->snd_ifname, IFNAMSIZ) != 0)
if ((flags & NETDEV_DOWN) != 0)
{
/* No... pass on this one and wait for the device that we want */
nlldbg("ERROR: Interface is down\n");
icmpv6_router_terminate(state, -ENETUNREACH);
return flags;
}
#endif
/* Check if the outgoing packet is available. It may have been claimed
* by a send interrupt serving a different thread -OR- if the output
* buffer currently contains unprocessed incoming data. In these cases
* we will just have to wait for the next polling cycle.
*/
if (dev->d_sndlen > 0 || (flags & ICMPv6_NEWDATA) != 0)
else if (dev->d_sndlen > 0 || (flags & ICMPv6_NEWDATA) != 0)
{
/* Another thread has beat us sending data or the buffer is busy,
* Check for a timeout. If not timed out, wait for the next
@ -157,14 +174,7 @@ static uint16_t icmpv6_router_interrupt(FAR struct net_driver_s *dev,
/* Don't allow any further call backs. */
state->snd_sent = true;
state->snd_cb->flags = 0;
state->snd_cb->priv = NULL;
state->snd_cb->event = NULL;
/* Wake up the waiting thread */
sem_post(&state->snd_sem);
icmpv6_router_terminate(state, OK);
}
return flags;
@ -212,7 +222,7 @@ static int icmpv6_send_message(FAR struct net_driver_s *dev, bool advertise)
* want anything to happen until we are ready.
*/
state.snd_cb = icmpv6_callback_alloc();
state.snd_cb = icmpv6_callback_alloc(dev);
if (!state.snd_cb)
{
ndbg("ERROR: Failed to allocate a cllback\n");
@ -223,8 +233,9 @@ static int icmpv6_send_message(FAR struct net_driver_s *dev, bool advertise)
/* Arm the callback */
state.snd_sent = false;
state.snd_result = -EBUSY;
state.snd_advertise = advertise;
state.snd_cb->flags = ICMPv6_POLL;
state.snd_cb->flags = (ICMPv6_POLL | NETDEV_DOWN);
state.snd_cb->priv = (FAR void *)&state;
state.snd_cb->event = icmpv6_router_interrupt;
@ -244,8 +255,8 @@ static int icmpv6_send_message(FAR struct net_driver_s *dev, bool advertise)
}
while (!state.snd_sent);
icmpv6_callback_free(state.snd_cb);
ret = OK;
ret = state.snd_result;
icmpv6_callback_free(dev, state.snd_cb);
errout_with_semaphore:
sem_destroy(&state.snd_sem);

2
net/icmpv6/icmpv6_ping.c
View File

@ -91,7 +91,7 @@ struct icmpv6_ping_s
int png_result; /* 0: success; <0:negated errno on fail */
net_ipv6addr_t png_addr; /* The peer to be ping'ed */
uint16_t png_id; /* Used to match requests with replies */
uint16_t png_seqno; /* IN: seqno to send; OUT: seqno recieved */
uint16_t png_seqno; /* IN: seqno to send; OUT: seqno received */
uint16_t png_datlen; /* The length of data to send in the ECHO request */
bool png_sent; /* true... the PING request has been sent */
};