Merge branch 'bugfix/ipv6_fragment_for_4.2' into 'release/v4.2'
lw-ip:fix bug for ipv6 fragment(backport 4.2) See merge request espressif/esp-idf!9583
This commit is contained in:
commit
53e8857849
|
@ -123,18 +123,31 @@ menu "LWIP"
|
||||||
Enabling this option allows checking for the destination address
|
Enabling this option allows checking for the destination address
|
||||||
of a received IPv4 Packet.
|
of a received IPv4 Packet.
|
||||||
|
|
||||||
config LWIP_IP_FRAG
|
config LWIP_IP4_FRAG
|
||||||
bool "Enable fragment outgoing IP packets"
|
bool "Enable fragment outgoing IP4 packets"
|
||||||
default y
|
default y
|
||||||
help
|
help
|
||||||
Enabling this option allows fragmenting outgoing IP packets if their size
|
Enabling this option allows fragmenting outgoing IP4 packets if their size
|
||||||
exceeds MTU.
|
exceeds MTU.
|
||||||
|
|
||||||
config LWIP_IP_REASSEMBLY
|
config LWIP_IP6_FRAG
|
||||||
bool "Enable reassembly incoming fragmented IP packets"
|
bool "Enable fragment outgoing IP6 packets"
|
||||||
|
default y
|
||||||
|
help
|
||||||
|
Enabling this option allows fragmenting outgoing IP6 packets if their size
|
||||||
|
exceeds MTU.
|
||||||
|
|
||||||
|
config LWIP_IP4_REASSEMBLY
|
||||||
|
bool "Enable reassembly incoming fragmented IP4 packets"
|
||||||
default n
|
default n
|
||||||
help
|
help
|
||||||
Enabling this option allows reassemblying incoming fragmented IP packets.
|
Enabling this option allows reassemblying incoming fragmented IP4 packets.
|
||||||
|
|
||||||
|
config LWIP_IP6_REASSEMBLY
|
||||||
|
bool "Enable reassembly incoming fragmented IP6 packets"
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
Enabling this option allows reassemblying incoming fragmented IP6 packets.
|
||||||
|
|
||||||
config LWIP_IP_FORWARD
|
config LWIP_IP_FORWARD
|
||||||
bool "Enable IP forwarding"
|
bool "Enable IP forwarding"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 64b640ecae5a6ce510814944d75e9ff408d3fc8d
|
Subproject commit 5b2072ebb82e606ed1d0ae1345742716d6499e7e
|
|
@ -157,18 +157,32 @@
|
||||||
--------------------------------
|
--------------------------------
|
||||||
*/
|
*/
|
||||||
/**
|
/**
|
||||||
* IP_REASSEMBLY==1: Reassemble incoming fragmented IP packets. Note that
|
* IP_REASSEMBLY==1: Reassemble incoming fragmented IP4 packets. Note that
|
||||||
* this option does not affect outgoing packet sizes, which can be controlled
|
* this option does not affect outgoing packet sizes, which can be controlled
|
||||||
* via IP_FRAG.
|
* via IP_FRAG.
|
||||||
*/
|
*/
|
||||||
#define IP_REASSEMBLY CONFIG_LWIP_IP_REASSEMBLY
|
#define IP_REASSEMBLY CONFIG_LWIP_IP4_REASSEMBLY
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* IP_FRAG==1: Fragment outgoing IP packets if their size exceeds MTU. Note
|
* LWIP_IPV6_REASS==1: reassemble incoming IP6 packets that fragmented. Note that
|
||||||
|
* this option does not affect outgoing packet sizes, which can be controlled
|
||||||
|
* via LWIP_IPV6_FRAG.
|
||||||
|
*/
|
||||||
|
#define LWIP_IPV6_REASS CONFIG_LWIP_IP6_REASSEMBLY
|
||||||
|
|
||||||
|
/**
|
||||||
|
* IP_FRAG==1: Fragment outgoing IP4 packets if their size exceeds MTU. Note
|
||||||
* that this option does not affect incoming packet sizes, which can be
|
* that this option does not affect incoming packet sizes, which can be
|
||||||
* controlled via IP_REASSEMBLY.
|
* controlled via IP_REASSEMBLY.
|
||||||
*/
|
*/
|
||||||
#define IP_FRAG CONFIG_LWIP_IP_FRAG
|
#define IP_FRAG CONFIG_LWIP_IP4_FRAG
|
||||||
|
|
||||||
|
/**
|
||||||
|
* LWIP_IPV6_FRAG==1: Fragment outgoing IP6 packets if their size exceeds MTU. Note
|
||||||
|
* that this option does not affect incoming packet sizes, which can be
|
||||||
|
* controlled via IP_REASSEMBLY.
|
||||||
|
*/
|
||||||
|
#define LWIP_IPV6_FRAG CONFIG_LWIP_IP6_FRAG
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* IP_REASS_MAXAGE: Maximum time (in multiples of IP_TMR_INTERVAL - so seconds, normally)
|
* IP_REASS_MAXAGE: Maximum time (in multiples of IP_TMR_INTERVAL - so seconds, normally)
|
||||||
|
|
Loading…
Reference in a new issue