mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-07-07 13:29:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor edits for for IPv6 compilation

Browse Source
This commit is contained in:
idelamer 2011-06-17 11:03:15 +00:00
parent 2911c84a69
commit 629fad6f5f
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/ipv6/ip6_frag.c
View File

@ -51,7 +51,7 @@
#include <string.h>
#if LWIP_IPV6_REASS /* don't build if not configured for use in lwipopts.h */
#if LWIP_IPV6 && LWIP_IPV6_REASS /* don't build if not configured for use in lwipopts.h */
/** Setting this to 0, you can turn off checking the fragments for overlapping
@ -518,9 +518,9 @@ nullreturn:
return NULL;
}
#endif /* LWIP_IPV6_REASS */
#endif /* LWIP_IPV6 ^^ LWIP_IPV6_REASS */
#if LWIP_IPV6_FRAG
#if LWIP_IPV6 && LWIP_IPV6_FRAG
/** Allocate a new struct pbuf_custom_ref */
static struct pbuf_custom_ref*
@ -686,4 +686,4 @@ ip6_frag(struct pbuf *p, struct netif *netif, ip6_addr_t *dest)
return ERR_OK;
}
#endif /* LWIP_IPV6_FRAG */
#endif /* LWIP_IPV6 && LWIP_IPV6_FRAG */

2
src/include/ipv6/lwip/dhcp6.h
View File

@ -50,7 +50,7 @@
struct dhcp6
{
TODO: implement DHCP6
//TODO: implement DHCP6
};
#endif /* LWIP_IPV6_DHCP6 */

8
src/include/ipv6/lwip/ip6_frag.h
View File

@ -51,7 +51,7 @@ extern "C" {
#endif
#if LWIP_IPV6_REASS /* don't build if not configured for use in lwipopts.h */
#if LWIP_IPV6 && LWIP_IPV6_REASS /* don't build if not configured for use in lwipopts.h */
/* The IPv6 reassembly timer interval in milliseconds. */
#define IP6_REASS_TMR_INTERVAL 1000
@ -73,9 +73,9 @@ struct ip6_reassdata {
void ip6_reass_tmr(void);
struct pbuf * ip6_reass(struct pbuf *p);
#endif /* LWIP_IPV6_REASS */
#endif /* LWIP_IPV6 && LWIP_IPV6_REASS */
#if LWIP_IPV6_FRAG /* don't build if not configured for use in lwipopts.h */
#if LWIP_IPV6 && LWIP_IPV6_FRAG /* don't build if not configured for use in lwipopts.h */
/** A custom pbuf that holds a reference to another pbuf, which is freed
* when this custom pbuf is freed. This is used to create a custom PBUF_REF
@ -92,7 +92,7 @@ struct pbuf_custom_ref {
err_t ip6_frag(struct pbuf *p, struct netif *netif, ip6_addr_t *dest);
#endif /* LWIP_IPV6_FRAG */
#endif /* LWIP_IPV6 && LWIP_IPV6_FRAG */
#ifdef __cplusplus

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

@ -377,7 +377,7 @@ struct tcp_pcb * tcp_new_ip6 (void);
#define tcp_bind_ip6(pcb, ip6addr, port) \
tcp_bind(pcb, ip6_2_ip(ip6addr), port)
#define tcp_connect_ip6(pcb, ip6addr, port, connected) \
udp_connect(pcb, ip6_2_ip(ip6addr), port, connected)
tcp_connect(pcb, ip6_2_ip(ip6addr), port, connected)
struct tcp_pcb * tcp_listen_dual_with_backlog(struct tcp_pcb *pcb, u8_t backlog);
#define tcp_listen_dual(pcb) tcp_listen_dual_with_backlog(pcb, TCP_DEFAULT_LISTEN_BACKLOG)
#else /* LWIP_IPV6 */