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

TCP: tcp_input() now receives IP domain as an input parameter vs. deriving from the IP header length.

Browse Source
This commit is contained in:
Gregory Nutt 2017-05-25 08:02:08 -06:00
parent 7182a3efac
commit 01b0a56371
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/icmpv6/icmpv6.h
View File

@ -215,11 +215,6 @@ void icmpv6_poll(FAR struct net_driver_s *dev);
void icmpv6_solicit(FAR struct net_driver_s *dev,
FAR const net_ipv6addr_t ipaddr);
#undef EXTERN
#ifdef __cplusplus
}
#endif
/****************************************************************************
* Name: icmpv6_rsolicit
*
@ -480,5 +475,10 @@ void icmpv6_rnotify(FAR struct net_driver_s *dev, const net_ipv6addr_t draddr,
# define icmpv6_rnotify(d,p,l)
#endif
#undef EXTERN
#ifdef __cplusplus
}
#endif
#endif /* CONFIG_NET_ICMPv6 */
#endif /* __NET_ICMPv6_ICMPv6_H */

23
net/tcp/tcp_input.c
View File

@ -72,8 +72,8 @@
*
* Parameters:
* dev - The device driver structure containing the received TCP packet.
* tcp - A pointer to the TCP header in the packet
* iplen - Combined length of the IP and TCP headers
* domain - IP domain (PF_INET or PF_INET6)
* iplen - Lngth of the IP header (IPv4_HDRLEN or IPv6_HDRLEN).
*
* Return:
* None
@ -83,7 +83,8 @@
*
****************************************************************************/
static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen)
static void tcp_input(FAR struct net_driver_s *dev, uint8_t domain,
unsigned int iplen)
{
FAR struct tcp_hdr_s *tcp;
FAR struct tcp_conn_s *conn = NULL;
@ -96,18 +97,6 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen)
int len;
int i;
#if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)
uint8_t domain = PF_UNSPEC;
if (iplen == IPv4_HDRLEN)
{
domain = PF_INET;
}
else if (iplen == IPv6_HDRLEN)
{
domain = PF_INET6;
}
#endif
#ifdef CONFIG_NET_STATISTICS
/* Bump up the count of TCP packets received */
@ -966,7 +955,7 @@ void tcp_ipv4_input(FAR struct net_driver_s *dev)
/* Then process in the TCP IPv4 input */
tcp_input(dev, IPv4_HDRLEN);
tcp_input(dev, PF_INET, IPv4_HDRLEN);
}
#endif
@ -996,7 +985,7 @@ void tcp_ipv6_input(FAR struct net_driver_s *dev)
/* Then process in the TCP IPv6 input */
tcp_input(dev, IPv6_HDRLEN);
tcp_input(dev, PF_INET6, IPv6_HDRLEN);
}
#endif