From 2cbf83b6f769331879dd2d5c7d0401dd1f362ee1 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Sat, 10 Nov 2018 09:17:54 +0100 Subject: [PATCH] lwip: bump to version v2.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From lwIP CHANGELOG (STABLE-2.1.2): ++ Bugfixes: 2018-11-21: Jens Nielsen * netbiosns.c: fix expecting too large packet (bug #55069) 2018-11-19: Dirk Ziegelmeier * smtp.c: fix compiling with strict C compatibility because of strnlen (bug #55034) 2018-11-12: Simon Goldschmidt * tcp.c: fix overflow check in tcp_recved triggering invalid assertion (bug #55015) 2018-11-12: Simon Goldschmidt * tcp.c: fix a bug in sending RST segments (sent from port 0) (STABLE-2.1.1): ++ Bugfixes: 2018-11-01: Joan Lledó * sockets.c: fix bad assertion in lwip_poll_dec_sockets_used() (bug #54933) 2018-11-01: Dirk Ziegelmeier * ip4.c: don't send 127.* to default netif (bug #54670) 2018-10-23: David Girault * altcp_tls_mbedtls.c: fix use-after free (bug #54774) 2018-10-23: Ognjen Bjelica, Dirk Ziegelmeier * snmp_scalar.c: Avoid NULL pointer dereference (bug #54886) 2018-10-23: Simon Goldschmidt * Fix missing standard includes in multiple files 2018-10-17: Ivan Warren * def.h: fix casting htonX and ntohX to u16_t (bug #54850) 2018-10-12: Simon Goldschmidt * Revert "tcp_abandon: no need to buffer pcb->local_port" (fix that source port was 0 for RST called when aborting a connection) 2018-10-11: Jonas Rabenstein * tcp.c: tcp_recved: check for overflow and warn about too big values (patch #9699) 2018-10-06: Joan Lledó * sockets.c: alloc_socket(): Check for LWIP_SOCKET_POLL when setting select- related variables (patch #9696) 2018-10-04: Spencer * tcp.c: Update prev pointer when skipping entries in tcp_slowtmr (patch #9694) 2018-09-27: Martine Lenders * lowpan6.c: Fix IEEE 802.15.4 address setting (bug #54749) --- pkg/lwip/Makefile | 4 +- ....c-Fix-IEEE-802.15.4-address-setting.patch | 38 ------------------- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 pkg/lwip/patches/0001-lowpan6.c-Fix-IEEE-802.15.4-address-setting.patch diff --git a/pkg/lwip/Makefile b/pkg/lwip/Makefile index 379093a031..8a84d402f1 100644 --- a/pkg/lwip/Makefile +++ b/pkg/lwip/Makefile @@ -1,7 +1,7 @@ PKG_NAME=lwip PKG_URL=git://git.savannah.nongnu.org/lwip.git -# lwIP v2.1.0 -PKG_VERSION=e6a8415df332ee34d7af02255b2aa1e8ee74348f +# lwIP v2.1.2 +PKG_VERSION=159e31b689577dbf69cf0683bbaffbd71fa5ee10 PKG_LICENSE=BSD-3-Clause LWIP_MODULES = lwip_api lwip_core lwip_ipv4 lwip_ipv6 \ diff --git a/pkg/lwip/patches/0001-lowpan6.c-Fix-IEEE-802.15.4-address-setting.patch b/pkg/lwip/patches/0001-lowpan6.c-Fix-IEEE-802.15.4-address-setting.patch deleted file mode 100644 index 793da70f4e..0000000000 --- a/pkg/lwip/patches/0001-lowpan6.c-Fix-IEEE-802.15.4-address-setting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ae1128a138dbf7b14886853bd149757b03859cdb Mon Sep 17 00:00:00 2001 -From: Martine Lenders -Date: Thu, 27 Sep 2018 21:21:18 +0200 -Subject: [PATCH] lowpan6.c: Fix IEEE 802.15.4 address setting - -Reverts a regression introduced in -3a8af612b3b818a89de5846cc9b046756af184cc: - -Use hardware address fetched from neighbor cache *not* the hardware -address of the interface as destination address. ---- - src/netif/lowpan6.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/netif/lowpan6.c b/src/netif/lowpan6.c -index 5769522..7f0d276 100644 ---- a/src/netif/lowpan6.c -+++ b/src/netif/lowpan6.c -@@ -630,11 +630,11 @@ lowpan6_output(struct netif *netif, struct pbuf *q, const ip6_addr_t *ip6addr) - } - - /* Send out the packet using the returned hardware address. */ -- result = lowpan6_hwaddr_to_addr(netif, &dest); -- if (result != ERR_OK) { -- MIB2_STATS_NETIF_INC(netif, ifoutdiscards); -- return result; -- } -+ dest.addr_len = netif->hwaddr_len; -+ /* XXX: Inferring the length of the source address from the destination address -+ * is not correct for IEEE 802.15.4, but currently we don't get this information -+ * from the neighbor cache */ -+ SMEMCPY(dest.addr, hwaddr, netif->hwaddr_len); - MIB2_STATS_NETIF_INC(netif, ifoutucastpkts); - return lowpan6_frag(netif, q, &src, &dest); - } --- -2.7.4 -