mirror
/
openwrt-routing
mirror of https://git.openwrt.org/feed/routing.git
1
0
Fork 0
Code Releases Activity

olsrd: update to 2022-03-18 

fcb30aa4da73 unix: fix meshing with wireguard/point-to-point interfaces

Remove upstreamed patch:
- 101-unix-fix-meshing-with-wireguard-point-to-point-interfaces.patch

Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Nick Hainke 2022-03-18 13:41:55 +01:00
parent 1cd72bff83
commit 319fac32b1
2 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
olsrd/Makefile
View File

@ -6,13 +6,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=olsrd
PKG_SOURCE_DATE:=2021-11-06
PKG_SOURCE_DATE:=2022-03-18
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git
PKG_SOURCE_VERSION:=665051a845464c0f95edb81432104dac39426f79
PKG_MIRROR_HASH:=6040b08b73690a7f5d53d153c29f386b87a041a5712af72bea816588bc0e2483
PKG_SOURCE_VERSION:=1e771b4d31e36f9ffd0a04c3f8f83abb803ec309
PKG_MIRROR_HASH:=2b238b179bc873902a0d094c0d3e43e0a373710763bdca4b6fec5eed431d4a8d
PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
PKG_BUILD_PARALLEL:=0

38
olsrd/patches/101-unix-fix-meshing-with-wireguard-point-to-point-interfaces.patch
View File

@ -1,38 +0,0 @@
From fcb30aa4da732d279527feba01cacc7dc996d137 Mon Sep 17 00:00:00 2001
From: Nick Hainke <vincent@systemli.org>
Date: Sun, 16 Jan 2022 00:08:56 +0100
Subject: [PATCH] unix: fix meshing with wireguard/point-to-point interfaces
Wireguard interfaces have no BROADCAST flag. We can also mesh on
point-to-point links. That is why we mesh now also on interfaces with
the IFF_POINTOPOINT flag enabled.
Signed-off-by: Nick Hainke <vincent@systemli.org>
---
src/unix/ifnet.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/src/unix/ifnet.c
+++ b/src/unix/ifnet.c
@@ -184,8 +184,8 @@ chk_if_changed(struct olsr_if *iface)
/* Check broadcast */
if ((olsr_cnf->ip_version == AF_INET) && !iface->cnf->ipv4_multicast.v4.s_addr && /* Skip if fixed bcast */
- (!(ifp->int_flags & IFF_BROADCAST))) {
- OLSR_PRINTF(3, "\tNo broadcast - removing\n");
+ ((!(ifp->int_flags & IFF_BROADCAST) && !(ifp->int_flags & IFF_POINTOPOINT)))) {
+ OLSR_PRINTF(3, "\tNo broadcast or point-to-point - removing\n");
goto remove_interface;
}
@@ -552,8 +552,8 @@ chk_if_up(struct olsr_if *iface, int deb
/* Check broadcast */
if ((olsr_cnf->ip_version == AF_INET) && !iface->cnf->ipv4_multicast.v4.s_addr && /* Skip if fixed bcast */
- (!(ifs.int_flags & IFF_BROADCAST))) {
- OLSR_PRINTF(debuglvl, "\tNo broadcast - skipping\n");
+ (!(ifs.int_flags & IFF_BROADCAST) && !(ifs.int_flags & IFF_POINTOPOINT))) {
+ OLSR_PRINTF(debuglvl, "\tNo broadcast or point-to-point - skipping\n");
return 0;
}