diff --git a/dnsproxy/Makefile b/dnsproxy/Makefile index 52851e7a..a9ad94bc 100644 --- a/dnsproxy/Makefile +++ b/dnsproxy/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsproxy -PKG_VERSION:=0.81.3 -PKG_RELEASE:=6 +PKG_VERSION:=0.81.4 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? diff --git a/ipv6-neigh/Makefile b/ipv6-neigh/Makefile index 4ffda96e..9143d4d6 100644 --- a/ipv6-neigh/Makefile +++ b/ipv6-neigh/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipv6-neigh PKG_VERSION:=0.1.0 -PKG_RELEASE:=12 +PKG_RELEASE:=13 PKG_BUILD_DEPENDS:=rust/host PKG_BUILD_PARALLEL:=1 diff --git a/ipv6-neigh/src/main.rs b/ipv6-neigh/src/main.rs index a67ab4d7..0c71eec8 100644 --- a/ipv6-neigh/src/main.rs +++ b/ipv6-neigh/src/main.rs @@ -585,13 +585,21 @@ fn parse_neighbour_message(neigh: NeighbourMessage, private_subnet_v4: bool) -> } let kind = neigh.header.kind; let ifindex = neigh.header.ifindex; - let mac = neigh.attributes.iter().find_map(|attr| match attr { + let mac_bytes = neigh.attributes.iter().find_map(|attr| match attr { NeighbourAttribute::LinkLayerAddress(mac) => Some(mac.to_owned()), _ => None, - })?; - let mac_str = format_mac(mac); - // Filter out empty or all-zero MACs (router own addresses, incomplete entries) - if mac_str.is_empty() || mac_str == "00:00:00:00:00:00" { + }); + // FAILED events may arrive without a hardware address (e.g. when ARP/NDP never + // succeeded, or the kernel cleared the lladdr on failure). Allow them through + // with an empty MAC so the FAILED handler can fall back to IP-based lookup. + let mac_str = match mac_bytes { + Some(m) => format_mac(m), + None if matches!(state, NeighbourState::Failed) => String::new(), + None => return None, + }; + // Filter out empty or all-zero MACs for non-FAILED states + // (router own addresses, incomplete entries). + if !matches!(state, NeighbourState::Failed) && (mac_str.is_empty() || mac_str == "00:00:00:00:00:00") { return None; } Some(Neigh { diff --git a/mlvpn/Makefile b/mlvpn/Makefile index 60088e11..9a99c6af 100644 --- a/mlvpn/Makefile +++ b/mlvpn/Makefile @@ -9,22 +9,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mlvpn PKG_VERSION:=2.6.5.20211028 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/zehome/MLVPN.git -PKG_SOURCE_VERSION:= +PKG_SOURCE_VERSION:=b934d4953d480cbbd43128d01150b829fa8839df PKG_SOURCE_DATE:=2021-10-28 #PKG_SOURCE_URL:=https://github.com/markfoodyburton/MLVPN.git -#PKG_SOURCE_VERSION:= +#PKG_SOURCE_VERSION:=b934d4953d480cbbd43128d01150b829fa8839df #PKG_SOURCE_DATE:=2018-09-03 #PKG_SOURCE_URL:=https://github.com/flohoff/MLVPN.git -#PKG_SOURCE_VERSION:= +#PKG_SOURCE_VERSION:=b934d4953d480cbbd43128d01150b829fa8839df #PKG_SOURCE_DATE:=2019-05-31 #PKG_SOURCE_URL:=https://github.com/link4all/MLVPN.git -#PKG_SOURCE_VERSION:= +#PKG_SOURCE_VERSION:=b934d4953d480cbbd43128d01150b829fa8839df #PKG_SOURCE_DATE:=2019-07-13