Merge pull request #1045 from ecsv/batadv-2024.0

batman-adv: Provide teardown hook for batadv_vlan proto

alfred/Makefile

@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alfred
-PKG_VERSION:=2023.1
+PKG_VERSION:=2024.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=438048248f373757d3a8bde7cbc6db6685f4d0105d130da2f5a54f29090c6974
+PKG_HASH:=d029a43638ab16771e5f71e134bc843d1713d74041c65bcda18a31d18f5531bd
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
 PKG_LICENSE:=GPL-2.0-only MIT

batctl/Makefile

@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
-PKG_VERSION:=2023.1
-PKG_RELEASE:=2
+PKG_VERSION:=2024.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=e5bf47305d955abb199244bd0e5fffab96108b1affabd0d9705533f8059395f1
+PKG_HASH:=76853e87201af63c411db152fd0c625a729a9733115897d1331604e2c5a67c7d
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>

batctl/patches/0001-batctl-tcpdump-Fix-missing-sanity-check-for-batman-a.patch

@@ -1,26 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sat, 27 Jan 2024 13:48:59 +0100
-Subject: batctl: tcpdump: Fix missing sanity check for batman-adv header
-
-parse_eth_hdr() is assuming that every ETH_P_BATMAN ethernet packet has a
-valid, minimal batman-adv header (packet_type, version, ttl) attached. But
-it doesn't actually check if the received buffer has enough bytes to access
-the two bytes packet_type + version. So it is possible that it tries to
-read outside of the received data.
-
-Fixes: 3bdfc388e74b ("implement simple tcpdump, first only batman packets")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batctl.git/commit/7ae3bdb59a7501197e12d3a7ab0d9924341e9ca8
-
---- a/tcpdump.c
-+++ b/tcpdump.c
-@@ -1068,6 +1068,9 @@ static void parse_eth_hdr(unsigned char
- 			dump_vlan(packet_buff, buff_len, read_opt, time_printed);
- 		break;
- 	case ETH_P_BATMAN:
-+		/* check for batman-adv packet_type + version */
-+		LEN_CHECK(buff_len, sizeof(*eth_hdr) + 2, "BAT HEADER")
-+
- 		batman_ogm_packet = (struct batadv_ogm_packet *)(packet_buff + ETH_HLEN);
- 
- 		if ((read_opt & COMPAT_FILTER) &&

batctl/patches/0002-batctl-tcpdump-Add-missing-throughput-header-length-.patch

@@ -1,34 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sat, 27 Jan 2024 13:49:00 +0100
-Subject: batctl: tcpdump: Add missing throughput header length check
-
-dump_batman_icmp() is only doing a length check for the original ICMP
-packet length. But the throughput packet (which is also handled by this
-function) is accessed without doing an additional length check. So it is
-possible that it tries to read outside of the received data.
-
-Fixes: f109b3473f86 ("batctl: introduce throughput meter support")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batctl.git/commit/189b66496309bc1a54b4821292da2428de8ceb1c
-
---- a/tcpdump.c
-+++ b/tcpdump.c
-@@ -863,7 +863,6 @@ static void dump_batman_icmp(unsigned ch
- 	LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct batadv_icmp_packet), "BAT ICMP");
- 
- 	icmp_packet = (struct batadv_icmp_packet *)(packet_buff + sizeof(struct ether_header));
--	tp = (struct batadv_icmp_tp_packet *)icmp_packet;
- 
- 	if (!time_printed)
- 		print_time();
-@@ -894,6 +893,10 @@ static void dump_batman_icmp(unsigned ch
- 			(size_t)buff_len - sizeof(struct ether_header));
- 		break;
- 	case BATADV_TP:
-+		LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(*tp), "BAT TP");
-+
-+		tp = (struct batadv_icmp_tp_packet *)icmp_packet;
-+
- 		printf("%s: ICMP TP type %s (%hhu), id %hhu, seq %u, ttl %2d, v %d, length %zu\n",
- 		       name, tp->subtype == BATADV_TP_MSG ? "MSG" :
- 			     tp->subtype == BATADV_TP_ACK ? "ACK" : "N/A",

batctl/patches/0003-batctl-tcpdump-Fix-IPv4-header-length-check.patch

@@ -1,27 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sat, 27 Jan 2024 13:49:01 +0100
-Subject: batctl: tcpdump: Fix IPv4 header length check
-
-dump_ip() is directly accessing the header in the header length check and
-assumes that ihl can be trusted. But when when ihl is set to something less
-than 5 then it would not even be possible to store the basic IPv4 header in
-it. But dump_ip would have still accepted it because it didn't check if
-there are at least enough bytes available to read the basic IPv4 header. So
-it is possible that it tries to read outside of the received data.
-
-Fixes: 75d68356f3fa ("[batctl] tcpdump - add basic IPv4 support")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batctl.git/commit/ddb254bd51aa43d216159f3be9c575369b041d35
-
---- a/tcpdump.c
-+++ b/tcpdump.c
-@@ -646,7 +646,9 @@ static void dump_ip(unsigned char *packe
- 	struct icmphdr *icmphdr;
- 
- 	iphdr = (struct iphdr *)packet_buff;
-+	LEN_CHECK((size_t)buff_len, sizeof(*iphdr), ip_string);
- 	LEN_CHECK((size_t)buff_len, (size_t)(iphdr->ihl * 4), ip_string);
-+	LEN_CHECK((size_t)(iphdr->ihl * 4), sizeof(*iphdr), ip_string);
- 
- 	if (!time_printed)
- 		print_time();

batctl/patches/0004-batctl-tcpdump-Add-missing-ICMPv6-Neighbor-Advert-le.patch

@@ -1,25 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sat, 27 Jan 2024 13:49:02 +0100
-Subject: batctl: tcpdump: Add missing ICMPv6 Neighbor Advert length check
-
-dump_ipv6() is doing a length check for the original ICMPv6 header length.
-But the neighbor advertisement (which is also handled by this function) is
-accessed without doing an additional length check. So it is possible that
-it tries to read outside of the received data.
-
-Fixes: 35b37756f4a3 ("add IPv6 support to tcpdump parser")
-Cc: Marco Dalla Torre <marco.dallato@gmail.com>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batctl.git/commit/da75747d435ca8a32a74895655a1d5bff8b7709b
-
---- a/tcpdump.c
-+++ b/tcpdump.c
-@@ -611,6 +611,8 @@ static void dump_ipv6(unsigned char *pac
- 			       nd_nas_target, buff_len);
- 			break;
- 		case ND_NEIGHBOR_ADVERT:
-+			LEN_CHECK((size_t)buff_len - (size_t)(sizeof(struct ip6_hdr)),
-+				  sizeof(*nd_advert), "ICMPv6 Neighbor Advertisement");
- 			nd_advert = (struct nd_neighbor_advert *)icmphdr;
- 			inet_ntop(AF_INET6, &(nd_advert->nd_na_target),
- 				  nd_nas_target, 40);

batctl/patches/0005-batctl-tcpdump-Add-missing-ICMPv6-Neighbor-Solicit-l.patch

@@ -1,25 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sat, 27 Jan 2024 13:49:03 +0100
-Subject: batctl: tcpdump: Add missing ICMPv6 Neighbor Solicit length check
-
-dump_ipv6() is doing a length check for the original ICMPv6 header length.
-But the neighbor solicitation (which is also handled by this function) is
-accessed without doing an additional length check. So it is possible that
-it tries to read outside of the received data.
-
-Fixes: 35b37756f4a3 ("add IPv6 support to tcpdump parser")
-Cc: Marco Dalla Torre <marco.dallato@gmail.com>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batctl.git/commit/83025933cb502192d22edc89de3c57103968c4ed
-
---- a/tcpdump.c
-+++ b/tcpdump.c
-@@ -604,6 +604,8 @@ static void dump_ipv6(unsigned char *pac
- 			       (size_t)buff_len - sizeof(struct icmp6_hdr));
- 			break;
- 		case ND_NEIGHBOR_SOLICIT:
-+			LEN_CHECK((size_t)buff_len - (size_t)(sizeof(struct ip6_hdr)),
-+				  sizeof(*nd_neigh_sol), "ICMPv6 Neighbor Solicitation");
- 			nd_neigh_sol = (struct nd_neighbor_solicit *)icmphdr;
- 			inet_ntop(AF_INET6, &(nd_neigh_sol->nd_ns_target),
- 				  nd_nas_target, 40);

batctl/patches/0006-batctl-tcpdump-Fix-ICMPv4-inner-IPv4-header-length-c.patch

@@ -1,41 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sat, 27 Jan 2024 13:49:04 +0100
-Subject: batctl: tcpdump: Fix ICMPv4 inner IPv4 header length check
-
-dump_ip() is doing a length check for the inner (inside ICMP) IPv4 header
-length. But it is just assuming that the inner ICMPv4 header has ihl set to
-5 - without actually checking for this. The more complex IPv4 header length
-check for the outer IPv4 header is missing before it tries to access the
-UDP header using the inner ihl IPv4 header length information. So it is
-possible that it tries to read outside of the received data.
-
-Fixes: 75d68356f3fa ("[batctl] tcpdump - add basic IPv4 support")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batctl.git/commit/fb7a51466bf46a4914a32edd8e1be6ba0733cd49
-
---- a/tcpdump.c
-+++ b/tcpdump.c
-@@ -682,12 +682,20 @@ static void dump_ip(unsigned char *packe
- 				(size_t)buff_len - (iphdr->ihl * 4));
- 			break;
- 		case ICMP_DEST_UNREACH:
--			LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct icmphdr),
--				sizeof(struct iphdr) + 8, "ICMP DEST_UNREACH");
--
- 			switch (icmphdr->code) {
- 			case ICMP_PORT_UNREACH:
-+				LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct icmphdr),
-+					  sizeof(struct iphdr), "ICMP DEST_UNREACH");
-+
-+				/* validate inner IP header information */
- 				tmp_iphdr = (struct iphdr *)(((char *)icmphdr) + sizeof(struct icmphdr));
-+				LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct icmphdr),
-+					  (size_t)(tmp_iphdr->ihl * 4), "ICMP DEST_UNREACH");
-+				LEN_CHECK((size_t)(tmp_iphdr->ihl * 4), sizeof(*iphdr), "ICMP DEST_UNREACH");
-+
-+				LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct icmphdr) - (tmp_iphdr->ihl * 4),
-+					  sizeof(*tmp_udphdr), "ICMP DEST_UNREACH");
-+
- 				tmp_udphdr = (struct udphdr *)(((char *)tmp_iphdr) + (tmp_iphdr->ihl * 4));
- 
- 				printf("%s: ICMP ", ipdst);

batman-adv/Makefile

@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2023.1
-PKG_RELEASE:=6
+PKG_VERSION:=2024.0
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=f46a7286660a5ec3506a1be7ef60b471c51ac70550597d598040479ab7b936b8
+PKG_HASH:=61110697b5799f646a2a82a4dcf97faed4bb12a7cc43bf4683d2c4de4f6b40e7
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>

batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch

@@ -2,6 +2,10 @@ From: Sven Eckelmann <sven@narfation.org>
 Date: Fri, 6 May 2022 22:03:29 +0200
 Subject: Revert "batman-adv: Migrate to linux/container_of.h"
 
+The original patch requires Linux 5.16.0 or a mac80211 compat header with this
+name. But the mac80211 package is currently not providing this header and
+OpenWrt main is still using older Linux kernel versions for some targets.
+
 This reverts commit 043ae5634bdfd4c4dd8b95a22890752495080bb5.
 
 --- a/compat-include/linux/container_of.h
@@ -117,10 +121,10 @@ This reverts commit 043ae5634bdfd4c4dd8b95a22890752495080bb5.
  #include <linux/gfp.h>
 --- a/net/batman-adv/hard-interface.c
 +++ b/net/batman-adv/hard-interface.c
-@@ -9,12 +9,12 @@
- 
+@@ -10,12 +10,12 @@
  #include <linux/atomic.h>
  #include <linux/byteorder/generic.h>
+ #include <linux/compiler.h>
 -#include <linux/container_of.h>
  #include <linux/errno.h>
  #include <linux/gfp.h>
@@ -133,7 +137,7 @@ This reverts commit 043ae5634bdfd4c4dd8b95a22890752495080bb5.
  #include <linux/list.h>
 --- a/net/batman-adv/main.c
 +++ b/net/batman-adv/main.c
-@@ -9,7 +9,6 @@
+@@ -10,7 +10,6 @@
  #include <linux/atomic.h>
  #include <linux/build_bug.h>
  #include <linux/byteorder/generic.h>

batman-adv/patches/0002-fix-batadv_is_cfg80211_netdev.patch

@@ -7,7 +7,7 @@ macro to use when building under backports.
 
 --- a/net/batman-adv/hard-interface.c
 +++ b/net/batman-adv/hard-interface.c
