net/chksum: move all chksum api declarations to common header
The following APIs need to be overriden by the arch after enabling
CONFIG_NET_ARCH_CHKSUM, move these functions to the common header
file to avoid prototype conflicts
uint16_t chksum(uint16_t sum, FAR const uint8_t *data, uint16_t len);
uint16_t net_chksum(FAR uint16_t *data, uint16_t len);
uint16_t ipv4_upperlayer_chksum(FAR struct net_driver_s *dev, uint8_t proto);
uint16_t ipv6_upperlayer_chksum(FAR struct net_driver_s *dev,
uint8_t proto, unsigned int iplen);
uint16_t ipv4_chksum(FAR struct ipv4_hdr_s *ipv4);
Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an
Xiang Xiao
parent
0de9e387a7
commit
4281acdb83
@ -619,6 +619,27 @@ int netdev_ifdown(FAR struct net_driver_s *dev);
|
|||||||
int netdev_carrier_on(FAR struct net_driver_s *dev);
|
int netdev_carrier_on(FAR struct net_driver_s *dev);
|
||||||
int netdev_carrier_off(FAR struct net_driver_s *dev);
|
int netdev_carrier_off(FAR struct net_driver_s *dev);
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Name: chksum
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* Calculate the raw change sum over the memory region described by
|
||||||
|
* data and len.
|
||||||
|
*
|
||||||
|
* Input Parameters:
|
||||||
|
* sum - Partial calculations carried over from a previous call to
|
||||||
|
* chksum(). This should be zero on the first time that check
|
||||||
|
* sum is called.
|
||||||
|
* data - Beginning of the data to include in the checksum.
|
||||||
|
* len - Length of the data to include in the checksum.
|
||||||
|
*
|
||||||
|
* Returned Value:
|
||||||
|
* The updated checksum value.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
uint16_t chksum(uint16_t sum, FAR const uint8_t *data, uint16_t len);
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: net_chksum
|
* Name: net_chksum
|
||||||
*
|
*
|
||||||
@ -647,6 +668,73 @@ int netdev_carrier_off(FAR struct net_driver_s *dev);
|
|||||||
|
|
||||||
uint16_t net_chksum(FAR uint16_t *data, uint16_t len);
|
uint16_t net_chksum(FAR uint16_t *data, uint16_t len);
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Name: ipv4_upperlayer_chksum
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* Perform the checksum calculation over the IPv4, protocol headers, and
|
||||||
|
* data payload as necessary.
|
||||||
|
*
|
||||||
|
* Input Parameters:
|
||||||
|
* dev - The network driver instance. The packet data is in the d_buf
|
||||||
|
* of the device.
|
||||||
|
* proto - The protocol being supported
|
||||||
|
*
|
||||||
|
* Returned Value:
|
||||||
|
* The calculated checksum
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#ifdef CONFIG_NET_IPv4
|
||||||
|
uint16_t ipv4_upperlayer_chksum(FAR struct net_driver_s *dev, uint8_t proto);
|
||||||
|
#endif /* CONFIG_NET_IPv4 */
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Name: ipv6_upperlayer_chksum
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* Perform the checksum calculation over the IPv6, protocol headers, and
|
||||||
|
* data payload as necessary.
|
||||||
|
*
|
||||||
|
* Input Parameters:
|
||||||
|
* dev - The network driver instance. The packet data is in the d_buf
|
||||||
|
* of the device.
|
||||||
|
* proto - The protocol being supported
|
||||||
|
* iplen - The size of the IPv6 header. This may be larger than
|
||||||
|
* IPv6_HDRLEN the IPv6 header if IPv6 extension headers are
|
||||||
|
* present.
|
||||||
|
*
|
||||||
|
* Returned Value:
|
||||||
|
* The calculated checksum
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#ifdef CONFIG_NET_IPv6
|
||||||
|
uint16_t ipv6_upperlayer_chksum(FAR struct net_driver_s *dev,
|
||||||
|
uint8_t proto, unsigned int iplen);
|
||||||
|
#endif /* CONFIG_NET_IPv6 */
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Name: ipv4_chksum
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* Calculate the IPv4 header checksum of the packet header in d_buf.
|
||||||
|
*
|
||||||
|
* The IPv4 header checksum is the Internet checksum of the 20 bytes of
|
||||||
|
* the IPv4 header.
|
||||||
|
*
|
||||||
|
* If CONFIG_NET_ARCH_CHKSUM is defined, then this function must be
|
||||||
|
* provided by architecture-specific logic.
|
||||||
|
*
|
||||||
|
* Returned Value:
|
||||||
|
* The IPv4 header checksum of the IPv4 header in the d_buf buffer.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#ifdef CONFIG_NET_IPv4
|
||||||
|
uint16_t ipv4_chksum(FAR struct ipv4_hdr_s *ipv4);
|
||||||
|
#endif /* CONFIG_NET_IPv4 */
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: net_incr32
|
* Name: net_incr32
|
||||||
*
|
*
|
||||||
|
|||||||
@ -28,6 +28,7 @@
|
|||||||
#include <nuttx/config.h>
|
#include <nuttx/config.h>
|
||||||
#include <nuttx/net/net.h>
|
#include <nuttx/net/net.h>
|
||||||
#include <nuttx/net/ip.h>
|
#include <nuttx/net/ip.h>
|
||||||
|
#include <nuttx/net/netdev.h>
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Public Types
|
* Public Types
|
||||||
@ -191,53 +192,6 @@ uint8_t net_ipv6_mask2pref(FAR const uint16_t *mask);
|
|||||||
void net_ipv6_pref2mask(uint8_t preflen, net_ipv6addr_t mask);
|
void net_ipv6_pref2mask(uint8_t preflen, net_ipv6addr_t mask);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: chksum
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* Calculate the raw change some over the memory region described by
|
|
||||||
* data and len.
|
|
||||||
*
|
|
||||||
* Input Parameters:
|
|
||||||
* sum - Partial calculations carried over from a previous call to chksum.
|
|
||||||
* This should be zero on the first time that check sum is called.
|
|
||||||
* data - Beginning of the data to include in the checksum.
|
|
||||||
* len - Length of the data to include in the checksum.
|
|
||||||
*
|
|
||||||
* Returned Value:
|
|
||||||
* The updated checksum value.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
uint16_t chksum(uint16_t sum, FAR const uint8_t *data, uint16_t len);
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: net_chksum
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* Calculate the Internet checksum over a buffer.
|
|
||||||
*
|
|
||||||
* The Internet checksum is the one's complement of the one's complement
|
|
||||||
* sum of all 16-bit words in the buffer.
|
|
||||||
*
|
|
||||||
* See RFC1071.
|
|
||||||
*
|
|
||||||
* If CONFIG_NET_ARCH_CHKSUM is defined, then this function must be
|
|
||||||
* provided by architecture-specific logic.
|
|
||||||
*
|
|
||||||
* Input Parameters:
|
|
||||||
*
|
|
||||||
* buf - A pointer to the buffer over which the checksum is to be computed.
|
|
||||||
*
|
|
||||||
* len - Length of the buffer over which the checksum is to be computed.
|
|
||||||
*
|
|
||||||
* Returned Value:
|
|
||||||
* The Internet checksum of the buffer.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
uint16_t net_chksum(FAR uint16_t *data, uint16_t len);
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: net_chksum_adjust
|
* Name: net_chksum_adjust
|
||||||
*
|
*
|
||||||
@ -254,79 +208,13 @@ uint16_t net_chksum(FAR uint16_t *data, uint16_t len);
|
|||||||
*
|
*
|
||||||
* Limitations:
|
* Limitations:
|
||||||
* The algorithm is applicable only for even offsets and even lengths.
|
* The algorithm is applicable only for even offsets and even lengths.
|
||||||
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void net_chksum_adjust(FAR uint16_t *chksum,
|
void net_chksum_adjust(FAR uint16_t *chksum,
|
||||||
FAR const uint16_t *optr, ssize_t olen,
|
FAR const uint16_t *optr, ssize_t olen,
|
||||||
FAR const uint16_t *nptr, ssize_t nlen);
|
FAR const uint16_t *nptr, ssize_t nlen);
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: ipv4_chksum
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* Calculate the IPv4 header checksum of the packet header in d_buf.
|
|
||||||
*
|
|
||||||
* The IPv4 header checksum is the Internet checksum of the 20 bytes of
|
|
||||||
* the IPv4 header.
|
|
||||||
*
|
|
||||||
* If CONFIG_NET_ARCH_CHKSUM is defined, then this function must be
|
|
||||||
* provided by architecture-specific logic.
|
|
||||||
*
|
|
||||||
* Returned Value:
|
|
||||||
* The IPv4 header checksum of the IPv4 header in the d_buf buffer.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifdef CONFIG_NET_IPv4
|
|
||||||
uint16_t ipv4_chksum(FAR struct ipv4_hdr_s *ipv4);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: ipv4_upperlayer_chksum
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* Perform the checksum calcaultion over the IPv4, protocol headers, and
|
|
||||||
* data payload as necessary.
|
|
||||||
*
|
|
||||||
* Input Parameters:
|
|
||||||
* dev - The network driver instance. The packet data is in the d_buf
|
|
||||||
* of the device.
|
|
||||||
* proto - The protocol being supported
|
|
||||||
*
|
|
||||||
* Returned Value:
|
|
||||||
* The calculated checksum
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifdef CONFIG_NET_IPv4
|
|
||||||
uint16_t ipv4_upperlayer_chksum(FAR struct net_driver_s *dev, uint8_t proto);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: ipv6_upperlayer_chksum
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* Perform the checksum calculation over the IPv6, protocol headers, and
|
|
||||||
* data payload as necessary.
|
|
||||||
*
|
|
||||||
* Input Parameters:
|
|
||||||
* dev - The network driver instance. The packet data is in the d_buf
|
|
||||||
* of the device.
|
|
||||||
* proto - The protocol being supported
|
|
||||||
* iplen - The size of the IPv6 header. This may be larger than
|
|
||||||
* IPv6_HDRLEN the IPv6 header if IPv6 extension headers are
|
|
||||||
* present.
|
|
||||||
*
|
|
||||||
* Returned Value:
|
|
||||||
* The calculated checksum
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifdef CONFIG_NET_IPv6
|
|
||||||
uint16_t ipv6_upperlayer_chksum(FAR struct net_driver_s *dev,
|
|
||||||
uint8_t proto, unsigned int iplen);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: tcp_chksum, tcp_ipv4_chksum, and tcp_ipv6_chksum
|
* Name: tcp_chksum, tcp_ipv4_chksum, and tcp_ipv6_chksum
|
||||||
*
|
*
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user