abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 21:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix the build: ip_globals.current_ip6_header cannot really be const :(

Browse Source
This commit is contained in:
goldsimon 2017-07-06 11:50:02 +02:00
parent 694fc7e472
commit 2594f1a423
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/lwip/ip.h
View File

@ -116,7 +116,7 @@ struct ip_globals
#endif /* LWIP_IPV4 */ #endif /* LWIP_IPV4 */
#if LWIP_IPV6 #if LWIP_IPV6
/** Header of the input IPv6 packet currently being processed. */ /** Header of the input IPv6 packet currently being processed. */
const struct ip6_hdr *current_ip6_header; struct ip6_hdr *current_ip6_header;
#endif /* LWIP_IPV6 */ #endif /* LWIP_IPV6 */
/** Total header length of current_ip4/6_header (i.e. after this, the UDP/TCP header starts) */ /** Total header length of current_ip4/6_header (i.e. after this, the UDP/TCP header starts) */
u16_t current_ip_header_tot_len; u16_t current_ip_header_tot_len;
@ -152,7 +152,7 @@ extern struct ip_globals ip_data;
/** Get the IPv6 header of the current packet. /** Get the IPv6 header of the current packet.
* This function must only be called from a receive callback (udp_recv, * This function must only be called from a receive callback (udp_recv,
* raw_recv, tcp_accept). It will return NULL otherwise. */ * raw_recv, tcp_accept). It will return NULL otherwise. */
#define ip6_current_header() ip_data.current_ip6_header #define ip6_current_header() ((const struct ip6_hdr*)(ip_data.current_ip6_header))
/** Returns TRUE if the current IP input packet is IPv6, FALSE if it is IPv4 */ /** Returns TRUE if the current IP input packet is IPv6, FALSE if it is IPv4 */
#define ip_current_is_v6() (ip6_current_header() != NULL) #define ip_current_is_v6() (ip6_current_header() != NULL)
/** Source IPv6 address of current_header */ /** Source IPv6 address of current_header */
@ -194,13 +194,13 @@ extern struct ip_globals ip_data;
/** Get the IPv6 header of the current packet. /** Get the IPv6 header of the current packet.
* This function must only be called from a receive callback (udp_recv, * This function must only be called from a receive callback (udp_recv,
* raw_recv, tcp_accept). It will return NULL otherwise. */ * raw_recv, tcp_accept). It will return NULL otherwise. */
#define ip6_current_header() ip_data.current_ip6_header #define ip6_current_header() ((const struct ip6_hdr*)(ip_data.current_ip6_header))
/** Always returns TRUE when only supporting IPv6 only */ /** Always returns TRUE when only supporting IPv6 only */
#define ip_current_is_v6() 1 #define ip_current_is_v6() 1
/** Get the transport layer protocol */ /** Get the transport layer protocol */
#define ip_current_header_proto() IP6H_NEXTH(ip6_current_header()) #define ip_current_header_proto() IP6H_NEXTH(ip6_current_header())
/** Get the transport layer header */ /** Get the transport layer header */
#define ip_next_header_ptr() ((const void*)((const u8_t*)ip6_current_header())) #define ip_next_header_ptr() ((const void*)(((const u8_t*)ip6_current_header()) + ip_current_header_tot_len()))
/** Source IP6 address of current_header */ /** Source IP6 address of current_header */
#define ip6_current_src_addr() (&ip_data.current_iphdr_src) #define ip6_current_src_addr() (&ip_data.current_iphdr_src)
/** Destination IP6 address of current_header */ /** Destination IP6 address of current_header */

2
src/include/lwip/ip6_frag.h
View File

@ -90,7 +90,7 @@ extern "C" {
struct ip6_reassdata { struct ip6_reassdata {
struct ip6_reassdata *next; struct ip6_reassdata *next;
struct pbuf *p; struct pbuf *p;
const struct ip6_hdr *iphdr; /* pointer to the first (original) IPv6 header */ struct ip6_hdr *iphdr; /* pointer to the first (original) IPv6 header */
#if IPV6_FRAG_COPYHEADER #if IPV6_FRAG_COPYHEADER
ip6_addr_p_t src; /* copy of the source address in the IP header */ ip6_addr_p_t src; /* copy of the source address in the IP header */
ip6_addr_p_t dest; /* copy of the destination address in the IP header */ ip6_addr_p_t dest; /* copy of the destination address in the IP header */