-@@ -307,8 +307,7 @@ static bool batadv_is_cfg80211_netdev(st
+@@ -308,8 +308,7 @@ static bool batadv_is_cfg80211_netdev(st
  {
  	if (!net_device)
  		return false;

batman-adv/patches/0003-Revert-batman-adv-Switch-to-linux-sprintf.h.patch

@@ -0,0 +1,97 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 2 Feb 2024 22:49:00 +0100
+Subject: Revert "batman-adv: Switch to linux/sprintf.h"
+
+The original patch requires Linux 6.6.0 or a mac80211 compat header with this
+name. But the mac80211 package is currently not providing this header and
+OpenWrt main is still using older Linux kernel versions for some targets.
+
+This reverts commit f0fb49c5ab70dfa064f0aa8d1c5d84f65e8cbc86.
+
+--- a/compat-include/linux/sprintf.h
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/* SPDX-License-Identifier: GPL-2.0 */
+-/* Copyright (C) B.A.T.M.A.N. contributors:
+- *
+- * Marek Lindner, Simon Wunderlich
+- *
+- * This file contains macros for maintaining compatibility with older versions
+- * of the Linux kernel.
+- */
+-
+-#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_SPRINTF_H_
+-#define _NET_BATMAN_ADV_COMPAT_LINUX_SPRINTF_H_
+-
+-#include <linux/version.h>
+-#if LINUX_VERSION_IS_GEQ(6, 6, 0)
+-#include_next <linux/sprintf.h>
+-#else
+-#include <linux/kernel.h>
+-#endif
+-
+-#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SPRINTF_H_ */
+--- a/net/batman-adv/bridge_loop_avoidance.c
++++ b/net/batman-adv/bridge_loop_avoidance.c
+@@ -19,6 +19,7 @@
+ #include <linux/if_vlan.h>
+ #include <linux/jhash.h>
+ #include <linux/jiffies.h>
++#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+ #include <linux/lockdep.h>
+@@ -29,7 +30,6 @@
+ #include <linux/skbuff.h>
+ #include <linux/slab.h>
+ #include <linux/spinlock.h>
+-#include <linux/sprintf.h>
+ #include <linux/stddef.h>
+ #include <linux/string.h>
+ #include <linux/workqueue.h>
+--- a/net/batman-adv/gateway_client.c
++++ b/net/batman-adv/gateway_client.c
+@@ -17,6 +17,7 @@
+ #include <linux/in.h>
+ #include <linux/ip.h>
+ #include <linux/ipv6.h>
++#include <linux/kernel.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+ #include <linux/lockdep.h>
+@@ -27,7 +28,6 @@
+ #include <linux/skbuff.h>
+ #include <linux/slab.h>
+ #include <linux/spinlock.h>
+-#include <linux/sprintf.h>
+ #include <linux/stddef.h>
+ #include <linux/udp.h>
+ #include <net/sock.h>
+--- a/net/batman-adv/main.c
++++ b/net/batman-adv/main.c
+@@ -32,7 +32,6 @@
+ #include <linux/skbuff.h>
+ #include <linux/slab.h>
+ #include <linux/spinlock.h>
+-#include <linux/sprintf.h>
+ #include <linux/stddef.h>
+ #include <linux/string.h>
+ #include <linux/workqueue.h>
+--- a/net/batman-adv/multicast.c
++++ b/net/batman-adv/multicast.c
+@@ -24,6 +24,7 @@
+ #include <linux/ip.h>
+ #include <linux/ipv6.h>
+ #include <linux/jiffies.h>
++#include <linux/kernel.h>
+ #include <linux/list.h>
+ #include <linux/lockdep.h>
+ #include <linux/netdevice.h>
+@@ -34,7 +35,6 @@
+ #include <linux/skbuff.h>
+ #include <linux/slab.h>
+ #include <linux/spinlock.h>
+-#include <linux/sprintf.h>
+ #include <linux/stddef.h>
+ #include <linux/string.h>
+ #include <linux/types.h>

batman-adv/patches/0003-batman-adv-Broken-sync-while-rescheduling-delayed-wo.patch

@@ -1,48 +0,0 @@
-From: Vladislav Efanov <VEfanov@ispras.ru>
-Date: Fri, 26 May 2023 19:16:32 +0300
-Subject: batman-adv: Broken sync while rescheduling delayed work
-
-Syzkaller got a lot of crashes like:
-KASAN: use-after-free Write in *_timers*
-
-All of these crashes point to the same memory area:
-
-The buggy address belongs to the object at ffff88801f870000
- which belongs to the cache kmalloc-8k of size 8192
-The buggy address is located 5320 bytes inside of
- 8192-byte region [ffff88801f870000, ffff88801f872000)
-
-This area belongs to :
-        batadv_priv->batadv_priv_dat->delayed_work->timer_list
-
-The reason for these issues is the lack of synchronization. Delayed
-work (batadv_dat_purge) schedules new timer/work while the device
-is being deleted. As the result new timer/delayed work is set after
-cancel_delayed_work_sync() was called. So after the device is freed
-the timer list contains pointer to already freed memory.
-
-Found by Linux Verification Center (linuxtesting.org) with syzkaller.
-
-Fixes: f6badf9eb582 ("batman-adv: Distributed ARP Table - implement local storage")
-Signed-off-by: Vladislav Efanov <VEfanov@ispras.ru>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/177ba85fb2d4ca2ecd30ca16803560e80e916fac
-
---- a/net/batman-adv/distributed-arp-table.c
-+++ b/net/batman-adv/distributed-arp-table.c
-@@ -101,7 +101,6 @@ static void batadv_dat_purge(struct work
-  */
- static void batadv_dat_start_timer(struct batadv_priv *bat_priv)
- {
--	INIT_DELAYED_WORK(&bat_priv->dat.work, batadv_dat_purge);
- 	queue_delayed_work(batadv_event_workqueue, &bat_priv->dat.work,
- 			   msecs_to_jiffies(10000));
- }
-@@ -819,6 +818,7 @@ int batadv_dat_init(struct batadv_priv *
- 	if (!bat_priv->dat.hash)
- 		return -ENOMEM;
- 
-+	INIT_DELAYED_WORK(&bat_priv->dat.work, batadv_dat_purge);
- 	batadv_dat_start_timer(bat_priv);
- 
- 	batadv_tvlv_handler_register(bat_priv, batadv_dat_tvlv_ogm_handler_v1,

batman-adv/patches/0004-Revert-batman-adv-Switch-to-linux-array_size.h.patch

@@ -0,0 +1,69 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 2 Feb 2024 22:49:48 +0100
+Subject: Revert "batman-adv: Switch to linux/array_size.h"
+
+The original patch requires Linux 6.7.0 or a mac80211 compat header with this
+name. But the mac80211 package is currently not providing this header and
+OpenWrt main is still using older Linux kernel versions for some targets.
+
+This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
+
+--- a/compat-include/linux/array_size.h
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/* SPDX-License-Identifier: GPL-2.0 */
+-/* Copyright (C) B.A.T.M.A.N. contributors:
+- *
+- * Marek Lindner, Simon Wunderlich
+- *
+- * This file contains macros for maintaining compatibility with older versions
+- * of the Linux kernel.
+- */
+-
+-#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_
+-#define _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_
+-
+-#include <linux/version.h>
+-#if LINUX_VERSION_IS_GEQ(6, 7, 0)
+-#include_next <linux/array_size.h>
+-#else
+-#include <linux/kernel.h>
+-#endif
+-
+-#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ARRAY_SIZE_H_ */
+--- a/net/batman-adv/main.c
++++ b/net/batman-adv/main.c
+@@ -6,7 +6,6 @@
+ 
+ #include "main.h"
+ 
+-#include <linux/array_size.h>
+ #include <linux/atomic.h>
+ #include <linux/build_bug.h>
+ #include <linux/byteorder/generic.h>
+@@ -20,6 +19,7 @@
+ #include <linux/init.h>
+ #include <linux/ip.h>
+ #include <linux/ipv6.h>
++#include <linux/kernel.h>
+ #include <linux/kobject.h>
+ #include <linux/kref.h>
+ #include <linux/list.h>
+--- a/net/batman-adv/netlink.c
++++ b/net/batman-adv/netlink.c
+@@ -7,7 +7,6 @@
+ #include "netlink.h"
+ #include "main.h"
+ 
+-#include <linux/array_size.h>
+ #include <linux/atomic.h>
+ #include <linux/bitops.h>
+ #include <linux/bug.h>
+@@ -21,6 +20,7 @@
+ #include <linux/if_ether.h>
+ #include <linux/if_vlan.h>
+ #include <linux/init.h>
++#include <linux/kernel.h>
+ #include <linux/limits.h>
+ #include <linux/list.h>
+ #include <linux/minmax.h>

batman-adv/patches/0004-batman-adv-compat-Use-native-kstrtox.h-for-5.10.185.patch

@@ -1,29 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Tue, 11 Jul 2023 11:46:30 +0200
-Subject: batman-adv: compat: Use native kstrtox.h for 5.10.185
-
-Upstream stable commit 6e2e551e39fd ("kernel.h: split out kstrtox() and
-simple_strtox() to a separate header") backported the support for
-linux/kstrtox.h. Unfortunately, the compat support via linux/kernel.h was
-dropped and thus references to kstrtou64 caused build errors
-
-  batman-adv/net/batman-adv/gateway_common.c: In function ‘batadv_parse_throughput’:
-  batman-adv/net/batman-adv/gateway_common.c:55:15: error: implicit declaration of function ‘kstrtou64’ [-Werror=implicit-function-declaration]
-     55 |         ret = kstrtou64(buff, 10, &lthroughput);
-        |               ^~~~~~~~~
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/8924adbdf993cd0521f9d0024b43e3b23af5114f
-
---- a/compat-include/linux/kstrtox.h
-+++ b/compat-include/linux/kstrtox.h
-@@ -11,7 +11,8 @@
- #define _NET_BATMAN_ADV_COMPAT_LINUX_KSTRTOX_H_
- 
- #include <linux/version.h>
--#if LINUX_VERSION_IS_GEQ(5, 14, 0)
-+#if (LINUX_VERSION_IS_GEQ(5, 10, 185) && LINUX_VERSION_IS_LESS(5, 11, 0)) || \
-+    LINUX_VERSION_IS_GEQ(5, 14, 0)
- #include_next <linux/kstrtox.h>
- #else
- #include <linux/kernel.h>

batman-adv/patches/0005-batman-adv-Do-not-get-eth-header-before-batadv_check.patch

@@ -1,111 +0,0 @@
-From: Remi Pommarel <repk@triplefau.lt>
-Date: Fri, 28 Jul 2023 15:38:50 +0200
-Subject: batman-adv: Do not get eth header before batadv_check_management_packet
-
-If received skb in batadv_v_elp_packet_recv or batadv_v_ogm_packet_recv
-is either cloned or non linearized then its data buffer will be
-reallocated by batadv_check_management_packet when skb_cow or
-skb_linearize get called. Thus geting ethernet header address inside
-skb data buffer before batadv_check_management_packet had any chance to
-reallocate it could lead to the following kernel panic:
-
-  Unable to handle kernel paging request at virtual address ffffff8020ab069a
-  Mem abort info:
-    ESR = 0x96000007
-    EC = 0x25: DABT (current EL), IL = 32 bits
-    SET = 0, FnV = 0
-    EA = 0, S1PTW = 0
-    FSC = 0x07: level 3 translation fault
-  Data abort info:
-    ISV = 0, ISS = 0x00000007
-    CM = 0, WnR = 0
-  swapper pgtable: 4k pages, 39-bit VAs, pgdp=0000000040f45000
-  [ffffff8020ab069a] pgd=180000007fffa003, p4d=180000007fffa003, pud=180000007fffa003, pmd=180000007fefe003, pte=0068000020ab0706
-  Internal error: Oops: 96000007 [#1] SMP
-  Modules linked in: ahci_mvebu libahci_platform libahci dvb_usb_af9035 dvb_usb_dib0700 dib0070 dib7000m dibx000_common ath11k_pci ath10k_pci ath10k_core mwl8k_new nf_nat_sip nf_conntrack_sip xhci_plat_hcd xhci_hcd nf_nat_pptp nf_conntrack_pptp at24 sbsa_gwdt
-  CPU: 1 PID: 16 Comm: ksoftirqd/1 Not tainted 5.15.42-00066-g3242268d425c-dirty #550
-  Hardware name: A8k (DT)
-  pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
-  pc : batadv_is_my_mac+0x60/0xc0
-  lr : batadv_v_ogm_packet_recv+0x98/0x5d0
-  sp : ffffff8000183820
-  x29: ffffff8000183820 x28: 0000000000000001 x27: ffffff8014f9af00
-  x26: 0000000000000000 x25: 0000000000000543 x24: 0000000000000003
-  x23: ffffff8020ab0580 x22: 0000000000000110 x21: ffffff80168ae880
-  x20: 0000000000000000 x19: ffffff800b561000 x18: 0000000000000000
-  x17: 0000000000000000 x16: 0000000000000000 x15: 00dc098924ae0032
-  x14: 0f0405433e0054b0 x13: ffffffff00000080 x12: 0000004000000001
-  x11: 0000000000000000 x10: 0000000000000000 x9 : 0000000000000000
-  x8 : 0000000000000000 x7 : ffffffc076dae000 x6 : ffffff8000183700
-  x5 : ffffffc00955e698 x4 : ffffff80168ae000 x3 : ffffff80059cf000
-  x2 : ffffff800b561000 x1 : ffffff8020ab0696 x0 : ffffff80168ae880
-  Call trace:
-   batadv_is_my_mac+0x60/0xc0
-   batadv_v_ogm_packet_recv+0x98/0x5d0
-   batadv_batman_skb_recv+0x1b8/0x244
-   __netif_receive_skb_core.isra.0+0x440/0xc74
-   __netif_receive_skb_one_core+0x14/0x20
-   netif_receive_skb+0x68/0x140
-   br_pass_frame_up+0x70/0x80
-   br_handle_frame_finish+0x108/0x284
-   br_handle_frame+0x190/0x250
-   __netif_receive_skb_core.isra.0+0x240/0xc74
-   __netif_receive_skb_list_core+0x6c/0x90
-   netif_receive_skb_list_internal+0x1f4/0x310
-   napi_complete_done+0x64/0x1d0
-   gro_cell_poll+0x7c/0xa0
-   __napi_poll+0x34/0x174
-   net_rx_action+0xf8/0x2a0
-   _stext+0x12c/0x2ac
-   run_ksoftirqd+0x4c/0x7c
-   smpboot_thread_fn+0x120/0x210
-   kthread+0x140/0x150
-   ret_from_fork+0x10/0x20
-  Code: f9403844 eb03009f 54fffee1 f94
-
-Thus ethernet header address should only be fetched after
-batadv_check_management_packet has been called.
-
-Fixes: 632835348e65 ("batman-adv: OGMv2 - add basic infrastructure")
-Signed-off-by: Remi Pommarel <repk@triplefau.lt>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/670971ac7e9a47ee952848e0ea9128180e8fb991
-
---- a/net/batman-adv/bat_v_elp.c
-+++ b/net/batman-adv/bat_v_elp.c
-@@ -505,7 +505,7 @@ int batadv_v_elp_packet_recv(struct sk_b
- 	struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
- 	struct batadv_elp_packet *elp_packet;
- 	struct batadv_hard_iface *primary_if;
--	struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
-+	struct ethhdr *ethhdr;
- 	bool res;
- 	int ret = NET_RX_DROP;
- 
-@@ -513,6 +513,7 @@ int batadv_v_elp_packet_recv(struct sk_b
- 	if (!res)
- 		goto free_skb;
- 
-+	ethhdr = eth_hdr(skb);
- 	if (batadv_is_my_mac(bat_priv, ethhdr->h_source))
- 		goto free_skb;
- 
---- a/net/batman-adv/bat_v_ogm.c
-+++ b/net/batman-adv/bat_v_ogm.c
-@@ -985,7 +985,7 @@ int batadv_v_ogm_packet_recv(struct sk_b
- {
- 	struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
- 	struct batadv_ogm2_packet *ogm_packet;
--	struct ethhdr *ethhdr = eth_hdr(skb);
-+	struct ethhdr *ethhdr;
- 	int ogm_offset;
- 	u8 *packet_pos;
- 	int ret = NET_RX_DROP;
-@@ -999,6 +999,7 @@ int batadv_v_ogm_packet_recv(struct sk_b
- 	if (!batadv_check_management_packet(skb, if_incoming, BATADV_OGM2_HLEN))
- 		goto free_skb;
- 
-+	ethhdr = eth_hdr(skb);
- 	if (batadv_is_my_mac(bat_priv, ethhdr->h_source))
- 		goto free_skb;
- 

batman-adv/patches/0006-batman-adv-Trigger-events-for-auto-adjusted-MTU.patch

@@ -1,28 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Wed, 19 Jul 2023 10:15:05 +0200
-Subject: batman-adv: Trigger events for auto adjusted MTU
-
-If an interface changes the MTU, it is expected that an NETDEV_PRECHANGEMTU
-and NETDEV_CHANGEMTU notification events is triggered. This worked fine for
-.ndo_change_mtu based changes because core networking code took care of it.
-But for auto-adjustments after hard-interfaces changes, these events were
-simply missing.
-
-Due to this problem, non-batman-adv components weren't aware of MTU changes
-and thus couldn't perform their own tasks correctly.
-
-Fixes: 8009e9f7ac4f ("set bat0 MTU according to the MTUs of the hard interfaces")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/27c4d7c1c7fa39d71ea6ccf1c23bcb4773243800
-
---- a/net/batman-adv/hard-interface.c
-+++ b/net/batman-adv/hard-interface.c
-@@ -629,7 +629,7 @@ out:
-  */
- void batadv_update_min_mtu(struct net_device *soft_iface)
- {
--	soft_iface->mtu = batadv_hardif_min_mtu(soft_iface);
-+	dev_set_mtu(soft_iface, batadv_hardif_min_mtu(soft_iface));
- 
- 	/* Check if the local translate table should be cleaned up to match a
- 	 * new (and smaller) MTU.

batman-adv/patches/0007-batman-adv-Don-t-increase-MTU-when-set-by-user.patch

@@ -1,71 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Wed, 19 Jul 2023 10:15:06 +0200
-Subject: batman-adv: Don't increase MTU when set by user
-
-If the user set an MTU value, it usually means that there are special
-requirements for the MTU. But if an interface gots activated, the MTU was
-always recalculated and then the user set value was overwritten.
-
-The only reason why this user set value has to be overwritten, is when the
-MTU has to be decreased because batman-adv is not able to transfer packets
-with the user specified size.
-
-Fixes: 88861ea9acb7 ("[batman-adv] replacing if up/down timer with kernel notifications")
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/2745af592150b758ee96abf9329dd5f42cf22c25
-
---- a/net/batman-adv/hard-interface.c
-+++ b/net/batman-adv/hard-interface.c
-@@ -629,7 +629,19 @@ out:
-  */
- void batadv_update_min_mtu(struct net_device *soft_iface)
- {
--	dev_set_mtu(soft_iface, batadv_hardif_min_mtu(soft_iface));
-+	struct batadv_priv *bat_priv = netdev_priv(soft_iface);
-+	int limit_mtu;
-+	int mtu;
-+
-+	mtu = batadv_hardif_min_mtu(soft_iface);
-+
-+	if (bat_priv->mtu_set_by_user)
-+		limit_mtu = bat_priv->mtu_set_by_user;
-+	else
-+		limit_mtu = ETH_DATA_LEN;
-+
-+	mtu = min(mtu, limit_mtu);
-+	dev_set_mtu(soft_iface, mtu);
- 
- 	/* Check if the local translate table should be cleaned up to match a
- 	 * new (and smaller) MTU.
---- a/net/batman-adv/soft-interface.c
-+++ b/net/batman-adv/soft-interface.c
-@@ -153,11 +153,14 @@ static int batadv_interface_set_mac_addr
- 
- static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu)
- {
-+	struct batadv_priv *bat_priv = netdev_priv(dev);
-+
- 	/* check ranges */
- 	if (new_mtu < 68 || new_mtu > batadv_hardif_min_mtu(dev))
- 		return -EINVAL;
- 
- 	dev->mtu = new_mtu;
-+	bat_priv->mtu_set_by_user = new_mtu;
- 
- 	return 0;
- }
---- a/net/batman-adv/types.h
-+++ b/net/batman-adv/types.h
-@@ -1547,6 +1547,12 @@ struct batadv_priv {
- 	struct net_device *soft_iface;
- 
- 	/**
-+	 * @mtu_set_by_user: MTU was set once by user
-+	 * protected by rtnl_lock
-+	 */
-+	int mtu_set_by_user;
-+
-+	/**
- 	 * @bat_counters: mesh internal traffic statistic counters (see
- 	 *  batadv_counters)
- 	 */

batman-adv/patches/0008-batman-adv-Fix-TT-global-entry-leak-when-client-roam.patch

@@ -1,76 +0,0 @@
-From: Remi Pommarel <repk@triplefau.lt>
-Date: Fri, 4 Aug 2023 11:39:36 +0200
-Subject: batman-adv: Fix TT global entry leak when client roamed back
-
-When a client roamed back to a node before it got time to destroy the
-pending local entry (i.e. within the same originator interval) the old
-global one is directly removed from hash table and left as such.
-
-But because this entry had an extra reference taken at lookup (i.e using
-batadv_tt_global_hash_find) there is no way its memory will be reclaimed
-at any time causing the following memory leak:
-
-  unreferenced object 0xffff0000073c8000 (size 18560):
-    comm "softirq", pid 0, jiffies 4294907738 (age 228.644s)
-    hex dump (first 32 bytes):
-      06 31 ac 12 c7 7a 05 00 01 00 00 00 00 00 00 00  .1...z..........
-      2c ad be 08 00 80 ff ff 6c b6 be 08 00 80 ff ff  ,.......l.......
-    backtrace:
-      [<00000000ee6e0ffa>] kmem_cache_alloc+0x1b4/0x300
-      [<000000000ff2fdbc>] batadv_tt_global_add+0x700/0xe20
-      [<00000000443897c7>] _batadv_tt_update_changes+0x21c/0x790
-      [<000000005dd90463>] batadv_tt_update_changes+0x3c/0x110
-      [<00000000a2d7fc57>] batadv_tt_tvlv_unicast_handler_v1+0xafc/0xe10
-      [<0000000011793f2a>] batadv_tvlv_containers_process+0x168/0x2b0
-      [<00000000b7cbe2ef>] batadv_recv_unicast_tvlv+0xec/0x1f4
-      [<0000000042aef1d8>] batadv_batman_skb_recv+0x25c/0x3a0
-      [<00000000bbd8b0a2>] __netif_receive_skb_core.isra.0+0x7a8/0xe90
-      [<000000004033d428>] __netif_receive_skb_one_core+0x64/0x74
-      [<000000000f39a009>] __netif_receive_skb+0x48/0xe0
-      [<00000000f2cd8888>] process_backlog+0x174/0x344
-      [<00000000507d6564>] __napi_poll+0x58/0x1f4
-      [<00000000b64ef9eb>] net_rx_action+0x504/0x590
-      [<00000000056fa5e4>] _stext+0x1b8/0x418
-      [<00000000878879d6>] run_ksoftirqd+0x74/0xa4
-  unreferenced object 0xffff00000bae1a80 (size 56):
-    comm "softirq", pid 0, jiffies 4294910888 (age 216.092s)
-    hex dump (first 32 bytes):
-      00 78 b1 0b 00 00 ff ff 0d 50 00 00 00 00 00 00  .x.......P......
-      00 00 00 00 00 00 00 00 50 c8 3c 07 00 00 ff ff  ........P.<.....
-    backtrace:
-      [<00000000ee6e0ffa>] kmem_cache_alloc+0x1b4/0x300
-      [<00000000d9aaa49e>] batadv_tt_global_add+0x53c/0xe20
-      [<00000000443897c7>] _batadv_tt_update_changes+0x21c/0x790
-      [<000000005dd90463>] batadv_tt_update_changes+0x3c/0x110
-      [<00000000a2d7fc57>] batadv_tt_tvlv_unicast_handler_v1+0xafc/0xe10
-      [<0000000011793f2a>] batadv_tvlv_containers_process+0x168/0x2b0
-      [<00000000b7cbe2ef>] batadv_recv_unicast_tvlv+0xec/0x1f4
-      [<0000000042aef1d8>] batadv_batman_skb_recv+0x25c/0x3a0
-      [<00000000bbd8b0a2>] __netif_receive_skb_core.isra.0+0x7a8/0xe90
-      [<000000004033d428>] __netif_receive_skb_one_core+0x64/0x74
-      [<000000000f39a009>] __netif_receive_skb+0x48/0xe0
-      [<00000000f2cd8888>] process_backlog+0x174/0x344
-      [<00000000507d6564>] __napi_poll+0x58/0x1f4
-      [<00000000b64ef9eb>] net_rx_action+0x504/0x590
-      [<00000000056fa5e4>] _stext+0x1b8/0x418
-      [<00000000878879d6>] run_ksoftirqd+0x74/0xa4
-
-Releasing the extra reference from batadv_tt_global_hash_find even at
-roam back when batadv_tt_global_free is called fixes this memory leak.
-
-Cc: stable@vger.kernel.org
-Fixes: 2443ba383c7d ("batman-adv: roaming handling mechanism redesign")
-Signed-off-by: Remi Pommarel <repk@triplefau.lt>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/26fce59c70729e07034de966ac5fd2d5c1f2d597
-
---- a/net/batman-adv/translation-table.c
-+++ b/net/batman-adv/translation-table.c
-@@ -774,7 +774,6 @@ check_roaming:
- 		if (roamed_back) {
- 			batadv_tt_global_free(bat_priv, tt_global,
- 					      "Roaming canceled");
--			tt_global = NULL;
- 		} else {
- 			/* The global entry has to be marked as ROAMING and
- 			 * has to be kept for consistency purpose

batman-adv/patches/0009-batman-adv-Fix-batadv_v_ogm_aggr_send-memory-leak.patch

@@ -1,47 +0,0 @@
-From: Remi Pommarel <repk@triplefau.lt>
-Date: Wed, 9 Aug 2023 17:29:13 +0200
-Subject: batman-adv: Fix batadv_v_ogm_aggr_send memory leak
-
-When batadv_v_ogm_aggr_send is called for an inactive interface, the skb
-is silently dropped by batadv_v_ogm_send_to_if() but never freed causing
-the following memory leak:
-
-  unreferenced object 0xffff00000c164800 (size 512):
-    comm "kworker/u8:1", pid 2648, jiffies 4295122303 (age 97.656s)
-    hex dump (first 32 bytes):
-      00 80 af 09 00 00 ff ff e1 09 00 00 75 01 60 83  ............u.`.
-      1f 00 00 00 b8 00 00 00 15 00 05 00 da e3 d3 64  ...............d
-    backtrace:
-      [<0000000007ad20f6>] __kmalloc_track_caller+0x1a8/0x310
-      [<00000000d1029e55>] kmalloc_reserve.constprop.0+0x70/0x13c
-      [<000000008b9d4183>] __alloc_skb+0xec/0x1fc
-      [<00000000c7af5051>] __netdev_alloc_skb+0x48/0x23c
-      [<00000000642ee5f5>] batadv_v_ogm_aggr_send+0x50/0x36c
-      [<0000000088660bd7>] batadv_v_ogm_aggr_work+0x24/0x40
-      [<0000000042fc2606>] process_one_work+0x3b0/0x610
-      [<000000002f2a0b1c>] worker_thread+0xa0/0x690
-      [<0000000059fae5d4>] kthread+0x1fc/0x210
-      [<000000000c587d3a>] ret_from_fork+0x10/0x20
-
-Free the skb in that case to fix this leak.
-
-Cc: stable@vger.kernel.org
-Fixes: 632835348e65 ("batman-adv: OGMv2 - add basic infrastructure")
-Signed-off-by: Remi Pommarel <repk@triplefau.lt>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/9024db261180f73fc687a9ecc7e79e3b0ccf50dc
-
---- a/net/batman-adv/bat_v_ogm.c
-+++ b/net/batman-adv/bat_v_ogm.c
-@@ -123,8 +123,10 @@ static void batadv_v_ogm_send_to_if(stru
- {
- 	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
- 
--	if (hard_iface->if_status != BATADV_IF_ACTIVE)
-+	if (hard_iface->if_status != BATADV_IF_ACTIVE) {
-+		kfree_skb(skb);
- 		return;
-+	}
- 
- 	batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX);
- 	batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES,

batman-adv/patches/0010-batman-adv-Hold-rtnl-lock-during-MTU-update-via-netl.patch

@@ -1,35 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Mon, 21 Aug 2023 21:48:48 +0200
-Subject: batman-adv: Hold rtnl lock during MTU update via netlink
-
-The automatic recalculation of the maximum allowed MTU is usually triggered
-by code sections which are already rtnl lock protected by callers outside
-of batman-adv. But when the fragmentation setting is changed via
-batman-adv's own batadv genl family, then the rtnl lock is not yet taken.
-
-But dev_set_mtu requires that the caller holds the rtnl lock because it
-uses netdevice notifiers. And this code will then fail the check for this
-lock:
-
-  RTNL: assertion failed at net/core/dev.c (1953)
-
-Cc: stable@vger.kernel.org
-Reported-by: syzbot+f8812454d9b3ac00d282@syzkaller.appspotmail.com
-Fixes: 27c4d7c1c7fa ("batman-adv: Trigger events for auto adjusted MTU")
-Reviewed-by: Simon Horman <horms@kernel.org>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/aeb35331aa9a17f9affd84c1a5b020aeb4a976f4
-
---- a/net/batman-adv/netlink.c
-+++ b/net/batman-adv/netlink.c
-@@ -495,7 +495,10 @@ static int batadv_netlink_set_mesh(struc
- 		attr = info->attrs[BATADV_ATTR_FRAGMENTATION_ENABLED];
- 
- 		atomic_set(&bat_priv->fragmentation, !!nla_get_u8(attr));
-+
-+		rtnl_lock();
- 		batadv_update_min_mtu(bat_priv->soft_iface);
-+		rtnl_unlock();
- 	}
- 
- 	if (info->attrs[BATADV_ATTR_GW_BANDWIDTH_DOWN]) {

bird1-openwrt/LUCI-DOCUMENTATION.md

@@ -1,342 +0,0 @@
-<!--
----------------------------------------------------------------------
-(C) 2014 - 2017 Eloi Carbo <eloicaso@openmailbox.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
----------------------------------------------------------------------
--->
-
-# LUCI Bird{4|6} v0.3 Packages Documentation
-*  BIRD Daemon's official documentation: http://bird.network.cz/?get_doc
-*  Extra documentation in English & Catalan: https://github.com/eloicaso/bgp-bmx6-bird-docn
-*  If you want to add new options to bird*-openwrt packages add a pull request or issue in: https://github.com/eloicaso/bird-openwrt
-
-> *Clarification*: This documentation covers luci-app-bird{4|6} as both are completely aligned and only those IPv4/6-specific options will be covered separately.
->
-> Bird v1.6.3 has been used to test luci-app-bird{4|6}. Using newer versions of the Daemon might change the behaviour or messages documented here. Create an issue or pull request if you spot any mismatch in this document to address it.
-
-# Table of contents
-1. [Status Page](#status)
-2. [Log Page](#log)
-3. [Overview Page](#overview)
-4. [General Protocols Page](#general)
-5. [BGP Portocol](#bgp)
-6. [Filters and Functions](#fnf)
-
-
-## Status Page <a name="status"></a>
-The Status Page allows you to Start, Stop and restart the service as well as to check the result of these operations.
-
-#### Components
-- *Button* **Start**: Execute a Bird Daemon Service Start call. Operation's result is shown in the *Service Status* Text Box.
-- *Button* **Stop**: Execute a Bird Daemon Service Stop call. Operation's result is shown in the *Service Status* Text Box.
-- *Button* **Restart**: Execute a Bird Daemon Service Restart call. Operation's result is shown in the *Service Status* Text Box.
-- *Text Box* **Service Status**: Executes a Bird Daemon Service Status call. Operation's result is shown as plain text.
-
-#### Service Status common messages
-* *Running*: Service is running with no issues
-* *Already started*: You have clicked *Start* when the service was already running. No action taken.
-* *Stopped*: You have clicked *Stop* when the service was running. Service has been stopped.
-* *Already stopped*: You have clicked *Stop* when the service was already stopped. No action taken.
-* *Stopped ... Started*: You have pressed *Restart* when the service was running. The service has been restarted.
-* *Already stopped .. Started*: You have pressed *Restart* when the service was already stopped. The service has been started.
-* *Failed - ERROR MESSAGE*: There is a configuration or validation issue that prevents Bird to start. Check the *Error Message* and the Log Page to debug it and fix it.
-
-#### Error Examples
-1. Validation issues:
-  `bird4: Failed - bird: /tmp/bird4.conf, line 65: syntax error`
-
-If we check the file shown: `/tmp/bird4.conf` :
-```
-protocol bgp BGPExample {
-import Filter NonExistingFilter;
-}
-```
-We have entered an invalid (non-existent in this case) filter name. In order to fix this, write the correct Filter Name or remove its reference from the BGP Protocol Configuration Page and start the service again.
-
-2. Configuration issues:
-  ` bird4: Failed - bird: /tmp/bird4.conf, line 76: Only internal neighbor can be RR client`
-
-In this case, it is easy to spot that we have incorrectly selected the *Route Reflector Server* option incorrectly and we only need to untick it and start the service to solve it.
-
-Usuarlly, any configuration issue will be flagged appropiately through Bird service messages. However, in the event where you do not have enough information, please look for advice in either Bird's documentation or in the affected Protocol's documentation.
-
-## Log Page <a name="log"></a>
-The Log Page shows the last 30 lines of the configured Bird Daemon Log file. This information is automatically refreshed each second.
-
-#### Components
-- *Text Area* **Log File**: 30 lines text area that shows the Log file information
-- *Text* **Using Log File** and **File Size**: The first line of the Text Area is fixed and shows the file being used and its current size. **Please**, check this size information regularly to avoid letting the Log information overflow your Storage as it will make your service stop and prevent it to start until you fix it.
-- *Text* **File Contents**: The next 30 lines show information about the events and debug information happening live. Main information are state changes and *info, warning, fatal or trace*. If you hit any issue starting the service, you can investigate the issue from this page.
-
-
-## Overview Page <a name="overview"></a>
-The Overview Page includes the configuration of basic Bird Daemon settings such as UCI usage, Routing Tables definition and Global Options.
-
-### Bird File Settings (UCI Usage)
-This section enables/disables the use of this package's capabilities.
-
-#### Components
-- *Check Box* **Use UCI configuration**:
-  - If enabled, the package will use the UCI configuration generated by this web settings and translate it into a Bird Daemon configuration file.
-  - If disabled, the package will do nothing and you will have to manually edit a Bird Daemon configuration file.
-- *Text Box* **UCI File**: This file specifies the selected location for the translated Bird Daemon configuration file. Do not leave blank.
-
-### Tables Configuration
-This section allows you to set the Routing tables that will be used later in the different protocols. You can *Add* as many instances as required.
-
-#### Components
-- *Text Box* **Table Name**: Set an unique (meaningful) routing table name.
-> In some instances or protocols, you may want or be required to set a specific ID to a Table. In order to do this, please, follow this -right now- [manual procedure](https://github.com/eloicaso/bgp-bmx6-bird-docn/blob/master/EN/manual_procedures.md).
-
-
-### Global Options
-This section allows you to configure basic Bird Daemon settings.
-
-#### Components
-- *Text Box* **Router ID**: Set the Identificator to be used in this Bird Daemon instance. This option must be:
-> IPv4, this option will be set by default to the lowest IP Address configured. Otherwise, the identificator must be an IPv4 address.
-
-> IPv6, this option is **mandatory** and must be a HEX value (Hexadecimal). This package (bird6-uci), provides the HEX value *0xCAFEBABE* as a default value to avoid initial crashes.
-
-- *Text Box* **Log File**: Set the Name and Location of the Log file. By default, its location will be /tmp/bird{4|6}.log as the non-persistent partition.
-- *Mutiple Value* **Log**: Set which elements you want Bird Daemon to log in the configured file.
-> *Caution I*: if you select *All*, the other selected options will have no validity as, by definition, they are already included.
-> *Caution II*: Take into consideration that the more elements Bird has to log, the more space you will require to store this log file. If your storage is full, Bird will fail to start until you free some space to store its Log data.
-
-- *Multi Value* **Debug**: Set which Debug information elements you want Bird Daemon to log in the configured file.
-> *Caution I*: if you select *All*, the other selected options will have no validity as, by definition, they are already included.
-> *Caution II*: Take into consideration that the more elements Bird has to log, the more space you will require to store this log file (this is particularly critical in Debug as it can log MegaBytes of data quickly). If your storage is full, Bird will fail to start until you free some space to store its Log data.
-
-## General Protocols <a name="general"></a>
-The General Protocols Page includes the configuration of key OS Protocols or Network Basic Settings such as Kernel, Device or Static Routes.
-
-### Kernel Options
-This section allows you to set all the Kernel Protocols required to do Networking.
-> The first Kernel instance is the Primary one and must be left by default for OS usage. Do not set its "Table" or "Kernel Table" options.
-
-#### Components
-- *Check Box* **Disabled**: Set this Check Box if you do not want to configure and use this Protocol.
-- *List Value* **Table**: Select the Routing Table to be used in the Kernel Protocol instance.
-> The Primary Kernel Protocol cannot be empty.
-
-- *Text Box* **Import**: Set if the protocol must import routes and which ones.
-  - **all**: Accept all the incoming routes.
-  - **none**: Reject all the incoming routes.
-  - **filter filterName**: Call an existing filter to define which incoming routes will be accepted or rejected.
-- *Text Box* **Export**: Set if the protocol must export routes and which ones.
-  - **all**: Accept all the outgoing routes.
-  - **none**: Reject all the outgoing routes.
-  - **filter filterName**: Call an existing filter to define which outgoing routes will be accepted or rejected.
-- *Text Box* **Scan time**: Set the time between Kernel Routing Table scans. This value must be the same for all the Kernel Protocols.
-- *Check Box* **Learn**: Set this option to allow the Kernel Protocol to learn Routes form other routing daemons or manually added by an admin.
-- *Check Box* **Persist**: Set this option to store the routes learnt in the table until it is removed. Unset this option if you want to clean the routes on the fly.
-- *Text Box* **Kernel Table**: Select the specific exitisting Routing Table for this Protocol instance.
-> The Kernel Table ID must be previously set by the administrator during the Routing Table configuration. Currently (v0.3), this process is done manually. Please, follow this [manual procedure](https://github.com/eloicaso/bgp-bmx6-bird-docn/blob/master/EN/manual_procedures.md).
-
-### Device Options
-This section allows you to set all the Device *Protocol*. The Device *Protocol* is just a mechanism to bound the interfaces and Kernel tables in order to get its information.
-
-#### Components
-- *Check Box* **Disabled**: Set this Check Box if you do not want to configure and use this Protocol.
-- *Text Box* **Scan Time**: Set the time between Kernel Routing Table scans. This value must be the same for all the Kernel Protocols.
-
-### Static Options
-This section allows you to create the container for Routes definition. Static protocol instances allows you to manually create Routes that Bird will use and which Routing Table should hold this information. It also helps to manage routes by marking them (i.e. *Unreachable*, *Blocked*, ...).
-
-#### Components
-- *Check Box* **Disabled**: Set this Check Box if you do not want to configure and use this Protocol.
-- *List Value* **Table**: Select the Routing Table to be used in the Static Protocol instance.
-
-### Routes
-This section allows to set which Routes will be set in a specific Static Protocol and how these should be handled.
-
-#### Components
-- *List Value* **Route Instance**: Set which Static Protocol instance will contain this route infromation.
-> Routes require an existing Static Protocol as parent.
-
-- *Text Box* **Route Prefix**: Set the Route instance to be defined.
-> Examples of routes are:. 10.0.0.0/8 (IPv4) or 2001:DB8:3000:0/16 (IPv6)
-
-- *List Value* **Type Of Route**: This value will set the conditional settings. Options are:
-  - **Router**: Classic routes going through specific IP Addresses. 
-    - *Text Box* **Via**: Set the target IP Address to be used for Routing
-    > I.e. 10.0.0.0/8 via 10.1.1.1
-
-  - **MultiPath**: Multiple paths Route.
-    - *List of Text Box* **Via**: Set the target Route to be used for Routing. This option allows several instances of **Via** elements.
-    > I.e. 10.0.0.0/8 via 10.1.1.1
-    >            via 10.1.1.100
-    >            via 10.1.1.200
-
-  - **Special**: Special treated Route.
-    - *Text Box* **Attribute**: Block special consideration of routes.
-    > **unreachable**: Return route cannot be reached.
-    > **prohibit**: Return route has been administratively blocked.
-    > **blackhole**: Silently drop the route.
-
-  - **Iface**: Classic routes going through specific interfaces.
-    - *List Value* **Interface**: Select the target interface to route.
-
-  - **Recursive**: Set a static recursive route. Its next hope will depen on the table's lookup for each target IP Address.
-
-### Direct Protocol
-This section allows to set pools of *directly* connected interfaces. Direct Protocol instances will make use of the *Device* Protocol in order to generate routes between the selected interfaces.
-
-#### Components
-- *Check Box* **Disabled**: Set this Check Box if you do not want to configure and use this Protocol.
-- *Text Box* **Interfaces**: This is the key option allowing to *tie* the interfaces and create direct routes between different sides. Enter each interface's name you want to couple.
-  - If you leave this option empty, it will tie all the interfaces together.
-  - Each interface must be quoted: i.e. `"eth0"`
-  - Several interfaces must be entered comma-separated: i.e. `"eth0", "wlan0"`
-  - If you want to restrict this to specific interfaces, you have to enter them using its name or a pattern: i.e. All the ethernet interfaces `"eth*"`
-  - You are allowed to **exclude** specific interfaces by adding `-` before the interface name: i.e. Exclude all the Wireless interfaces `"-wlan*"`
-  > Example: All the wired interfaces (eth and em) but exclude all the wireless and point-to-point interfaces: `"eth*", "em*", "-wlan*", "-ptp_*"`
-
-> Current version 0.3 requires you to enter each interface you want to **include** or **exclude** manually. This will be enhanced in future versions.
-
-### Pipe Protocol
-This section allows to set instances of *linked* routing tables. Each instance will allow you to share the routes from a primary table to a secondary one.
-
-#### Components
-- *Check Box* **Disabled**: Set this Check Box if you do not want to configure and use this Protocol.
-- *List Value* **Table**: Select the **Primary** Routing Table to be used.
-- *List Value* **Peer Table**: Select the **Secondary** Routing Table to be used.
-- *List Value* **Mode**: Set if you want to work in *transparent* or *opaque* mode.
-  - **Transparent**: Retransmits all the routes and its attributes. Therefore, you get two identical routing tables. This is the default behaviour.
-  - **Opaque**: This mode is not recommended for new configurations and it is not recommended. Tables will only share the optimal routes and overwrite route's attributes with new ones (Pipe).
-- *Text Box* **Import**: Set if the protocol must import routes and which ones.
-  - **all**: Accept all the incoming routes.
-  - **none**: Reject all the incoming routes.
-  - **filter filterName**: Call an existing filter to define which incoming routes will be accepted or rejected.
-- *Text Box* **Export**: Set if the protocol must export routes and which ones.
-  - **all**: Accept all the outgoing routes.
-  - **none**: Reject all the outgoing routes.
-  - **filter filterName**: Call an existing filter to define which outgoing routes will be accepted or rejected.
-
-
-## BGP Protocol<a name="bgp"></a>
-The BGP Protocol Page includes all the settings to configure BGP Templates and BGP instances.
-BGP Templates and Instances share most of the options as Templates are meant to diminish the requirements on Instances.
-> An extreme example case could be the Template holding all the options and the Instance only referencing to the Template as the only option..
-
-### BGP Templates
-This section allows you to set BGP Templates, which are commonly used BGP configuration*themes* to reduce the number of repeated settings while adding BGP Instances.
-
-### BGP Instances
-This section allows you to set BGP Instances. The Instances are the ones starting the BGP Protocol and can, or not, use a BGP Template to re-use the common properties.
-> **Caution**: Any duplicated option between an Instance and a Template will resolve by using the Instance option and dismissing the Template one. **Instance** > *Template*.
-
-#### BGP Instance Specific Option
-- *List Value* **Templates**: Set the BGP Template that will feed the instance. Any option in the Template will be inherited.
-
-#### Common Options
-- *Check Box* **Disabled**: Set this Check Box if you do not want to configure and use this Protocol.
-- *Text Area* **Description**: Set a descriptive text to identify this protocol and what it does.
-- *Text Box* **Import**: Set if the protocol must import routes and which ones.
-  - **all**: Accept all the incoming routes.
-  - **none**: Reject all the incoming routes.
-  - **filter filterName**: Call an existing filter to define which incoming routes will be accepted or rejected.
-- *Text Box* **Export**: Set if the protocol must export routes and which ones.
-  - **all**: Accept all the outgoing routes.
-  - **none**: Reject all the outgoing routes.
-  - **filter filterName**: Call an existing filter to define which outgoing routes will be accepted or rejected.
-- *List Value* **Table**: Select the Routing Table to be used.
-- *List Value* **IGP Table**: Set the IGP Routing Table (Internal BGP). Bird uses the same Routing Table for both External BGP and Internal BGP by default.
-- *Text Area* **Source Address**: Set the local IP Address. By default the Router ID will be used.
-- *Text Area* **Local AS**: Set the local BGP Autonomous System ID.
-- *Text Area* **Local BGP Address**: Set the local BGP Autonomous System IP Address.
-- *Text Area* **Neighbor IP Address**: Set BGP neighbour's IP Address.
-- *Text Area* **Neighbor AS**: Set BGP neighbour's Autonomous System ID.
-- *Check Box* **Next Hop Self**: Overwrite Next Hop cost attributes with its own source address as next hop. Disabled by default as it is only used in some specific instances.
-- *Check Box* **Next Hop Keep**: Forward the same Next Hop information even in situations where the system would use its own source address instead. Disabled by default.
-- *Check Box* **Route Reflector Server**: Set if BGP instance must act as a Route Reflector Server and expect neighbours AS to act as clients
-- *Text Value* **Route Reflector Cluster ID**: Route Reflector service ID to avoid loops. This options is only allowed in the Server (not clients) and it is Router's ID by default.
-- *Text Box* **Routes Import Limit**: Set the maximum number of routes the protocol will import.
-- *List Value* **Routes Import Limit Action**: Set the action to apply if the *Routes Import Limit* is exceeded. Options are:
-  - **block**: Block any route exceeding the limit.
-  - **disable**: Stop the protocol.
-  - **warn**: Print Log warnings.
-  - **restart**: Restart the protocol.
-- *Text Box* **Routes Export Limit**: Set the maximum number of routes the protocol will export.
-- *List Value* **Routes Export Limit Action**: Set the action to apply if the *Routes Export Limit* is exceeded. Options are:
-  - **block**: Block any route exceeding the limit.
-  - **disable**: Stop BGP protocol.
-  - **warn**: Print Log warnings.
-  - **restart**: Restart BGP protocol.
-- *Text Box* **Routes Received Limit**: Set the maximum number of shared routes the Protocol must accept and remember (the **number** of imported routes is not affected by this option).
-- *List Value* **Routes Received Limit Action**: Set the action to apply if the *Routes Received Limit* is exceeded. Options are:
-  - **block**: Block any route exceeding the limit.
-  - **disable**: Stop BGP protocol.
-  - **warn**: Print Log warnings.
-  - **restart**: Restart BGP protocol.
-
-
-## Filters and Functions<a name="fnf"></a>
-The Filters and the Functions Page allows you to edit Bird Daemon Filter and Functions files without requiring you to go to command line.  Both Pages share the same code base and the only main change is where they are getting the files from. Therefore, and for documentation simplicity sake, both pages will be covered in this section.
-> From version 0.3 onwards:
-> The default and supported place to store filter files is under `/etc/bird{4|6}/filters`. 
-> The default and supported place to store function files is under `/etc/bird{4|6}/functions`. 
-
-> Current version 0.3 does not allow changing file names. You will have to change the default filenames through SSH. This will be enhanced in future versions.
-
-#### Components
-- *List Value* **Filter Files** / **Function Files**: Set the Filter or Function file to edit from the ones under `/etc/bird{4|6}/filters` / `/etc/bird{4|6}/functions`.
-> If you want to create a new Filter or Function file, use the **New File** element in the list.
-
-> The default behaviour is to allow administrators to create new files using this scheme:
-> */etc/bird{4|6}/filters/filter*-**TIMESTAMP**. *Timestamp* is: YYYYMMDD-HHMM. I.e. */etc/bird4/filters/filter-20170705-2030*
-> */etc/bird{4|6}/functions/function*-**TIMESTAMP**. *Timestamp* is: YYYYMMDD-HHMM. I.e. */etc/bird4/functions/function-20170705-2030*
-
-- *Button* **Load File**: Click this button to Load the file selected in the *{filter|function} Files* list. This button **must** be pressed in order to edit the target file.
-- *Read Only Text Box* **Editing File**: This Read-Only field is empty by default. It will get populated with the target file to edit. 
-> **Caution**: Only if this field shows a file path, the contents of the target file can be edited and saved. 
-
-- *Text Area* **File Contents**: This text area will show the contents of the file shown in the *Editting File*. Save the contents of this text area by pressing the Button **Submit**
-> Use **spaces** instead of **tabs** for indentation.
-
-> **Caveat**: If you save your filter or function using the *New File* option, until you refresh the page, the **saved** file will still appear as *New File*. However, the file will be created and correctly stored and you will be able to edit it with no problems.
-> After refreshing the page, your file will appear normally together with a new *New File* option.
-> This behaviour will be enhanced in future versions.
-
-#### Common Errors
-Most common errors produced by Filters and Functions are:
-
-- Syntax errors: `bird: /etc/bird4/filters/filter-20170507-0951, line 4: syntax error` 
-> This instances require you to check where your errors is following Bird's hints.
-
-- Non-existing filter: `bird: /tmp/bird4.conf, line 71: No such filter.`
-> Check your Filter name or define it in the **Filters Page**
-
-- Calls to functions not defined in the Functions files or not part of the Bird filter/function definition *language*: `, line 4: You can't call something which is not a function. Really.`
-> Check you Function definition, your call name or Bird's official documentation to get the right reference.
-
-#### Critical Errors
-There are some critical errors that could escape from first sight as Bird Daemon will start working *correctly*.
-
-If you set your Filter **without** *accept* or *reject* calls, your filter will fail to work and let all the routes pass by as accepted. This will be shown in the **Log Page**:
-
-Example: **Filter "doNothing"**
-```
-filter doNothing
-{
-    print "HelloWorld";
-}
-```
-This *wrong* filter has been used in our BGP instance and Bird Daemon runs correctly. However, if we check the **Log Page** we find:
-```
-2017-05-07 10:18:49 <ERR> Filter doNothing did not return accept nor reject. Make up your mind
-2017-05-07 10:18:49 <INFO> HelloWorld
-```
-> Do not leave any filter without *accept* or *reject* calls to avoid this wrong behaviour that will incurr in a waste of resources.

bird1-openwrt/Makefile

@@ -1,166 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# Copyright (C) 2014-2017 Eloi Carbó <eloicaso@openmailbox.org>
-# Copyright (C) 2022-2023 Roger Pueyo Centelles <roger.pueyo@guifi.net>
-#
-
-include $(TOPDIR)/rules.mk
-
-BIRD1_PKG := bird1
-BIRD1_IPV4_PKG := $(BIRD1_PKG)-ipv4
-BIRD1_IPV6_PKG := $(BIRD1_PKG)-ipv6
-BIRD4 := bird4
-BIRD6 := bird6
-
-PKG_NAME := $(BIRD1_PKG)-openwrt
-PKG_IPV4_NAME := $(BIRD1_IPV4_PKG)-openwrt
-PKG_IPV6_NAME := $(BIRD1_IPV6_PKG)-openwrt
-PKG_VERSION := 0.3
-PKG_RELEASE := 5
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_LICENSE := GPL-3.0-or-later
-
-PKG_UCI_NAME := $(BIRD1_PKG)-uci
-PKG_LUCI_NAME := $(BIRD1_PKG)-luci
-PKG_IPV4_UCI_NAME := $(BIRD1_IPV4_PKG)-uci
-PKG_IPV6_UCI_NAME := $(BIRD1_IPV6_PKG)-uci
-PKG_IPV4_LUCI_NAME := luci-app-$(BIRD1_IPV4_PKG)
-PKG_IPV6_LUCI_NAME := luci-app-$(BIRD1_IPV6_PKG)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Build/Prepare
-endef
-
-define Build/Compile
-endef
-
-define Package/$(PKG_UCI_NAME)/Default
-  TITLE:=The BIRD UCI module (v1.6)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  MAINTAINER:=Roger Pueyo Centelles <roger.pueyo@guifi.net>
-  URL:=https://github.com/openwrt/bird1-openwrt/
-  DEPENDS:=+libuci +uci
-endef
-
-define Package/$(PKG_LUCI_NAME)/Default
-  TITLE:=LuCI support for BIRD (v1.6)
-  SECTION:=luci
-  CATEGORY:=LuCI
-  SUBMENU:=3. Applications
-  MAINTAINER:=Roger Pueyo Centelles <roger.pueyo@guifi.net>
-  URL:=https://github.com/openwrt/bird1-openwrt/
-  DEPENDS:=+luci-base +luci-compat
-endef
-
-define Package/$(PKG_UCI_NAME)/description
-$(BIRD1_PKG) UCI integration module
-endef
-
-define Package/$(PKG_LUCI_NAME)/description
-$(BIRD1_PKG) application for LuCI
-endef
-
-define Package/$(PKG_IPV4_UCI_NAME)
-$(call Package/$(PKG_UCI_NAME)/Default)
-  TITLE+= (IPv4)
-  DEPENDS+= +$(BIRD1_IPV4_PKG)
-endef
-
-define Package/$(PKG_IPV6_UCI_NAME)
-$(call Package/$(PKG_UCI_NAME)/Default)
-  TITLE+= (IPv6)
-  DEPENDS+= +$(BIRD1_IPV6_PKG)
-endef
-
-define Package/$(PKG_IPV4_LUCI_NAME)
-$(call Package/$(PKG_LUCI_NAME)/Default)
-  TITLE+= (IPv4)
-  DEPENDS+= +$(PKG_IPV4_UCI_NAME)
-endef
-
-define Package/$(PKG_IPV6_LUCI_NAME)
-$(call Package/$(PKG_LUCI_NAME)/Default)
-  TITLE+= (IPv6)
-  DEPENDS+= +$(PKG_IPV6_UCI_NAME)
-endef
-
-define Package/$(PKG_IPV4_UCI_NAME)/conffiles
-/etc/config/$(BIRD4)
-endef
-
-define Package/$(PKG_IPV6_UCI_NAME)/conffiles
-/etc/config/$(BIRD6)
-endef
-
-define Package/$(PKG_IPV4_UCI_NAME)/install
-	$(INSTALL_DIR) $(1)/etc/$(BIRD4)/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/$(BIRD4)/filters
-	$(INSTALL_DIR) $(1)/etc/$(BIRD4)/functions
-	$(INSTALL_BIN) ./$(PKG_IPV4_NAME)/src/init.d/$(BIRD4)* $(1)/etc/$(BIRD4)/init.d/
-	$(CP) ./$(PKG_IPV4_NAME)/src/uci-defaults/* $(1)/etc/$(BIRD4)/init.d/
-	$(INSTALL_CONF) ./$(PKG_IPV4_NAME)/src/config/$(BIRD4) $(1)/etc/config/
-endef
-
-define Package/$(PKG_IPV6_UCI_NAME)/install
-	$(INSTALL_DIR) $(1)/etc/$(BIRD6)/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/$(BIRD6)/filters
-	$(INSTALL_DIR) $(1)/etc/$(BIRD6)/functions
-	$(INSTALL_BIN) ./$(PKG_IPV6_NAME)/src/init.d/$(BIRD6)* $(1)/etc/$(BIRD6)/init.d/
-	$(CP) ./$(PKG_IPV6_NAME)/src/uci-defaults/* $(1)/etc/$(BIRD6)/init.d/
-	$(INSTALL_CONF) ./$(PKG_IPV6_NAME)/src/config/$(BIRD6) $(1)/etc/config/
-endef
-
-define Package/$(PKG_IPV4_UCI_NAME)/postinst
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-    ( . /etc/$(BIRD4)/init.d/bird-uci-install-init.d $(BIRD4) ) && rm -f /etc/$(BIRD4)/init.d/bird-uci-install-init.d
-    ( . /etc/$(BIRD4)/init.d/99-relocate-filters $(BIRD4) ) && rm -f /etc/$(BIRD4)/init.d/99-relocate-filters
-    if [ -f /etc/sysupgrade.conf ] && ! grep $(BIRD4) /etc/sysupgrade.conf; then
-        echo /etc/config/$(BIRD4) >> /etc/sysupgrade.conf
-        echo /etc/$(BIRD4)/filters/ >> /etc/sysupgrade.conf
-        echo /etc/$(BIRD4)/functions/ >> /etc/sysupgrade.conf
-    fi
-fi
-endef
-
-define Package/$(PKG_IPV6_UCI_NAME)/postinst
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-    ( . /etc/$(BIRD6)/init.d/bird-uci-install-init.d $(BIRD6) ) && rm -f /etc/$(BIRD6)/init.d/bird-uci-install-init.d
-    ( . /etc/$(BIRD6)/init.d/99-relocate-filters $(BIRD6) ) && rm -f /etc/$(BIRD6)/init.d/99-relocate-filters
-    if [ -f /etc/sysupgrade.conf ] && ! grep $(BIRD6) /etc/sysupgrade.conf; then
-        echo /etc/config/$(BIRD6) >> /etc/sysupgrade.conf
-        echo /etc/$(BIRD6)/filters/ >> /etc/sysupgrade.conf
-        echo /etc/$(BIRD6)/functions/ >> /etc/sysupgrade.conf
-    fi
-fi
-endef
-
-$(eval $(call BuildPackage,$(PKG_IPV4_UCI_NAME)))
-$(eval $(call BuildPackage,$(PKG_IPV6_UCI_NAME)))
-
-define Package/$(PKG_IPV4_LUCI_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/$(BIRD4)/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/$(BIRD4)/
-	$(CP) ./$(PKG_IPV4_NAME)/src/model/* $(1)/usr/lib/lua/luci/model/cbi/$(BIRD4)/
-	$(CP) ./$(PKG_IPV4_NAME)/src/controller/* $(1)/usr/lib/lua/luci/controller/
-	$(CP) ./$(PKG_IPV4_NAME)/src/view/* $(1)/usr/lib/lua/luci/view/$(BIRD4)/
-endef
-
-define Package/$(PKG_IPV6_LUCI_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/$(BIRD6)/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/$(BIRD6)/
-	$(CP) ./$(PKG_IPV6_NAME)/src/model/* $(1)/usr/lib/lua/luci/model/cbi/$(BIRD6)/
-	$(CP) ./$(PKG_IPV6_NAME)/src/controller/* $(1)/usr/lib/lua/luci/controller/
-	$(CP) ./$(PKG_IPV6_NAME)/src/view/* $(1)/usr/lib/lua/luci/view/$(BIRD6)/
-endef
-
-$(eval $(call BuildPackage,$(PKG_IPV4_LUCI_NAME)))
-$(eval $(call BuildPackage,$(PKG_IPV6_LUCI_NAME)))

bird1-openwrt/README.md

@@ -1,80 +0,0 @@
-# bird-openwrt
-
-Package for OpenWRT to bring integration with UCI and LUCI to Bird4 and Bird6 daemon.
-
-This repository contains an UCI module adding support for an user-friendly configuration of the BIRD daemon in OpenWRT systems and a LuCI application to control this UCI configuration using the web-based OpenWRT configuration system.
-
-**Package Names**: luci-app-bird{4|6} and bird{4|6}-uci
-
-**Dependences**: +bird{4|6} +libuci +luci-base +uci +libuci-lua
-
-**Last Version**: 0.3
-
-**Terminal (UCI) Documentation**: [Link](https://github.com/eloicaso/bird-openwrt/blob/master/UCI-DOCUMENTATION.md)
-
-**Web (LUCI) Documentation**: [Link](https://github.com/eloicaso/bird-openwrt/blob/master/LUCI-DOCUMENTATION.md)
-
-
-## Known issues (v0.3):
-* There is an issue with pre-built images. It seems that the UCI-Default Scripts are not applied for some reason. If you face this situation, just copy both packages in your /tmp and and execute "opkg install PackageName.ipk --force-reinstall". It will overwrite your /etc/config/bird{4|6}, create a backup of this configuration.
-
-* LUCI Material Design Theme shows a "Loading page" in **Logs Page** preventing it to load. Moreover, the OpenWRT Theme crashes loading the **Log Page**.
-Please, go to `System -> Language and Style -> Design` and change it to any other avaiable Theme (*Bootstrap* or *Freifunk_Generic* are recommended).
-
-* There is a manual procedure to designate custom Routing Table IDs created through this package's UI. Please, visit [this page](https://github.com/eloicaso/bgp-bmx6-bird-docn/blob/master/EN/manual_procedures.md) for more details.
-
-## How to compile:
-Due to the existence of Routing's bird-openwrt packages, if you want to build your system using this repo's bird packages, you need to proceed as follows:
-
-
-* Add this github as a repository in feeds.conf. Alternatively, you could use a local git clone)
-```
-src-git birdwrt https://github.com/eloicaso/bird-openwrt.git
-
-```
-OR
-```
-src-link birdwrt /path/to/your/git/clone/bird-openwrt
-```
-
-* Disable OpenWRT-Routing repository to avoid getting the outdated package
-```
-# src-git routing https://github.com/openwrt-routing/packages.git
-```
-
-* Update and install all packages in feeds
-```
-./scripts/feeds update -a; ./scripts/feeds install -a
-```
-
-* Enable OpenWRT-Routing repository to fulfill bird{4/6} dependencies
-```
-src-git routing https://github.com/openwrt-routing/packages.git
-./scripts/feeds update routing; ./scripts/feeds install bird4 bird6
-```
-
-* Compile (Option 1) the whole OpenWRT image with the package included
-```
-make menuconfig -> Network -> Routing and Redirection -> Select bird*-uci
-                -> LuCI -> 3. Applications -> Select luci-app-bird*
-make V=99
-```
-
-* Compile (Option 2) the packet ( ! this method requires to compile its dependeces before using Option 1)
-```
-make package/feeds/birdwrt/bird{4/6}-openwrt/compile V=99
-```
-
-* Find your package in
-```
-[OpenWRT_folder]/bin/packages/{Architecture}/routing/bird{4/6}-uci_{Version}_{Architecture}.ipk
-[OpenWRT_folder]/bin/packages/{Architecture}/routing/luci-app-bird{4/6}_{Version}_{Architecture}.ipk
-```
-
-* Install your .ipk in your dev-environment (avoid CheckSum Missmatch issues)
-```
-scp bird{4/6}-uci_{Version}_{Architecture}.ipk user@IPAddres:/tmp
-
-On your Dev-Environment:
-opkg install bird{4/6}-uci_{Version}_{Architecture}.ipk --force-checksum
-```

bird1-openwrt/UCI-DOCUMENTATION.md

@@ -1,345 +0,0 @@
-<!--
----------------------------------------------------------------------
-(C) 2014 - 2017 Eloi Carbo <eloicaso@openmailbox.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
----------------------------------------------------------------------
--->
-
-# Bird{4|6} UCI Packages Documentation
-*  BIRD Daemon's original documentation: http://bird.network.cz/?get_doc
-* Usage examples (Gitlab): https://gitlab.labs.nic.cz/labs/bird/wikis/home
-* Extra documentation in English & Catalan: https://github.com/eloicaso/bgp-bmx6-bird-docn
-* If you want to add new options to bird*-openwrt packages add a pull request or issue in: https://github.com/eloicaso/bird-openwrt
-
-### Options used in /etc/config/bird{4|6}
-> *Clarification*: Any reference to **{4|6}** in this document means that it applies to both Bird4 and Bird6 packages and configurations. Otherwise, the text will clarify which specific package is affected by it.
-
-#### CONFIGURATION SECTION 1: 'bird'
-Usage example :
-``` Bash
-config bird 'bird'
-    option use_UCI_config '1'
-    option UCI_config_file '/tmp/bird4.conf'
-```
-
-* **use_UCI_config**: *Boolean*
-This option allows you to use package's UCI configuration translation instead of using the original Bird config file (hand-edited). If true/1, birdX init.d script will use the translation placed in "UCI_config_file". Otherwise, it will use the default "/etc/birdX.conf" configuration.
-**\[HINT**\] This could be used to allow multiple configurations and swap them easily.
-*Default: 0*
-
-* **UCI_config_file**: *String* File_path
-This option sets where will be placed the translation of the UCI configuration file.
-*Default: /tmp/birdX.conf*
-
-
-#### CONFIGURATION SECTION 2: 'global NAME'
-Usage example:
-```Bash
-config global 'global'
-    option log_file '/tmp/bird4.log'
-    option log 'all'
-    option debug 'off'
-    option router_id '172.16.1.6'
-```
-
-* **log_file**: *String* File_path
-This option sets the path of the file used to save Bird Log and Debug's information.
-*Default: /tmp/bird{4|6}.log*
-
-* **log**: *String/Enumeration* (all/off, info, warning, error, fatal, debug, trace, remote, auth, bug)
-This option allows you to set which information you want to save in the Log file.
-**\[HINT\]** Use the enumeration like: { info, waning, error }. Do not enter any extra option if you select "all" (Bird will fail to start).
-*Default: all*
-
-* **debug**: *String/Enumeration* ( all/off, states, routes, filters, interfaces, events, packets)
-This option allows you to set which **extra** debug information will be saved in the "log_file" file.
-**\[HINT\]** Use the enumeration like: { info, waning, error }. Do not enter any extra option if you select "all" (Bird will fail to start).
-*Default: off*
-
-* **router_id**: IP Address
-This option sets which will be the Router ID.
-**\[HINT\]** In **Bird4** this field is the lowest IP address (not loopback) among the existing interfaces by default (Optional property).
-In **Bird6** there is no default value and it is mandatory.
-
-* **listen_bgp_addr**: IP Address
-This option sets the IP address that Bird BGP instances will listen by default.
-*Default: 0.0.0.0*
-
-* **listen_bgp_port**: *Integer* Port
-This option sets the port that Bird BGP instances will listen by default.
-*Default: IP 0.0.0.0 and Port 179*
-
-* **listen_bgp_dual**: *Boolean*
-**\[Bird6\]** This option configures Bird6 BGP instances to listen only IPv6 or IPv4/6 BGP routes.
-
-
-#### <a name="table"></a>CONFIGURATION SECTION 3: 'table'
-Usage example:
-``` Bash
-config table
-    option name 'aux'
-```
-
-* **name**: *String*
-This option allows you to set the name of the auxiliar kernel tables used for Bird. This option is mandatory for most of the protocols.
-
-
-#### CONFIGURATION SECTION 4: 'kernel NAME'
-Usage example:
-``` Bash
-config kernel kernel1
-    option table 'aux'
-    option import 'all'
-    option export 'all'
-    option kernel_table '100'
-    option scan_time '10'
-    option learn '1'
-    option persist '0'
-    option disabled '0'
-```
-
-* **table**: *String*
-Set an auxiliary table for the current kernel routing instance. This table **MUST** exist as a [table](#table) instance.
-**\[HINT\]** If there is an Kernel protocol instance that uses the "main" kernel table, not using table/kernel_table options, this should be included before the rest of Kernel instances (which will use auxiliary tables).
-
-* **import**: *String/Filter* function
-This option delimits which routes coming from other protocols will be accepted. 
-Options are:
-**All/none**: allows to import all the routes or none of them.
-**Filter name**: \[import 'bgp_filter_in'\] the protocol will use the filter with the given name (Specified filter **must** exists in any file under /etc/bird{4|6}/filters/ folder).
-
-* export: String/Filter function
-This option delimits which routes going out from the protocol. This option allows filters in different manners:
-**All/none**: allows to export all the routes or none of them.
-**Filter name**: \[export 'bgp_filter_out'\] the protocol will use the filter with the given name(Specified filter **must** exists in any file under /etc/bird{4|6}/filters/ folder).
-
-* **kernel_table**: *Integer*
-This option sets the identification number of the Kernel table that will be used instead of the main one.
-*Default: main table (254)*
-
-* **scan_time**: *Integer*
-This option sets the time between checks to target kernel table.
-
-* **learn**: *Boolean*
-Set if kernel table will add the routes from other routing protocols or the system administrator.
-
-* **persist**: *Boolean*
-Set if Bird Daemon will save the known routes when exiting or if it will clean the routing table.
-
-* **disable**: *Boolean*
-This option sets if the protocol will be used or dismissed.
-*Default: 0*
-
-
-#### CONFIGURATION SECTION 5: 'device NAME'
-Usage example:
-``` Bash
-config device device1
-    option scan_time '10'
-    option disabled '0'
-```
-
-* **scan_time***: *Integer*
-This option sets the time between checks to the selected kernel table.
-
-* **disable**: *Boolean*
-This option sets if the protocol will be used or dismissed.
-*Default: 0*
-
-
-#### CONFIGURATION SECTION 6: 'static NAME'
-Usage example:
-``` Bash
-config static static1
-    option table 'aux'
-    option disabled '0'
-```
-
-* **table**: *String*
-Set an auxiliary table for the current static instance. This table **MUST** exist as a [table](#table) instance.
-**\[HINT\]** If there is an static instance that uses the "main" kernel table (not using table/kernel_table options), this should be included before the rest of static instances (which will use auxiliary tables).
-
-* **disable**: *Boolean*
-This option sets if the protocol will be used or dismissed.
-*Default: 0*
-
-
-#### CONFIGURATION SECTION 7 & 8: 'bgp NAME' & 'bgp_template NAME'
-This section merges two different configuration sections: BGP *instances* and *templates*. The first one is the basic BGP configuration part and the second one is the template used to minimize the number of options written in the configuration file for each unique instance. Both configuration sections have the same options but, when Bird finds duplicities, the instance will overwrite the template options.
-
-Usage examples:
-``` Bash
-# instance
-config bgp bgp1
-    option template 'bgp_common'
-    option description 'Description of the BGP instance'
-    option neighbor_address '172.16.1.5'
-    option neighbor_as '65530'
-    option source_address '172.16.1.6'
-    option next_hop_self '0'
-    option next_hop_keep '0'
-    option rr_client '1'
-    option rr_cluster_id '172.16.1.6'
-```
-
-``` Bash
-# template
-config bgp_template bgp_common
-    option table 'aux'
-    option import 'all'
-    option export 'all'
-    option local_address '172.16.1.6'
-    option local_as '65001'
-    option import_limit '100'
-    option import_limit_action 'warn'
-    option export_limit '100'
-    option export_limit_action 'warn'
-    option receive_limit '100'
-    option receive_limit_action 'warn'
-    option disabled '0'
-```
-
-* **template**: *String*
-This option states the template used for current BGP instance. This template MUST exist.
-
-* **description**: *String*
-This option allows to add a description of the bgp instance and its function.
-
-* **local_addr**: IP address
-This option allows to set the IP source of our Autonomous System (AS).
-
-* **local_as**: *Integer*
-This option allows to set the identification number of our AS number. This option is mandatory for each BGP instance.
-
-* **neighbor_addr**: IP address 
-Each BGP instance has a neighbor connected to. This option allows to set its IP address.
-
-* **neighbor_as**: *Integer*
-Each BGP instance has a neighbor connected to. This option allows to set its AS ID.
-
-* **next_hop_self**: *Boolean*
-If this option is true, BGP protocol will avoid to calculate the next hop and always advertise own "Router id" IP.
-*Default: 0*
-
-* **next_hop_keep**: *Boolean*
-If this option is true, BGP will always use the received next_hop information to redirect the route.
-*Default: 0*
-
-* **rr_client**: *Boolean*
-IF this option is true, the router will be set as Route Reflector and will treat the rest of the routers as RR clients.
-*Default: 0*
-
-* **rr_cluster_id**: *Integer*
-This option sets the identification number of the RR cluster. All the nodes in a cluster needs this option and share the same number.
-*Default: Router id*
-
-* **import_limit**: *Integer*
-This option sets the limit of routes that a protocol can import until take the action indicated in the import_limit_action.
-import_limit also counts filtered routes (even dropped ones).
-*Default: 0 (no limit)*
-
-* **import_limit_action**: *String*
-This option allows to decide the action to take when reached the limit of imported routes.
-Actions are: warn, block, restart, disable
-
-* **export_limit**: *Integer*
-This option sets the limit of routes that a protocol can export until take the action indicated in the export_limit_action.
-*Default: 0 (no limit)*
-
-* **export_limit_action**: *String*
-This option allows to decide the action to take when reached the limit of exported routes.
-Actions are: warn, block, restart, disable
-
-* **receive_limit**: *Integer*
-This option sets the limit of routes that a protocol can receive until take the action indicated in the receive_limit_action. receive_limit only counts accepted routes from the protocol.
-*Default: 0 (no limit)*
-
-* **receive_limit_action**: *String*
-This option allows to decide the action to take when reached the limit of received routes.
-Actions are: warn, block, restart, disable
-
-* **disable**: *Boolean*
-This option sets if the protocol will be used or dismissed.
-*Default: 0*
-
-
-#### CONFIGURATION SECTION 9: 'route' 
-Usage example:
-``` Bash
-config route
-    option instance 'static1'
-    option type 'router'
-    option prefix '192.168.9.0/24'
-    option via '10.99.105.159'
-
-config route
-    option instance 'static1'
-    option type 'special'
-    option prefix '192.168.2.0/24'
-    option attribute 'unreachable'
-
-config route
-    option instance 'static1'
-    option type 'iface'
-    option prefix '192.168.3.0/24'
-    option iface 'mgmt0'
-
-config route
-    option instance 'static1'
-    option type 'recursive'
-    option prefix '192.168.4.0/24'
-    option ip '192.168.1.1'
-
-config route
-    option instance 'static1'
-    option type 'multipath'
-    option prefix '192.168.30.0/24'
-    list l_via '172.16.1.5'
-    list l_via '172.16.1.6'
-```
-
-* **instance**: *String*
-This option indicates the route that the static protocol instance will apply.
-
-* **type**: *String*
-This option states the type of route that will be applied. Also defines the options available for it.
-Types are: 'router', 'special', 'iface', 'recursive' or 'multipath'.
-
-* **prefix**: IP address/network
-This option allows to define the network that you want to define.
-**\[router only\]** 
-**via**: IP Address
-This option indicates the IP address of the neighbor router where the routes will pass through.
-**\[special only\]**
-**attribute**: *String*
-This option will mark the behaviour of the route.
-Attribures are: 'blackhole', 'unreachable' or 'prohibit'.
-**\[iface only\]**
-**iface**: *String*
-This option indicates the interface used to redirect the BGP routes. Careful, the interface MUST exist, or Bird will fail to start.
-**\[recursive only\]**
-**ip**: IP address
-This option states the IP address which the next hop will depend on.
-**\[multipath only\]**
-This is a list, not an option. Use it as in the example, or check the UCI configuration documentation.
-**l_via**: IP address
-This list of IPs specifies the list (following the sequence) of routers that the route will follow as next hops.
-
-
-#### CONFIGURATION SECTION 10 & 11: 'filter NAME' & 'function Name'
-Filters are written in separated files under **/etc/bird{4|6}/filters/** and **/etc/bird{4|6}/functions/**. Their syntax can be found [here.](http://bird.network.cz/?get_doc&f=bird-5.html)
-The content of each filter and file file will be included in the resulting bird{4|6}.conf file without checking its syntax, so you could find errors during start time.
-
-* Clarification for any existing **v0.2** user: an automated upgrade path has been added to switch your old "filter" or "function" sections. It is safe to upgrade, but doing regular backups of your key files is always a good practise to avoid frustration.

bird1-openwrt/bird1-ipv4-openwrt/src/config/bird4

@@ -1,33 +0,0 @@
-config bird 'bird'
-    option use_UCI_config '1'
-        #Caution! Enabling this option, Bird will translate this
-        #UCI file and use it instead of /etc/bird4.conf
-    option UCI_config_file '/tmp/bird4.conf'
-        #If you enable useUCIconfig, UCIconfigFile will be Bird's
-        #configuration file location.
-
-config global 'global'
-    option log_file '/tmp/bird4.log'
-    option log 'all'
-    option debug 'off'
-
-config table
-    option name 'aux'
-
-config kernel kernel1
-    option table 'aux'
-    option import 'all'
-    option export 'all'
-    option kernel_table '100'
-    option scan_time '10'
-    option learn '1'
-    option persist '0'
-    option disabled '0'
-
-config device device1
-    option scan_time '10'
-    option disabled '0'
-
-config static static1
-    option table 'aux'
-    option disabled '0'

bird1-openwrt/bird1-ipv4-openwrt/src/controller/bird4.lua

@@ -1,52 +0,0 @@
---[[ 
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
---]]
-
-module("luci.controller.bird4", package.seeall)
-
-function index()
-        entry({"admin", "network", "bird4",},
-            alias("admin", "network", "bird4", "status"),
-            _("Bird4"), 0)
-
-        entry({"admin", "network", "bird4", "status"},
-            form("bird4/status"),
-            _("Status"), 0).leaf = true
-
-        entry({"admin","network","bird4","log"},
-            template("bird4/log"),
-            _("Log"), 1).leaf = true
-
-        entry({"admin", "network", "bird4", "overview"},
-            cbi("bird4/overview"),
-            _("Overview"), 2).leaf = true
-
-        entry({"admin","network","bird4","proto_general"},
-            cbi("bird4/gen_proto"),
-            _("General protocols"), 3).leaf = true
-
-        entry({"admin","network","bird4","proto_bgp"},
-            cbi("bird4/bgp_proto"),
-            _("BGP Protocol"), 4).leaf = true
-
-        entry({"admin","network","bird4","filters"},
-            form("bird4/filters"),
-            _("Filters"), 5).leaf = true
-
-        entry({"admin","network","bird4","functions"},
-            form("bird4/functions"),
-            _("Functions"), 6).leaf = true
-end

bird1-openwrt/bird1-ipv4-openwrt/src/init.d/bird4

@@ -1,233 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-# Copyright (C) 2014-2017 - Eloi Carbo
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Extra Service Function to get the Status of the Service
-# This complements /etc/rc.common functions
-# Commands ending with *_quiet are meant to be ran in Luci. These
-# scripts' return minimal output.
-EXTRA_COMMANDS="status start_quiet stop_quiet restart_quiet status_quiet"
-EXTRA_HELP="        status  Returns service status"
-
-BIRD="bird4"
-BIRD_CONFIG="/etc/${BIRD}.conf"
-BIRD_LOG="/var/log/${BIRD}.log"
-BIRD_ERR="/tmp/${BIRD}.err"
-
-START=99
-STOP=10
-
-SERVICE_DAEMONIZE=1
-SERVICE_USE_PID=1
-SERVICE_PID_FILE="/var/run/${BIRD}.pid"
-
-BIRD_BIN="/usr/sbin/${BIRD}"
-# Special non-terminal-rich output for Luci calls
-LUCI="false"
-
-. /etc/${BIRD}/init.d/${BIRD}-lib.sh
-
-start() {
-    config_load ${BIRD}
-    local use_UCI_config
-    get use_UCI_config 'bird'
-
-    #Start the service
-    if [ "${LUCI}" == "false" ]; then
-        echo "Starting ${BIRD} Service [ ... ]"
-    fi
-    if [ -f ${BIRD_ERR} ]; then
-        echo -n "" > ${BIRD_ERR}
-    else
-        touch ${BIRD_ERR}
-    fi
-
-    if [ -z "${use_UCI_config}" -o "${use_UCI_config}" = "0" ]; then
-        # Disable Custom bird-openwrt settings.
-        # Use default behaviour and files
-        ${BIRD_BIN} -d -c ${BIRD_CONFIG} -P ${SERVICE_PID_FILE} -D ${BIRD_LOG} &> ${BIRD_ERR} &
-    else
-        #Set Bird4 configuration location:
-        local UCI_config_file
-        local log_file
-        get UCI_config_file 'bird'
-        get log_file 'global'
-        BIRD_CONFIG="${UCI_config_file:-$BIRD_CONFIG}"
-        BIRD_LOG="${log_file:-$BIRD_LOG}"
-        #Backup previous configuration
-        [ -f ${BIRD_CONFIG} ] && cp ${BIRD_CONFIG} ${BIRD_CONFIG}.bak
-        #Setup the basic configuration
-        prepare_global 'global'
-
-        # Gather and set all Functions
-        gather_functions
-        # Gather and set all Filters
-        gather_filters
-
-        # Setup Main Protocols
-        config_foreach prepare_kernel 'kernel'
-        config_foreach prepare_static 'static'
-        config_foreach prepare_device 'device'
-        config_foreach prepare_direct 'direct'
-        config_foreach prepare_pipe 'pipe'
-
-        #Setup protocol's configuration: BGP
-        config_foreach prepare_bgp_template 'bgp_template'
-        config_foreach prepare_bgp 'bgp'
-
-        #Setup protocol's configuration: OSPF
-        config_foreach prepare_ospf_instance 'ospf'
-
-        #Start the service
-        ${BIRD_BIN} -d -c ${BIRD_CONFIG} -P ${SERVICE_PID_FILE} -D ${BIRD_LOG} &>${BIRD_ERR} &
-    fi
-    while [ ! -s ${SERVICE_PID_FILE} ]; do
-        sleep 1
-        if [ -s ${BIRD_ERR} ]; then
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} Daemon Start Status: \033[0;31m[ FAILED ]\e[m"
-                cat ${BIRD_ERR}
-                cat ${BIRD_ERR} >> ${BIRD_LOG}
-            else
-                echo "${BIRD} - Failed: $(cat ${BIRD_ERR})"
-                cat ${BIRD_ERR} >> ${BIRD_LOG}
-            fi
-            break
-        fi
-    done
-
-    # PID & ERROR contents are read from their files to avoid an issue
-    # where if [ -s ${SERVICE_PID_FILE} ] and if [ -s ${BIRD_ERR} ]
-    # fails unless a previous command reads its contents making its
-    # behaviour unreliable.
-    SVC_PID="$(cat ${SERVICE_PID_FILE})"
-    BRDERR_TXT="$(cat ${BIRD_ERR})"
-    if [ -n "${SVC_PID}" ]; then
-        if [ -n "${BRDERR_TXT}" ]; then
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} Daemon already started. Status \033[0;32m[ RUNNING ]\e[m"
-            else
-                echo "${BIRD} already started"
-            fi
-        else
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} Daemon Start Status: \033[0;32m[ STARTED ]\e[m"
-            else
-                echo "${BIRD} - Started"
-            fi
-        fi
-        # PID File found (service started correctly)
-        return 0
-    fi
-
-    # PID File not found (error while starting service)
-    return 1
-}
-
-stop() {
-    if [ -s ${SERVICE_PID_FILE} ]; then
-        config_load ${BIRD}
-        local log_file
-        get log_file 'global'
-        BIRD_LOG="${log_file:-$BIRD_LOG}"
-        start-stop-daemon -p ${SERVICE_PID_FILE} -K 2>&1 >> ${BIRD_LOG}
-        if [ $? -eq 0 ]; then
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} Daemon Stop Status: \033[0;32m[ OK ]\e[m"
-            else
-                echo "${BIRD} - Stopped"
-            fi
-            echo -n "" > ${BIRD_ERR}
-        else
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} Daemon Stop Status: \033[0;31m[ FAILED ]\e[m"
-                echo "Check ${BIRD_LOG} file for more information."
-            else
-                echo "${BIRD} Failed to Stop. See Log file: ${BIRD_LOG}"
-            fi
-        fi
-    else
-        if [ "${LUCI}" == "false" ]; then
-            echo -e "${BIRD} Daemon Service already stopped. \033[0;31m[ FAILED ]\e[m"
-        else
-            echo "${BIRD} already stopped"
-        fi
-    fi
-    return 0
-}
-
-restart() {
-    stop
-    sleep 1
-    if [ "${LUCI}" == "true" ]; then
-        echo " ... "
-    fi
-    start
-}
-
-reload() {
-    service_reload ${BIRD_BIN}
-}
-
-status() {
-    if [ -s ${SERVICE_PID_FILE} ]; then
-        if [ "${LUCI}" == "false" ]; then
-            echo -e "${BIRD} start status: \033[0;32m[ RUNNING ]\e[m"
-        else
-            echo "${BIRD}: Running"
-        fi
-        return 0
-    else
-        if [ -s ${BIRD_ERR} ]; then
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} service status: \033[0;31m[ STOPPED ]\e[m"
-                cat ${BIRD_ERR}
-            else
-                echo "${BIRD}: Failed - $(cat ${BIRD_ERR})"
-            fi
-            return 2
-        else
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} service status: \033[0;31m[ STOPPED ]\e[m"
-            else
-                echo "${BIRD}: Stopped"
-            fi
-            return 1
-        fi
-    fi
-}
-
-
-# Luci-specific calls (stripped output).
-# The following scripts are not meant to be ran using Ash Terminal
-# Used in: LUCI/model/cbi/bird4/status.lua
-start_quiet() {
-    LUCI="true"
-    start
-}
-stop_quiet() {
-    LUCI="true"
-    stop
-}
-restart_quiet() {
-    LUCI="true"
-    restart
-}
-status_quiet() {
-    LUCI="true"
-    status
-}

bird1-openwrt/bird1-ipv4-openwrt/src/init.d/bird4-lib.sh

@@ -1,590 +0,0 @@
-# Bird4-OpenWRT Library - Functions used in /etc/init.d/bird4 script.
-#
-#
-# Copyright (C) 2014-2017 - Eloi Carbo
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-
-# Function: writeToConfig $1
-# $1 string.
-# Allows to write in the $BIRD_CONFIG file, the string $1. This function does not check the $1 string.
-# Example: writeToConfig "value: $N"
-writeToConfig() {
-    echo "$1" >> ${BIRD_CONFIG}
-}
-
-
-# Function: write $1 $2
-# $1 string. $2 string.
-# This function checks if $2 is empty. If not, it writes the string $1 in the $BIRD_CONFIG file.
-# Use write function to check if $1, value found inside $2, is not empty and can be written in the configuration file.
-# Example: N=""; write "value: $N" $N;
-write() {
-    [ -n "$2" ] && writeToConfig "$1"
-}
-
-
-#Function: write_bool $1 $2
-# $1 string; $2 boolean
-# This function checks if $2 is true and write the $1 string into $BIRD_CONFIG file.
-# Example: local N=0; write_bool $N
-write_bool() {
-    [ "$2" == 1 ] && writeToConfig "    $1;"
-}
-
-
-# Function: get $1 $2
-# $1 string. $2 string
-# This function uses the external UCI function "config_get $result $section $option" to obtain a string value from UCI config file.
-# To use this function, use the same name of the UCI option for the variable.
-# Example: UCI (option id 'abcd'); local id; get id $section
-get() {
-    config_get $1 $2 $1
-}
-
-
-# Function: get_a_bool $1 $2
-# $1 boolean. $2 string
-# This function uses the external UCI function "config_get_bool $result $section $option" to obtain a boolean value from UCI config file.
-# To use this function, use the same name of the UCI option for the variable $1.
-# Example: UCI (option use_ipv6 '1'); local use_ipv6; get use_ipv6 $section
-# Note: this function was originally called get_bool(), but it collided with
-#       the get_bool() function provided by /lib/functions.sh. Read more at
-#       https://github.com/openwrt/routing/issues/920.
-get_a_bool() {
-    config_get_bool $1 $2 $1
-}
-
-
-# Function: multipath_list $1
-# $1 string
-# This function writes the $1 string in the multipath routes.
-multipath_list() {
-    write "          via $1" $1
-}
-
-
-# Function: range_list $1
-# $1 string
-# This function writes the $1 string in the OSPF networks.
-range_list(){
-    write "            $1;" $1
-}
-
-
-# Function: hidden_range_list $1
-# $1 string
-# This function writes the $1 string in the OSPF networks as hidden.
-hidden_range_list(){
-   write "            $1 hidden;" $1
-}
-
-
-# Function: prepare_tables $1
-# $1 string
-# This function gets each "table" section in the UCI configuration and sets each option in the bird4.conf file.
-# $1 is set as the ID of the current UCI table section
-prepare_tables() {
-    local section="$1"; local name
-
-    get name ${section}
-
-    write "table ${name};" ${name}
-}
-
-
-# Function: prepare_global $1
-# $1 string
-# This function gets each "global" section in the UCI configuration and sets each option in the bird4.conf file.
-# $1 is set as the ID of the current UCI global section. prepare_global is the first configuration set in the bird4.conf and removes the old file.
-prepare_global () {
-    local section="$1"
-    local log_file; local log; local debug; local router_id; local table
-
-    # Remove old configuration file
-    rm -f "${BIRD_CONFIG}"
-
-    get log_file ${section}
-    get log ${section}
-    get debug ${section}
-    get router_id ${section}
-    get table ${section}
-
-    # First line of the NEW configuration file
-    echo "#Bird4 configuration using UCI:" > ${BIRD_CONFIG}
-    writeToConfig " "
-    #TODO: Set Syslog as receiver if empty
-    #    LOGF="${log_file:-syslog]}"
-    #TODO: If $log/$debug are empty, set to off
-    if [ -n "${log_file}" -a -n "${log}" ]; then
-        firstEntry="${log:0:3}"
-        if [ "${firstEntry}" = "all" -o "${firstEntry}" = "off" ]; then
-            writeToConfig 'log "'${log_file}'" '${firstEntry}';'
-        else
-            logEntries=$(echo ${log} | tr " " ",")
-            writeToConfig "log \"${log_file}\" { ${logEntries} };"
-        fi
-    fi
-
-    if [ -n "${debug}" ]; then
-        firstEntry="${debug:0:3}"
-        if [ "${firstEntry}" = "all" -o "${firstEntry}" = "off" ]; then
-            writeToConfig "debug protocols ${firstEntry};"
-        else
-            debugEntries=$(echo ${debug} | tr " " ",")
-            writeToConfig "debug protocols { ${debugEntries} };"
-        fi
-    fi
-    writeToConfig " "
-    writeToConfig "#Router ID"
-    write "router id ${router_id};" ${router_id}
-    writeToConfig " "
-    writeToConfig "#Secondary tables"
-    config_foreach prepare_tables 'table'
-    writeToConfig " "
-}
-
-
-# Function: prepare_routes $1
-# $1 string
-# This function gets each "route" section in the UCI configuration and sets each option in the bird4.conf file.
-# $1 is set as the ID of the current UCI route section. Each type of route has its own treatment.
-prepare_routes() {
-    local instance; local prefix; local via; local type; local attribute; local iface
-    local section="$1"
-    local protoInstance="$2"
-
-    get instance ${section}
-    get type ${section}
-    get prefix ${section}
-
-    if [ "${instance}" = "${protoInstance}" ]; then
-        case "${type}" in
-            "router")
-                get via ${section}
-                [ -n "${prefix}" -a -n "${via}" ] && writeToConfig "    route ${prefix} via ${via};"
-                ;;
-            "special")
-                get attribute ${section}
-                [ -n "${prefix}" -a -n "${attribute}" ] && writeToConfig "    route ${prefix} ${attribute};"
-                ;;
-            "iface")
-                get iface ${section}
-                [ -n "${prefix}" -a -n "${iface}" ] && writeToConfig '    route '${prefix}' via "'${iface}'";'
-                ;;
-            "multipath")
-                write "    route ${prefix} multipath" ${prefix}
-                config_list_foreach ${section} l_via multipath_list
-                writeToConfig "        ;"
-                ;;
-        esac
-    fi
-}
-
-
-# Function: prepare_kernel $1
-# $1 string
-# This function gets each "kernel" protocol section in the UCI configuration and sets each option in the bird4.conf file.
-# $1 is set as the ID of the current UCI kernel section.
-prepare_kernel() {
-    local section="$1"
-    local disabled; local table; local kernel_table; local import; local export
-    local scan_time; local persist; local learn
-
-    get_a_bool disabled ${section}
-    get table ${section}
-    get import ${section}
-    get export ${section}
-    get scan_time ${section}
-    get kernel_table ${section}
-    get learn ${section}
-    get persist ${section}
-
-    write "#${section} configuration:" ${section}
-    writeToConfig "protocol kernel ${section} {" ${section}
-    write_bool disabled ${disabled}
-    write "    table ${table};" ${table}
-    write "    kernel table ${kernel_table};" ${kernel_table}
-    write_bool learn ${learn}
-    write_bool persist ${persist}
-    write "    scan time ${scan_time};" ${scan_time}
-    write "    import ${import};" ${import}
-    write "    export ${export};" ${export}
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-# Function: prepare_static $1
-# $1 string
-# This function gets each "static" protocol section in the UCI configuration and sets each option in the bird4.conf file.
-# $1 is set as the ID of the current UCI static section.
-prepare_static() {
-    local section="$1"
-    local disabled; local table
-
-    get disabled ${section}
-    get table ${section}
-
-    if [ "${disabled}" -eq 0 ]; then
-        writeToConfig "#${section} configration:" ${section}
-        writeToConfig "protocol static {"
-        write "    table ${table};" ${table}
-        config_foreach prepare_routes 'route' ${section}
-        writeToConfig "}"
-        writeToConfig " "
-    fi
-}
-
-
-# Function: prepare_direct $1
-# $1 string
-# This function gets each "direct" protocol section in the UCI configuration and sets each option in the bird4.conf file.
-# $1 is set as the ID of the current UCI direct section.
-prepare_direct() {
-    local section="$1"
-    local disabled; local interface
-
-    get disabled ${section}
-    get interface ${section}
-
-    write "#${section} configuration:" ${section}
-    writeToConfig "protocol direct {"
-    write_bool disabled ${disabled}
-    write "    interface ${interface};" ${interface}
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-# Function: prepare_pipe $1
-# $1 string
-# This function gets each "pipe" protocol section in the UCI configuration an
-# $1 is set as the ID of the current UCI direct section.
-prepare_pipe() {
-    local section="$1"
-    local disabled; local table; local peer_table; local mode; local import; local export
-
-    get disabled $section
-    get peer_table $section
-    get mode $section
-    get table $section
-    get import $section
-    get export $section
-
-    write "#$section configuration:" $section
-    writeToConfig "protocol pipe $section {" $section
-    write_bool disabled $disabled
-    write "    table $table;" $table
-    write "    peer table $peer_table;" $peer_table
-    write "    mode $mode;" $mode
-    write "    import $import;" $import
-    write "    export $export;" $export
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-# Function: prepare_device $1
-# $1 string
-# This function gets each "device" protocol section in the UCI configuration and sets each option in the bird4.conf file.
-# $1 is set as the ID of the current UCI device section.
-prepare_device() {
-    local section="$1"
-    local disabled; local scan_time
-
-    get disabled ${section}
-    get scan_time ${section}
-
-    write "#${section} configuration:" ${section}
-    writeToConfig "protocol device {"
-    write_bool disabled ${disabled}
-    write "    scan time ${scan_time};" ${scan_time}
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-# Function: prepare_bgp_template $1
-# $1 string
-# This function gets each "bgp_template" protocol section in the UCI configuration and sets each option in the bird4.conf file.
-# $1 is set as the ID of the current UCI bgp_template section.
-# Careful! Template options will be replaced by "instance" options if there is any match.
-prepare_bgp_template() {
-    local section="$1"
-    local disabled; local table; local import; local export
-    local local_as; local neighbor_address; local neighbor_as; local source_address
-    local next_hop_self; local next_hop_keep; local rr_client; local rr_cluster_id
-    local import_limit; local import_limit_action; local export_limit; local export_limit_action
-    local receive_limit; local receive_limit_action; local igp_table
-
-    get_a_bool disabled ${section}
-    get table ${section}
-    get import ${section}
-    get export ${section}
-    get source_address ${section}
-
-    get local_as ${section}
-    get neighbor_address ${section}
-    get neighbor_as ${section}
-
-    get_a_bool next_hop_self ${section}
-    get_a_bool next_hop_keep ${section}
-    get rr_client ${section}
-    get rr_cluster_id ${section}
-
-    get import_limit ${section}
-    get import_limit_action ${section}
-    get export_limit ${section}
-    get export_limit_action ${section}
-
-    get receive_limit ${section}
-    get receive_limit_action ${section}
-    get igp_table ${section}
-
-    writeToConfig "#${section} template:"
-    writeToConfig "template bgp ${section} {"
-    [ -n "${disabled}" ] && write_bool disabled ${disabled}
-    [ -n "${table}" ] && writeToConfig "    table ${table};"
-    [ -n "${igp_table}" ] && writeToConfig "    igp table ${igp_table};"
-    [ -n "${local_as}" ] && writeToConfig "    local as ${local_as};"
-    [ -n "${source_address}" ] && writeToConfig "    source address ${source_address};"
-    [ -n "${import}" ] && writeToConfig "    import ${import};"
-    [ -n "${export}" ] && writeToConfig "    export ${export};"
-    [ -n "${neighbor_address}" -a -n "${neighbor_as}" ] && writeToConfig "    neighbor ${neighbor_address} as ${neighbor_as};"
-    if [ -n "${import_limit}" -a "${import_limit}" > "0" ]; then
-        [ -z "${import_limit_action}" ] && ${import_limit_action} = "warn"
-        writeToConfig "    import limit ${import_limit} action ${import_limit_action};"
-    fi
-    if [ -n "${export_limit}" -a "${export_limit}" > "0" ]; then
-        [ -z "${export_limit_action}" ] && ${export_limit_action} = "warn"
-        writeToConfig "    export limit ${export_limit} action ${export_limit_action};"
-    fi
-    if [ -n "${receive_limit}" -a "${receive_limit}" > "0" ]; then
-        [ -z "${receive_limit_action}" ] && ${receive_limit_action} = "warn"
-        writeToConfig "    receive limit ${receive_limit} action ${receive_limit_action};"
-    fi
-    [ -n "${next_hop_self}" ] && write_bool "    next hop self;" ${next_hop_self}
-    [ -n "${next_hop_keep}" ] && write_bool "    next hop keep;" ${next_hop_keep}
-    [ -n "${rr_client}" ]     && write_bool "    rr client;" ${rr_client}
-    [ -n "${rr_cluster_id}" ] && writeToConfig "    rr cluster id ${rr_cluster_id};"
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-# Function: prepare_bgp $1
-# $1 string
-# This function gets each "bgp" protocol section in the UCI configuration and sets each option in the bird4.conf file.
-# $1 is set as the ID of the current UCI bgp section.
-# Careful! The options set in bgp instances overlap bgp_template ones.
-prepare_bgp() {
-    local section="$1"
-    local disabled; local table; local template; local description; local igp_table; local passive
-    local import; local export; local source_address; local local_as; local neighbor_address
-    local neighbor_as; local rr_client; local rr_cluster_id; local import_limit
-    local import_limit_action; local export_limit; local export_limit_action
-    local receive_limit; local receive_limit_action; local igp_table
-
-    get disabled ${section}
-    get table ${section}
-    get igp_table ${section}
-    get template ${section}
-    get description ${section}
-    get passive ${section}
-
-    get import ${section}
-    get export ${section}
-    get source_address ${section}
-    get local_as ${section}
-    get neighbor_address ${section}
-
-    get neighbor_as ${section}
-    get import_limit ${section}
-    get import_limit_action ${section}
-    get export_limit ${section}
-    get export_limit_action ${section}
-
-    get receive_limit ${section}
-    get receive_limit_action ${section}
-    get_a_bool next_hop_self ${section}
-    get_a_bool next_hop_keep ${section}
-    get rr_client ${section}
-    get rr_cluster_id ${section}
-
-    writeToConfig "#${section} configuration:"
-    [ -n "${template}" ] && writeToConfig "protocol bgp ${section} from ${template} {" \
-                         || writeToConfig "protocol bgp ${section} {"
-    [ -n "${disabled}" ] && write_bool disabled ${disabled}
-    [ -n "${table}" ] && writeToConfig "    table ${table};"
-    [ -n "${igp_table}" ] && writeToConfig "    igp table ${igp_table};"
-    [ -n "${passive}" ] && writeToConfig "    passive;" ${passive}
-    [ -n "${local_as}" ] && writeToConfig "    local as ${local_as};"
-    [ -n "${source_address}" ] && writeToConfig "    source address ${source_address};"
-    [ -n "${import}" ] && writeToConfig "    import ${import};"
-    [ -n "${export}" ] && writeToConfig "    export ${export};"
-    [ -n "${neighbor_address}" -a -n "${neighbor_as}" ] && writeToConfig "    neighbor ${neighbor_address} as ${neighbor_as};"
-    if [ -n "${import_limit}" -a "${import_limit}" > "0" ]; then
-        [ -z "${import_limit_action}" ] && ${import_limit_action} = "warn"
-        writeToConfig "    import limit ${import_limit} action ${import_limit_action};"
-    fi
-    if [ -n "${export_limit}" -a "${export_limit}" > "0" ]; then
-        [ -z "${export_limit_action}" ] && ${export_limit_action} = "warn"
-        writeToConfig "    export limit ${export_limit} action ${export_limit_action};"
-    fi
-    if [ -n "${receive_limit}" -a "${receive_limit}" > "0" ]; then
-        [ -z "${receive_limit_action}" ] && ${receive_limit_action} = "warn"
-        writeToConfig "    receive limit ${receive_limit} action ${receive_limit_action};"
-    fi
-    [ -n "${next_hop_self}" ] && write_bool "    next hop self;" ${next_hop_self}
-    [ -n "${next_hop_keep}" ] && write_bool "    next hop keep;" ${next_hop_keep}
-    [ -n "${rr_client}" ] && write_bool "    rr client;" ${rr_client}
-    [ -n "${rr_cluster_id}" ] && writeToConfig "    rr cluster id ${rr_cluster_id};"
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-#Function: prepare_ospf_network $1
-# $1 string $2 string
-# This function gets each "ospf_network" protocol section in the UCI configuration, checks if its Area ID is the same as the one
-# being configurated and finally sets the list of network ranges to be propagated, or not, by the OSPF protocol
-# $1 is set as the ID of the action area of the internal networks.
-# $2 is set as the ID of the current area being configurated.
-prepare_ospf_networks() {
-    local section="$1"
-    local current_area="$2"
-
-    if [ "${section}" = "${current_area}" ]; then
-        writeToConfig "        networks {"
-        config_list_foreach ${section} range range_list
-        config_list_foreach ${section} hidden_range hidden_range_list
-        writeToConfig "        };"
-    fi
-}
-
-
-# Function: prepare_ospf_password $1 $2
-prepare_ospf_passwords() {
-    local section="$1"
-    local current_interface="$2"
-    local interface; local passphrase
-
-    get interface $section
-    get passphrase $section
-
-    [ "current_interface" = "${interface}" ] && write '            password "$passphrase";' ${passphrase}
-}
-
-
-# Function: prepare_ospf_neighbors $1 $2
-#prepare_ospf_neighbors() {
-#}
-
-
-# Function: prepare_ospf_interface $1 $2
-prepare_ospf_interface() {
-    local section="$1"
-    local current_area="$2"
-    local area; local cost; local type; local hello; local priority; local retransmit; local authentication
-
-    get area ${section}
-    get cost ${section}
-    get type ${section}
-    get hello ${section}
-    get priority ${section}
-    get retransmit ${section}
-
-    if [ "${current_area}" = "${area}" ]; then
-        writeToConfig '        interface "$section" {'
-        write "            cost ${cost};" ${cost}
-        write "            hello ${hello};" ${hello}
-        write "            type ${type};" ${type}
-        write "            retransmit ${retransmit};" ${retransmit}
-        write "            authentication ${authentication};" ${authentication}
-        config_foreach prepare_ospf_passwords "ospf_password" ${section}
- #       config_foreach prepare_ospf_neighbors "ospf_neighbor" $section
-        writeToConfig "        };"
-    fi
-}
-
-
-# Function: prepare_ospf_area $1
-prepare_ospf_area() {
-    local section="$1"
-    local instance; local stub; local default_cost
-
-    get instance ${section}
-    get stub ${section}
-    get default_cost ${section}
-
-    writeToConfig "    area ${section} {"
-    if [ -n "${instance}" -a "${instance}" = "${section}" ]; then
-        [ -n "${stub}" -a "${stub}" = "1" ] && writeToConfig "        stub yes;"
-        [ -n "${default_cost}" ] && writeToConfig "        default cost ${default_cost};"
-        config_foreach prepare_ospf_networks "ospf_networks" ${section}
-        config_foreach prepare_ospf_interface "ospf_interface" ${section}
-        writeToConfig "    };"
-    fi
-}
-
-
-# Function: prepare_ospf_instance $1
-# $1 string
-# This function gets each "ospf_area" protocol section in the UCI configuration and sets each option in the bird4.conf file.
-# $1 is set as the ID of the current UCI ospf_area section.
-prepare_ospf_instance() {
-    local section="$1"
-    local cfg1583compat; local tick
-
-    get cfg1583compat ${section}
-    get tick ${section}
-
-    writeToConfig "protocol ospf ${section} {"
-    [ -n "${cfg1583compat}" ] && cfg1583State="yes" || cfg1583State="no"
-    writeToConfig "    rfc1583compat ${cfg1583State};"
-    [ -n "${tick}" ] && writeToConfig "    tick ${tick};"
-    config_foreach prepare_ospf_area 'ospf_area'
-    writeToConfig "}"
-}
-
-
-# Function: gather_filters
-# This function gets all the FILES under /filters folder and adds
-# them into the config as %include elements on top of the file
-# If there are no filters, the section will remain empty.
-gather_filters() {
-    writeToConfig "#Filters Section:"
-    for filter in $(find /etc/${BIRD}/filters -type f); do
-        writeToConfig "include \"${filter}\";"
-    done
-    writeToConfig "#End of Filters --"
-    writeToConfig " "
-}
-
-
-# Function: gather_functions
-# This function gets all the FILES under /functions folder and adds
-# them into the config as %include elements on top of the file
-# If there are no filters, the section will remain empty.
-gather_functions() {
-    writeToConfig "#Functions Section:"
-    for func in $(find /etc/${BIRD}/functions -type f); do
-        writeToConfig "include \"${func}\";"
-    done
-    writeToConfig "#End of Functions --"
-    writeToConfig " "
-}

bird1-openwrt/bird1-ipv4-openwrt/src/model/bgp_proto.lua

@@ -1,282 +0,0 @@
---[[ 
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
---]]
-
-require("luci.sys")
-local http = require "luci.http"
-local uci = luci.model.uci.cursor()
-
--- Repeated Strings
-local common_string = "Valid options are:<br />" .. "1. all (All the routes)<br />" .. "2. none (No routes)<br />" .. "3. filter <b>Your_Filter_Name</b> (Call a specific filter from any of the available in the filters files)"
-local imp_string = "Set if the protocol must import routes.<br />" .. common_string
-local exp_string = "Set if the protocol must export routes.<br />" .. common_string
-
-m=Map("bird4", "Bird4 BGP protocol's configuration")
-
-tab_templates = {}
-uci:foreach('bird4', 'bgp_template', function (s)
-	local name = s[".name"]
-	if (name ~= nil) then
-		table.insert(tab_templates, name)
-	end
-end)
-
---
--- BGP TEMPLATES
---
-sect_templates = m:section(TypedSection, "bgp_template", "BGP Templates", "Configuration of the templates used in BGP instances.")
-sect_templates.addremove = true
-sect_templates.anonymous = false
-
-disabled = sect_templates:option(Flag, "disabled", "Disabled", "Enable/Disable BGP Protocol")
-disabled.optional=true
-
-table = sect_templates:option(ListValue, "table", "Table", "Set the table used for BGP Routing")
-table.optional=true
-uci:foreach("bird4", "table",
-	function (s)
-		table:value(s.name)
-	end)
-table:value("")
-table.default = ""
-
-igp_table = sect_templates:option(ListValue, "igp_table", "IGP Table", "Select the IGP Routing Table to use. Hint: usually the same table as BGP.")
-igp_table.optional = true
-uci:foreach("bird4", "table",
-function(s)
-    igp_table:value(s.name)
-end)
-igp_table:value("")
-igp_table.default = ""
-
-import = sect_templates:option(Value, "import", "Import", imp_string)
-import.optional=true
-
-export = sect_templates:option(Value, "export", "Export", exp_string)
-export.optional=true
-
-source_addr = sect_templates:option(Value, "source_address", "Source Address", "Source address for BGP routing. By default uses Router ID")
-source_addr.optional = true
-
-local_as = sect_templates:option(Value, "local_as", "Local AS", "")
-local_as.optional = false
-
-next_hop_self = sect_templates:option(Flag, "next_hop_self", "Next hop self", "Avoid next hop calculation and advertise own source address as next hop")
-next_hop_self.default = nil
-next_hop_self.optional = true
-
-next_hop_keep = sect_templates:option(Flag, "next_hop_keep", "Next hop keep", "Forward the received Next Hop attribute event in situations where the local address should be used instead, like subneting")
-next_hop_keep.default = nil
-next_hop_keep.optional = true
-
-rr_client = sect_templates:option(Flag, "rr_client", "Route Reflector server", "This router serves as a Route Reflector server and treats neighbors as clients")
-rr_client.default = nil
-rr_client.optional = true
-
-rr_cluster_id = sect_templates:option(Value, "rr_cluster_id", "Route Reflector Cluster ID", "Identificator of the RR cluster. By default uses the Router ID")
-rr_cluster_id.optional = true
-
-import_trigger = sect_templates:option(Flag, "import_trigger", "Import Limit", "Enable Routes Import limit settings")
-import_trigger.default = 0
-import_trigger.rmempty = false
-import_trigger.optional = false
-
-import_limit = sect_templates:option(Value, "import_limit", "Routes import limit", "Specify an import route limit.")
-import_limit:depends({import_trigger = "1"})
-import_limit.rmempty = true
-
-import_limit_action = sect_templates:option(ListValue, "import_limit_action", "Routes import limit action", "Action to take when import routes limit ir reached")
-import_limit_action:depends({import_trigger = "1"})
-import_limit_action:value("warn")
-import_limit_action:value("block")
-import_limit_action:value("disable")
-import_limit_action:value("restart")
-import_limit_action.default = "warn"
-import_limit_action.rmempty = true
-
-export_trigger = sect_templates:option(Flag, "export_trigger", "Export Limit", "Enable Routes Export limit settings")
-export_trigger.default = 0
-export_trigger.rmempty = false
-export_trigger.optional = false
-
-export_limit = sect_templates:option(Value, "export_limit", "Routes export limit", "Specify an export route limit.")
-export_limit:depends({export_trigger = "1"})
-export_limit.rmempty = true
-
-export_limit_action = sect_templates:option(ListValue, "export_limit_action", "Routes export limit action", "Action to take when export routes limit is reached")
-export_limit_action:depends({export_trigger = "1"})
-export_limit_action.rmempty = true
-export_limit_action:value("warn")
-export_limit_action:value("block")
-export_limit_action:value("disable")
-export_limit_action:value("restart")
-export_limit_action.default = "warn"
-
-receive_trigger = sect_templates:option(Flag, "receive_trigger", "Received Limit", "Enable Routes Received Limit settings")
-receive_trigger.default = 0
-receive_trigger.rmempty = false
-receive_trigger.optional = false
-
-receive_limit = sect_templates:option(Value, "receive_limit", "Routes received limit", "Specify a received route limit.")
-receive_limit:depends({receive_trigger = "1"})
-receive_limit.rmempty = true
-
-receive_limit_action = sect_templates:option(ListValue, "receive_limit_action", "Routes received limit action", "Action to take when received routes limit is reached")
-receive_limit_action:depends({receive_trigger = "1"})
-receive_limit_action:value("warn")
-receive_limit_action:value("block")
-receive_limit_action:value("disable")
-receive_limit_action:value("restart")
-receive_limit_action.default = "warn"
-receive_limit_action.rmempty= true
-
---
--- BGP INSTANCES
---
-sect_instances = m:section(TypedSection, "bgp", "BGP Instances", "Configuration of the BGP protocol instances")
-sect_instances.addremove = true
-sect_instances.anonymous = false
-
-disabled = sect_instances:option(Flag, "disabled", "Disabled", "Enable/Disable BGP Protocol")
-disabled.optional = false
-disabled.rmempty = false
-disabled.default = nil
-
-templates = sect_instances:option(ListValue, "template", "Templates", "Available BGP templates")
-uci:foreach("bird4", "bgp_template",
-	function(s)
-		templates:value(s[".name"])
-	end)
-templates:value("")
-
-description = sect_instances:option(TextValue, "description", "Description", "Description of the current BGP instance")
-description.optional = true
-
-table = sect_instances:option(ListValue, "table", "Table", "Set the table used for BGP Routing")
-table.optional=true
-uci:foreach("bird4", "table",
-    function (s)
-        table:value(s.name)
-    end)
-table:value("")
-table.default = ""
-
-igp_table = sect_instances:option(ListValue, "igp_table", "IGP Table", "Select the IGP Routing Table to use. Hint: usually the same table as BGP.")
-igp_table.optional = true
-uci:foreach("bird4", "table",
-function(s)
-    igp_table:value(s.name)
-end)
-igp_table:value("")
-igp_table.default = ""
-
-passive = sect_instances:option(Flag, "passive", "Passive", "Disable automatic initialization of outgoing connections.")
-passive.optional=true
-passive.rmempty = false
-passive.default = nil
-
-import = sect_instances:option(Value, "import", "Import", imp_string)
-import.optional=true
-
-export = sect_instances:option(Value, "export", "Export", exp_string)
-export.optional=true
-
-source_address = sect_instances:option(Value, "source_address", "Source Address", "Source address for BGP routing. By default uses Router ID")
-source_address.optional = true
-
-local_as = sect_instances:option(Value, "local_as", "Local AS", "")
-local_as.optional=true
-
-neighbor_address = sect_instances:option(Value, "neighbor_address", "Neighbor IP Address", "")
-neighbor_address.optional = false
-
-neighbor_as = sect_instances:option(Value, "neighbor_as", "Neighbor AS", "")
-neighbor_as.optional = false
-
-next_hop_self = sect_instances:option(Flag, "next_hop_self", "Next hop self", "Avoid next hop calculation and advertise own source address as next hop")
-next_hop_self.default = nil
-next_hop_self.optional = true
-
-next_hop_keep = sect_instances:option(Flag, "next_hop_keep", "Next hop keep", "Forward the received Next Hop attribute event in situations where the local address should be used instead, like subneting")
-next_hop_keep.default = nil
-next_hop_keep.optional = true
-
-rr_client = sect_instances:option(Flag, "rr_client", "Route Reflector server", "This router serves as a Route Reflector server and treats neighbors as clients")
-rr_client.default = nil
-rr_client.optional = true
-
-rr_cluster_id = sect_instances:option(Value, "rr_cluster_id", "Route Reflector Cluster ID", "Identificator of the RR cluster. By default uses the Router ID")
-rr_cluster_id.optional = true
-
-import_trigger = sect_instances:option(Flag, "import_trigger", "Import Limit", "Enable Routes Import limit settings")
-import_trigger.default = 0
-import_trigger.rmempty = false
-import_trigger.optional = false
-
-import_limit = sect_instances:option(Value, "import_limit", "Routes import limit", "Specify an import route limit.")
-import_limit:depends({import_trigger = "1"})
-import_limit.rmempty = true
-
-import_limit_action = sect_instances:option(ListValue, "import_limit_action", "Routes import limit action", "Action to take when import routes limit ir reached")
-import_limit_action:depends({import_trigger = "1"})
-import_limit_action:value("warn")
-import_limit_action:value("block")
-import_limit_action:value("disable")
-import_limit_action:value("restart")
-import_limit_action.default = "warn"
-import_limit_action.rmempty = true
-
-export_trigger = sect_instances:option(Flag, "export_trigger", "Export Limit", "Enable Routes Export limit settings")
-export_trigger.default = 0
-export_trigger.rmempty = false
-export_trigger.optional = false
-
-export_limit = sect_instances:option(Value, "export_limit", "Routes export limit", "Specify an export route limit.")
-export_limit:depends({export_trigger = "1"})
-export_limit.rmempty = true
-
-export_limit_action = sect_instances:option(ListValue, "export_limit_action", "Routes export limit action", "Action to take when export routes limit is reached")
-export_limit_action:depends({export_trigger = "1"})
-export_limit_action:value("warn")
-export_limit_action:value("block")
-export_limit_action:value("disable")
-export_limit_action:value("restart")
-export_limit_action.default = "warn"
-export_limit_action.rmempty= true
-
-receive_trigger = sect_instances:option(Flag, "receive_trigger", "Received Limit", "Enable Routes Received Limit settings")
-receive_trigger.default = 0
-receive_trigger.rmempty = false
-receive_trigger.optional = false
-
-receive_limit = sect_instances:option(Value, "receive_limit", "Routes received limit", "Specify a received route limit.")
-receive_limit:depends({receive_trigger = "1"})
-receive_limit.rmempty = true
-
-receive_limit_action = sect_instances:option(ListValue, "receive_limit_action", "Routes received limit action", "Action to take when received routes limit is reached")
-receive_limit_action:depends({receive_trigger = "1"})
-receive_limit_action:value("warn")
-receive_limit_action:value("block")
-receive_limit_action:value("disable")
-receive_limit_action:value("restart")
-receive_limit_action.default = "warn"
-receive_limit_action.rmempty= true
-
-
-function m.on_commit(self,map)
-        luci.sys.exec('/etc/init.d/bird4 restart')
-end
-return m

bird1-openwrt/bird1-ipv4-openwrt/src/model/filters.lua

@@ -1,77 +0,0 @@
---[[
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-]]--
-
-local fs = require "nixio.fs"
-local filters_dir = "/etc/bird4/filters/"
-local lock_file = "/etc/bird4/filter_lock"
-
-m = SimpleForm("bird4", "Bird4 Filters", "<b>INFO:</b> New files are created using Timestamps.<br />In order to make it easier to handle, use SSH to connect to your terminal and rename those files.<br />If your file is not correctly shown in the list, please, refresh your browser.")
-
-s = m:section(SimpleSection)
-files = s:option(ListValue, "Files", "Filter Files:")
-local new_filter = filters_dir .. os.date("filter-%Y%m%d-%H%M")
-
--- New File Entry
-files:value(new_filter, "New File (".. new_filter .. ")")
-files.default = new_filter
-
-local i, file_list = 0, { }
-for filename in io.popen("find " .. filters_dir .. " -type f"):lines() do
-    i = i + 1
-    files:value(filename, filename)
-end
-
-ld = s:option(Button, "_load", "Load File")
-ld.inputstyle = "reload"
-
-st_file = s:option(DummyValue, "_stfile", "Editing file:")
-function st_file.cfgvalue(self, section)
-    if ld:formvalue(section) then
-        fs.writefile(lock_file, files:formvalue(section))
-        return files:formvalue(section)
-    else
-        fs.writefile(lock_file, "")
-        return ""
-    end
-end
-
-area = s:option(Value, "_filters")
-area.template = "bird4/tvalue"
-area.rows = 30
-function area.cfgvalue(self,section)
-    if ld:formvalue(section) then
-        local contents = fs.readfile(files:formvalue(section))
-        if contents then
-            return contents
-        else
-            return ""
-        end
-    else
-        return ""
-    end
-end
-
-function area.write(self, section)
-    local locked_file = fs.readfile(lock_file)
-    if locked_file and not ld:formvalue(section) then
-        local text = self:formvalue(section):gsub("\r\n?", "\n")
-        fs.writefile(locked_file, text)
-        fs.writefile(lock_file, "")
-    end
-end
-
-return m

bird1-openwrt/bird1-ipv4-openwrt/src/model/functions.lua

@@ -1,77 +0,0 @@
---[[
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-]]--
-
-local fs = require "nixio.fs"
-local functions_dir = "/etc/bird4/functions/"
-local lock_file = "/etc/bird4/function_lock"
-
-m = SimpleForm("bird4", "Bird4 Functions", "<b>INFO:</b> New files are created using Timestamps.<br />In order to make it easier to handle, use SSH to connect to your terminal and rename those files.<br />If your file is not correctly shown in the list, please, refresh your browser.")
-
-s = m:section(SimpleSection)
-files = s:option(ListValue, "Files", "Function Files:")
-local new_function = functions_dir .. os.date("function-%Y%m%d-%H%M")
-
--- New File Entry
-files:value(new_function, "New File (".. new_function .. ")")
-files.default = new_function
-
-local i, file_list = 0, { }
-for filename in io.popen("find " .. functions_dir .. " -type f"):lines() do
-    i = i + 1
-    files:value(filename, filename)
-end
-
-ld = s:option(Button, "_load", "Load File")
-ld.inputstyle = "reload"
-
-st_file = s:option(DummyValue, "_stfile", "Editing file:")
-function st_file.cfgvalue(self, section)
-    if ld:formvalue(section) then
-        fs.writefile(lock_file, files:formvalue(section))
-        return files:formvalue(section)
-    else
-        fs.writefile(lock_file, "")
-        return ""
-    end
-end
-
-area = s:option(Value, "_functions")
-area.template = "bird4/tvalue"
-area.rows = 30
-function area.cfgvalue(self,section)
-    if ld:formvalue(section) then
-        local contents = fs.readfile(files:formvalue(section))
-        if contents then
-            return contents
-        else
-            return ""
-        end
-    else
-        return ""
-    end
-end
-
-function area.write(self, section)
-    local locked_file = fs.readfile(lock_file)
-    if locked_file and not ld:formvalue(section) then
-        local text = self:formvalue(section):gsub("\r\n?", "\n")
-        fs.writefile(locked_file, text)
-        fs.writefile(lock_file, "")
-    end
-end
-
-return m

bird1-openwrt/bird1-ipv4-openwrt/src/model/gen_proto.lua

@@ -1,263 +0,0 @@
---[[ 
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
---]]
-
-require("luci.sys")
-local http = require "luci.http"
-local uci = luci.model.uci.cursor()
-
--- Repeated Strings
-local common_string = "Valid options are:<br />" .. "1. all (All the routes)<br />" .. "2. none (No routes)<br />" .. "3. filter <b>Your_Filter_Name</b>      (Call a specific filter from any of the available in the filters files)"
-local imp_string = "Set if the protocol must import routes.<br />" .. common_string
-local exp_string = "Set if the protocol must export routes.<br />" .. common_string
-
-m=Map("bird4", "Bird4 general protocol's configuration.")
-
--- Optional parameters lists
-local protoptions = {
-	{["name"]="table", ["help"]="Auxiliar table for routing", ["depends"]={"static","kernel"}},
-	{["name"]="import", ["help"]=imp_string, ["depends"]={"kernel"}},
-	{["name"]="export", ["help"]=exp_string, ["depends"]={"kernel"}},
-	{["name"]="scan_time", ["help"]="Time between scans", ["depends"]={"kernel","device"}},
-	{["name"]="kernel_table", ["help"]="Set which table must be used as auxiliar kernel table", ["depends"]={"kernel"}},
-	{["name"]="learn", ["help"]="Learn routes", ["depends"]={"kernel"}},
-	{["name"]="persist", ["help"]="Store routes. After a restart, routes willstill be configured", ["depends"]={"kernel"}}
-}
-
-local routeroptions = {
-	{["name"]="prefix",["help"]="",["depends"]={"router","special","iface","multipath","recursive"}},
-	{["name"]="via",["help"]="",["depends"]={"router","multipath"}},
-	{["name"]="attribute",["help"]="",["depends"]={"special"}},
-	{["name"]="iface",["help"]="",["depends"]={"iface"}},
-	{["name"]="ip",["help"]="",["depends"]={"recursive"}}
-}
-
-
---
--- KERNEL PROTOCOL
---
-sect_kernel_protos = m:section(TypedSection, "kernel", "Kernel options", "Configuration of the kernel protocols. First Instance MUST be Primary table (no table or kernel_table fields).")
-sect_kernel_protos.addremove = true
-sect_kernel_protos.anonymous = false
-
--- Default kernel parameters
-disabled = sect_kernel_protos:option(Flag, "disabled", "Disabled", "If this option is true, the protocol will not be configured.")
-disabled.default=0
-
--- Optional parameters
-for _,o in ipairs(protoptions) do
-	if o.name ~= nil then
-		for _, d in ipairs(o.depends) do
-			if d == "kernel" then
-				if o.name == "learn" or o.name == "persist" then
-					value = sect_kernel_protos:option(Flag, o.name, translate(o.name), translate(o.help))
-				elseif o.name == "table" then 
-					value = sect_kernel_protos:option(ListValue, o.name, translate(o.name), translate(o.help))
-					uci:foreach("bird4", "table",
-						function (s)
-							value:value(s.name)
-						end)
-					value:value("")
-					value.default = ""
-				else
-					value = sect_kernel_protos:option(Value, o.name, translate(o.name), translate(o.help))
-				end
-				value.optional = true
-				value.rmempty = true
-			end
-		end
-
-	end
-end
-
-
---
--- DEVICE PROTOCOL
---
-sect_device_protos = m:section(TypedSection, "device", "Device options", "Configuration of the device protocols.")
-sect_device_protos.addremove = true
-sect_device_protos.anonymous = false
-
--- Default kernel parameters
-
-disabled = sect_device_protos:option(Flag, "disabled", "Disabled", "If this option is true, the protocol will not be configured.")
-disabled.default=0
-
--- Optional parameters
-for _,o in ipairs(protoptions) do
-	if o.name ~= nil then
-		for _, d in ipairs(o.depends) do
-			if d == "device" then
-				value = sect_device_protos:option(Value, o.name, translate(o.name), translate(o.help))
-				value.optional = true
-				value.rmempty = true
-			end
-		end
-	end
-end
-
-
---
--- PIPE PROTOCOL
---
-sect_pipe_protos = m:section(TypedSection, "pipe", "Pipe options",     "Configuration of the Pipe protocols.")
-sect_pipe_protos.addremove = true
-sect_pipe_protos.anonymous = false
-
--- Default Pipe parameters
-disabled = sect_pipe_protos:option(Flag, "disabled", "Disabled", "If this  option is true, the protocol will not be configured. This protocol will connect the configured 'Table' to the 'Peer Table'.")
-disabled.default=0
-
-table = sect_pipe_protos:option(ListValue, "table", "Table", "Select the Primary Table to connect.")
-table.optional = false
-uci:foreach("bird4", "table",
-  function (s)
-    table:value(s.name)
-  end)
-table:value("")
-table.default = ""
-
-peer_table = sect_pipe_protos:option(ListValue, "peer_table", "Peer Table", "Select the Secondary Table to connect.")
-table.optional = false
-uci:foreach("bird4", "table",
-  function (s)
-    peer_table:value(s.name)
-  end)
-peer_table:value("")
-peer_table.default = ""
-
-mode = sect_pipe_protos:option(ListValue, "mode", "Mode", "Select <b>transparent</b> to retransmit all routes and their attributes<br />Select <b>opaque</b> to retransmit optimal routes (similar to what other protocols do)")
-mode.optional = false
-mode:value("transparent")
-mode:value("opaque")
-mode.default = "transparent"
-
-import = sect_pipe_protos:option(Value, "import", "Import",imp_string)
-import.optional=true
-
-export = sect_pipe_protos:option(Value, "export", "Export", exp_string)
-export.optional=true
-
-
---
--- DIRECT PROTOCOL
---
-sect_direct_protos = m:section(TypedSection, "direct", "Direct options", "Configuration of the Direct protocols.")
-sect_direct_protos.addremove = true
-sect_direct_protos.anonymous = false
-
--- Default Direct parameters
-disabled = sect_direct_protos:option(Flag, "disabled", "Disabled", "If this option is true, the protocol will not be configured. This protocol will connect the configured 'Table' to the 'Peer Table'.")
-disabled.optional = false
-disabled.default = 0
-
-interface = sect_direct_protos:option(Value, "interface", "Interfaces", "By default Direct will generate device routes for all the interfaces. To restrict this behaviour, select a number of patterns to match your desired interfaces:" .. "<br />" .. "1. All the strings <b>MUST</b> be quoted: \"pattern\"" .. "<br />" .. "2. Use * (star) to match patterns: \"eth*\" (<b>include</b> all eth... interfaces)" .. "<br />" .. "3. You can add \"-\" (minus) to exclude patterns: \"-em*\" (<b>exclude</b> all em... interfaces)." .. "<br />" .. "4. Separate several patterns using , (coma): \"-em*\", \"eth*\" (<b>exclude</b> em... and <b>include</b> all eth... interfaces).")
-interface.optional = false
-interface.default = "\"*\""
-
-
---
--- STATIC PROTOCOL
---
-sect_static_protos = m:section(TypedSection, "static", "Static options", "Configuration of the static protocols.")
-sect_static_protos.addremove = true
-sect_static_protos.anonymous = false
-
--- Default kernel parameters
-disabled = sect_static_protos:option(Flag, "disabled", "Disabled", "If this option is true, the protocol will not be configured.")
-disabled.default=0
-
--- Optional parameters
-for _,o in ipairs(protoptions) do
-    if o.name ~= nil then
-        for _, d in ipairs(o.depends) do
-            if d == "static" then
-                if o.name == "table" then
-                    value = sect_static_protos:option(ListValue, o.name, translate(o.name), translate(o.help))
-                    uci:foreach("bird4", "table",
-                        function (s)
-                            value:value(s.name)
-                        end)
-                    value:value("")
-                    value.default = ""
-                else
-                    value = sect_static_protos:option(Value, o.name, translate(o.name), translate(o.help))
-                end
-                    value.optional = true
-                    value.rmempty = true
-            end
-        end
-    end
-end
-
-
---
--- ROUTES FOR STATIC PROTOCOL
---
-sect_routes = m:section(TypedSection, "route", "Routes configuration", "Configuration of the routes used in static protocols.")
-sect_routes.addremove = true
-sect_routes.anonymous = true
-
-instance = sect_routes:option(ListValue, "instance", "Route instance", "")
-i = 0
-uci:foreach("bird4", "static",
-	function (s)
-		instance:value(s[".name"])
-	end)
-
-prefix = sect_routes:option(Value, "prefix", "Route prefix", "")
-
-type = sect_routes:option(ListValue, "type", "Type of route", "")
-type:value("router")
-type:value("special")
-type:value("iface")
-type:value("recursive")
-type:value("multipath")
-
-valueVia = sect_routes:option(Value, "via", "Via", "")
-valueVia.optional = false
-valueVia:depends("type", "router")
-valueVia.datatype = "ip4addr"
-
-listVia = sect_routes:option(DynamicList, "l_via", "Via", "")
-listVia:depends("type", "multipath")
-listVia.optional=false
-listVia.datatype = "ip4addr"
-
-attribute = sect_routes:option(ListValue, "attribute", "Attribute", "")
-attribute:depends("type", "special")
-attribute:value("unreachable")
-attribute:value("prohibit")
-attribute:value("blackhole")
-
-iface  = sect_routes:option(ListValue, "iface", "Interface", "")
-iface:depends("type", "iface")
-uci:foreach("network", "interface",
-	function(section)
-        if section[".name"] ~= "loopback" then
-            iface:value(section[".name"])
-        end
-	end)
-
-ip =  sect_routes:option(Value, "ip", "IP address", "")
-ip:depends("type", "ip")
-ip.datatype = [[ or"ip4addr", "ip6addr" ]]
-
-function m.on_commit(self,map)
-        luci.sys.exec('/etc/init.d/bird4 restart')
-end
-
-return m

bird1-openwrt/bird1-ipv4-openwrt/src/model/overview.lua

@@ -1,76 +0,0 @@
---[[ 
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-]]--
-
-require("luci.sys")
-local http = require "luci.http"
-local uci = require "luci.model.uci"
-local uciout = uci.cursor()
-
-m=Map("bird4", "Bird4 UCI configuration helper", "")
-
--- Named section: "bird"
-
-s_bird_uci = m:section(NamedSection, "bird", "bird", "Bird4 file settings", "")
-s_bird_uci.addremove = False
-
-uuc = s_bird_uci:option(Flag, "use_UCI_config", "Use UCI configuration", "Use UCI configuration instead of the /etc/bird4.conf file")
-
-ucf = s_bird_uci:option(Value, "UCI_config_file", "UCI File", "Specify the file to place the UCI-translated configuration")
-ucf.default = "/tmp/bird4.conf"
-
--- Named Section: "table"
-
-s_bird_table = m:section(TypedSection, "table", "Tables configuration", "Configuration of the tables used in the protocols")
-s_bird_table.addremove = true
-s_bird_table.anonymous = true
-
-name = s_bird_table:option(Value, "name", "Table name", "Descriptor ID of the table")
-
--- Named section: "global"
-
-s_bird_global = m:section(NamedSection, "global", "global", "Global options", "Basic Bird4 settings")
-s_bird_global.addremove = False
-
-id = s_bird_global:option(Value, "router_id", "Router ID", "Identification number of the router. By default, is the router's IP.")
-
-lf = s_bird_global:option(Value, "log_file", "Log File", "File used to store log related data.")
-
-l = s_bird_global:option(MultiValue, "log", "Log", "Set which elements do you want to log.")
-l:value("all", "All")
-l:value("info", "Info")
-l:value("warning","Warning")
-l:value("error","Error")
-l:value("fatal","Fatal")
-l:value("debug","Debug")
-l:value("trace","Trace")
-l:value("remote","Remote")
-l:value("auth","Auth")
-
-d = s_bird_global:option(MultiValue, "debug", "Debug", "Set which elements do you want to debug.")
-d:value("all", "All")
-d:value("states","States")
-d:value("routes","Routes")
-d:value("filters","Filters")
-d:value("interfaces","Interfaces")
-d:value("events","Events")
-d:value("packets","Packets")
-
-function m.on_commit(self,map)
-        luci.sys.exec('/etc/init.d/bird4 restart')
-end
-
-return m

bird1-openwrt/bird1-ipv4-openwrt/src/model/status.lua

@@ -1,53 +0,0 @@
---[[
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-]]--
-
-local sys = require "luci.sys"
-
-m = SimpleForm("bird4", "Bird4 Daemon Status Page", "This page let you Start,   Stop, Restart and check Bird4 Service Status.")
-m.reset = false
-m.submit = false
-
-s = m:section(SimpleSection)
-
-start = s:option(Button, "_start", "Start Bird4 Daemon:")
-start.inputtitle = "   Start   "
-start.inputstyle = "apply"
-
-stop = s:option(Button, "_stop", "Stop Bird4 Daemon:")
-stop.inputtitle = "   Stop   "
-stop.inputstyle = "remove"
-
-restart = s:option(Button, "_restart", "Restart Bird4 Daemon:")
-restart.inputtitle = "Restart"
-restart.inputstyle = "reload"
-
-output = s:option(DummyValue, "_value", "Service Status")
-function output.cfgvalue(self, section)
-    local ret = ""
-    if start:formvalue(section) then
-        ret = sys.exec("/etc/init.d/bird4 start_quiet")
-    elseif stop:formvalue(section) then
-        ret = sys.exec("/etc/init.d/bird4 stop_quiet")
-    elseif restart:formvalue(section) then
-        ret = sys.exec("/etc/init.d/bird4 restart_quiet")
-    else
-        ret = sys.exec("/etc/init.d/bird4 status_quiet")
-    end
-    return ret
-end
-
-return m

bird1-openwrt/bird1-ipv4-openwrt/src/uci-defaults/99-relocate-filters

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# This UCI-Defaults script will MOVE any pre-existing filter
-# stored in a file and configured as an UCI item (deprecated)
-# The script will try to match any "filter" Section, get its
-# "file_path" property and move the file (if exists) to the
-# new (v0.3+) default location: /etc/bird{4|6}/filters
-
-[ $# -ne 1 ] && exit 1
-BIRD="$1"
-
-. /lib/functions.sh
-
-# This function will move an existing folder configured on
-# Bird as a "filter" to filters' folder.
-mv_filter() {
-    local section="$1"
-    local file_path
-    config_get file_path ${section} file_path
-
-    if [ -f ${file_path} ]; then
-        mv ${file_path} /etc/${BIRD}/filters/
-    fi
-    uci delete ${BIRD}.${section}
-}
-
-if [ -f /etc/config/${BIRD} ]; then
-    config_load ${BIRD}
-    config_foreach mv_filter 'filter'
-    uci commit ${BIRD}
-fi
-
-exit 0

bird1-openwrt/bird1-ipv4-openwrt/src/uci-defaults/bird-uci-install-init.d

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-[ $# -ne 1 ] && exit 1
-
-BIRD=$1
-
-EXC=`mount -t overlayfs | grep overlayfs -c`
-
-[ $EXC > 0 ] && rm -r /etc/init.d/${BIRD} || mv /etc/init.d/${BIRD} /etc/${BIRD}/init.d/${BIRD}.orig
-
-ln -s /etc/${BIRD}/init.d/${BIRD} /etc/init.d/${BIRD}
-
-exit 0

bird1-openwrt/bird1-ipv4-openwrt/src/view/log.htm

@@ -1,41 +0,0 @@
-<%-
-    -- Only populate textarea through XHR.poll
-    -- "refresh" is present in the URL (.../log?refresh=1)
-    if luci.http.formvalue("refresh") then
-
-        -- Force HTTP Contents to be "text/plain"
-        luci.http.prepare_content("text/plain")
-
-        local sys = require("luci.sys")
-        local uci = require "luci.model.uci".cursor()
-
-        -- Get Log File from Bird's configuration or leave it empty.
-        local log_file = uci:get("bird4", "global", "log_file") or ""
-        local log_size = ""
-        if log_file then
-            log_size = sys.exec("du -h " .. log_file .. " | awk '{print      $1}'")
-            -- Gathering last 30 lines of the Log File.
-            lf = sys.exec("tail -n30 " .. log_file):gsub("\r\n?", "\n")
-        end
-
-        -- Write File used and its contents.
-        luci.http.write("Using Log File: " .. log_file .. " - File Size: " .. log_size .. "\n" .. lf)
-
-        -- Avoid printing the rest of the page (return only text log data)
-        return
-    end
--%>
-
-<%+header%>
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-    // Refresh page each second. Use "refresh=1" as trigger.
-    XHR.poll(1, '<%=url('admin/network/bird4/log')%>', { refresh: 1 },       function(xhrInstance) {
-        var area = document.getElementById('log')
-        area.value = xhrInstance.responseText;
-    });
-//]]></script>
-
-
-<textarea readonly="readonly" style="width: 100%" wrap="on" rows="32"        id="log"><%=lf:pcdata()%></textarea>
-<%+footer%>

bird1-openwrt/bird1-ipv4-openwrt/src/view/tvalue.htm

@@ -1,5 +0,0 @@
-<%+cbi/valueheader%>
-	<textarea class="cbi-input-textarea" <% if not self.size then %> style="width: 100%; font: normal 11pt 'Courier New'"<% else %> cols="<%=self.size%>"<% end %> data-update="change"<%= attr("name", cbid) .. attr("id", cbid) .. ifattr(self.rows, "rows") .. ifattr(self.wrap, "wrap")  .. ifattr(self.readonly, "readonly") %>>
-	<%-=pcdata(self:cfgvalue(section))-%>
-	</textarea>
-<%+cbi/valuefooter%>

bird1-openwrt/bird1-ipv6-openwrt/src/config/bird6

@@ -1,36 +0,0 @@
-config bird 'bird'
-    option use_UCI_config '1'
-        #Caution! Enabling this option, Bird will translate this
-        #UCI file and use it instead of /etc/bird6.conf
-    option UCI_config_file '/tmp/bird6.conf'
-        #If you enable useUCIconfig, UCIconfigFile will be Bird's
-        #configuration file location.
-
-config global 'global'
-    option log_file '/tmp/bird6.log'
-    option log 'all'
-    option debug 'off'
-    # This option is set up because is mandatory for Bird6.
-    # Change it to your IPv4 Address or a HEX value.
-    option router_id '0xCAFEBABE'
-
-config table
-    option name 'aux'
-
-config kernel kernel1
-    option table 'aux'
-    option import 'all'
-    option export 'all'
-    option kernel_table '100'
-    option scan_time '10'
-    option learn '1'
-    option persist '0'
-    option disabled '0'
-
-config device device1
-    option scan_time '10'
-    option disabled '0'
-
-config static static1
-    option table 'aux'
-    option disabled '0'

bird1-openwrt/bird1-ipv6-openwrt/src/controller/bird6.lua

@@ -1,52 +0,0 @@
---[[ 
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
---]]
-
-module("luci.controller.bird6", package.seeall)
-
-function index()
-        entry({"admin","network","bird6"},
-            alias("admin","network","bird6","status"),
-            _("Bird6"), 0)
-
-        entry({"admin", "network", "bird6", "status"},
-            form("bird6/status"),
-            _("Status"), 0).leaf = true
-
-        entry({"admin","network","bird6","log"},
-            template("bird6/log"),
-            _("Log"), 1).leaf = true
-
-        entry({"admin","network","bird6","overview"},
-            cbi("bird6/overview"),
-            _("Overview"), 2).leaf = true
-
-        entry({"admin","network","bird6","proto_general"},
-            cbi("bird6/gen_proto"),
-            _("General protocols"), 3).leaf = true
-
-        entry({"admin","network","bird6","proto_bgp"},
-            cbi("bird6/bgp_proto"),
-            _("BGP Protocol"), 4).leaf = true
-
-        entry({"admin","network","bird6","filters"},
-            form("bird6/filters"),
-            _("Filters"), 5).leaf = true
-
-        entry({"admin","network","bird6","functions"},
-            form("bird6/functions"),
-            _("Functions"), 6).leaf = true
-end

bird1-openwrt/bird1-ipv6-openwrt/src/init.d/bird6

@@ -1,225 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-# Copyright (C) 2014-2017 - Eloi Carbo
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Extra Service Function to get the Status of the Service
-# This complements /etc/rc.common functions
-# Commands ending with *_quiet are meant to be ran in Luci. These
-# scripts' return minimal output.
-EXTRA_COMMANDS="status start_quiet stop_quiet restart_quiet status_quiet"
-EXTRA_HELP="        status  Returns service status"
-
-BIRD="bird6"
-BIRD_CONFIG="/etc/${BIRD}.conf"
-BIRD_LOG="/var/log/${BIRD}.log"
-BIRD_ERR="/tmp/${BIRD}.err"
-
-START=99
-STOP=10
-
-SERVICE_DAEMONIZE=1
-SERVICE_USE_PID=1
-SERVICE_PID_FILE="/var/run/${BIRD}.pid"
-
-BIRD_BIN="/usr/sbin/${BIRD}"
-# Special non-terminal-rich output for Luci calls
-LUCI="false"
-
-. /etc/${BIRD}/init.d/${BIRD}-lib.sh
-
-start() {
-    config_load ${BIRD}
-    local use_UCI_config
-    get use_UCI_config 'bird'
-
-    #Start the service
-    if [ "${LUCI}" == "false" ]; then
-        echo "Starting ${BIRD} Service [ ... ]"
-    fi
-    if [ -f ${BIRD_ERR} ]; then
-        echo "" > ${BIRD_ERR}
-    else
-        touch ${BIRD_ERR}
-    fi
-
-    if [ -z "${use_UCI_config}" -o "${use_UCI_config}" = "0" ]; then
-        # Disable Custom bird-openwrt settings.
-        # Use default behaviour and files
-        ${BIRD_BIN} -d -c ${BIRD_CONFIG} -P ${SERVICE_PID_FILE} -D ${BIRD_LOG} &> ${BIRD_ERR} &
-    else
-        #Set Bird6 configuration location:
-        local UCI_config_file
-        local log_file
-        get UCI_config_file 'bird'
-        get log_file 'global'
-        BIRD_CONFIG="${UCI_config_file:-$BIRD_CONFIG}"
-        BIRD_LOG="${log_file:-$BIRD_LOG}"
-        #Backup previous configuration
-        [ -f ${BIRD_CONFIG} ] && cp ${BIRD_CONFIG} ${BIRD_CONFIG}.bak
-        #Setup the basic configuration
-        prepare_global 'global'
-
-        # Gather and set all Functions
-        gather_functions
-        # Gather and set all Filters
-        gather_filters
-
-        # Setup Main Protocols
-        config_foreach prepare_kernel 'kernel'
-        config_foreach prepare_static 'static'
-        config_foreach prepare_device 'device'
-        config_foreach prepare_direct 'direct'
-        config_foreach prepare_pipe 'pipe'
-
-        #Setup protocol's configuration: BGP
-        config_foreach prepare_bgp_template 'bgp_template'
-        config_foreach prepare_bgp 'bgp'
-
-        #Setup protocol's configuration: OSPF
-        #config_foreach prepare_ospf_instance 'ospf'
-
-        #Start the service
-        ${BIRD_BIN} -d -c ${BIRD_CONFIG} -P ${SERVICE_PID_FILE} -D ${BIRD_LOG} &>${BIRD_ERR} &
-    fi
-    while [ ! -s ${SERVICE_PID_FILE} ]; do
-        sleep 1
-        if [ -s ${BIRD_ERR} ]; then
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} Daemon Start Status: \033[0;31m[ FAILED ]\e[m"
-                cat ${BIRD_ERR}
-                cat ${BIRD_ERR} >> ${BIRD_LOG}
-            else
-                echo "${BIRD} - Failed: $(cat ${BIRD_ERR})"
-                cat ${BIRD_ERR} >> ${BIRD_LOG}
-            fi
-            break
-        fi
-    done
-
-    if [ -s ${SERVICE_PID_FILE} ]; then
-        if [ -s ${BIRD_ERR} ]; then
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} Daemon already started. Status \033[0;32m[ RUNNING ]\e[m"
-            else
-                echo "${BIRD} already started"
-            fi
-        else
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} Daemon Start Status: \033[0;32m[ STARTED ]\e[m"
-            else
-                echo "${BIRD} - Started"
-            fi
-        fi
-        # PID File found (service started correctly)
-        return 0
-    fi
-
-    # PID File not found (error while starting service)
-    return 1
-}
-
-stop() {
-    if [ -s ${SERVICE_PID_FILE} ]; then
-        config_load ${BIRD}
-        local log_file
-        get log_file 'global'
-        BIRD_LOG="${log_file:-$BIRD_LOG}"
-        start-stop-daemon -p ${SERVICE_PID_FILE} -K 2>&1 >> ${BIRD_LOG}
-        if [ $? -eq 0 ]; then
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} Daemon Stop Status: \033[0;32m[ OK ]\e[m"
-            else
-                echo "${BIRD} - Stopped"
-            fi
-        else
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} Daemon Stop Status: \033[0;31m[ FAILED ]\e[m"
-                echo "Check ${BIRD_LOG} file for more information."
-            else
-                echo "${BIRD} Failed to Stop. See Log file: ${BIRD_LOG}"
-            fi
-        fi
-    else
-        if [ "${LUCI}" == "false" ]; then
-            echo -e "${BIRD} Daemon Service already stopped. \033[0;31m[ FAILED ]\e[m"
-        else
-            echo "${BIRD} already stopped"
-        fi
-    fi
-    return 0
-}
-
-restart() {
-    stop
-    sleep 1
-    if [ "${LUCI}" == "true" ]; then
-        echo " ... "
-    fi
-    start
-}
-
-reload() {
-    service_reload ${BIRD_BIN}
-}
-
-status() {
-    if [ -s ${SERVICE_PID_FILE} ]; then
-        if [ "${LUCI}" == "false" ]; then
-            echo -e "${BIRD} start status: \033[0;32m[ RUNNING ]\e[m"
-        else
-            echo "${BIRD}: Running"
-        fi
-        return 0
-    else
-        if [ -s ${BIRD_ERR} ]; then
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} service status: \033[0;31m[ STOPPED ]\e[m"
-                cat ${BIRD_ERR}
-            else
-                echo "${BIRD}: Failed - $(cat ${BIRD_ERR})"
-            fi
-            return 2
-        else
-            if [ "${LUCI}" == "false" ]; then
-                echo -e "${BIRD} service status: \033[0;31m[ STOPPED ]\e[m"
-            else
-                echo "${BIRD}: Stopped"
-            fi
-            return 1
-        fi
-    fi
-}
-
-# Luci-specific calls (stripped output).
-# The following scripts are not meant to be ran using Ash Terminal
-# Used in: LUCI/model/cbi/bird6/status.lua
-start_quiet() {
-    LUCI="true"
-    start
-}
-stop_quiet() {
-    LUCI="true"
-    stop
-}
-restart_quiet() {
-    LUCI="true"
-    restart
-}
-status_quiet() {
-    LUCI="true"
-    status
-}

bird1-openwrt/bird1-ipv6-openwrt/src/init.d/bird6-lib.sh

@@ -1,476 +0,0 @@
-# Bird6-OpenWRT Library - Functions used in /etc/init.d/bird6 script.
-#
-#
-# Copyright (C) 2014-2017 - Eloi Carbo
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-
-# Function: writeToConfig $1
-# $1 string.
-# Allows to write in the $BIRD_CONFIG file, the string $1. This function does not check the $1 string.
-# Example: writeToConfig "value: $N"
-writeToConfig() {
-    echo "$1" >> ${BIRD_CONFIG}
-}
-
-
-# Function: write $1 $2
-# $1 string. $2 string.
-# This function checks if $2 is empty. If not, it writes the string $1 in the $BIRD_CONFIG file.
-# Use write function to check if $1, value found inside $2, is not empty and can be written in the configuration file.
-# Example: N=""; write "value: $N" $N;
-write() {
-    [ -n "$2" ] && writeToConfig "$1"
-}
-
-
-#Function: write_bool $1 $2
-# $1 string; $2 boolean
-# This function checks if $2 is true or false and write the $1 string into $BIRD_CONFIG file.
-# The function writes a # before the $2 string if its false.
-# Example: local N=0; write_bool $N
-write_bool() {
-    [ "$2" == 0 ] && writeToConfig "#   $1;" || writeToConfig "    $1;"
-}
-
-
-# Function: get $1 $2
-# $1 string. $2 string
-# This function uses the external UCI function "config_get $result $section $option" to obtain a string value from UCI config file.
-# To use this function, use the same name of the UCI option for the variable.
-# Example: UCI (option id 'abcd'); local id; get id $section
-get() {
-    config_get $1 $2 $1
-}
-
-
-# Function: get_a_bool $1 $2
-# $1 boolean. $2 string
-# This function uses the external UCI function "config_get_bool $result $section $option" to obtain a boolean value from UCI config file.
-# To use this function, use the same name of the UCI option for the variable $1.
-# Example: UCI (option use_ipv6 '1'); local use_ipv6; get use_ipv6 $section
-# Note: this function was originally called get_bool(), but it collided with
-#       the get_bool() function provided by /lib/functions.sh. Read more at
-#       https://github.com/openwrt/routing/issues/920.
-get_a_bool() {
-    config_get_bool $1 $2 $1
-}
-
-
-# Function: multipath_list $1
-# $1 string
-# This function writes the $1 string in the multipath routes.
-multipath_list() {
-    write "          via $1" $1
-}
-
-
-# Function: prepare_tables $1
-# $1 string
-# This function gets each "table" section in the UCI configuration and sets each option in the bird6.conf file.
-# $1 is set as the ID of the current UCI table section
-prepare_tables() {
-    local section="$1"; local name
-
-    get name ${section}
-
-    write "table ${name};" ${name}
-}
-
-
-# Function: prepare_global $1
-# $1 string
-# This function gets each "global" section in the UCI configuration and sets each option in the bird6.conf file.
-# $1 is set as the ID of the current UCI global section. prepare_global is the first configuration set in the bird6.conf and removes the old file.
-prepare_global () {
-    local section="$1"
-    local log_file; local log; local debug; local router_id; local table
-    local listen_bgp_addr; local listen_bgp_port; local listen_bgp_dual
-
-    # Remove old configuration file
-    rm -f "${BIRD_CONFIG}"
-
-    get log_file ${section}
-    get log ${section}
-    get debug ${section}
-    get router_id ${section}
-    get table ${section}
-    get listen_bgp_addr ${section}
-    get listen_bgp_port ${section}
-    get listen_bgp_dual ${section}
-
-    # First line of the NEW configuration file
-    echo "#Bird6 configuration using UCI:" > ${BIRD_CONFIG}
-    writeToConfig " "
-    #TODO: Set Syslog as receiver if empty
-    #    LOGF="${log_file:-syslog]}"
-    #TODO: If $log/$debug are empty, set to off
-    if [ -n "${log_file}" -a -n "${log}" ]; then
-        firstEntry="${log:0:3}"
-        if [ "${firstEntry}" = "all" -o "${firstEntry}" = "off" ]; then
-            writeToConfig 'log "'${log_file}'" '${firstEntry}';'
-        else
-            logEntries=$(echo ${log} | tr " " ",")
-            writeToConfig "log \"${log_file}\" { ${logEntries} };"
-        fi
-    fi
-
-    if [ -n "${debug}" ]; then
-        firstEntry="${debug:0:3}"
-        if [ "${firstEntry}" = "all" -o "${firstEntry}" = "off" ]; then
-            writeToConfig "debug protocols ${firstEntry};"
-        else
-            debugEntries=$(echo ${debug} | tr " " ",")
-            writeToConfig "debug protocols { ${debugEntries} };"
-        fi
-    fi
-    writeToConfig " "
-    writeToConfig "#Router ID"
-    write "router id ${router_id};" ${router_id}
-    writeToConfig " "
-    writeToConfig "#Secondary tables"
-    config_foreach prepare_tables 'table'
-    if [ -n "${listen_bgp_dual}" -o "${listen_bgp_dual}" = "0" ]; then
-        writeToConfig "listen bgp ${listen_bgp_addr} ${listen_bgp_port} v6only;"
-    else
-        writeToConfig "listen bgp ${listen_bgp_addr} ${listen_bgp_port} dual;"
-    fi
-    writeToConfig " "
-}
-
-
-# Function: prepare_routes $1
-# $1 string
-# This function gets each "route" section in the UCI configuration and sets each option in the bird6.conf file.
-# $1 is set as the ID of the current UCI route section. Each type of route has its own treatment.
-prepare_routes() {
-    local instance; local prefix; local via; local type
-    local section="$1"
-    local protoInstance="$2"
-
-    get instance ${section}
-    get type ${section}
-    get prefix ${section}
-    
-    if [ "${instance}" = "${protoInstance}" ]; then
-        case "${type}" in
-            "router")
-                get via ${section}
-                [ -n "${prefix}" -a -n "${via}" ] && writeToConfig "    route ${prefix} via ${via};"
-                ;;
-            "special")
-                get attribute ${section}
-                [ -n "${prefix}" -a -n "${attribute}" ] && writeToConfig "    route ${prefix} ${attribute};"
-                ;;
-            "iface")
-                get iface ${section}
-                [ -n "${prefix}" -a -n "${iface}" ] && writeToConfig '    route '${prefix}' via "'${iface}'";'
-                ;;
-            "multipath")
-                write "    route ${prefix} multipath" ${prefix}
-                config_list_foreach ${section} l_via multipath_list
-                writeToConfig "        ;"
-                ;;
-        esac
-    fi
-}
-
-
-# Function: prepare_kernel $1
-# $1 string
-# This function gets each "kernel" protocol section in the UCI configuration and sets each option in the bird6.conf file.
-# $1 is set as the ID of the current UCI kernel section.
-prepare_kernel() {
-    local section="$1"
-    local disabled; local table; local kernel_table; local import; local export
-    local scan_time; local persist; local learn
-
-    get_a_bool disabled ${section}
-    get table ${section}
-    get import ${section}
-    get export ${section}
-    get scan_time ${section}
-    get kernel_table ${section}
-    get learn ${section}
-    get persist ${section}
-
-    write "#${section} configuration:" ${section}
-    writeToConfig "protocol kernel ${section} {" ${section}
-    write_bool disabled ${disabled}
-    write "    table ${table};" ${table}
-    write "    kernel table ${kernel_table};" ${kernel_table}
-    write_bool learn ${learn}
-    write_bool persist ${persist}
-    write "    scan time ${scan_time};" ${scan_time}
-    write "    import ${import};" ${import}
-    write "    export ${export};" ${export}
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-# Function: prepare_static $1
-# $1 string
-# This function gets each "static" protocol section in the UCI configuration and sets each option in the bird6.conf file.
-# $1 is set as the ID of the current UCI static section.
-prepare_static() {
-    local section="$1"
-    local disabled; local table
-
-    get disabled ${section}
-    get table ${section}
-
-    if [ "${disabled}" -eq 0 ]; then
-        writeToConfig "#${section} configration:" ${section}
-        writeToConfig "protocol static {"
-        write "    table ${table};" ${table}
-        config_foreach prepare_routes 'route' ${section}
-        writeToConfig "}"
-        writeToConfig " "
-    fi
-}
-
-
-# Function: prepare_direct $1
-# $1 string
-# This function gets each "direct" protocol section in the UCI configuration and sets each option in the bird6.conf file.
-# $1 is set as the ID of the current UCI direct section.
-prepare_direct() {
-    local section="$1"
-    local disabled; local interface
-
-    get disabled ${section}
-    get interface ${section}
-
-    write "#${section} configuration:" ${section}
-    writeToConfig "protocol direct {"
-    write_bool disabled ${disabled}
-    write "    interface ${interface};" ${interface}
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-# Function: prepare_pipe $1
-# $1 string
-# This function gets each "pipe" protocol section in the UCI configuration and sets each option in the bird6.conf file.
-# $1 is set as the ID of the current UCI direct section.
-prepare_pipe() {
-    local section="$1"
-    local disabled; local table; local peer_table; local mode; local import; local export
-
-    get disabled ${section}
-    get peer_table ${section}
-    get mode ${section}
-    get table ${section}
-    get import ${section}
-    get export ${section}
-
-    write "#${section} configuration:" ${section}
-    writeToConfig "protocol pipe ${section} {" ${section}
-    write_bool disabled ${disabled}
-    write "    table ${table};" ${table}
-    write "    peer table ${peer_table};" ${peer_table}
-    write "    mode ${mode};" ${mode}
-    write "    import ${import};" ${import}
-    write "    export ${export};" ${export}
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-# Function: prepare_device $1
-# $1 string
-# This function gets each "device" protocol section in the UCI configuration and sets each option in the bird6.conf file.
-# $1 is set as the ID of the current UCI device section.
-prepare_device() {
-    local section="$1"
-    local disabled; local scan_time
-
-    get disabled ${section}
-    get scan_time ${section}
-
-    write "#${section} configuration:" ${section}
-    writeToConfig "protocol device {"
-    write_bool disabled ${disabled}
-    write "    scan time ${scan_time};" ${scan_time}
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-# Function: prepare_bgp_template $1
-# $1 string
-# This function gets each "bgp_template" protocol section in the UCI configuration and sets each option in the bird6.conf file.
-# $1 is set as the ID of the current UCI bgp_template section.
-# Careful! Template options will be replaced by "instance" options if there is any match.
-prepare_bgp_template() {
-    local section="$1"
-    local disabled; local table; local import; local export; local local_address
-    local local_as; local neighbor_address; local neighbor_as; local source_address
-    local next_hop_self; local next_hop_keep; local rr_client; local rr_cluster_id
-    local import_limit; local import_limit_action; local export_limit; local export_limit_action
-    local receive_limit; local receive_limit_action; local igp_table
-
-    get_a_bool disabled ${section}
-    get_a_bool next_hop_self ${section}
-    get_a_bool next_hop_keep ${section}
-    get table ${section}
-    get import ${section}
-    get export ${section}
-    get local_address ${section}
-    get local_as ${section}
-    get igp_table ${section}
-    get rr_client ${section}
-    get rr_cluster_id ${section}
-    get import_limit ${section}
-    get import_limit_action ${section}
-    get export_limit ${section}
-    get export_limit_action ${section}
-    get receive_limit ${section}
-    get receive_limit_action ${section}
-    get neighbor_address ${section}
-    get neighbor_as ${section}
-
-    writeToConfig "#${section} template:"
-    writeToConfig "template bgp ${section} {"
-    [ -n "${disabled}" ] && write_bool disabled ${disabled}
-    write "    table ${table};" ${table}
-    write "    local as ${local_as};" ${local_as}
-    write "    source address ${local_address};" ${local_address}
-    write "    import ${import};" ${import}
-    write "    export ${export};" ${export}
-    if [ -n "${next_hop_self}" ]; then
-        [ "${next_hop_self}" = "1" ] && writeToConfig "    next hop self;" || writeToConfig "#    next hop self;"
-    fi
-    if [ -n "${next_hop_keep}" ]; then
-        [ "${next_hop_keep}" = "1" ] && writeToConfig "    next hop keep;" || writeToConfig "#    next hop keep;"
-    fi
-    [ -n "${igp_table}" ] && writeToConfig "    igp table ${igp_table};"
-    [ "${rr_client}" = "1" ] && writeToConfig "    rr client;" || writeToConfig "#    rr client;"
-    write "    rr cluster id ${rr_cluster_id};" ${rr_cluster_id}
-    if [ -n "${import_limit}" -a "${import_limit}" > "0" ]; then
-        [ -z "${import_limit_action}" ] && ${import_limit_action} = "warn"
-        writeToConfig "    import limit ${import_limit} action ${import_limit_action};"
-    fi
-    if [ -n "${export_limit}" -a "${export_limit}" > "0" ]; then
-        [ -z "${export_limit_action}" ] && ${export_limit_action} = "warn"
-        writeToConfig "    export limit ${export_limit} action ${export_limit_action};"
-    fi
-    if [ -n "${receive_limit}" -a "${receive_limit}" > "0" ]; then
-        [ -z "${receive_limit_action}" ] && ${receive_limit_action} = "warn"
-        writeToConfig "    receive limit ${receive_limit} action ${receive_limit_action};"
-    fi
-    [ -n "${neighbor_address}" -a -n "${neighbor_as}" ] && writeToConfig "    neighbor ${neighbor_address} as ${neighbor_as};"
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-# Function: prepare_bgp $1
-# $1 string
-# This function gets each "bgp" protocol section in the UCI configuration and sets each option in the bird6.conf file.
-# $1 is set as the ID of the current UCI bgp section.
-# Careful! The options set in bgp instances overlap bgp_template ones.
-prepare_bgp() {
-    local section="$1"
-    local disabled; local table; local template; local description; local import
-    local export; local local_address; local local_as; local neighbor_address
-    local neighbor_as; local rr_client; local rr_cluster_id; local import_limit
-    local import_limit_action; local export_limit; local export_limit_action
-    local receive_limit; local receive_limit_action; local igp_table
-
-    get disabled ${section}
-    get table ${section}
-    get template ${section}
-    get description ${section}
-    get import ${section}
-    get export ${section}
-    get local_address ${section}
-    get local_as ${section}
-    get igp_table ${section}
-    get rr_client ${section}
-    get rr_cluster_id ${section}
-    get import_limit ${section}
-    get import_limit_action ${section}
-    get export_limit ${section}
-    get export_limit_action ${section}
-    get receive_limit ${section}
-    get receive_limit_action ${section}
-    get neighbor_address ${section}
-    get neighbor_as ${section}
-
-    writeToConfig "#${section} configuration:"
-    [ -n "${template}" ] && writeToConfig "protocol bgp ${section} from ${template} {" || writeToConfig "protocol bgp ${section} {"
-    [ -n "${disabled}" ] && write_bool disabled ${disabled}
-    write "    table ${table};" ${table}
-    write "    local as ${local_as};" ${local_as}
-    write "    source address ${local_address};" ${local_address}
-    write "    import ${import};" ${import}
-    write "    export ${export};" ${export}
-    if [ -n "${next_hop_self}" ]; then
-        [ "${next_hop_self}" = "1" ] && writeToConfig "    next hop self;" || writeToConfig "#    next hop self;"
-    fi
-    if [ -n "${next_hop_keep}" ]; then
-        [ "${next_hop_keep}" = "1" ] && writeToConfig "    next hop keep;" || writeToConfig "#    next hop keep;"
-    fi
-    [ -n "${igp_table}" ] && writeToConfig "    igp table ${igp_table};"
-    [ "${rr_client}" = "1" ] && writeToConfig "    rr client;" || writeToConfig "#    rr client;"
-    write "    rr cluster id ${rr_cluster_id};" ${rr_cluster_id}
-    if [ -n "${import_limit}" -a "${import_limit}" > "0" ]; then
-        [ -z "${import_limit_action}" ] && ${import_limit_action} = "warn"
-        writeToConfig "    import limit ${import_limit} action ${import_limit_action};"
-    fi
-    if [ -n "${export_limit}" -a "${export_limit}" > "0" ]; then
-        [ -z "${export_limit_action}" ] && ${export_limit_action} = "warn"
-        writeToConfig "    export limit ${export_limit} action ${export_limit_action};"
-    fi
-    if [ -n "${receive_limit}" -a "${receive_limit}" > "0" ]; then
-        [ -z "${receive_limit_action}" ] && ${receive_limit_action} = "warn"
-        writeToConfig "    receive limit ${receive_limit} action ${receive_limit_action};"
-    fi
-    [ -n "${neighbor_address}" -a -n "${neighbor_as}" ] && writeToConfig "    neighbor ${neighbor_address} as ${neighbor_as};"
-    writeToConfig "}"
-    writeToConfig " "
-}
-
-
-# Function: gather_filters
-# This function gets all the FILES under /filters folder and adds
-# them into the config as %include elements on top of the file
-# If there are no filters, the section will remain empty.
-gather_filters() {
-    writeToConfig "#Filters Section:"
-    for filter in $(find /etc/${BIRD}/filters -type f); do
-        writeToConfig "include \"${filter}\";"
-    done
-    writeToConfig "#End of Filters --"
-    writeToConfig " "
-}
-
-
-# Function: gather_functions
-# This function gets all the FILES under /functions folder and adds
-# them into the config as %include elements on top of the file
-# If there are no filters, the section will remain empty.
-gather_functions() {
-    writeToConfig "#Functions Section:"
-    for func in $(find /etc/${BIRD}/functions -type f); do
-        writeToConfig "include \"${func}\";"
-    done
-    writeToConfig "#End of Functions --"
-    writeToConfig " "
-}

bird1-openwrt/bird1-ipv6-openwrt/src/model/bgp_proto.lua

@@ -1,286 +0,0 @@
---[[ 
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
---]]
-
-require("luci.sys")
-local http = require "luci.http"
-local uci = luci.model.uci.cursor()
-
--- Repeated Strings
-local common_string = "Valid options are:<br />" .. "1. all (All the routes)<br />" .. "2. none (No routes)<br />" .. "3. filter <b>Your_Filter_Name</b> (Call a specific filter from any of the available in the filters files)"
-local imp_string = "Set if the protocol must import routes.<br />" .. common_string
-local exp_string = "Set if the protocol must export routes.<br />" .. common_string
-
-m=Map("bird6", "Bird6 BGP protocol's configuration")
-
-tab_templates = {}
-uci:foreach('bird6', 'bgp_template', function (s)
-	local name = s[".name"]
-	if (name ~= nil) then
-		table.insert(tab_templates, name)
-	end
-end)
-
---
--- BGP TEMPLATES
---
-sect_templates = m:section(TypedSection, "bgp_template", "BGP Templates", "Configuration of the templates used in BGP instances.")
-sect_templates.addremove = true
-sect_templates.anonymous = false
-
-disabled = sect_templates:option(Flag, "disabled", "Disabled", "Enable/Disable BGP Protocol")
-disabled.optional=true
-
-description = sect_templates:option(TextValue, "description", "Description", "Description of the current BGP instance")
-description.optional = true
-
-table = sect_templates:option(ListValue, "table", "Table", "Set the table used for BGP Routing")
-table.optional=true
-uci:foreach("bird6", "table",
-	function (s)
-		table:value(s.name)
-	end)
-table:value("")
-table.default = ""
-
-igp_table = sect_templates:option(ListValue, "igp_table", "IGP Table", "Select the IGP Routing Table to use. Hint: usually the same table as BGP.")
-igp_table.optional = true
-uci:foreach("bird6", "table",
-function(s)
-    igp_table:value(s.name)
-end)
-igp_table:value("")
-igp_table.default = ""
-
-import = sect_templates:option(Value, "import", "Import", imp_string)
-import.optional=true
-
-export = sect_templates:option(Value, "export", "Export", exp_string)
-export.optional=true
-
-source_addr = sect_templates:option(Value, "source_address", "Source Address", "Source address for BGP routing. By default uses Router ID")
-source_addr.optional = true
-
-local_address = sect_templates:option(Value, "local_address", "Local BGP address", "")
-local_address.optional = false
-
-local_as = sect_templates:option(Value, "local_as", "Local AS", "")
-local_as.optional = false
-
-next_hop_self = sect_templates:option(Flag, "next_hop_self", "Next hop self", "Avoid next hop calculation and advertise own source address as next hop")
-next_hop_self.default = nil
-next_hop_self.optional = true
-
-next_hop_keep = sect_templates:option(Flag, "next_hop_keep", "Next hop keep", "Forward the received Next Hop attribute event in situations where the local address should be used instead, like subneting")
-next_hop_keep.default = nil
-next_hop_keep.optional = true
-
-rr_client = sect_templates:option(Flag, "rr_client", "Route Reflector server", "This router serves as a Route Reflector server and treats neighbors as clients")
-rr_client.default = nil
-rr_client.optional = true
-
-rr_cluster_id = sect_templates:option(Value, "rr_cluster_id", "Route Reflector Cluster ID", "Identificator of the RR cluster. By default uses the Router ID")
-rr_cluster_id.optional = true
-
-import_trigger = sect_templates:option(Flag, "import_trigger", "Import Limit", "Enable Routes Import limit settings")
-import_trigger.default = 0
-import_trigger.rmempty = false
-import_trigger.optional = false
-
-import_limit = sect_templates:option(Value, "import_limit", "Routes import limit", "Specify an import route limit.")
-import_limit:depends({import_trigger = "1"})
-import_limit.rmempty = true
-
-import_limit_action = sect_templates:option(ListValue, "import_limit_action", "Routes import limit action", "Action to take when import routes limit ir reached")
-import_limit_action:depends({import_trigger = "1"})
-import_limit_action:value("warn")
-import_limit_action:value("block")
-import_limit_action:value("disable")
-import_limit_action:value("restart")
-import_limit_action.default = "warn"
-import_limit_action.rmempty = true
-
-export_trigger = sect_templates:option(Flag, "export_trigger", "Export Limit", "Enable Routes Export limit settings")
-export_trigger.default = 0
-export_trigger.rmempty = false
-export_trigger.optional = false
-
-export_limit = sect_templates:option(Value, "export_limit", "Routes export limit", "Specify an export route limit.")
-export_limit:depends({export_trigger = "1"})
-export_limit.rmempty = true
-
-export_limit_action = sect_templates:option(ListValue, "export_limit_action", "Routes export limit action", "Action to take when export routes limit is reached")
-export_limit_action:depends({export_trigger = "1"})
-export_limit_action.rmempty = true
-export_limit_action:value("warn")
-export_limit_action:value("block")
-export_limit_action:value("disable")
-export_limit_action:value("restart")
-export_limit_action.default = "warn"
-
-receive_trigger = sect_templates:option(Flag, "receive_trigger", "Received Limit", "Enable Routes Received Limit settings")
-receive_trigger.default = 0
-receive_trigger.rmempty = false
-receive_trigger.optional = false
-
-receive_limit = sect_templates:option(Value, "receive_limit", "Routes received limit", "Specify a received route limit.")
-receive_limit:depends({receive_trigger = "1"})
-receive_limit.rmempty = true
-
-receive_limit_action = sect_templates:option(ListValue, "receive_limit_action", "Routes received limit action", "Action to take when received routes limit is reached")
-receive_limit_action:depends({receive_trigger = "1"})
-receive_limit_action:value("warn")
-receive_limit_action:value("block")
-receive_limit_action:value("disable")
-receive_limit_action:value("restart")
-receive_limit_action.default = "warn"
-receive_limit_action.rmempty= true
-
---
--- BGP INSTANCES
---
-sect_instances = m:section(TypedSection, "bgp", "BGP Instances", "Configuration of the BGP protocol instances")
-sect_instances.addremove = true
-sect_instances.anonymous = false
-
-templates = sect_instances:option(ListValue, "template", "Templates", "Available BGP templates")
-uci:foreach("bird6", "bgp_template",
-	function(s)
-		templates:value(s[".name"])
-	end)
-templates:value("")
-
-disabled = sect_instances:option(Flag, "disabled", "Disabled", "Enable/Disable BGP Protocol")
-disabled.optional = false
-disabled.rmempty = false
-disabled.default = nil
-
-description = sect_instances:option(TextValue, "description", "Description", "Description of the current BGP instance")
-description.optional = true
-
-table = sect_instances:option(ListValue, "table", "Table", "Set the table used for BGP Routing")
-table.optional=true
-uci:foreach("bird6", "table",
-    function (s)
-        table:value(s.name)
-    end)
-table:value("")
-table.default = ""
-
-igp_table = sect_instances:option(ListValue, "igp_table", "IGP Table", "Select the IGP Routing Table to use. Hint: usually the same table as BGP.")
-igp_table.optional = true
-uci:foreach("bird6", "table",
-function(s)
-    igp_table:value(s.name)
-end)
-igp_table:value("")
-igp_table.default = ""
-
-import = sect_instances:option(Value, "import", "Import", imp_string)
-import.optional=true
-
-export = sect_instances:option(Value, "export", "Export", exp_string)
-export.optional=true
-
-source_address = sect_instances:option(Value, "source_address", "Source Address", "Source address for BGP routing. By default uses Router ID")
-source_address.optional = true
-
-local_address = sect_instances:option(Value, "local_address", "Local BGP address", "")
-local_address.optional=true
-
-local_as = sect_instances:option(Value, "local_as", "Local AS", "")
-local_as.optional=true
-
-neighbor_address = sect_instances:option(Value, "neighbor_address", "Neighbor IP Address", "")
-neighbor_address.optional = false
-
-neighbor_as = sect_instances:option(Value, "neighbor_as", "Neighbor AS", "")
-neighbor_as.optional = false
-
-next_hop_self = sect_instances:option(Flag, "next_hop_self", "Next hop self", "Avoid next hop calculation and advertise own source address as next hop")
-next_hop_self.default = nil
-next_hop_self.optional = true
-
-next_hop_keep = sect_instances:option(Flag, "next_hop_keep", "Next hop keep", "Forward the received Next Hop attribute event in situations where the local address should be used instead, like subneting")
-next_hop_keep.default = nil
-next_hop_keep.optional = true
-
-rr_client = sect_instances:option(Flag, "rr_client", "Route Reflector server", "This router serves as a Route Reflector server and treats neighbors as clients")
-rr_client.default = nil
-rr_client.optional = true
-
-rr_cluster_id = sect_instances:option(Value, "rr_cluster_id", "Route Reflector Cluster ID", "Identificator of the RR cluster. By default uses the Router ID")
-rr_cluster_id.optional = true
-
-import_trigger = sect_instances:option(Flag, "import_trigger", "Import Limit", "Enable Routes Import limit settings")
-import_trigger.default = 0
-import_trigger.rmempty = false
-import_trigger.optional = false
-
-import_limit = sect_instances:option(Value, "import_limit", "Routes import limit", "Specify an import route limit.")
-import_limit:depends({import_trigger = "1"})
-import_limit.rmempty = true
-
-import_limit_action = sect_instances:option(ListValue, "import_limit_action", "Routes import limit action", "Action to take when import routes limit ir reached")
-import_limit_action:depends({import_trigger = "1"})
-import_limit_action:value("warn")
-import_limit_action:value("block")
-import_limit_action:value("disable")
-import_limit_action:value("restart")
-import_limit_action.default = "warn"
-import_limit_action.rmempty = true
-
-export_trigger = sect_instances:option(Flag, "export_trigger", "Export Limit", "Enable Routes Export limit settings")
-export_trigger.default = 0
-export_trigger.rmempty = false
-export_trigger.optional = false
-
-export_limit = sect_instances:option(Value, "export_limit", "Routes export limit", "Specify an export route limit.")
-export_limit:depends({export_trigger = "1"})
-export_limit.rmempty = true
-
-export_limit_action = sect_instances:option(ListValue, "export_limit_action", "Routes export limit action", "Action to take when export routes limit is reached")
-export_limit_action:depends({export_trigger = "1"})
-export_limit_action.rmempty = true
-export_limit_action:value("warn")
-export_limit_action:value("block")
-export_limit_action:value("disable")
-export_limit_action:value("restart")
-export_limit_action.default = "warn"
-
-receive_trigger = sect_instances:option(Flag, "receive_trigger", "Received Limit", "Enable Routes Received Limit settings")
-receive_trigger.default = 0
-receive_trigger.rmempty = false
-receive_trigger.optional = false
-
-receive_limit = sect_instances:option(Value, "receive_limit", "Routes received limit", "Specify a received route limit.")
-receive_limit:depends({receive_trigger = "1"})
-receive_limit.rmempty = true
-
-receive_limit_action = sect_instances:option(ListValue, "receive_limit_action", "Routes received limit action", "Action to take when received routes limit is reached")
-receive_limit_action:depends({receive_trigger = "1"})
-receive_limit_action:value("warn")
-receive_limit_action:value("block")
-receive_limit_action:value("disable")
-receive_limit_action:value("restart")
-receive_limit_action.default = "warn"
-receive_limit_action.rmempty= true
-
-function m.on_commit(self,map)
-        luci.sys.exec('/etc/init.d/bird6 restart')
-end
-
-return m

bird1-openwrt/bird1-ipv6-openwrt/src/model/filters.lua

@@ -1,77 +0,0 @@
---[[
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-]]--
-
-local fs = require "nixio.fs"
-local filters_dir = "/etc/bird6/filters/"
-local lock_file = "/etc/bird6/filter_lock"
-
-m = SimpleForm("bird6", "Bird6 Filters", "<b>INFO:</b> New files are created using Timestamps.<br />In order to make it easier to handle, use SSH to connect to your terminal and rename those files.<br />If your file is not correctly shown in the list, please, refresh your browser.")
-
-s = m:section(SimpleSection)
-files = s:option(ListValue, "Files", "Filter Files:")
-local new_filter = filters_dir .. os.date("filter-%Y%m%d-%H%M")
-
--- New File Entry
-files:value(new_filter, "New File (".. new_filter .. ")")
-files.default = new_filter
-
-local i, file_list = 0, { }
-for filename in io.popen("find " .. filters_dir .. " -type f"):lines() do
-    i = i + 1
-    files:value(filename, filename)
-end
-
-ld = s:option(Button, "_load", "Load File")
-ld.inputstyle = "reload"
-
-st_file = s:option(DummyValue, "_stfile", "Editing file:")
-function st_file.cfgvalue(self, section)
-    if ld:formvalue(section) then
-        fs.writefile(lock_file, files:formvalue(section))
-        return files:formvalue(section)
-    else
-        fs.writefile(lock_file, "")
-        return ""
-    end
-end
-
-area = s:option(Value, "_filters")
-area.template = "bird6/tvalue"
-area.rows = 30
-function area.cfgvalue(self,section)
-    if ld:formvalue(section) then
-        local contents = fs.readfile(files:formvalue(section))
-        if contents then
-            return contents
-        else
-            return ""
-        end
-    else
-        return ""
-    end
-end
-
-function area.write(self, section)
-    local locked_file = fs.readfile(lock_file)
-    if locked_file and not ld:formvalue(section) then
-        local text = self:formvalue(section):gsub("\r\n?", "\n")
-        fs.writefile(locked_file, text)
-        fs.writefile(lock_file, "")
-    end
-end
-
-return m

bird1-openwrt/bird1-ipv6-openwrt/src/model/functions.lua

@@ -1,77 +0,0 @@
---[[
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-]]--
-
-local fs = require "nixio.fs"
-local functions_dir = "/etc/bird6/functions/"
-local lock_file = "/etc/bird6/function_lock"
-
-m = SimpleForm("bird6", "Bird6 Functions", "<b>INFO:</b> New files are created using Timestamps.<br />In order to make it easier to handle, use SSH to connect to your terminal and rename those files.<br />If your file is not correctly shown in the list, please, refresh your browser.")
-
-s = m:section(SimpleSection)
-files = s:option(ListValue, "Files", "Function Files:")
-local new_function = functions_dir .. os.date("function-%Y%m%d-%H%M")
-
--- New File Entry
-files:value(new_function, "New File (".. new_function .. ")")
-files.default = new_function
-
-local i, file_list = 0, { }
-for filename in io.popen("find " .. functions_dir .. " -type f"):lines() do
-    i = i + 1
-    files:value(filename, filename)
-end
-
-ld = s:option(Button, "_load", "Load File")
-ld.inputstyle = "reload"
-
-st_file = s:option(DummyValue, "_stfile", "Editing file:")
-function st_file.cfgvalue(self, section)
-    if ld:formvalue(section) then
-        fs.writefile(lock_file, files:formvalue(section))
-        return files:formvalue(section)
-    else
-        fs.writefile(lock_file, "")
-        return ""
-    end
-end
-
-area = s:option(Value, "_functions")
-area.template = "bird6/tvalue"
-area.rows = 30
-function area.cfgvalue(self,section)
-    if ld:formvalue(section) then
-        local contents = fs.readfile(files:formvalue(section))
-        if contents then
-            return contents
-        else
-            return ""
-        end
-    else
-        return ""
-    end
-end
-
-function area.write(self, section)
-    local locked_file = fs.readfile(lock_file)
-    if locked_file and not ld:formvalue(section) then
-        local text = self:formvalue(section):gsub("\r\n?", "\n")
-        fs.writefile(locked_file, text)
-        fs.writefile(lock_file, "")
-    end
-end
-
-return m

bird1-openwrt/bird1-ipv6-openwrt/src/model/gen_proto.lua

@@ -1,266 +0,0 @@
---[[ 
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
---]]
-
-require("luci.sys")
-local http = require "luci.http"
-local uci = luci.model.uci.cursor()
-
--- Repeated Strings
-local common_string = "Valid options are:<br />" .. "1. all (All the routes)<br />" .. "2. none (No routes)<br />" .. "3. filter <b>Your_Filter_Name</b>      (Call a specific filter from any of the available in the filters files)"
-local imp_string = "Set if the protocol must import routes.<br />" .. common_string
-local exp_string = "Set if the protocol must export routes.<br />" .. common_string
-
-m=Map("bird6", "Bird6 general protocol's configuration.")
-
--- Optional parameters lists
-local protoptions = {
-	{["name"]="table", ["help"]="Auxiliar table for routing", ["depends"]={"static","kernel"}},
-	{["name"]="import", ["help"]=imp_string, ["depends"]={"kernel"}},
-	{["name"]="export", ["help"]=exp_string, ["depends"]={"kernel"}},
-	{["name"]="scan_time", ["help"]="Time between scans", ["depends"]={"kernel","device"}},
-	{["name"]="kernel_table", ["help"]="Set which table must be used as auxiliar kernel table", ["depends"]={"kernel"}},
-	{["name"]="learn", ["help"]="Learn routes", ["depends"]={"kernel"}},
-	{["name"]="persist", ["help"]="Store routes. After a restart, routes willstill be configured", ["depends"]={"kernel"}}
-}
-
-local routeroptions = {
-	{["name"]="prefix",["help"]="",["depends"]={"router","special","iface","multipath","recursive"}},
-	{["name"]="via",["help"]="",["depends"]={"router","multipath"}},
-	{["name"]="attribute",["help"]="",["depends"]={"special"}},
-	{["name"]="iface",["help"]="",["depends"]={"iface"}},
-	{["name"]="ip",["help"]="",["depends"]={"recursive"}}
-}
-
---
--- KERNEL PROTOCOL
---
-
-sect_kernel_protos = m:section(TypedSection, "kernel", "Kernel options", "Configuration of the kernel protocols. First Instance MUST be Primary table (no table or kernel_table fields).")
-sect_kernel_protos.addremove = true
-sect_kernel_protos.anonymous = false
-
--- Default kernel parameters
-
-disabled = sect_kernel_protos:option(Flag, "disabled", "Disabled", "If this option is true, the protocol will not be configured.")
-disabled.default=0
-
--- Optional parameters
-for _,o in ipairs(protoptions) do
-	if o.name ~= nil then
-		for _, d in ipairs(o.depends) do
-			if d == "kernel" then
-				if o.name == "learn" or o.name == "persist" then
-					value = sect_kernel_protos:option(Flag, o.name, translate(o.name), translate(o.help))
-				elseif o.name == "table" then 
-					value = sect_kernel_protos:option(ListValue, o.name, translate(o.name), translate(o.help))
-					uci:foreach("bird6", "table",
-						function (s)
-							value:value(s.name)
-						end)
-					value:value("")
-                    value.default = ""
-				else
-					value = sect_kernel_protos:option(Value, o.name, translate(o.name), translate(o.help))
-				end
-				value.optional = true
-				value.rmempty = true
-			end
-		end
-
-	end
-end
-
---
--- DEVICE PROTOCOL
---
-
-sect_device_protos = m:section(TypedSection, "device", "Device options", "Configuration of the device protocols.")
-sect_device_protos.addremove = true
-sect_device_protos.anonymous = false
-
--- Default kernel parameters
-
-disabled = sect_device_protos:option(Flag, "disabled", "Disabled", "If this option is true, the protocol will not be configured.")
-disabled.default=0
-
--- Optional parameters
-for _,o in ipairs(protoptions) do
-	if o.name ~= nil then
-		for _, d in ipairs(o.depends) do
-			if d == "device" then
-				value = sect_device_protos:option(Value, o.name, translate(o.name), translate(o.help))
-				value.optional = true
-				value.rmempty = true
-			end
-		end
-	end
-end
-																												
---
--- STATIC PROTOCOL
---
-
-sect_static_protos = m:section(TypedSection, "static", "Static options", "Configuration of the static protocols.")
-sect_static_protos.addremove = true
-sect_static_protos.anonymous = false
-
--- Default kernel parameters
-
-disabled = sect_static_protos:option(Flag, "disabled", "Disabled", "If this option is true, the protocol will not be configured.")
-disabled.default=0
-
--- Optional parameters
-for _,o in ipairs(protoptions) do
-	if o.name ~= nil then
-		for _, d in ipairs(o.depends) do
-			if d == "static" then
-				if o.name == "table" then
-					value = sect_static_protos:option(ListValue, o.name, translate(o.name), translate(o.help))
-					uci:foreach("bird6", "table",
-						function (s)
-							value:value(s.name)
-						end)
-					value:value("")
-                    value.default = ""
-				else
-					value = sect_static_protos:option(Value, o.name, translate(o.name), translate(o.help))
-				end
-					value.optional = true
-					value.rmempty = true
-			end
-		end
-	end
-end
-
-
---
--- PIPE PROTOCOL
---
-sect_pipe_protos = m:section(TypedSection, "pipe", "Pipe options",     "Configuration of the Pipe protocols.")
-sect_pipe_protos.addremove = true
-sect_pipe_protos.anonymous = false
-
--- Default Pipe parameters
-disabled = sect_pipe_protos:option(Flag, "disabled", "Disabled", "If this  option is true, the protocol will not be configured. This protocol will connect the configured 'Table' to the 'Peer Table'.")
-disabled.default=0
-
-table = sect_pipe_protos:option(ListValue, "table", "Table", "Select the Primary Table to connect.")
-table.optional = false
-uci:foreach("bird6", "table",
-  function (s)
-    table:value(s.name)
-  end)
-table:value("")
-table.default = ""
-
-peer_table = sect_pipe_protos:option(ListValue, "peer_table", "Peer Table", "Select the Secondary Table to connect.")
-table.optional = false
-uci:foreach("bird6", "table",
-  function (s)
-    peer_table:value(s.name)
-  end)
-peer_table:value("")
-peer_table.default = ""
-
-mode = sect_pipe_protos:option(ListValue, "mode", "Mode", "Select <b>transparent</b> to retransmit all routes and their attributes<br />Select <b>opaque</b> to retransmit optimal routes (similar to what other protocols do)")
-mode.optional = false
-mode:value("transparent")
-mode:value("opaque")
-mode.default = "transparent"
-
-import = sect_pipe_protos:option(Value, "import", "Import",imp_string)
-import.optional=true
-
-export = sect_pipe_protos:option(Value, "export", "Export", exp_string)
-export.optional=true
-
-
---
--- DIRECT PROTOCOL
---
-sect_direct_protos = m:section(TypedSection, "direct", "Direct options", "Configuration of the Direct protocols.")
-sect_direct_protos.addremove = true
-sect_direct_protos.anonymous = false
-
--- Default Direct parameters
-disabled = sect_direct_protos:option(Flag, "disabled", "Disabled", "If this option is true, the protocol will not be configured. This protocol will connect the configured 'Table' to the 'Peer Table'.")
-disabled.optional = false
-disabled.default = 0
-
-interface = sect_direct_protos:option(Value, "interface", "Interfaces", "By default Direct will generate device routes for all the interfaces. To restrict this behaviour, select a number of patterns to match your desired interfaces:" .. "<br />" .. "1. All the strings <b>MUST</b> be quoted: \"pattern\"" .. "<br />" .. "2. Use * (star) to match patterns: \"eth*\" (<b>include</b> all eth... interfaces)" .. "<br />" .. "3. You can add \"-\" (minus) to exclude patterns: \"-em*\" (<b>exclude</b> all em... interfaces)." .. "<br />" .. "4. Separate several patterns using , (coma): \"-em*\", \"eth*\" (<b>exclude</b> em... and <b>include</b> all eth... interfaces).")
-interface.optional = false
-interface.default = "\"*\""
-
-
---
--- ROUTES FOR STATIC PROTOCOL
---
-sect_routes = m:section(TypedSection, "route", "Routes configuration", "Configuration of the routes used in static protocols.")
-sect_routes.addremove = true
-sect_routes.anonymous = true
-
-instance = sect_routes:option(ListValue, "instance", "Route instance", "")
-i = 0
-
-uci:foreach("bird6", "static",
-	function (s)
-		instance:value(s[".name"])
-	end)
-
-prefix = sect_routes:option(Value, "prefix", "Route prefix", "")
-prefix.datatype = "ip6prefix"
-
-type = sect_routes:option(ListValue, "type", "Type of route", "")
-type:value("router")
-type:value("special")
-type:value("iface")
-type:value("recursive")
-type:value("multipath")
-
-valueVia = sect_routes:option(Value, "via", "Via", "")
-valueVia.optional = false
-valueVia:depends("type", "router")
-valueVia.datatype = "ip6addr"
-
-listVia = sect_routes:option(DynamicList, "l_via", "Via", "")
-listVia:depends("type", "multipath")
-listVia.optional=false
-listVia.datatype = "ip6addr"
-
-attribute = sect_routes:option(Value, "attribute", "Attribute", "Types are: unreachable, prohibit and blackhole")
-attribute:depends("type", "special")
-
-iface  = sect_routes:option(ListValue, "iface", "Interface", "")
-iface:depends("type", "iface")
-
-uci:foreach("network", "interface",
-	function(section)
-        if section[".name"] ~= "loopback" then
-            iface:value(section[".name"])
-        end
-	end)
-
-ip =  sect_routes:option(Value, "ip", "IP address", "")
-ip:depends("type", "ip")
-ip.datatype = [[ or"ip4addr", "ip6addr" ]]
-
-function m.on_commit(self,map)
-        luci.sys.exec('/etc/init.d/bird6 restart')
-end
-
-return m
-

bird1-openwrt/bird1-ipv6-openwrt/src/model/overview.lua

@@ -1,85 +0,0 @@
---[[ 
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-]]--
-
-require("luci.sys")
-local http = require "luci.http"
-local uci = require "luci.model.uci"
-local uciout = uci.cursor()
-
-m=Map("bird6", "Bird6 UCI configuration helper", "")
-
--- Named section: "bird"
-
-s_bird_uci = m:section(NamedSection, "bird", "bird", "Bird6 file settings", "")
-s_bird_uci.addremove = False
-
-uuc = s_bird_uci:option(Flag, "use_UCI_config", "Use UCI configuration", "Use UCI configuration instead of the /etc/bird6.conf file")
-
-ucf = s_bird_uci:option(Value, "UCI_config_file", "UCI File", "Specify the file to place the UCI-translated configuration")
-ucf.default = "/tmp/bird6.conf"
-
--- Named Section: "table"
-
-s_bird_table = m:section(TypedSection, "table", "Tables configuration", "Configuration of the tables used in the protocols")
-s_bird_table.addremove = true
-s_bird_table.anonymous = true
-
-name = s_bird_table:option(Value, "name", "Table name", "Descriptor ID of the table")
-
--- Named section: "global"
-
-s_bird_global = m:section(NamedSection, "global", "global", "Global options", "Basic Bird6 settings")
-s_bird_global.addremove = False
-
-id = s_bird_global:option(Value, "router_id", "Router ID", "Identification number of the router. By default, is the router's IP.")
-
-lf = s_bird_global:option(Value, "log_file", "Log File", "File used to store log related data.")
-
-l = s_bird_global:option(MultiValue, "log", "Log", "Set which elements do you want to log.")
-l:value("all", "All")
-l:value("info", "Info")
-l:value("warning","Warning")
-l:value("error","Error")
-l:value("fatal","Fatal")
-l:value("debug","Debug")
-l:value("trace","Trace")
-l:value("remote","Remote")
-l:value("auth","Auth")
-
-d = s_bird_global:option(MultiValue, "debug", "Debug", "Set which elements do you want to debug.")
-d:value("all", "All")
-d:value("states","States")
-d:value("routes","Routes")
-d:value("filters","Filters")
-d:value("interfaces","Interfaces")
-d:value("events","Events")
-d:value("packets","Packets")
-
-listen_addr = s_bird_global:option(Value, "listen_bgp_addr", "BGP Address", "Set the Addres that BGP will listen to.")
-listen_addr.optional = true
-
-listen_port = s_bird_global:option(Value, "listen_bgp_port", "BGP Port", "Set the port that BGP will listen to.")
-listen_port.optional = true
-
-listen_dual = s_bird_global:option(Flag, "listen_bgp_dual", "BGP Dual/ipv6", "Set if BGP connections will listen ipv6 only 'ipv6only' or both ipv4/6 'dual' routes")
-listen_dual.optional = true
-
-function m.on_commit(self,map)
-        luci.sys.exec('/etc/init.d/bird6 restart')
-end
-
-return m

bird1-openwrt/bird1-ipv6-openwrt/src/model/status.lua

@@ -1,53 +0,0 @@
---[[
-Copyright (C) 2014-2017 - Eloi Carbo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-]]--
-
-local sys = require "luci.sys"
-
-m = SimpleForm("bird6", "Bird6 Daemon Status Page", "This page let you Start,   Stop, Restart and check Bird6 Service Status.")
-m.reset = false
-m.submit = false
-
-s = m:section(SimpleSection)
-
-start = s:option(Button, "_start", "Start Bird4 Daemon:")
-start.inputtitle = "   Start   "
-start.inputstyle = "apply"
-
-stop = s:option(Button, "_stop", "Stop Bird4 Daemon:")
-stop.inputtitle = "   Stop   "
-stop.inputstyle = "remove"
-
-restart = s:option(Button, "_restart", "Restart Bird4 Daemon:")
-restart.inputtitle = "Restart"
-restart.inputstyle = "reload"
-
-output = s:option(DummyValue, "_value", "Service Status")
-function output.cfgvalue(self, section)
-    local ret = ""
-    if start:formvalue(section) then
-        ret = sys.exec("/etc/init.d/bird6 start_quiet")
-    elseif stop:formvalue(section) then
-        ret = sys.exec("/etc/init.d/bird6 stop_quiet")
-    elseif restart:formvalue(section) then
-        ret = sys.exec("/etc/init.d/bird6 restart_quiet")
-    else
-        ret = sys.exec("/etc/init.d/bird6 status_quiet")
-    end
-    return ret
-end
-
-return m

bird1-openwrt/bird1-ipv6-openwrt/src/uci-defaults/99-relocate-filters

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# This UCI-Defaults script will MOVE any pre-existing filter
-# stored in a file and configured as an UCI item (deprecated)
-# The script will try to match any "filter" Section, get its
-# "file_path" property and move the file (if exists) to the
-# new (v0.3+) default location: /etc/bird{4|6}/filters
-
-[ $# -ne 1 ] && exit 1
-BIRD="$1"
-
-. /lib/functions.sh
-
-# This function will move an existing folder configured on
-# Bird as a "filter" to filters' folder.
-mv_filter() {
-    local section="$1"
-    local file_path
-    config_get file_path ${section} file_path
-
-    if [ -f ${file_path} ]; then
-        mv ${file_path} /etc/${BIRD}/filters/
-    fi
-    uci delete ${BIRD}.${section}
-}
-
-if [ -f /etc/config/${BIRD} ]; then
-    config_load ${BIRD}
-    config_foreach mv_filter 'filter'
-    uci commit ${BIRD}
-fi
-
-exit 0

bird1-openwrt/bird1-ipv6-openwrt/src/uci-defaults/bird-uci-install-init.d

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-[ $# -ne 1 ] && exit 1
-
-BIRD=$1
-
-EXC=`mount -t overlayfs | grep overlayfs -c`
-
-[ $EXC > 0 ] && rm -r /etc/init.d/${BIRD} || mv /etc/init.d/${BIRD} /etc/${BIRD}/init.d/${BIRD}.orig
-
-ln -s /etc/${BIRD}/init.d/${BIRD} /etc/init.d/${BIRD}
-
-exit 0

bird1-openwrt/bird1-ipv6-openwrt/src/view/log.htm

@@ -1,41 +0,0 @@
-<%-
-    -- Only populate textarea through XHR.poll
-    -- "refresh" is present in the URL (.../log?refresh=1)
-    if luci.http.formvalue("refresh") then
-
-        -- Force HTTP Contents to be "text/plain"
-        luci.http.prepare_content("text/plain")
-
-        local sys = require("luci.sys")
-        local uci = require "luci.model.uci".cursor()
-
-        -- Get Log File from Bird's configuration or leave it empty.
-        local log_file = uci:get("bird6", "global", "log_file") or ""
-        local log_size = ""
-        if log_file then
-            log_size = sys.exec("du -h " .. log_file .. " | awk '{print      $1}'")
-            -- Gathering last 30 lines of the Log File.
-            lf = sys.exec("tail -n30 " .. log_file):gsub("\r\n?", "\n")
-        end
-
-        -- Write File used and its contents.
-        luci.http.write("Using Log File: " .. log_file .. " - File Size: " .. log_size .. "\n" .. lf)
-
-        -- Avoid printing the rest of the page (return only text log data)
-        return
-    end
--%>
-
-<%+header%>
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-    // Refresh page each second. Use "refresh=1" as trigger.
-    XHR.poll(1, '<%=url('admin/network/bird6/log')%>', { refresh: 1 },       function(xhrInstance) {
-        var area = document.getElementById('log')
-        area.value = xhrInstance.responseText;
-    });
-//]]></script>
-
-
-<textarea readonly="readonly" style="width: 100%" wrap="on" rows="32"        id="log"><%=lf:pcdata()%></textarea>
-<%+footer%>

bird1-openwrt/bird1-ipv6-openwrt/src/view/tvalue.htm

@@ -1,5 +0,0 @@
-<%+cbi/valueheader%>
-	<textarea class="cbi-input-textarea" <% if not self.size then %> style="width: 100%; font: normal 11pt 'Courier New'"<% else %> cols="<%=self.size%>"<% end %> data-update="change"<%= attr("name", cbid) .. attr("id", cbid) .. ifattr(self.rows, "rows") .. ifattr(self.wrap, "wrap")  .. ifattr(self.readonly, "readonly") %>>
-	<%-=pcdata(self:cfgvalue(section))-%>
-	</textarea>
-<%+cbi/valuefooter%>

bird1/Makefile

@@ -1,225 +0,0 @@
-# 
-# Copyright (C) 2009-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bird1
-PKG_VERSION:=1.6.8
-PKG_RELEASE:=2
-
-PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_HASH:=6c61ab5d2ef59d2559a8735b8252b5a0238013b43e5fb8a96c5d9d06e7bc00b2
-PKG_BUILD_DEPENDS:=ncurses readline
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-PKG_BUILD_DIR:=$(BUILD_DIR)/bird-$(PKG_VERSION)
-
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bird1/Default
-  TITLE:=The BIRD Internet Routing Daemon (v1.6)
-  URL:=https://bird.network.cz/
-  DEPENDS:=+libpthread
-endef
-
-define Package/bird1c/Default
-  TITLE:=The BIRD command-line client (v1.6)
-  URL:=https://bird.network.cz/
-  DEPENDS:=+libreadline +libncurses
-endef
-
-define Package/bird1cl/Default
-  TITLE:=The BIRD lightweight command-line client (v1.6)
-  URL:=https://bird.network.cz/
-endef
-
-define Package/bird1/Default/description1
-BIRD is an internet routing daemon which manages TCP/IP routing tables
-with support of modern routing protocols, easy to use configuration
-interface and powerful route filtering language. It is lightweight and
-efficient and therefore appropriate for small embedded routers.
-
-This packages the legacy v1.6 branch of Bird, which splits IPv4 and IPv6
-support into separate binaries. See also the bird2 package for the newer
-branch which integrates support for both IP protocols in a single binary.
-
-endef
-
-define Package/bird1/Default/description2
-In BGP, BIRD supports communities, multiprotocol extensions, MD5
-authentication, 32bit AS numbers and could act as a route server or a
-route reflector. BIRD also supports multiple RIBs, multiple kernel
-routing tables and redistribution between the protocols with a powerful
-configuration syntax.
-
-endef
-
-define Package/bird1/Default/description3
-This is a BIRD command-line client. It is used to send commands to BIRD,
-commands can perform simple actions such as enabling/disabling of
-protocols, telling BIRD to show various information, telling it to show
-a routing table filtered by a filter, or asking BIRD to reconfigure.
-
-Unless you can't afford dependency on ncurses and readline, you
-should install BIRD command-line client together with BIRD.
-
-endef
-
-define Package/bird1/Default/description4
-This is a BIRD lightweight command-line client. It is used to send commands to BIRD,
-commands can perform simple actions such as enabling/disabling of
-protocols, telling BIRD to show various information, telling it to show
-a routing table filtered by a filter, or asking BIRD to reconfigure.
-
-endef
-
-define Package/bird1-ipv4
-$(call Package/bird1/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE+= (IPv4)
-  CONFLICTS+=bird4
-endef
-
-define Package/bird1c-ipv4
-$(call Package/bird1c/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE+= (IPv4)
-  DEPENDS+=+bird1-ipv4
-  CONFLICTS+=birdc4
-endef
-
-define Package/bird1cl-ipv4
-$(call Package/bird1cl/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE+= (IPv4)
-  DEPENDS+=+bird1-ipv4
-  CONFLICTS+=birdcl4
-endef
-
-define Package/bird1-ipv6
-$(call Package/bird1/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE+= (IPv6)
-  CONFLICTS+=bird6
-endef
-
-define Package/bird1c-ipv6
-$(call Package/bird1c/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE+= (IPv6)
-  DEPENDS+=+bird1-ipv6
-  CONFLICTS+=birdc6
-endef
-
-define Package/bird1cl-ipv6
-$(call Package/bird1cl/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE+= (IPv6)
-  DEPENDS+=+bird1-ipv6
-  CONFLICTS+=birdcl6
-endef
-
-define Package/bird1-ipv4/description
-$(call Package/bird1/Default/description1)
-This is IPv4 version of BIRD, it supports OSPFv2, RIPv2 and BGP
-protocols.
-
-$(call Package/bird1/Default/description2)
-endef
-
-define Package/bird1c-ipv4/description
-$(call Package/bird1/Default/description1)
-$(call Package/bird1/Default/description3)
-endef
-
-define Package/bird1cl-ipv4/description
-$(call Package/bird1/Default/description1)
-$(call Package/bird1/Default/description4)
-endef
-
-define Package/bird1-ipv6/description
-$(call Package/bird1/Default/description1)
-This is IPv6 version of BIRD, it supports OSPFv3, RIPng and BGP
-protocols.
-
-$(call Package/bird1/Default/description2)
-endef
-
-define Package/bird1c-ipv6/description
-$(call Package/bird1/Default/description1)
-$(call Package/bird1/Default/description3)
-endef
-
-define Package/bird1cl-ipv6/description
-$(call Package/bird1/Default/description1)
-$(call Package/bird1/Default/description4)
-endef
-
-CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)"
-
-TARGET_CFLAGS+=-std=gnu89
-
-define Build/Template
-
-$(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
-	$(call Build/Configure/Default,$(3))
-	$(call Build/Compile/Default,)
-	( cd $(PKG_BUILD_DIR); mv -f bird bird$(2); mv -f birdc birdc$(2); mv -f birdcl birdcl$(2) )
-	-$(MAKE) -C $(PKG_BUILD_DIR) clean
-	touch $$@
-
-$(STAMP_BUILT): $(STAMP_BUILT)-$(2)
-
-define Package/bird1-ipv$(2)/install
-	$(INSTALL_DIR)  $$(1)/usr/sbin
-	$(INSTALL_BIN)  $$(PKG_BUILD_DIR)/bird$(2) $$(1)/usr/sbin/
-	$(INSTALL_DIR)  $$(1)/etc
-	$(INSTALL_DATA) ./files/bird$(2).conf $$(1)/etc/
-	$(INSTALL_DIR)  $$(1)/etc/init.d
-	$(INSTALL_BIN)  ./files/bird$(2).init $$(1)/etc/init.d/bird$(2)
-
-endef
-
-define Package/bird1-ipv$(2)/conffiles
-/etc/bird$(2).conf
-endef
-
-define Package/bird1c-ipv$(2)/install
-	$(INSTALL_DIR) $$(1)/usr/sbin
-	$(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdc$(2) $$(1)/usr/sbin/
-endef
-
-define Package/bird1cl-ipv$(2)/install
-	$(INSTALL_DIR) $$(1)/usr/sbin
-	$(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdcl$(2) $$(1)/usr/sbin/
-endef
-
-endef
-
-
-$(eval $(call Build/Template,bird1-ipv4,4, --disable-ipv6))
-$(eval $(call Build/Template,bird1-ipv6,6, --enable-ipv6))
-
-$(eval $(call BuildPackage,bird1-ipv4))
-$(eval $(call BuildPackage,bird1c-ipv4))
-$(eval $(call BuildPackage,bird1cl-ipv4))
-$(eval $(call BuildPackage,bird1-ipv6))
-$(eval $(call BuildPackage,bird1c-ipv6))
-$(eval $(call BuildPackage,bird1cl-ipv6))

bird1/files/bird4.conf

@@ -1,121 +0,0 @@
-
-# THIS CONFIG FILE IS NOT A COMPLETE DOCUMENTATION
-# PLEASE LOOK IN THE BIRD DOCUMENTATION FOR MORE INFO
-
-# However, most of options used here are just for example
-# and will be removed in real-life configs.
-
-log syslog all;
-
-# Override router ID
-#router id 192.168.0.1;
-
-# Turn on global debugging of all protocols
-#debug protocols all;
-
-
-# Define a route filter...
-# filter test_filter {
-#	if net ~ 10.0.0.0/16 then accept;
-#	else reject;
-# }
-
-# The direct protocol automatically generates device routes to all network
-# interfaces. Can exist in as many instances as you wish if you want to
-# populate multiple routing tables with device routes. Because device routes
-# are handled by Linux kernel, this protocol is  usually not needed.
-# protocol direct {
-#	interface "*";	# Restrict network interfaces it works with
-# }
-
-# This pseudo-protocol performs synchronization between BIRD's routing
-# tables and the kernel. You can run multiple instances of the kernel
-# protocol and synchronize different kernel tables with different BIRD tables.
-protocol kernel {
-#	learn;			# Learn all alien routes from the kernel
-#	persist;		# Don't remove routes on bird shutdown
-	scan time 20;		# Scan kernel routing table every 20 seconds
-#	import none;		# Default is import all
-#	export all;		# Default is export none
-}
-
-# This pseudo-protocol watches all interface up/down events.
-protocol device {
-	scan time 10;		# Scan interfaces every 10 seconds
-}
-
-# Static routes (again, there can be multiple instances, so that you
-# can disable/enable various groups of static routes on the fly).
-protocol static {
-#	export all;		# Default is export none
-#	route 0.0.0.0/0 via 62.168.0.13;
-#	route 10.0.0.0/8 reject;
-#	route 192.168.0.0/16 reject;
-}
-
-
-#protocol rip {
-#	disabled;
-#	import all;
-#	export all;
-#	export filter test_filter;
-
-#	port 1520;
-#	period 7;
-#	infinity 16;
-#	garbage time 60;
-#	interface "*" { mode broadcast; };
-#	honor neighbor;
-#	honor always;
-#	honor never;
-#	authentication none;
-#}
-
-
-#protocol ospf {
-#	disabled;
-#	import all;
-#	export all;
-#	export where source = RTS_STATIC;
-
-#	area 0 {
-#		interface "eth*" {
-#			cost 10;
-#			hello 3;
-#			retransmit 2;
-#			wait 5;
-#			dead 20;
-#			type broadcast;
-#			authentication simple;
-#			password "pass";
-#		};
-#	};
-#}
-
-
-#protocol bgp {
-#	disabled;
-#	import all;
-#	export all;
-#	export where source = RTS_STATIC;
-
-#	local as 65000;
-#	neighbor 192.168.1.1 as 65001;
-#	multihop 20 via 192.168.2.1;
-
-#	hold time 240;
-#	startup hold time 240;
-#	connect retry time 120;
-#	keepalive time 80;	# defaults to hold time / 3
-#	start delay time 5;	# How long do we wait before initial connect
-#	error wait time 60, 300;# Minimum and maximum time we wait after an error (when consecutive
-#				# errors occur, we increase the delay exponentially ...
-#	error forget time 300;	# ... until this timeout expires)
-#	disable after error;	# Disable the protocol automatically when an error occurs
-#	next hop self;		# Disable next hop processing and always advertise our local address as nexthop
-#	source address 62.168.0.14;	# What local address we use for the TCP connection
-#	password "secret"	# Password used for MD5 authentication
-#	rr client;		# I am a route reflector and the neighor is my client
-#	rr cluster id 1.0.0.1	# Use this value for cluster id instead of my router id 
-#	};
-#}

bird1/files/bird4.init

@@ -1,26 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2014 OpenWrt.org
-
-BIRD="bird4"
-
-START=99
-STOP=10
-
-SERVICE_DAEMONIZE=1
-SERVICE_USE_PID=1
-SERVICE_PID_FILE="/var/run/$BIRD.pid"
-
-BIRD_BIN="/usr/sbin/$BIRD"
-BIRD_CONF="/etc/$BIRD.conf"
-
-start() {
-	service_start $BIRD_BIN -d -c $BIRD_CONF -P $SERVICE_PID_FILE
-}
-
-stop() {
-	service_stop $BIRD_BIN
-}
-
-reload() {
-	service_reload $BIRD_BIN
-}

bird1/files/bird6.conf

@@ -1,121 +0,0 @@
-
-# THIS CONFIG FILE IS NOT A COMPLETE DOCUMENTATION
-# PLEASE LOOK IN THE BIRD DOCUMENTATION FOR MORE INFO
-
-# However, most of options used here are just for example
-# and will be removed in real-life configs.
-
-log syslog all;
-
-# Override router ID
-#router id 192.168.0.1;
-
-# Turn on global debugging of all protocols
-#debug protocols all;
-
-
-# Define a route filter...
-# filter test_filter {
-#	if net ~ 10.0.0.0/16 then accept;
-#	else reject;
-# }
-
-# The direct protocol automatically generates device routes to all network
-# interfaces. Can exist in as many instances as you wish if you want to
-# populate multiple routing tables with device routes. Because device routes
-# are handled by Linux kernel, this protocol is  usually not needed.
-# protocol direct {
-#	interface "*";	# Restrict network interfaces it works with
-# }
-
-# This pseudo-protocol performs synchronization between BIRD's routing
-# tables and the kernel. You can run multiple instances of the kernel
-# protocol and synchronize different kernel tables with different BIRD tables.
-protocol kernel {
-#	learn;			# Learn all alien routes from the kernel
-#	persist;		# Don't remove routes on bird shutdown
-	scan time 20;		# Scan kernel routing table every 20 seconds
-#	import none;		# Default is import all
-#	export all;		# Default is export none
-}
-
-# This pseudo-protocol watches all interface up/down events.
-protocol device {
-	scan time 10;		# Scan interfaces every 10 seconds
-}
-
-# Static routes (again, there can be multiple instances, so that you
-# can disable/enable various groups of static routes on the fly).
-protocol static {
-#	export all;		# Default is export none
-#	route 0.0.0.0/0 via 62.168.0.13;
-#	route 10.0.0.0/8 reject;
-#	route 192.168.0.0/16 reject;
-}
-
-
-#protocol rip {
-#	disabled;
-#	import all;
-#	export all;
-#	export filter test_filter;
-
-#	port 1520;
-#	period 7;
-#	infinity 16;
-#	garbage time 60;
-#	interface "*" { mode broadcast; };
-#	honor neighbor;
-#	honor always;
-#	honor never;
-#	authentication none;
-#}
-
-
-#protocol ospf {
-#	disabled;
-#	import all;
-#	export all;
-#	export where source = RTS_STATIC;
-
-#	area 0 {
-#		interface "eth*" {
-#			cost 10;
-#			hello 3;
-#			retransmit 2;
-#			wait 5;
-#			dead 20;
-#			type broadcast;
-#			authentication simple;
-#			password "pass";
-#		};
-#	};
-#}
-
-
-#protocol bgp {
-#	disabled;
-#	import all;
-#	export all;
-#	export where source = RTS_STATIC;
-
-#	local as 65000;
-#	neighbor 192.168.1.1 as 65001;
-#	multihop 20 via 192.168.2.1;
-
-#	hold time 240;
-#	startup hold time 240;
-#	connect retry time 120;
-#	keepalive time 80;	# defaults to hold time / 3
-#	start delay time 5;	# How long do we wait before initial connect
-#	error wait time 60, 300;# Minimum and maximum time we wait after an error (when consecutive
-#				# errors occur, we increase the delay exponentially ...
-#	error forget time 300;	# ... until this timeout expires)
-#	disable after error;	# Disable the protocol automatically when an error occurs
-#	next hop self;		# Disable next hop processing and always advertise our local address as nexthop
-#	source address 62.168.0.14;	# What local address we use for the TCP connection
-#	password "secret"	# Password used for MD5 authentication
-#	rr client;		# I am a route reflector and the neighor is my client
-#	rr cluster id 1.0.0.1	# Use this value for cluster id instead of my router id 
-#	};
-#}

bird1/files/bird6.init

@@ -1,26 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2014 OpenWrt.org
-
-BIRD="bird6"
-
-START=99
-STOP=10
-
-SERVICE_DAEMONIZE=1
-SERVICE_USE_PID=1
-SERVICE_PID_FILE="/var/run/$BIRD.pid"
-
-BIRD_BIN="/usr/sbin/$BIRD"
-BIRD_CONF="/etc/$BIRD.conf"
-
-start() {
-	service_start $BIRD_BIN -d -c $BIRD_CONF -P $SERVICE_PID_FILE
-}
-
-stop() {
-	service_stop $BIRD_BIN
-}
-
-reload() {
-	service_reload $BIRD_BIN
-}

bird1/patches/010-gcc10.patch

@@ -1,11 +0,0 @@
---- a/sysdep/unix/krt.h
-+++ b/sysdep/unix/krt.h
-@@ -112,7 +112,7 @@ struct kif_proto {
-   struct kif_state sys;		/* Sysdep state */
- };
- 
--struct kif_proto *kif_proto;
-+extern struct kif_proto *kif_proto;
- 
- #define KIF_CF ((struct kif_config *)p->p.cf)
- 

bird2/Makefile

@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird2
-PKG_VERSION:=2.13.1
+PKG_VERSION:=2.14
 PKG_RELEASE:=1
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_HASH:=97bb8d57be9bc5083e2b566416d27e314162856a12ca7c77e202e467d20d4080
+PKG_HASH:=b0b9f6f8566541b9be4af1f0cac675c5a3785601a55667a7ec3d7de29735a786
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
 PKG_LICENSE:=GPL-2.0-or-later

cjdns/Makefile

@@ -18,7 +18,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=v21.1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/cjdelisle/cjdns/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
@@ -78,7 +78,7 @@ define Build/Compile
 	$(INSTALL_DIR) $(PKG_BUILD_DIR)/tmp
 	(cd $(PKG_BUILD_DIR) && \
 	CROSS="true" \
-	CC="$(TARGET_CC)" \
+	CC="$(TARGET_CC_NOCACHE)" \
 	AR="$(TARGET_AR)" \
 	RANLIB="$(TARGET_RANLIB)" \
 	CFLAGS="$(TARGET_CFLAGS) -U_FORTIFY_SOURCE -Wno-error=array-bounds -Wno-error=stringop-overflow -Wno-error=stringop-overread" \

luci-app-olsrd2/Makefile

@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-olsrd2
 PKG_VERSION:=0.2.6
-PKG_RELEASE:=14
+PKG_RELEASE:=15
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk

luci-app-olsrd2/htdocs/luci-static/resources/view/olsrd2/overview.js

@@ -15,33 +15,31 @@ var callgetLan = rpc.declare({
 
 function createTable(data) {
     let tableData = [];
-	if ( data && data[0] && data[0].version && data[0].version[0] ) {
-		if ( data[0].version[0].version_text != undefined ) {
-			tableData.push([_('Version'),data[0].version[0].version_text]);
+	if ( data && data.version && data.version[0] ) {
+		if ( data.version[0].version_text != undefined ) {
+			tableData.push([_('OLSRd2 Version'),data.version[0].version_text]);
 		}
-		if ( data[0].version[0].version_commit != undefined) {
-			tableData.push([_('GIT commit'),data[0].version[0].version_commit]);
+		if ( data.version[0].version_commit != undefined) {
+			tableData.push([_('OLSRd2 GIT commit'),data.version[0].version_commit]);
 		}
 	}
-	if ( data && data[1] && data[1].lan && data[1].lan[0] ) {
-		if ( data[1].lan[0].lan != undefined ) {
-			tableData.push([_('LAN IP'),data[1].lan[0].lan]);
-		}
-		if ( data[1].lan[0].domain != undefined) {
-			tableData.push([_('Domain'),data[1].lan[0].domain]);
-		}
-		if ( data[1].lan[0].domain_metric != undefined) {
-			tableData.push([_('Domain metric'),data[1].lan[0].domain_metric]);
-		}
-		if ( data[1].lan[0].domain_metric_out != undefined) {
-			tableData.push([_('Domain metric outgoing'),data[1].lan[0].domain_metric_out]);
-		}
-		if ( data[1].lan[0].domain_metric_out_raw != undefined) {
-			tableData.push([_('domain_metric_out_raw'),data[1].lan[0].domain_metric_out_raw]);
-		}
-		if ( data[1].lan[0].domain_distance != undefined) {
-			tableData.push([_('Domain distance'),data[1].lan[0].domain_distance]);
-		}
+	tableData.push(['']);
+    return tableData;
+}
+
+function createTableDomain(data) {
+    let tableData = [];
+	if ( data && data.lan && data.lan[0] ) {
+		data.lan.forEach(row => {
+			tableData.push([
+				row.lan,
+				row.domain,
+				row.domain_metric,
+				row.domain_metric_out,
+				row.domain_metric_out_raw,
+				row.domain_distance
+			])
+		});
 	}
     return tableData;
 }
@@ -59,16 +57,26 @@ return view.extend({
 			E('th', { 'class': 'th left' }),
 			E('th', { 'class': 'th left' })
 		]));
+		var trd = E('table', { 'class': 'table' });
+		trd.appendChild(E('trd', { 'class': 'tr cbi-section-table-titles' }, [
+			E('th', { 'class': 'th left' }, [ 'LAN IP' ]),
+			E('th', { 'class': 'th left' }, [ 'Domain' ]),
+			E('th', { 'class': 'th left' }, [ 'Domain Metric' ]),
+			E('th', { 'class': 'th left' }, [ 'Domain Metric out' ]),
+			E('th', { 'class': 'th left' }, [ 'Domain Metric out' ]),
+			E('th', { 'class': 'th left' }, [ 'Domain distance' ])
+		]));
         poll.add(() => {
             Promise.all([
 				callgetVersion(),
 				callgetLan()
             ]).then((results) => {
-                cbi_update_table(tr, createTable(results));
+                cbi_update_table(tr, createTable(results[0]));
+                cbi_update_table(trd, createTableDomain(results[1]));
             })
         }, 30);
 
-		return tr;
+		return [tr,trd];
 	}
 
 });

quagga/Makefile

@@ -1,287 +0,0 @@
-#
-# Copyright (C) 2006-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=quagga
-PKG_VERSION:=1.2.4
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SAVANNAH/quagga/
-PKG_HASH:=e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3
-
-PKG_MAINTAINER:=Vasilis Tsiligiannis <acinonyx@openwrt.gr>
-PKG_LICENSE:=GPL-2.0-or-later
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_IPV6 \
-	CONFIG_PACKAGE_quagga-watchquagga \
-	CONFIG_PACKAGE_quagga-zebra \
-	CONFIG_PACKAGE_quagga-libzebra \
-	CONFIG_PACKAGE_quagga-libospf \
-	CONFIG_PACKAGE_quagga-bgpd \
-	CONFIG_PACKAGE_quagga-isisd \
-	CONFIG_PACKAGE_quagga-ospf6d \
-	CONFIG_PACKAGE_quagga-ripd \
-	CONFIG_PACKAGE_quagga-ripngd \
-	CONFIG_PACKAGE_quagga-vtysh
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/quagga/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  DEPENDS:=quagga
-  TITLE:=The Quagga Software Routing Suite
-  URL:=https://www.quagga.net
-endef
-
-define Package/quagga
-  $(call Package/quagga/Default)
-  DEPENDS:=+librt
-  MENU:=1
-endef
-
-define Package/quagga/description
-  A routing software package that provides TCP/IP based routing services
-  with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2,
-  OSPFv3, BGP-4, and BGP-4+
-endef
-
-define Package/quagga-watchquagga
-  $(call Package/quagga/Default)
-  TITLE:=Quagga watchdog
-  DEPENDS+=+quagga-libzebra
-  DEFAULT:=y if PACKAGE_quagga
-endef
-
-define Package/quagga-zebra
-  $(call Package/quagga/Default)
-  TITLE:=Zebra daemon
-  DEPENDS+=+quagga-libzebra
-  DEFAULT:=y if PACKAGE_quagga
-endef
-
-define Package/quagga-libzebra
-  $(call Package/quagga/Default)
-  TITLE:=zebra library
-endef
-
-define Package/quagga-libospf
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra
-  TITLE:=OSPF library
-endef
-
-define Package/quagga-bgpd
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra
-  TITLE:=BGPv4, BGPv4+, BGPv4- routing engine
-endef
-
-define Package/quagga-isisd
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra
-  TITLE:=IS-IS routing engine
-endef
-
-define Package/quagga-ospfd
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libospf
-  TITLE:=OSPFv2 routing engine
-endef
-
-define Package/quagga-ospf6d
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libospf @IPV6
-  TITLE:=OSPFv3 routing engine
-endef
-
-define Package/quagga-ripd
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra
-  TITLE:=RIP routing engine
-endef
-
-define Package/quagga-ripngd
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra @IPV6
-  TITLE:=RIPNG routing engine
-endef
-
-define Package/quagga-vtysh
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra +libreadline +libncurses
-  TITLE:=integrated shell for Quagga routing software
-endef
-
-define Package/quagga-zebra/conffiles
-/etc/quagga/zebra.conf
-endef
-
-define Package/quagga-bgpd/conffiles
-/etc/quagga/bgpd.conf
-endef
-
-define Package/quagga-isisd/conffiles
-/etc/quagga/isisd.conf
-endef
-
-define Package/quagga-ospfd/conffiles
-/etc/quagga/ospfd.conf
-endef
-
-define Package/quagga-ospf6d/conffiles
-/etc/quagga/ospf6d.conf
-endef
-
-define Package/quagga-ripd/conffiles
-/etc/quagga/ripd.conf
-endef
-
-define Package/quagga-ripngd/conffiles
-/etc/quagga/ripngd.conf
-endef
-
-ifneq ($(SDK),)
-CONFIG_PACKAGE_quagga-libzebra:=m
-CONFIG_PACKAGE_quagga-libospf:=m
-CONFIG_PACKAGE_quagga-watchquagga:=m
-CONFIG_PACKAGE_quagga-zebra:=m
-CONFIG_PACKAGE_quagga-bgpd:=m
-CONFIG_PACKAGE_quagga-isisd:=m
-CONFIG_PACKAGE_quagga-ospf6d:=m
-CONFIG_PACKAGE_quagga-ripd:=m
-CONFIG_PACKAGE_quagga-ripngd:=m
-CONFIG_PACKAGE_quagga-vtysh:=m
-endif
-
-CONFIGURE_ARGS+= \
-	--localstatedir=/var/run/quagga \
-	--sysconfdir=/etc/quagga/ \
-	--enable-shared \
-	--disable-static \
-	--enable-user=network \
-	--enable-group=network \
-	--enable-multipath=8 \
-	--disable-ospfclient \
-	--disable-capabilities \
-	--disable-doc \
-	--disable-nhrpd \
-	$(call autoconf_bool,CONFIG_PACKAGE_quagga-libzebra,zebra) \
-	$(call autoconf_bool,CONFIG_PACKAGE_quagga-libospf,ospfd) \
-	$(call autoconf_bool,CONFIG_PACKAGE_quagga-bgpd,bgpd) \
-	$(call autoconf_bool,CONFIG_PACKAGE_quagga-isisd,isisd) \
-	$(call autoconf_bool,CONFIG_PACKAGE_quagga-ospf6d,ospf6d) \
-	$(call autoconf_bool,CONFIG_PACKAGE_quagga-ripd,ripd) \
-	$(call autoconf_bool,CONFIG_PACKAGE_quagga-ripngd,ripngd) \
-	$(call autoconf_bool,CONFIG_PACKAGE_quagga-vtysh,vtysh) \
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
-
-define Package/quagga/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/quagga $(1)/usr/sbin/quagga.init
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/quagga.init $(1)/etc/init.d/quagga
-endef
-
-define Package/quagga-watchquagga/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/
-endef
-
-define Package/quagga-zebra/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/quagga
-	chmod 0750 $(1)/etc/quagga
-	$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/zebra.conf
-endef
-
-define Package/quagga-bgpd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/quagga
-	chmod 0750 $(1)/etc/quagga
-	$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/bgpd.conf
-endef
-
-define Package/quagga-isisd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/quagga
-	chmod 0750 $(1)/etc/quagga
-	$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/isisd.conf
-endef
-
-define Package/quagga-ospfd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/quagga
-	chmod 0750 $(1)/etc/quagga
-	$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ospfd.conf
-endef
-
-define Package/quagga-ospf6d/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/quagga
-	chmod 0750 $(1)/etc/quagga
-	$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ospf6d.conf
-endef
-
-define Package/quagga-ripd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/quagga
-	chmod 0750 $(1)/etc/quagga
-	$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ripd.conf
-endef
-
-define Package/quagga-ripngd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/quagga
-	chmod 0750 $(1)/etc/quagga
-	$(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ripngd.conf
-endef
-
-define Package/quagga-vtysh/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/
-endef
-
-define Package/quagga-libospf/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(1)/usr/lib/
-endef
-
-define Package/quagga-libzebra/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,quagga))
-$(eval $(call BuildPackage,quagga-libzebra))
-$(eval $(call BuildPackage,quagga-libospf))
-$(eval $(call BuildPackage,quagga-watchquagga))
-$(eval $(call BuildPackage,quagga-zebra))
-$(eval $(call BuildPackage,quagga-bgpd))
-$(eval $(call BuildPackage,quagga-isisd))
-$(eval $(call BuildPackage,quagga-ospfd))
-$(eval $(call BuildPackage,quagga-ospf6d))
-$(eval $(call BuildPackage,quagga-ripd))
-$(eval $(call BuildPackage,quagga-ripngd))
-$(eval $(call BuildPackage,quagga-vtysh))

quagga/files/quagga

@@ -1,335 +0,0 @@
-#!/bin/sh
-#
-# quagga	Starts/stops quagga daemons and watchquagga.
-#		Create a daemon.conf file to have that routing daemon
-#		started/stopped automagically when using this script
-#		without any daemon names as args.
-#		If watchquagga is available, it will also be
-#		started/stopped if the script is called without
-#		any daemon names.
-#
-
-ME=$(basename $0)
-
-usage() {
-	echo "Usage: ${ME} {start|stop|restart} [daemon ...]"
-	exit 2
-}
-
-if [ -z "$1" ]
-then
-	usage
-else
-	COMMAND=$1
-fi
-shift
-ARG_DAEMONS=$*
-BINDIR=/usr/sbin
-CONFDIR=/etc/quagga
-STATEDIR=/var/run/quagga
-RUNUSER=network
-RUNGROUP=$RUNUSER
-DAEMONS="zebra ripd ripngd ospfd ospf6d bgpd"
-DAEMON_FLAGS=-d
-WATCHQUAGGA_FLAGS="-d -z -T 60 -R"
-WATCHQUAGGA_CMD="$0 watchrestart"
-if [ ${COMMAND} != "watchrestart" -a -x "${BINDIR}/watchquagga" ]
-then
-	DAEMONS="${DAEMONS} watchquagga"
-fi
-DAEMONS_STARTSEQ=${DAEMONS}
-
-reverse()
-{
-	local revlist r
-        revlist=
-        for r
-	do
-                revlist="$r $revlist"
-        done
-        echo $revlist
-}
-
-DAEMONS_STOPSEQ=$(reverse ${DAEMONS_STARTSEQ})
-
-#pidof() {
-#	ps ax | awk 'match($5, "(^|/)'"$1"'$") > 0 { printf " %s", $1 }'
-#}
-
-quit() {
-	echo "${ME}: $1"
-	exit 0
-}
-
-die() {
-	echo "${ME}: $1"
-	exit 1
-}
-
-is_in() {
-	local i
-	for i in $2
-	do
-		[ "$1" = "$i" ] && return 0
-	done
-	return 1
-}
-
-select_subset() {
-	local unknown i j
-	unknown=
-	RESULT=
-	for i in $1
-	do
-		is_in $i "$2" || unknown="$unknown $i"
-	done
-	if [ -n "$unknown" ]
-	then
-		RESULT=$unknown
-		return 1
-	else
-		for j in $2
-		do
-			is_in $j "$1" && RESULT="$RESULT $j"
-		done
-		return 0
-	fi
-}
-
-# check command
-
-case ${COMMAND}
-in
-	start|stop|restart)
-		;;
-	watchrestart)
-		if [ -n "$ARG_DAEMONS" ]
-		then
-			echo "${ME}: watchrestart mode is only for use by watchquagga"
-			exit 2
-		fi
-		;;
-	*)
-		usage
-		;;
-esac
-
-# select daemons to start
-
-case ${COMMAND}
-in
-	start|restart|watchrestart)
-		START_DAEMONS=
-		for d in ${DAEMONS_STARTSEQ}
-		do
-			[ -x "${BINDIR}/${d}" -a -f "${CONFDIR}/${d}.conf" ] \
-			&& START_DAEMONS="${START_DAEMONS}${d} "
-		done
-		WATCHQUAGGA_DAEMONS=${START_DAEMONS}
-		if is_in watchquagga "${DAEMONS_STARTSEQ}"
-		then
-			START_DAEMONS="${START_DAEMONS} watchquagga"
-		fi
-		if [ -n "${ARG_DAEMONS}" ]
-		then
-			if select_subset "${ARG_DAEMONS}" "${DAEMONS}"
-			then
-				if select_subset "${ARG_DAEMONS}" "${START_DAEMONS}"
-				then
-					START_DAEMONS=${RESULT}
-				else
-					die "these daemons are not startable:${RESULT}."
-				fi
-			else
-				die "unknown daemons:${RESULT}; choose from: ${DAEMONS}."
-			fi
-		fi
-		;;
-esac
-
-# select daemons to stop
-
-case ${COMMAND}
-in
-	stop|restart|watchrestart)
-		STOP_DAEMONS=${DAEMONS_STOPSEQ}
-		if [ -n "${ARG_DAEMONS}" ]
-		then
-			if select_subset "${ARG_DAEMONS}" "${STOP_DAEMONS}"
-			then
-				STOP_DAEMONS=${RESULT}
-			else
-				die "unknown daemons:${RESULT}; choose from: ${DAEMONS}."
-			fi
-		fi
-		stop_daemons=
-		for d in ${STOP_DAEMONS}
-		do
-			pidfile=${STATEDIR}/${d}.pid
-			if [ -f "${pidfile}" -o -n "$(pidof ${d})" ]
-			then
-				stop_daemons="${stop_daemons}${d} "
-			elif [ -n "${ARG_DAEMONS}" ]
-			then
-				echo "${ME}: found no ${d} process running."
-			fi
-		done
-		STOP_DAEMONS=${stop_daemons}
-		;;
-esac
-
-# stop daemons
-
-for d in $STOP_DAEMONS
-do
-	echo -n "${ME}: Stopping ${d} ... "
-	pidfile=${STATEDIR}/${d}.pid
-	if [ -f "${pidfile}" ]
-	then
-		file_pid=$(cat ${pidfile})
-		if [ -z "${file_pid}" ]
-		then
-			echo -n "no pid file entry found ... "
-		fi
-	else
-		file_pid=
-		echo -n "no pid file found ... "
-	fi
-	proc_pid=$(pidof ${d})
-	if [ -z "${proc_pid}" ]
-	then
-		echo -n "found no ${d} process running ... "
-	else
-		count=0
-		notinpidfile=
-		for p in ${proc_pid}
-		do
-			count=$((${count}+1))
-			if kill ${p}
-			then
-				echo -n "killed ${p} ... "
-			else
-				echo -n "failed to kill ${p} ... "
-			fi
-			[ "${p}" = "${file_pid}" ] \
-			|| notinpidfile="${notinpidfile} ${p}"
-		done
-		[ ${count} -le 1 ] \
-		|| echo -n "WARNING: ${count} ${d} processes were found running ... "
-		for n in ${notinpidfile}
-		do
-			echo -n "WARNING: process ${n} was not in pid file ... "
-		done
-	fi
-	count=0
-	survivors=$(pidof ${d})
-	while [ -n "${survivors}" ]
-	do
-		sleep 1
-		count=$((${count}+1))
-		survivors=$(pidof ${d})
-		[ -z "${survivors}" -o ${count} -gt 5 ] && break
-		for p in ${survivors}
-		do
-			sleep 1
-			echo -n "${p} "
-			kill ${p}
-		done
-	done
-	survivors=$(pidof ${d})
-	[ -n "${survivors}" ] && \
-	if kill -KILL ${survivors}
-	then
-		echo -n "KILLed ${survivors} ... "
-	else
-		echo -n "failed to KILL ${survivors} ... "
-	fi
-	sleep 1
-	survivors=$(pidof ${d})
-	if [ -z "${survivors}" ]
-	then
-		echo -n "done."
-		if [ -f "${pidfile}" ]
-		then
-			rm -f ${pidfile} \
-			|| echo -n " Failed to remove pidfile."
-		fi
-	else
-		echo -n "failed to stop ${survivors} - giving up."
-		if [ "${survivors}" != "${file_pid}" ]
-		then
-			if echo "${survivors}" > ${pidfile}
-			then
-				chown ${RUNUSER}:${RUNGROUP} ${pidfile}
-				echo -n " Wrote ${survivors} to pidfile."
-			else
-				echo -n " Failed to write ${survivors} to pidfile."
-			fi
-		fi
-	fi
-	echo
-done
-
-# start daemons
-
-if [ -n "$START_DAEMONS" ]
-then
-	[ -d ${CONFDIR} ] \
-	|| quit "${ME}: no config directory ${CONFDIR} - exiting."
-	chown -R ${RUNUSER}:${RUNGROUP} ${CONFDIR}
-	[ -d ${STATEDIR} ] || mkdir -p ${STATEDIR} \
-	|| die "${ME}: could not create state directory ${STATEDIR} - exiting."
-	chown -R ${RUNUSER}:${RUNGROUP} ${STATEDIR}
-
-	for d in $START_DAEMONS
-	do
-		echo -n "${ME}: Starting ${d} ... "
-		proc_pid=$(pidof ${d})
-		pidfile=${STATEDIR}/${d}.pid
-		file_pid=
-		if [ -f "${pidfile}" ]
-		then
-			file_pid=$(cat ${pidfile})
-			if [ -n "${file_pid}" ]
-			then
-				echo -n "found old pid file entry ${file_pid} ... "
-			fi
-		fi
-		if [ -n "${proc_pid}" ]
-		then
-			echo -n "found ${d} running (${proc_pid}) - skipping ${d}."
-			if [ "${proc_pid}" != "${file_pid}" ]
-			then
-				if echo "${proc_pid}" > ${pidfile}
-				then
-					chown ${RUNUSER}:${RUNGROUP} ${pidfile}
-					echo -n " Wrote ${proc_pid} to pidfile."
-				else
-					echo -n " Failed to write ${proc_pid} to pidfile."
-				fi
-			fi
-		elif rm -f "${pidfile}"
-		then
-			if [ "${d}" = "watchquagga" ]
-			then
-				"${BINDIR}/${d}" \
-					${WATCHQUAGGA_FLAGS} \
-					"${WATCHQUAGGA_CMD}" \
-					${WATCHQUAGGA_DAEMONS}
-				status=$?
-			else
-				"${BINDIR}/${d}" ${DAEMON_FLAGS}
-				status=$?
-			fi
-			if [ $status -eq 0 ]
-			then
-				echo -n "done."
-			else
-				echo -n "failed."
-			fi
-		else
-			echo -n " failed to remove pidfile."
-		fi
-		echo
-	done
-fi

quagga/files/quagga.conf

@@ -1,7 +0,0 @@
-password zebra
-!
-access-list vty permit 127.0.0.0/8
-access-list vty deny any
-!
-line vty
- access-class vty

quagga/files/quagga.init

@@ -1,11 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=60
-start() {
-	/usr/sbin/quagga.init start
-}
-
-stop() {
-	/usr/sbin/quagga.init stop
-}

quagga/patches/140-holdtimer-set.patch

@@ -1,22 +0,0 @@
---- a/bgpd/bgp_network.c
-+++ b/bgpd/bgp_network.c
-@@ -255,8 +255,7 @@ bgp_accept (struct thread *thread)
- 
-     /* Config state that should affect OPEN packet must be copied over */
-     peer->local_id = peer1->local_id;
--    peer->v_holdtime = peer1->v_holdtime;
--    peer->v_keepalive = peer1->v_keepalive;
-+    peer->v_holdtime = BGP_LARGE_HOLDTIME;
-     peer->local_as = peer1->local_as;
-     peer->change_local_as = peer1->change_local_as;
-     peer->flags = peer1->flags;
---- a/bgpd/bgpd.h
-+++ b/bgpd/bgpd.h
-@@ -754,6 +754,7 @@ struct bgp_nlri
- 
- /* BGP timers default value.  */
- #define BGP_INIT_START_TIMER                     1
-+#define BGP_LARGE_HOLDTIME                     240
- #define BGP_DEFAULT_HOLDTIME                   180
- #define BGP_DEFAULT_KEEPALIVE                   60 
- #define BGP_DEFAULT_EBGP_ROUTEADV                3

quagga/patches/170-use-supported-pagers.patch

@@ -1,29 +0,0 @@
---- a/vtysh/vtysh.c
-+++ b/vtysh/vtysh.c
-@@ -253,7 +253,7 @@ vtysh_pager_init (void)
-   if (pager_defined)
-     vtysh_pager_name = strdup (pager_defined);
-   else
--    vtysh_pager_name = strdup ("more");
-+    vtysh_pager_name = strdup ("cat");
- }
- 
- /* Command execution over the vty interface. */
-@@ -2214,7 +2214,7 @@ DEFUN (vtysh_terminal_length,
- {
-   int lines;
-   char *endptr = NULL;
--  char default_pager[10];
-+  char default_pager[12];
- 
-   lines = strtol (argv[0], &endptr, 10);
-   if (lines < 0 || lines > 512 || *endptr != '\0')
-@@ -2231,7 +2231,7 @@ DEFUN (vtysh_terminal_length,
- 
-   if (lines != 0)
-     {
--      snprintf(default_pager, 10, "more -%i", lines);
-+      snprintf(default_pager, 12, "head -n %i", lines);
-       vtysh_pager_name = strdup (default_pager);
-     }
- 

quagga/patches/200-gcc10.patch

@@ -1,95 +0,0 @@
---- a/lib/prefix.h
-+++ b/lib/prefix.h
-@@ -44,7 +44,7 @@
-  */
- struct ethaddr {
-     u_char octet[ETHER_ADDR_LEN];
--} __packed;
-+} __attribute__((packed));
- 
- 
- /*
---- a/pimd/pim_version.h
-+++ b/pimd/pim_version.h
-@@ -25,6 +25,6 @@
- 
- #define PIMD_VERSION_STR "0.166"
- 
--const char * const PIMD_VERSION;
-+extern const char * const PIMD_VERSION;
- 
- #endif /* PIM_VERSION_H */
---- a/pimd/pimd.h
-+++ b/pimd/pimd.h
-@@ -68,39 +68,39 @@
- #define PIM_MASK_PIM_J_P             (1 << 12)
- #define PIM_MASK_STATIC              (1 << 13)
- 
--const char *const PIM_ALL_SYSTEMS;
--const char *const PIM_ALL_ROUTERS;
--const char *const PIM_ALL_PIM_ROUTERS;
--const char *const PIM_ALL_IGMP_ROUTERS;
-+extern const char *const PIM_ALL_SYSTEMS;
-+extern const char *const PIM_ALL_ROUTERS;
-+extern const char *const PIM_ALL_PIM_ROUTERS;
-+extern const char *const PIM_ALL_IGMP_ROUTERS;
- 
--struct thread_master     *master;
--uint32_t                  qpim_debugs;
--int                       qpim_mroute_socket_fd;
--int64_t                   qpim_mroute_socket_creation; /* timestamp of creation */
--struct thread            *qpim_mroute_socket_reader;
--int                       qpim_mroute_oif_highest_vif_index;
--struct list              *qpim_channel_oil_list; /* list of struct channel_oil */
--struct in_addr            qpim_all_pim_routers_addr;
--int                       qpim_t_periodic; /* Period between Join/Prune Messages */
--struct list              *qpim_upstream_list; /* list of struct pim_upstream */
--struct zclient           *qpim_zclient_update;
--struct zclient           *qpim_zclient_lookup;
--struct pim_assert_metric  qpim_infinite_assert_metric;
--long                      qpim_rpf_cache_refresh_delay_msec;
--struct thread            *qpim_rpf_cache_refresher;
--int64_t                   qpim_rpf_cache_refresh_requests;
--int64_t                   qpim_rpf_cache_refresh_events;
--int64_t                   qpim_rpf_cache_refresh_last;
--struct in_addr            qpim_inaddr_any;
--struct list              *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */
--struct in_addr            qpim_ssmpingd_group_addr;
--int64_t                   qpim_scan_oil_events;
--int64_t                   qpim_scan_oil_last;
--int64_t                   qpim_mroute_add_events;
--int64_t                   qpim_mroute_add_last;
--int64_t                   qpim_mroute_del_events;
--int64_t                   qpim_mroute_del_last;
--struct list              *qpim_static_route_list; /* list of routes added statically */
-+extern struct thread_master     *master;
-+extern uint32_t                  qpim_debugs;
-+extern int                       qpim_mroute_socket_fd;
-+extern int64_t                   qpim_mroute_socket_creation; /* timestamp of creation */
-+extern struct thread            *qpim_mroute_socket_reader;
-+extern int                       qpim_mroute_oif_highest_vif_index;
-+extern struct list              *qpim_channel_oil_list; /* list of struct channel_oil */
-+static struct in_addr            qpim_all_pim_routers_addr;
-+extern int                       qpim_t_periodic; /* Period between Join/Prune Messages */
-+extern struct list              *qpim_upstream_list; /* list of struct pim_upstream */
-+extern struct zclient           *qpim_zclient_update;
-+extern struct zclient           *qpim_zclient_lookup;
-+extern struct pim_assert_metric  qpim_infinite_assert_metric;
-+extern long                      qpim_rpf_cache_refresh_delay_msec;
-+extern struct thread            *qpim_rpf_cache_refresher;
-+extern int64_t                   qpim_rpf_cache_refresh_requests;
-+extern int64_t                   qpim_rpf_cache_refresh_events;
-+extern int64_t                   qpim_rpf_cache_refresh_last;
-+extern struct in_addr            qpim_inaddr_any;
-+extern struct list              *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */
-+extern struct in_addr            qpim_ssmpingd_group_addr;
-+extern int64_t                   qpim_scan_oil_events;
-+extern int64_t                   qpim_scan_oil_last;
-+extern int64_t                   qpim_mroute_add_events;
-+extern int64_t                   qpim_mroute_add_last;
-+extern int64_t                   qpim_mroute_del_events;
-+extern int64_t                   qpim_mroute_del_last;
-+extern struct list              *qpim_static_route_list; /* list of routes added statically */
- 
- #define PIM_JP_HOLDTIME (qpim_t_periodic * 7 / 2)
-