Merge pull request #1045 from ecsv/batadv-2024.0

batman-adv: Provide teardown hook for batadv_vlan proto

.github/workflows/check-autorelease-deprecation.yml

@@ -0,0 +1,91 @@
+name: Check autorelease deprecation
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, converted_to_draft, ready_for_review, edited]
+
+jobs:
+  build:
+    name: Check autorelease deprecation
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    permissions:
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+
+      - name: Determine branch name
+        run: |
+          BRANCH="${GITHUB_BASE_REF#refs/heads/}"
+          echo "Building for $BRANCH"
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+
+      - name: Determine changed packages
+        run: |
+          RET=0
+
+          # only detect packages with changes
+          PKG_ROOTS=$(find . -name Makefile | \
+            grep -v ".*/src/Makefile" | \
+            sed -e 's@./\(.*\)/Makefile@\1/@')
+          CHANGES=$(git diff --diff-filter=d --name-only origin/$BRANCH...)
+
+          for ROOT in $PKG_ROOTS; do
+            for CHANGE in $CHANGES; do
+              if [[ "$CHANGE" == "$ROOT"* ]]; then
+                if grep -q '$(AUTORELEASE)' "$ROOT/Makefile"; then
+                  CONTAINS_AUTORELEASE+="$ROOT"
+                fi
+                break
+              fi
+            done
+          done
+
+          if [ -n "$CONTAINS_AUTORELEASE" ]; then
+            RET=1
+            cat > "$GITHUB_WORKSPACE/pr_comment.md" << EOF
+          Please do no longer set *PKG_RELEASE* to *AUTORELEASE* as the
+          feature is deprecated. Please use an integer instead. Below is a
+          list of affected packages including correct *PKG_RELEASE*:
+
+          EOF
+          fi
+
+          for ROOT in $CONTAINS_AUTORELEASE; do
+            echo -n "  - ${ROOT}Makefile: PKG_RELEASE:=" >> "$GITHUB_WORKSPACE/pr_comment.md"
+            last_bump="$(git log --pretty=format:'%h %s' "$ROOT" |
+              grep --max-count=1 -e ': [uU]pdate to ' -e ': [bB]ump to ' |
+              cut -f 1 -d ' ')"
+
+            if [ -n "$last_bump" ]; then
+              echo -n $(($(git rev-list --count "$last_bump..HEAD" "$ROOT") + 2)) >> "$GITHUB_WORKSPACE/pr_comment.md"
+            else
+              echo -n $(($(git rev-list --count HEAD "$ROOT") + 2)) >> "$GITHUB_WORKSPACE/pr_comment.md"
+            fi
+            echo >> "$GITHUB_WORKSPACE/pr_comment.md"
+          done
+
+          exit $RET
+
+      - name: Find Comment
+        uses: peter-evans/find-comment@v2
+        if: ${{ failure() }}
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+
+      - name: Create or update comment
+        uses: peter-evans/create-or-update-comment@v2
+        if: ${{ failure() }}
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body-file: 'pr_comment.md'
+          edit-mode: replace

.github/workflows/entrypoint.sh

@@ -4,6 +4,11 @@
 set -o errexit # failing commands causes script to fail
 set -o nounset # undefined variables causes script to fail
 
+echo "src/gz packages_ci file:///ci" >> /etc/opkg/distfeeds.conf
+
+FINGERPRINT="$(usign -F -p /ci/packages_ci.pub)"
+cp /ci/packages_ci.pub "/etc/opkg/keys/$FINGERPRINT"
+
 mkdir -p /var/lock/
 
 opkg update
@@ -21,10 +26,24 @@ for PKG in /ci/*.ipk; do
 
 	echo "Testing package $PKG_NAME in version $PKG_VERSION from $PKG_SOURCE"
 
-	opkg install "$PKG"
-
 	export PKG_NAME PKG_VERSION CI_HELPER
 
+	PRE_TEST_SCRIPT=$(find /ci/ -name "$PKG_SOURCE" -type d)/pre-test.sh
+
+	if [ -f "$PRE_TEST_SCRIPT" ]; then
+		echo "Use package specific pre-test.sh"
+		if sh "$PRE_TEST_SCRIPT" "$PKG_NAME" "$PKG_VERSION"; then
+			echo "Pre-test successful"
+		else
+			echo "Pre-test failed"
+			exit 1
+		fi
+	else
+		echo "No pre-test.sh script available"
+	fi
+
+	opkg install "$PKG"
+
 	TEST_SCRIPT=$(find /ci/ -name "$PKG_SOURCE" -type d)/test.sh
 
 	if [ -f "$TEST_SCRIPT" ]; then
@@ -39,5 +58,5 @@ for PKG in /ci/*.ipk; do
 		echo "No test.sh script available"
 	fi
 
-	opkg remove "$PKG_NAME" --force-removal-of-dependent-packages --force-remove
+	opkg remove "$PKG_NAME" --force-removal-of-dependent-packages --force-remove --autoremove || true
 done

.github/workflows/multi-arch-test-build.yml

@@ -3,6 +3,10 @@ name: Test Build
 on:
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     name: Test ${{ matrix.arch }}
@@ -11,37 +15,37 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - arch: arc_archs
-            target: archs38-generic
-            runtime_test: false
+          - arch: aarch64_generic
+            target: armsr-armv8
+            runtime_test: true
+
+          - arch: arm_cortex-a15_neon-vfpv4
+            target: armsr-armv7
+            runtime_test: true
 
           - arch: arm_cortex-a9_vfpv3-d16
             target: mvebu-cortexa9
             runtime_test: false
 
+          - arch: i386_pentium-mmx
+            target: x86-geode
+            runtime_test: true
+
           - arch: mips_24kc
             target: ath79-generic
-            runtime_test: false
+            runtime_test: true
 
           - arch: powerpc_464fp
             target: apm821xx-nand
             runtime_test: false
 
-          - arch: powerpc_8540
+          - arch: powerpc_8548
             target: mpc85xx-p1010
             runtime_test: false
 
-          - arch: aarch64_cortex-a53
-            target: mvebu-cortexa53
-            runtime_test: true
-
-          - arch: arm_cortex-a15_neon-vfpv4
-            target: armvirt-32
-            runtime_test: true
-
-          - arch: i386_pentium-mmx
-            target: x86-geode
-            runtime_test: true
+          - arch: riscv64_riscv64
+            target: sifiveu-generic
+            runtime_test: false
 
           - arch: x86_64
             target: x86-64
@@ -82,20 +86,36 @@ jobs:
           echo "Building $PACKAGES"
           echo "PACKAGES=$PACKAGES" >> $GITHUB_ENV
 
+      - name: Generate build keys
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y signify-openbsd
+          signify-openbsd -G -n -c 'DO NOT USE - OpenWrt packages feed CI' -p packages_ci.pub -s packages_ci.sec
+          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+          echo "KEY_BUILD<<$EOF" >> $GITHUB_ENV
+          cat packages_ci.sec >> $GITHUB_ENV
+          echo "$EOF" >> $GITHUB_ENV
+
       - name: Build
         uses: openwrt/gh-action-sdk@v5
         env:
           ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
           FEEDNAME: packages_ci
+          INDEX: 1
+          KEY_BUILD: ${{ env.KEY_BUILD }}
 
       - name: Move created packages to project dir
-        run: cp bin/packages/${{ matrix.arch }}/packages_ci/*.ipk . || true
+        run: cp bin/packages/${{ matrix.arch }}/packages_ci/* . || true
 
       - name: Store packages
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ matrix.arch}}-packages
-          path: "*.ipk"
+          name: ${{env.ARCHIVE_NAME}}-packages
+          path: |
+            Packages
+            Packages.*
+            *.ipk
+            PKG-INFO
 
       - name: Store logs
         uses: actions/upload-artifact@v3
@@ -106,19 +126,32 @@ jobs:
       - name: Remove logs
         run: sudo rm -rf logs/ || true
 
-      - name: Register QEMU
-        if: ${{ matrix.runtime_test }}
+      - name: Check if any packages were built
         run: |
-          sudo docker run --rm --privileged aptman/qus -s -- -p
+          if [ -n "$(find . -maxdepth 1 -type f -name '*.ipk' -print -quit)" ]; then
+            echo "Found *.ipk files"
+            HAVE_IPKS=true
+          else
+            echo "No *.ipk files found"
+            HAVE_IPKS=false
+          fi
+          echo "HAVE_IPKS=$HAVE_IPKS" >> $GITHUB_ENV
+
+      - name: Register QEMU
+        if: ${{ matrix.runtime_test && fromJSON(env.HAVE_IPKS) }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static binfmt-support
+          sudo update-binfmts --import
 
       - name: Build Docker container
-        if: ${{ matrix.runtime_test }}
+        if: ${{ matrix.runtime_test && fromJSON(env.HAVE_IPKS) }}
         run: |
           docker build -t test-container --build-arg ARCH .github/workflows/
         env:
           ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
 
       - name: Test via Docker container
-        if: ${{ matrix.runtime_test }}
+        if: ${{ matrix.runtime_test && fromJSON(env.HAVE_IPKS) }}
         run: |
           docker run --rm -v $GITHUB_WORKSPACE:/ci test-container

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

babeld/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
-PKG_VERSION:=1.12.2
+PKG_VERSION:=1.13.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/
-PKG_HASH:=1db22b6193070ea2450a1ab51196fd72f58a1329f780cb0388e2e4b2e7768cbb
+PKG_HASH:=15f24d26da0ccfc073abcdef0309f281e4684f2aa71126f826572c4c845e8dd9
 
 PKG_MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>, \
 	Baptiste Jonglez <openwrt-pkg@bitsofnetworks.org>, \

babeld/patches/600-add-ubus.patch

@@ -9,7 +9,7 @@
  struct timeval now;
  
  unsigned char myid[8];
-@@ -521,6 +523,9 @@ main(int argc, char **argv)
+@@ -505,6 +507,9 @@ main(int argc, char **argv)
          }
      }
  
@@ -19,7 +19,7 @@
      init_signals();
      rc = resize_receive_buffer(1500);
      if(rc < 0)
-@@ -616,6 +621,8 @@ main(int argc, char **argv)
+@@ -597,6 +602,8 @@ main(int argc, char **argv)
                  FD_SET(local_sockets[i].fd, &readfds);
                  maxfd = MAX(maxfd, local_sockets[i].fd);
              }
@@ -28,7 +28,7 @@
              rc = select(maxfd + 1, &readfds, NULL, NULL, &tv);
              if(rc < 0) {
                  if(errno != EINTR) {
-@@ -684,6 +691,9 @@ main(int argc, char **argv)
+@@ -665,6 +672,9 @@ main(int argc, char **argv)
              i++;
          }
  
@@ -57,7 +57,7 @@
  static struct filter *input_filters = NULL;
  static struct filter *output_filters = NULL;
  static struct filter *redistribute_filters = NULL;
-@@ -1036,7 +1038,8 @@ parse_option(int c, gnc_t gnc, void *clo
+@@ -1024,7 +1026,8 @@ parse_option(int c, gnc_t gnc, void *clo
                strcmp(token, "daemonise") == 0 ||
                strcmp(token, "skip-kernel-setup") == 0 ||
                strcmp(token, "ipv6-subtrees") == 0 ||
@@ -67,7 +67,7 @@
          int b;
          c = getbool(c, &b, gnc, closure);
          if(c < -1)
-@@ -1054,6 +1057,8 @@ parse_option(int c, gnc_t gnc, void *clo
+@@ -1042,6 +1045,8 @@ parse_option(int c, gnc_t gnc, void *clo
              has_ipv6_subtrees = b;
          else if(strcmp(token, "reflect-kernel-metric") == 0)
              reflect_kernel_metric = b;

babeld/src/ubus.c

@@ -245,23 +245,6 @@ static int babeld_ubus_get_xroutes(struct ubus_context *ctx_local,
 static void babeld_add_route_buf(struct babel_route *route,
                                  struct blob_buf *b) {
   void *prefix;
-  char channels[100];
-
-  if (route->channels_len == 0) {
-    channels[0] = '\0';
-  } else {
-    int i, j = 0;
-    snprintf(channels, sizeof(channels), " chan (");
-    j = strlen(channels);
-    for (i = 0; i < route->channels_len; i++) {
-      if (i > 0)
-        channels[j++] = ',';
-      snprintf(channels + j, sizeof(channels) - j, "%u",
-               (unsigned)route->channels[i]);
-      j = strlen(channels);
-    }
-    snprintf(channels + j, sizeof(channels) - j, ")");
-  }
 
   prefix = blobmsg_open_table(
       b, format_prefix(route->src->prefix, route->src->plen));
@@ -274,7 +257,6 @@ static void babeld_add_route_buf(struct babel_route *route,
   blobmsg_add_u32(b, "refmetric", route->refmetric);
   blobmsg_add_string(b, "id", format_eui64(route->src->id));
   blobmsg_add_u32(b, "seqno", (uint32_t)route->seqno);
-  blobmsg_add_string(b, "channels", channels);
   blobmsg_add_u32(b, "age", (int)(now.tv_sec - route->time));
   blobmsg_add_string(b, "via", format_address(route->neigh->address));
   if (memcmp(route->nexthop, route->neigh->address, 16) != 0)
@@ -357,7 +339,6 @@ static void babeld_add_neighbour_buf(struct neighbour *neigh,
   blobmsg_add_u32(b, "rxcost", neighbour_rxcost(neigh));
   blobmsg_add_u32(b, "txcost", neigh->txcost);
   blobmsg_add_string(b, "rtt", format_thousands(neigh->rtt));
-  blobmsg_add_u32(b, "channel", neigh->ifp->channel);
   blobmsg_add_u8(b, "if_up", if_up(neigh->ifp));
   blobmsg_close_table(b, neighbour);
 }

batctl/Makefile

@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
-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:=e5bf47305d955abb199244bd0e5fffab96108b1affabd0d9705533f8059395f1
+PKG_HASH:=76853e87201af63c411db152fd0c625a729a9733115897d1331604e2c5a67c7d
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>

batman-adv/Makefile

@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2023.1
+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/files/lib/netifd/proto/batadv_vlan.sh

@@ -22,4 +22,8 @@ proto_batadv_vlan_setup() {
 	proto_send_update "$config"
 }
 
+proto_batadv_vlan_teardown() {
+	local cfg="$1"
+}
+
 add_protocol batadv_vlan

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/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/src/compat-hacks.h

@@ -28,7 +28,10 @@ static inline u32 batadv_get_random_u32_below(u32 ep_ro)
 
 #endif /* LINUX_VERSION_IS_LESS(6, 2, 0) */
 
-#if LINUX_VERSION_IS_LESS(6, 4, 0)
+#if LINUX_VERSION_IS_LESS(6, 4, 0) && \
+    !(LINUX_VERSION_IS_GEQ(5, 10, 205) && LINUX_VERSION_IS_LESS(5, 11, 0)) && \
+    !(LINUX_VERSION_IS_GEQ(5, 15, 144) && LINUX_VERSION_IS_LESS(5, 16, 0)) && \
+    !(LINUX_VERSION_IS_GEQ(6, 1, 69) && LINUX_VERSION_IS_LESS(6, 2, 0))
 
 #include <linux/if_vlan.h>
 

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
+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:=8d895e3e311880e9efb888b4386cbec2f7e18bfb8334e8d4c8ca7c4341092638
+PKG_HASH:=b0b9f6f8566541b9be4af1f0cac675c5a3785601a55667a7ec3d7de29735a786
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
 PKG_LICENSE:=GPL-2.0-or-later

bmx6/Makefile

@@ -1,150 +0,0 @@
-#    Copyright (C) 2011 Fundacio Privada per a la Xarxa Oberta, Lliure i Neutral guifi.net
-#
-#    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 2 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, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-#    The full GNU General Public License is included in this distribution in
-#    the file called "COPYING".
-#
-# Contibutors:
-#	Axel Neumann, Simó Albert i Beltran, Pau Escrich
-#
-
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bmx6
-PKG_VERSION:=0.1-alpha
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/bmx-routing/bmx6.git
-PKG_SOURCE_DATE:=2020-06-08
-PKG_SOURCE_VERSION:=65cb0d542f16a4b4689f5ad2542c9f24215a6616
-PKG_MIRROR_HASH:=45501cfe9f82e08e8082147f90b94ba5b6bd11771a9140412bfbf5523a796177
-
-PKG_MAINTAINER:=Axel Neumann <neumann@cgws.de>
-PKG_LICENSE:=GPL-2.0-or-later
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += $(FPIC)
-
-MAKE_ARGS += \
-	EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DNO_DEBUG_ALL -DNO_DEBUG_DUMP" \
-	EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib " \
-	GIT_REV="$(PKG_REV)" \
-	CC="$(TARGET_CC)" \
-	INSTALL_DIR="$(PKG_INSTALL_DIR)" \
-	STRIP="/bin/false" \
-	build_all
-
-define Package/bmx6/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  TITLE:=BMX6 layer 3 routing daemon
-  URL:=https://bmx6.net/projects/bmx6
-  DEPENDS:=+kmod-ip6-tunnel +kmod-iptunnel6 +kmod-tun
-endef
-
-define Package/bmx6/description
-BMX6 layer 3 routing daemon supporting IPv4, IPv6, and IPv4 over IPv6
-endef
-
-define Package/bmx6
-  $(call Package/bmx6/Default)
-  MENU:=1
-endef
-
-define Package/bmx6-uci-config
-  $(call Package/bmx6/Default)
-  DEPENDS:=bmx6 +libuci
-  TITLE:=configuration plugin based on uci (recommended!)
-endef
-
-define Package/bmx6-json
-  $(call Package/bmx6/Default)
-  DEPENDS:=bmx6 +libjson-c
-  TITLE:=json plugin based on json-c
-endef
-
-define Package/bmx6-sms
-  $(call Package/bmx6/Default)
-  DEPENDS:=bmx6
-  TITLE:=sms plugin
-endef
-
-#define Package/bmx6-quagga
-#  $(call Package/bmx6/Default)
-#  DEPENDS:=bmx6 +qmp-quagga @BROKEN
-#  TITLE:=bmx6 quagga plugin to redistribute/export routes (needs manet/bmx6 patched quagga 0.99.21)
-#endef
-
-define Package/bmx6-table
-  $(call Package/bmx6/Default)
-  DEPENDS:=bmx6
-  TITLE:=bmx6 table plugin to automatic announce routing-table routes via ip6ip tunnels
-endef
-
-define Build/Configure
-	mkdir -p $(PKG_INSTALL_DIR)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS)
-endef
-
-define Package/bmx6/install
-	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx6 $(1)/usr/sbin/bmx6
-endef
-
-define Package/bmx6-uci-config/conffiles
-/etc/config/bmx6
-endef
-
-define Package/bmx6-uci-config/install
-	$(INSTALL_DIR) $(1)/usr/lib $(1)/etc/config $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_uci_config/bmx6_config.so $(1)/usr/lib/bmx6_config.so
-	$(INSTALL_BIN) ./files/etc/init.d/bmx6 $(1)/etc/init.d/bmx6
-	$(INSTALL_DATA) ./files/etc/config/bmx6 $(1)/etc/config/bmx6
-endef
-
-define Package/bmx6-json/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_json/bmx6_json.so $(1)/usr/lib/bmx6_json.so
-endef
-
-define Package/bmx6-sms/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_sms/bmx6_sms.so $(1)/usr/lib/bmx6_sms.so
-endef
-
-define Package/bmx6-table/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_table/bmx6_table.so $(1)/usr/lib/bmx6_table.so
-endef
-
-#define Package/bmx6-quagga/install
-#	$(INSTALL_DIR) $(1)/usr/lib
-#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_quagga/bmx6_quagga.so $(1)/usr/lib/bmx6_quagga.so
-#endef
-
-$(eval $(call BuildPackage,bmx6))
-$(eval $(call BuildPackage,bmx6-uci-config))
-$(eval $(call BuildPackage,bmx6-json))
-$(eval $(call BuildPackage,bmx6-sms))
-#$(eval $(call BuildPackage,bmx6-quagga))
-$(eval $(call BuildPackage,bmx6-table))

bmx6/files/etc/config/bmx6

@@ -1,82 +0,0 @@
-
-# for more information:
-# http://bmx6.net/projects/bmx6/wiki
-# options execute: bmx6 --help
-
-config 'bmx6' 'general'
-#       option 'runtimeDir' '/var/run/bmx6'
-#       option 'tun4Address' '10.202.0.116/32'
-#       option 'tun4Address' '10.254.10.0/32'
-#       option 'tun6Address' '2012:0:0:1000::1/64'
-
-#config 'ipVersion' 'ipVersion'
-#       option 'ipVersion' '6'   # default is 4
-#       option 'throwRules' '0'
-
-
-#config 'plugin'
-#        option 'plugin' 'bmx6_config.so'
-
-
-
-#config 'plugin'
-#        option 'plugin' 'bmx6_json.so'
-
-
-
-#config 'plugin'
-#        option 'plugin' 'bmx6_sms.so'
-
-
-config 'dev' 'mesh_1'
-        option 'dev' 'eth0.12'
-
-config 'dev' 'mesh_2'
-        option 'dev' 'ath0.12'
-
-
-
-#config 'hna' 'my_global_prefix'
-#       option 'hna' '2012:0:0:74:0:0:0:0/64'
-
-
-#config 'tunOut'
-#        option 'tunOut' 'ip6'
-#        option 'network' '2012::/16'
-#        option 'exportDistance' '0'
-
-#config 'tunOut'
-#        option 'tunOut' 'ip4'
-#        option 'network' '10.254.0.0/16'
-#        option 'exportDistance' '0'  # requires quagga plugin !
-#        option 'minPrefixLen' '27'
-
-
-
-#config 'plugin'
-#        option 'plugin' 'bmx6_quagga.so'
-
-
-
-#config 'redistribute'
-#        option 'redistribute' 'ospf6'
-#        option 'network' '10.0.0.0/8'
-#        option 'minPrefixLen' '10'
-#        option 'bandwidth' '10000000'
-#        option 'ospf6' '1'
-#        option 'aggregatePrefixLen' '16'
-
-#config 'redistribute'
-#        option 'redistribute' 'bgp'
-#        option 'network' '0.0.0.0/0'
-#        option 'minPrefixLen' '0'
-#        option 'maxPrefixLen' '24'
-#        option 'bandwidth' '10000000'
-#        option 'bgp' '1'
-#        option 'aggregatePrefixLen' '8'
-
-
-
-
-
-

bmx6/files/etc/init.d/bmx6

@@ -1,37 +0,0 @@
-#!/bin/sh /etc/rc.common
-#    Copyright (C) 2017 Gui Iribarren <gui@altermundi.net>
-#    Copyright (C) 2011 Fundacio Privada per a la Xarxa Oberta, Lliure i Neutral guifi.net
-#
-#    This is free software, licensed under the GNU General Public License v3.
-
-START=91
-STOP=91
-USE_PROCD=1
-
-NAME=bmx6
-BIN=/usr/sbin/bmx6
-CONF=/etc/config/bmx6
-PID=/var/run/bmx6/pid
-DEBUG=0
-
-start_service() {
-    procd_open_instance "$NAME"
-    procd_set_param command "$BIN" -f "$CONF" -d "$DEBUG"
-
-    ### Respawn automatically when process dies, after waiting respawn_timeout seconds
-    ### If respawn_retry consecutives respawns die before respawn_threshold seconds (i.e. they crash)
-    ### it will stop trying and leave it dead.
-    procd_set_param respawn ${respawn_threshold:-60} ${respawn_timeout:-3} ${respawn_retry:-5}
-
-    procd_set_param limits core="20000"  # Equivalent to 'ulimit -c 20000'
-    procd_close_instance
-}
-
-reload_service() {
-    "$BIN" -c configReload
-}
-
-service_triggers()
-{
-    procd_add_reload_trigger "bmx6" # Call reload_service() when /etc/config/bmx6 changed and reload_config is run
-}

bmx6/patches/010-siocgstamp.patch

@@ -1,40 +0,0 @@
---- a/schedule.c
-+++ b/schedule.c
-@@ -356,7 +356,9 @@ loop4Event:
- 					continue;
- 				}
- 
-+#ifdef SIOCGSTAMP
- 				ioctl(pb.i.iif->rx_mcast_sock, SIOCGSTAMP, &(pb.i.tv_stamp)) ;
-+#endif
- 				
- 				rx_packet( &pb );
- 				
-@@ -381,8 +383,10 @@ loop4Event:
- 					
- 					continue;
- 				}
--				
-+
-+#ifdef SIOCGSTAMP
- 				ioctl(pb.i.iif->rx_fullbrc_sock, SIOCGSTAMP, &(pb.i.tv_stamp)) ;
-+#endif
- 				
- 				rx_packet( &pb );
- 				
-@@ -432,10 +436,15 @@ loop4Event:
- 					}
- 				}
- #endif
-+#ifdef SIOCGSTAMP
- 				if ( tv_stamp == NULL )
- 					ioctl( pb.i.iif->unicast_sock, SIOCGSTAMP, &(pb.i.tv_stamp) );
- 				else
- 					timercpy( tv_stamp, &(pb.i.tv_stamp) );
-+#else
-+				if (tv_stamp)
-+					timercpy( tv_stamp, &(pb.i.tv_stamp) );
-+#endif
- 				
- 				rx_packet( &pb );
- 				

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-bmx6/COPYING

@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

luci-app-bmx6/Makefile

@@ -1,99 +0,0 @@
-#    Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-#
-#    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 2 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, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-#    The full GNU General Public License is included in this distribution in
-#    the file called "COPYING".
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-bmx6
-PKG_RELEASE:=6
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_LICENSE:=GPL-2.0+
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-bmx6
-  SECTION:=luci
-  CATEGORY:=LuCI
-  SUBMENU:=3. Applications
-  TITLE:= bmx6 configuration, status and visualization module
-  DEPENDS:=+luci-lib-json +luci-base +luci-lib-httpclient +bmx6 +luci-lib-jquery-1-4 +luci-lib-dracula
-  MAINTAINER:= Pau Escrich <p4u@dabax.net>
-endef
-
-define Package/luci-lib-jquery-1-4
-  SECTION:=luci
-  CATEGORY:=LuCI
-  TITLE:=LuCI - Lua Configuration Interface
-  MAINTAINER:=Gui Iribarren <gui@altermundi.net>
-  SUBMENU:=6. Libraries
-  TITLE:=jQuery 1.4 javascript library
-endef
-
-define Package/luci-lib-dracula
-  SECTION:=luci
-  CATEGORY:=LuCI
-  TITLE:=LuCI - Lua Configuration Interface
-  MAINTAINER:=Pau Escrich <p4u@dabax.net>
-  SUBMENU:=6. Libraries
-  TITLE:=dracula graph javascript library
-endef
-
-define Package/luci-app-bmx6/description
-	bmx6 web application (status and configuration) for LuCi web interface
-endef
-
-define Package/luci-lib-jquery-1-4/description
-	minified javascript jQuery 1.4 library
-endef
-
-define Package/luci-lib-dracula-graph/description
-	minified dracula javascript graph library
-endef
-
-define Package/luci-app-bmx6/conffiles
-	/etc/config/luci-bmx6
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/luci-app-bmx6/install
-	$(CP) ./bmx6/* $(1)/
-	chmod 755 $(1)/www/cgi-bin/bmx6-info
-endef
-
-define Package/luci-lib-jquery-1-4/install
-	$(INSTALL_DIR) $(1)/www/luci-static/resources/jquery/
-	$(CP) ./jquery/* $(1)/www/luci-static/resources/jquery/
-endef
-
-define Package/luci-lib-dracula/install
-	$(INSTALL_DIR) $(1)/www/luci-static/resources/dracula
-	$(CP) ./dracula/* $(1)/www/luci-static/resources/dracula/
-endef
-
-$(eval $(call BuildPackage,luci-app-bmx6))
-$(eval $(call BuildPackage,luci-lib-jquery-1-4))
-$(eval $(call BuildPackage,luci-lib-dracula))

luci-app-bmx6/bmx6/etc/config/luci-bmx6

@@ -1,7 +0,0 @@
-config 'bmx6' 'luci'
-	option ignore '0'
-	option place 'admin network BMX6'
-	#option place 'qmp Mesh'
-	option position '3'
-	#option json 'http://127.0.0.1/cgi-bin/bmx6-info?'
-	option json 'exec:/www/cgi-bin/bmx6-info -s'

luci-app-bmx6/bmx6/usr/lib/lua/luci/controller/bmx6.lua

@@ -1,277 +0,0 @@
---[[
-    Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-    Contributors Jo-Philipp Wich <xm@subsignal.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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    The full GNU General Public License is included in this distribution in
-    the file called "COPYING".
---]]
-
-local bmx6json = require("luci.model.bmx6json")
-
-module("luci.controller.bmx6", package.seeall)
-
-function index()
-	local place = {}
-	local ucim = require "luci.model.uci"
-	local uci = ucim.cursor()
-
-	-- checking if ignore is on
-	if uci:get("luci-bmx6","luci","ignore") == "1" then
-		return nil
-	end
-
-	-- getting value from uci database
-	local uci_place = uci:get("luci-bmx6","luci","place")
-
-	-- default values
-	if uci_place == nil then
-		place = {"bmx6"}
-	else
-		local util = require "luci.util"
-		place = util.split(uci_place," ")
-	end
-
-	-- getting position of menu
-	local uci_position = uci:get("luci-bmx6","luci","position")
-
-	---------------------------
-	-- Starting with the pages
-	---------------------------
-
-	--- status (default)
-	entry(place,call("action_nodes_j"),place[#place],tonumber(uci_position))            
-
-	table.insert(place,"Status")
-	entry(place,call("action_status_j"),"Status",0)
-	table.remove(place)
-
-	--- nodes
-	table.insert(place,"Nodes")
-	entry(place,call("action_nodes_j"),"Nodes",1)
-	table.remove(place)
-
-	--- links
-	table.insert(place,"Links")
-	entry(place,call("action_links"),"Links",2).leaf = true
-	table.remove(place)
-
-	-- Tunnels
-	table.insert(place,"Tunnels")
-	entry(place,call("action_tunnels_j"), "Tunnels", 3).leaf = true
-	table.remove(place)
-
-	--- Chat
-	table.insert(place,"Chat")
-	entry(place,call("action_chat"),"Chat",5)
-	table.remove(place)
-
-	--- Graph
-	table.insert(place,"Graph")
-	entry(place, template("bmx6/graph"), "Graph",4)
-	table.remove(place)
-
-	--- Topology (hidden)
-	table.insert(place,"topology")
-	entry(place, call("action_topology"), nil)
-	table.remove(place)
-
-	--- configuration (CBI)
-	table.insert(place,"Configuration")
-	entry(place, cbi("bmx6/main"), "Configuration",6).dependent=false
-
-	table.insert(place,"General")
-	entry(place, cbi("bmx6/main"), "General",1)
-	table.remove(place)
-
-	table.insert(place,"Advanced")
-	entry(place, cbi("bmx6/advanced"), "Advanced",5)
-	table.remove(place)
-
-	table.insert(place,"Interfaces")
-	entry(place, cbi("bmx6/interfaces"), "Interfaces",2)
-	table.remove(place)
-
-	table.insert(place,"Tunnels")
-        entry(place, cbi("bmx6/tunnels"), "Tunnels",3)
-        table.remove(place)
-
-	table.insert(place,"Plugins")
-	entry(place, cbi("bmx6/plugins"), "Plugins",6)
-	table.remove(place)
-
-	table.insert(place,"HNAv6")
-	entry(place, cbi("bmx6/hna"), "HNAv6",4)
-	table.remove(place)
-
-	table.remove(place)
-
-end
-
-function action_status_j()
-	luci.template.render("bmx6/status_j", {})
-end
-
-
-function action_nodes_j()
-	local http = require "luci.http"
-	local link_non_js = "/cgi-bin/luci" .. http.getenv("PATH_INFO") .. '/nodes_nojs'
-
-	luci.template.render("bmx6/nodes_j", {link_non_js=link_non_js})
-end
-
-function action_gateways_j()
-	luci.template.render("bmx6/gateways_j", {})
-end
-
-function action_tunnels_j()
-        luci.template.render("bmx6/tunnels_j", {})
-end
-
-function action_links(host)
-	local links = bmx6json.get("links", host)
-	local devlinks = {}
-	local _,l
-
-	if links ~= nil then
-		links = links.links
-		for _,l in ipairs(links) do
-			devlinks[l.viaDev] = {}
-		end
-		for _,l in ipairs(links) do
-			l.name = luci.util.split(l.name,'.')[1]
-			table.insert(devlinks[l.viaDev],l)
-		end
-	end
-
-	luci.template.render("bmx6/links", {links=devlinks})
-end
-
-function action_topology()
-	local originators = bmx6json.get("originators/all")
-	local o,i,l,i2
-	local first = true
-	local topology = '[ '
-	local cache = '/tmp/bmx6-topology.json'
-	local offset = 60
-
-	local cachefd = io.open(cache,r)
-	local update = false
-
-	if cachefd ~= nil then
-		local lastupdate = tonumber(cachefd:read("*line")) or 0
-		if os.time() >= lastupdate + offset then
-			update = true
-		else
-			topology = cachefd:read("*all")
-		end
-		cachefd:close()
-	end
-
-	if cachefd == nil or update then
-	    	for i,o in ipairs(originators) do
-	    		local links = bmx6json.get("links",o.primaryIp)
-	    		if links then
-	    			if first then
-	    				first = false
-	    			else
-						topology = topology .. ', '
-	    			end
-	    
-					topology = topology .. '{ "name": "%s", "links": [' %o.name
-	    
-	    			local first2 = true
-	    
-	    			for i2,l in ipairs(links.links) do
-	    				if first2 then
-	    					first2 = false
-	    				else
-	    					topology = topology .. ', '
-						end
-						name = l.name or l.llocalIp or "unknown"
-						topology = topology .. '{ "name": "%s", "rxRate": %s, "txRate": %s }'
-							%{ name, l.rxRate, l.txRate }
-	    
-	    			end
-	    
-	    			topology = topology .. ']}'
-	    		end
-	    
-	    	end
-		
-		topology = topology .. ' ]'
-
-		-- Upgrading the content of the cache file
-	 	cachefd = io.open(cache,'w+')
-		cachefd:write(os.time()..'\n')
-		cachefd:write(topology)
-		cachefd:close()
-	end
-
-	luci.http.prepare_content("application/json")
-	luci.http.write(topology)
-end
-
-
-function action_chat()
-	local sms_dir = "/var/run/bmx6/sms"
-	local rcvd_dir = sms_dir .. "/rcvdSms"
-	local send_file = sms_dir .. "/sendSms/chat"
-	local sms_list = bmx6json.get("rcvdSms")
-	local sender = ""
-	local sms_file = ""
-	local chat = {}
-	local to_send = nil
-	local sent = ""
-	local fd = nil
-
-	if luci.sys.call("test -d " .. sms_dir) ~= 0 then
-		luci.template.render("bmx6/error", {txt="sms plugin disabled or some problem with directory " .. sms_dir})
-		return nil
-	end
-
-	sms_list = luci.util.split(luci.util.exec("ls "..rcvd_dir.."/*:chat"))
-
-	for _,sms_path in ipairs(sms_list) do
-	  if #sms_path > #rcvd_dir then
-		sms_file = luci.util.split(sms_path,'/')
-		sms_file = sms_file[#sms_file]
-		sender = luci.util.split(sms_file,':')[1]
-
-		-- Trying to clean the name
-		if string.find(sender,".") ~= nil then
-			sender = luci.util.split(sender,".")[1]
-		end
-
-		fd = io.open(sms_path,"r")
-		chat[sender] = fd:read()
-		fd:close()
-	  end
-	end
-
-	to_send = luci.http.formvalue("toSend")
-	if to_send ~= nil and #to_send > 1  then
-		fd = io.open(send_file,"w")
-		fd:write(to_send)
-		fd:close()
-		sent = to_send
-	else
-		sent = luci.util.exec("cat "..send_file)
-	end
-
-	luci.template.render("bmx6/chat", {chat=chat,sent=sent})
-end
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/model/bmx6json.lua

@@ -1,224 +0,0 @@
---[[
-    Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-    Contributors Jo-Philipp Wich <xm@subsignal.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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    The full GNU General Public License is included in this distribution in
-    the file called "COPYING".
---]]
-
-local ltn12 = require("luci.ltn12")
-local json = require("luci.json")
-local util = require("luci.util")
-local uci = require("luci.model.uci")
-local sys = require("luci.sys")
-local template = require("luci.template")
-local http = require("luci.http")
-local string = require("string")
-local table = require("table")
-local nixio = require("nixio")
-local nixiofs = require("nixio.fs")
-local ipairs = ipairs
-
-module "luci.model.bmx6json"
-
--- Returns a LUA object from bmx6 JSON daemon
-
-function get(field, host)
-	local url
-	if host ~= nil then
-		if host:match(":") then
-			url = 'http://[%s]/cgi-bin/bmx6-info?' % host
-		else
-			url = 'http://%s/cgi-bin/bmx6-info?' % host
-		end
-	else
-		url = uci.cursor():get("luci-bmx6","luci","json")
-	end
-
-	if url == nil then
-		 print_error("bmx6 json url not configured, cannot fetch bmx6 daemon data",true)
-		 return nil
-	 end
-
-	 local json_url = util.split(url,":")
-	 local raw = ""
-
-	if json_url[1] == "http"  then
-		raw,err = wget(url..field,1000)
-		sys.exec("")
-	else
-
-		if json_url[1] == "exec" then
-			raw = sys.exec(json_url[2]..' '..field)
-		else
-			print_error("bmx6 json url not recognized, cannot fetch bmx6 daemon data. Use http: or exec:",true)
-			return nil
-		end
-
-	end
-
-	local data = nil
-
-	if raw and raw:len() > 10 then
-		local decoder = json.Decoder()
-		ltn12.pump.all(ltn12.source.string(raw), decoder:sink())
-		data = decoder:get()
---	else
---		print_error("Cannot get data from bmx6 daemon",true)
---		return nil
-	end
-
-	return data
-end
-
-function print_error(txt,popup)
-	util.perror(txt)
-	sys.call("logger -t bmx6json " .. txt)
-
-	if popup then
-		http.write('<script type="text/javascript">alert("Some error detected, please check it: '..txt..'");</script>')
-	else
-		http.write("<h1>Dammit! some error detected</h1>")
-		http.write("bmx6-luci: " .. txt)
-		http.write('<p><FORM><INPUT TYPE="BUTTON" VALUE="Go Back" ONCLICK="history.go(-1)"></FORM></p>')
-	end
-
-end
-
-function text2html(txt)
-	txt = string.gsub(txt,"<","{")
-	txt = string.gsub(txt,">","}")
-	txt = util.striptags(txt)
-	return txt
-end
-
-
-function wget(url, timeout)
-	local rfd, wfd = nixio.pipe()
-	local pid = nixio.fork()
-	if pid == 0 then
-		rfd:close()
-		nixio.dup(wfd, nixio.stdout)
-		-- candidates for wget, try first ones with SSL support
-		local candidates = {{"/usr/bin/wget-ssl",1},{"/usr/bin/wget",0},{"/bin/wget",0}}
-		local _, bin
-		for _, bin in ipairs(candidates) do
-			if nixiofs.access(bin[1], "x") then
-				if bin[2] == 0 then
-					nixio.exec(bin[1], "-q", "-O", "-", url)
-				else
-					nixio.exec(bin[1], "--no-check-certificate", "-q", "-O", "-", url)
-				end
-			end
-		end
-		return
-	else
-		wfd:close()
-		rfd:setblocking(false)
-
-		local buffer = { }
-		local err1, err2
-
-		while true do
-			local ready = nixio.poll({{ fd = rfd, events = nixio.poll_flags("in") }}, timeout)
-			if not ready then
-				nixio.kill(pid, nixio.const.SIGKILL)
-				err1 = "timeout"
-				break
-			end
-
-			local rv = rfd:read(4096)
-			if rv then
-				-- eof
-				if #rv == 0 then
-					break
-				end
-
-				buffer[#buffer+1] = rv
-			else
-				-- error
-				if nixio.errno() ~= nixio.const.EAGAIN and
-				   nixio.errno() ~= nixio.const.EWOULDBLOCK then
-				   	err1 = "error"
-				   	err2 = nixio.errno()
-				end
-			end
-		end
-
-		nixio.waitpid(pid, "nohang")
-		if not err1 then
-			return table.concat(buffer)
-		else
-			return nil, err1, err2
-		end
-	end
-end
-
-function getOptions(name)
-	-- Getting json and Checking if bmx6-json is avaiable
-	local options = get("options")
-	if options == nil or options.OPTIONS == nil then
-		m.message = "bmx6-json plugin is not running or some mistake in luci-bmx6 configuration, check /etc/config/luci-bmx6"
-		return nil
-	else
-		options = options.OPTIONS
-	end
-
-	-- Filtering by the option name
-	local i,_
-	local namedopt = nil
-	if name ~= nil then
-		for _,i in ipairs(options) do
-			if i.name == name and i.CHILD_OPTIONS ~= nil then
-				namedopt = i.CHILD_OPTIONS
-				break
-			end
-		end
-	end
-
-	return namedopt
-end
-
--- Rturns a help string formated to be used in HTML scope
-function getHtmlHelp(opt)
-	if opt == nil then return nil end
-	
-	local help = ""
-	if opt.help ~= nil then
-		help = text2html(opt.help)
-	end
-	if opt.syntax ~= nil then
-		help = help .. "<br/><b>Syntax: </b>" .. text2html(opt.syntax)
-	end		
-
-	return help
-end
-
-function testandreload()
-	local test = sys.call('bmx6 -c --test > /tmp/bmx6-luci.err.tmp')
-	if test ~= 0 then
-		return sys.exec("cat /tmp/bmx6-luci.err.tmp")
-	end
-
-	local err = sys.call('bmx6 -c --configReload > /tmp/bmx6-luci.err.tmp')
-		if err ~= 0 then
-		return sys.exec("cat /tmp/bmx6-luci.err.tmp")
-	end
-
-	return nil
-end
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/model/cbi/bmx6/advanced.lua

@@ -1,75 +0,0 @@
---[[
-    Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    The full GNU General Public License is included in this distribution in
-    the file called "COPYING".
---]]
-
-m = Map("bmx6", "bmx6")
-
-local bmx6json = require("luci.model.bmx6json")
-local util = require("luci.util")
-local http = require("luci.http")
-local sys = require("luci.sys")
-
-local options = bmx6json.get("options")
-if options == nil or options.OPTIONS == nil then
-	m.message = "bmx6-json plugin is not running or some mistake in luci-bmx6 configuration, check /etc/config/luci-bmx6"
-	options = {}
-else
-	options = options.OPTIONS
-end
-
-local general = m:section(NamedSection,"general","bmx6")
-general.addremove = true
-
-local name = ""
-local help = ""
-local value = nil
-local _,o
-
-for _,o in ipairs(options) do
-	if o.name ~= nil and o.CHILD_OPTIONS == nil and o.configurable == 1 then
-		help = ""
-		name = o.name
-
-		if o.help ~= nil then
-			help = bmx6json.text2html(o.help)
-		end
-
-		if o.syntax ~= nil then
-			help = help .. "<br/><strong>Syntax: </strong>" .. bmx6json.text2html(o.syntax)
-		end
-
-		if o.def ~= nil then
-			help = help .. "<strong> Default: </strong>" .. o.def
-		end
-
-		value = general:option(Value,name,name,help)
-
-	end
-end
-
-function m.on_commit(self,map)
-	local err = sys.call('bmx6 -c --configReload > /tmp/bmx6-luci.err.tmp')
-	if err ~= 0 then
-		m.message = sys.exec("cat /tmp/bmx6-luci.err.tmp")
-	end
-end
-
-return m
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/model/cbi/bmx6/hna.lua

@@ -1,47 +0,0 @@
---[[
-    Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    The full GNU General Public License is included in this distribution in
-    the file called "COPYING".
---]]
-
-local sys = require("luci.sys")
-
-m = Map("bmx6", "bmx6")
-
-local hna = m:section(TypedSection,"unicastHna","IPv6 HNA")
-hna.addremove = true
-hna.anonymous = true
-local hna_option = hna:option(Value,"unicastHna", "IPv6 Host Network Announcement. Syntax <NETADDR>/<PREFIX>")
-
---function hna_option:validate(value)
---	local err = sys.call('bmx6 -c --test -a ' .. value)
---	if err ~= 0 then
---		return nil
---	end
---	return value
---end
-
-function m.on_commit(self,map)
-        local err = sys.call('bmx6 -c --configReload > /tmp/bmx6-luci.err.tmp')
-	if err ~= 0 then
-		m.message = sys.exec("cat /tmp/bmx6-luci.err.tmp")
-        end
-end
-
-return m
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/model/cbi/bmx6/interfaces.lua

@@ -1,77 +0,0 @@
---[[
-    Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    The full GNU General Public License is included in this distribution in
-    the file called "COPYING".
---]]
-
-local sys = require("luci.sys")
-local bmx6json = require("luci.model.bmx6json")
-local m = Map("bmx6", "bmx6")
-
-local eth_int = sys.net.devices()
-local interfaces = m:section(TypedSection,"dev","Devices","")
-interfaces.addremove = true
-interfaces.anonymous = true
-
-local intlv = interfaces:option(ListValue,"dev","Device")
-
-for _,i in ipairs(eth_int) do
-	intlv:value(i,i)
-end
-
--- Getting json and looking for device section
-local json = bmx6json.get("options")
-
-if json == nil or json.OPTIONS == nil then
-	m.message = "bmx6-json plugin is not running or some mistake in luci-bmx6 configuration, check /etc/config/luci-bmx6"
-	json = {}
-else
-	json = json.OPTIONS
-end
-
-local dev = {}
-for _,j in ipairs(json) do
-	if j.name == "dev" and j.CHILD_OPTIONS ~= nil then
-		dev = j.CHILD_OPTIONS
-		break
-	end
-end
-
-local help = ""
-local name = ""
-
-for _,o in ipairs(dev) do
-	if o.name ~= nil then
-		help = ""
-		name = o.name
-		if o.help ~= nil then
-			help = bmx6json.text2html(o.help)
-		end
-
-		if o.syntax ~= nil then
-			help = help .. "<br/><strong>Syntax: </strong>" .. bmx6json.text2html(o.syntax)
-		end
-
-		value = interfaces:option(Value,name,name,help)
-		value.optional = true
-	end
-end
-
-
-return m
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/model/cbi/bmx6/main.lua

@@ -1,105 +0,0 @@
---[[
-    Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    The full GNU General Public License is included in this distribution in
-    the file called "COPYING".
---]]
-
-local sys = require("luci.sys")
-local bmx6json = require("luci.model.bmx6json")
-
-m = Map("bmx6", "bmx6")
-
--- Getting json and Checking if bmx6-json is avaiable
-local options = bmx6json.get("options")
-if options == nil or options.OPTIONS == nil then
-	m.message = "bmx6-json plugin is not running or some mistake in luci-bmx6 configuration, check /etc/config/luci-bmx6"
-	return m
-else
-	options = options.OPTIONS
-end
-
--- Getting a list of interfaces
-local eth_int = luci.sys.net.devices()
-
-local tunDev = m:section(TypedSection,"tunDev",translate("Tunnel device"),translate("Define incoming ipip tunnel interface name"))
-tunDev.addremove = true
-tunDev.anonymous = true
-tunDev:option(Value,"tunDev",translate("Name"),translate("Name for the tunnel network device"))
-tunDev:option(Value,"tun4Address", translate("IPv4 address/length"),translate("Specify default IPv4 tunnel address and announced range (ex. 10.1.2.3/24)"))
-tunDev:option(Value,"tun6Address", translate("IPv6 address/length"),translate("Specify default IPv6 tunnel address and announced range (ex. 2012:0:0:123:0:0:0:1/64)"))
-
--- IP section
-local ipV = m:section(NamedSection,"ipVersion","ipVersion",translate("Miscellaneous IP options"))
-ipV.addremove = false
-local lipv = ipV:option(ListValue,"ipVersion",translate("IP version"))
-lipv:value("6","6")
-lipv.default = "6"
-
--- rest of ip options are optional, getting them from json
-local ipoptions = {}
-for _,o in ipairs(options) do
-	if o.name == "ipVersion" and o.CHILD_OPTIONS ~= nil then
-		ipoptions = o.CHILD_OPTIONS
-		break
-	end
-end
-
-local help = ""
-local name = ""
-local value = nil
-
-for _,o in ipairs(ipoptions) do
-	if o.name ~= nil then
-		help = ""
-		name = o.name
-		if o.help ~= nil then
-			help = bmx6json.text2html(o.help)
-		end
-
-		if o.syntax ~= nil then
-			help = help .. "<br/><strong>Syntax: </strong>" .. bmx6json.text2html(o.syntax)
-		end
-
-		if o.def ~= nil then
-			help = help .. "<br/><strong> Default: </strong>" .. bmx6json.text2html(o.def)
-		end
-
-		value = ipV:option(Value,name,name,help)
-		value.optional = true
-	end
-end
-
--- Interfaces section
-local interfaces = m:section(TypedSection,"dev",translate("Devices"),translate("Network devices to mesh with"))
-interfaces.addremove = true
-interfaces.anonymous = true
-local intlv = interfaces:option(ListValue,"dev",translate("Device"))
-
-for _,i in ipairs(eth_int) do
-	intlv:value(i,i)
-end
-
-function m.on_commit(self,map)
-    local err = sys.call('bmx6 -c --configReload > /tmp/bmx6-luci.err.tmp')
-    if err ~= 0 then
-        m.message = sys.exec("cat /tmp/bmx6-luci.err.tmp")
-    end
-end
-
-return m
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/model/cbi/bmx6/plugins.lua

@@ -1,50 +0,0 @@
---[[
-    Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    The full GNU General Public License is included in this distribution in
-    the file called "COPYING".
---]]
-local sys = require("luci.sys")
-
-m = Map("bmx6", "bmx6")
-plugins_dir = {"/usr/lib/","/var/lib","/lib"}
-
-plugin = m:section(TypedSection,"plugin","Plugin")
-plugin.addremove = true
-plugin.anonymous = true
-plv = plugin:option(ListValue,"plugin", "Plugin")
-
-for _,d in ipairs(plugins_dir) do
-	pl = luci.sys.exec("cd "..d..";ls bmx6_*")
-	if #pl > 6 then
-		for _,v in ipairs(luci.util.split(pl,"\n")) do
-			plv:value(v,v)
-		end
-	end
-end
-
-
-function m.on_commit(self,map)
-	local err = sys.call('/etc/init.d/bmx6 restart')
-	if err ~= 0 then
-		m.message = sys.exec("Cannot restart bmx6")
-	end
-end
-
-
-return m
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/model/cbi/bmx6/tunnels.lua

@@ -1,70 +0,0 @@
---[[
-    Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    The full GNU General Public License is included in this distribution in
-    the file called "COPYING".
---]]
-
-local sys = require("luci.sys")
-local bmx6json = require("luci.model.bmx6json")
-
-m = Map("bmx6", "bmx6")
-
--- tunOut
-local tunnelsOut = m:section(TypedSection,"tunOut",translate("Networks to fetch"),translate("Gateways announcements to fetch"))
-tunnelsOut.addremove = true
-tunnelsOut.anonymous = true
-tunnelsOut:option(Value,"tunOut","Name")
-tunnelsOut:option(Value,"network", translate("Network to fetch"))
-
-local tunoptions = bmx6json.getOptions("tunOut")
-local _,o
-for _,o in ipairs(tunoptions) do
-        if o.name ~= nil  and o.name ~= "network" then
-		help = bmx6json.getHtmlHelp(o)
-		value = tunnelsOut:option(Value,o.name,o.name,help)
-		value.optional = true
-	end
-end
-
-
--- tunOut
-local tunnelsIn = m:section(TypedSection,"tunIn",translate("Networks to offer"),translate("Gateways to announce in the network"))
-tunnelsIn.addremove = true
-tunnelsIn.anonymous = true
-tunnelsIn:option(Value,"tunIn","Name")
-tunnelsIn:option(Value,"network", translate("Network to offer"))
-
-local tunInoptions = bmx6json.getOptions("tunIn")
-local _,o
-for _,o in ipairs(tunInoptions) do
-        if o.name ~= nil  and o.name ~= "network" then
-		help = bmx6json.getHtmlHelp(o)
-		value = tunnelsIn:option(Value,o.name,o.name,help)
-		value.optional = true
-	end
-end
-
-function m.on_commit(self,map)
-	--Not working. If test returns error the changes are still commited
-	local msg = bmx6json.testandreload()
-	if msg ~= nil then
-		m.message = msg
-	end
-end
-
-return m

luci-app-bmx6/bmx6/usr/lib/lua/luci/view/admin_status/index/neighbours_simple.htm

@@ -1,108 +0,0 @@
-<script type="text/javascript">//<![CDATA[
-
-	XHR.poll(5, '/cgi-bin/bmx6-info', { 'neighbours': '' },
-		function(x, st)
-		{
-			var originators = st.neighbours[0].originators;
-			var descriptions = st.neighbours[1].descriptions;
-
-			var tb = document.getElementById('descriptions_table');
-
-			if ( originators.length != descriptions.length )
-			{
-				var tr = tb.insertRow(-1);
-				tr.className = 'cbi-section-table-row';
-				var td = tr.insertCell(-1);
-				td.colSpan = 7;
-				td.innerHTML = '<em><br /><%:Some problem with JSON: lenght of originators and descriptions different. %></em>';
-				return 1;
-			}
-
-			if ( originators && descriptions && tb)
-			{
-				/* clear all rows */
-				while( tb.rows.length > 1 )
-					tb.deleteRow(1);
-
-				for( var i = 0; i < descriptions.length; i++ )
-				{
-					var tr = tb.insertRow(-1);
-					tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
-					tr.insertCell(-1).innerHTML = descriptions[i].DESC_ADV.globalId.replace(/\.[^\.]+$/,"");
-
-					var extensions = descriptions[i].DESC_ADV.extensions;
-
-					//Looking for the extensions
-					var hna6 = [];
-					for( var e = 0; e < extensions.length; e++)
-					{
-						if( extensions[e].HNA6_EXTENSION )
-						{
-							hna6 = extensions[e].HNA6_EXTENSION;
-							break;
-						}
-					}
-
-					//Adding first HNA with prefix=128 as main address
-					var ipstxt = '';
-					var address;
-					var prefix;
-
-					for( var e = 0; e < hna6.length; e++ )
-					{
-						address = hna6[e].address;
-						prefix = hna6[e].prefixlen;
-						if ( prefix == '128' )
-							{
-								ipstxt += address;
-								break;
-							}
-					}
-
-					tr.insertCell(-1).innerHTML = ipstxt;
-
-					tr.insertCell(-1).innerHTML = originators[i].viaDev;
-					tr.insertCell(-1).innerHTML = originators[i].metric;
-					tr.insertCell(-1).innerHTML = originators[i].lastDesc;
-					tr.insertCell(-1).innerHTML = originators[i].lastRef;
-					tr.insertCell(-1).innerHTML = originators[i].blocked;
-
-				}
-
-				if( tb.rows.length == 1 )
-				{
-					var tr = tb.insertRow(-1);
-						tr.className = 'cbi-section-table-row';
-
-					var td = tr.insertCell(-1);
-						td.colSpan = 7;
-						td.innerHTML = '<em><br /><%:There are no nodes available.%></em>';
-				}
-			}
-		}
-	);
-//]]></script>
-
-<div class="cbi-map">
-
-<fieldset class="cbi-section">
-	<legend><%:Mesh nodes%></legend>
-	<table class="cbi-section-table" id="descriptions_table">
-		<tr class="cbi-section-table-titles">
-			<th class="cbi-section-table-cell"><%:Hostname%></th>
-			<th class="cbi-section-table-cell"><%:Primary IP%></th>
-			<th class="cbi-section-table-cell"><%:Via Device%></th>
-			<th class="cbi-section-table-cell"><%:Metric%></th>
-			<th class="cbi-section-table-cell"><%:Last Desc%></th>
-			<th class="cbi-section-table-cell"><%:Last Ref%></th>
-			<th class="cbi-section-table-cell"><%:Blocked%></th>
-		</tr>
-		<tr class="cbi-section-table-row">
-			<td colspan="7"><em><br /><%:Collecting data...%></em></td>
-		</tr>
-	</table>
-</fieldset>
-
-</div>
-
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/view/bmx6/chat.htm

@@ -1,35 +0,0 @@
-<%+header%>
-<meta http-equiv="refresh" content="60" />
-<h2><a id="content" name="content"><%:Chat%></a></h2>
-<p>This is sms a chat where all bmx6 nodes can participate. The data is replayed using routing packets, so there is a limit of 2040 bytes. Use it only to send short messages.</p>
-<p>Each participant can only send one sms at same time.</p>
-<br />
-
-<strong>Received SMS</strong>
-<br />
-<pre style="background-color:#dadbe6;">
-<% for orig,sms in pairs(chat) do %>
-         <u><%=orig%></u>:<%=sms%>
-<% end %>
-</pre>
-
-<form action=".">
-        <input type="submit" value="refresh" />
-</form>
-
-<br />
-
-<form action="." method="post">
-	<input type="text" name="toSend" />
-	<input type="submit" value="send sms" />
-</form>
-
-<br />
-<table>
-	<tr>
-	<td><strong>Your last sms: </strong></td>
-	<td><pre><%=sent%></pre></td>
-	</tr>
-</table>
-<%+footer%>
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/view/bmx6/error.htm

@@ -1,10 +0,0 @@
-<%+header%>
-<h2><a id="content" name="content"><%:ERROR%></a></h2>
-<strong>Some error has occurred</strong>
-<br />
-<pre>
-	<%=txt%>
-</pre>
-<br />
-<%+footer%>
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/view/bmx6/gateways_j.htm

@@ -1,120 +0,0 @@
-<%+header%>
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-
-<script type="text/javascript">//<![CDATA[
-
-	var displayExtraInfo = function ( id ) {
-
-		document.getElementById('extra-info').innerHTML = document.getElementById(id).innerHTML;
-	}
-	XHR.poll(5, '/cgi-bin/bmx6-info', { 'descriptions/all': '' },
-		function(x, st)
-		{
-		  var tb = document.getElementById('descriptions_table');
-		  var rowcount = 0;
-		  var tunicon = "<%=resource%>/icons/tunnel.png";
-		  /* clear all rows */
-		  while( tb.rows.length > 1 ) tb.deleteRow(1);
-
-		  for ( var k in st  )
-			{
-			var description = st[k].DESC_ADV;
-		  	var tun4in6;
-
-			for ( var k in description.extensions )
-				{
-				var value = description.extensions[k];
-
-					if ( value.TUN4IN6_NET_EXTENSION )
-						{
-						tun4in6 = value.TUN4IN6_NET_EXTENSION;
-						break;
-						}
-				}
-
-			if ( tun4in6 )
-			{
-				var nodename = description.globalId.replace(/\..+$/,'');
-
-				for( var i = 0; i < tun4in6.length; i++ )
-				{
-					var tr = tb.insertRow(-1);
-					var network =  tun4in6[i].network;
-					var network_len = tun4in6[i].networklen;
-					var network_bw = tun4in6[i].bandwidth;
-
-					if ( network_len >= 32 ) continue;
-
-					tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((rowcount++ % 2) + 1);
-					tr.insertCell(-1).innerHTML = String.format('<a href="/cgi-bin/bmx6control?function=gwselect&amp;node=%s"><img src="%s" /></a>',nodename,tunicon);
-					tr.insertCell(-1).innerHTML = nodename;
-					tr.insertCell(-1).innerHTML = network + '/' + network_len;
-					tr.insertCell(-1).innerHTML = network_bw;
-
-
-				}
-
-				if( tb.rows.length == 1 )
-				{
-					var tr = tb.insertRow(-1);
-						tr.className = 'cbi-section-table-row';
-
-					var td = tr.insertCell(-1);
-						td.colSpan = 4;
-						td.innerHTML = '<em><br /><%:There are no gateways announced in the network.%></em>';
-				}
-				}
-			}
-		}
-	);
-//]]></script>
-
-<style>
-
-	div.hideme{
-		display: none;
-	}
-
-	div.info{
-		background: #FFF;
-		border: solid 1px;
-		height: 80px;
-		display: block;
-		overflow: auto;
-	}
-
-	div.inforow{
-		text-align:left;
-		display:inline-block;
-		width:20%;
-		margin:5px;
-		vertical-align:top;
-
-	}
-
-#extra-info ul { list-style: none outside none; margin-left: 0em; }
-
-</style>
-<div class="cbi-map">
-
-<h2>Originators</h2>
-<div class="cbi-map-descr"></div>
-<fieldset class="cbi-section">
-	<legend><%:Mesh gateways%></legend>
-	<table class="cbi-section-table" id="descriptions_table">
-		<tr class="cbi-section-table-titles">
-			<th class="cbi-section-table-cell"></th>
-			<th class="cbi-section-table-cell"><%:Node%></th>
-			<th class="cbi-section-table-cell"><%:Network%></th>
-			<th class="cbi-section-table-cell"><%:Bandwidth%></th>
-		</tr>
-		<tr class="cbi-section-table-row">
-			<td colspan="4"><em><br /><%:Collecting data...%></em></td>
-		</tr>
-	</table>
-</fieldset>
-
-</div>
-
-<%+footer%>
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/view/bmx6/graph.htm

@@ -1,49 +0,0 @@
-<%#
-Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-Contributors Jo-Philip
-
-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 2 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, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-The full GNU General Public License is included in this distribution in
-the file called "COPYING".
--%>
-
-<%
-	luci.http.prepare_content("text/html")
-
-	local location = { unpack(luci.dispatcher.context.path) }
-	location[#location] = "topology"
-%>
-
-<%+header%>
-
-<button id="redraw" onclick="redraw();">&nbsp redraw &nbsp</button>
-
-<div id="wait" style="text-align: center">
-<br /><br />
-<img src="<%=resource%>/icons/loading.gif" />
-<%:Collecting data...%>
-
-</div>
-
-<div id="canvas" style="min-width:1024px; min-height:1024px"></div>
-
-<script type="text/javascript" src="<%=resource%>/jquery/jquery-1.4.js"></script>
-<script type="text/javascript" src="<%=resource%>/dracula/raphael-min.js"></script>
-<script type="text/javascript" src="<%=resource%>/dracula/dracula_graffle.js"></script>
-<script type="text/javascript" src="<%=resource%>/dracula/dracula_graph.js"></script>
-<script type="text/javascript" src="<%=resource%>/bmx6/js/bmx6-graph.js"></script>
-
-<%+footer%>

luci-app-bmx6/bmx6/usr/lib/lua/luci/view/bmx6/links.htm

@@ -1,55 +0,0 @@
-<%+header%>
-<meta http-equiv="refresh" content="10" />
-<h2><a id="content" name="content"><%:Links%></a></h2>
-<br />
-<div id="links" style="position:relative;padding-left:2px">
-
-<% for j,d in pairs(links) do %>
-
-	<table>
-	<tr>
-		<td><img src="/luci-static/resources/bmx6/wifi.png"/></td>
-		<td><strong><%=j%></strong></td>
-	</tr>
-	</table>
-
-	<div style="display:table">
-
-<% for i,l in ipairs(d) do  %>
-	<div id="link" style="background-color:#dadbe9;left:50px;width:300px;margin:10px;float:left;position:relative">
-	<table>
-	<tr><th colspan="2">
-		<span style="color:grey;font-weight:700;text-align:left;">
-		<%=l.name%>
-		<br />
-		</span>
-	</th></tr>
-	<tr>
-		<td><img src="/luci-static/resources/bmx6/link.png"/></td>
-		<td>
-		<ul>
-			<li>Local IP: <a href="[<%=l.llocalIp%>]"><%=l.llocalIp%></a></li>
-			<li>Device: <%=l.viaDev%></li>
-			<li>Rate (rx/tx):
-				<% if l.rxRate+l.txRate < 120 then %>
-					<span style="color:red;">
-				<% else %>
-					<span style="color:green;">
-				<% end %>
-					<%=l.rxRate%>/<%=l.txRate%>
-				</span>
-			</li>
-			<li>Routes: <%=l.routes%></li>
-		</ul>
-		</td>
-	</tr>
-	</table>
-	</div>
-<% end %>
-</div>
-<% end %>
-</div>
-
-<br />
-<br />
-<%+footer%>

luci-app-bmx6/bmx6/usr/lib/lua/luci/view/bmx6/nodes_j.htm

@@ -1,204 +0,0 @@
-<%#
-   Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-   Contributors Lluis Esquerda <eskerda@gmail.com>
-
-   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 2 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, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   The full GNU General Public License is included in this distribution in
-   the file called "COPYING".
--%>
-
-<%+header%>
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript" src="<%=resource%>/bmx6/js/polling.js"></script>
-
-
-<style>
-
-	div.hideme{
-		display: none;
-	}
-
-	div.info{
-		background: #FFF;
-		border: solid 0px;
-		height: 90px;
-		display: block;
-		overflow: auto;
-	}
-
-	div.inforow{
-		text-align:left;
-		display:inline-block;
-		width:20%;
-		margin:5px;
-		vertical-align:top;
-
-	}
-
-#extra-info ul { list-style: none outside none; margin-left: 0em; }
-
-</style>
-<div class="cbi-map">
-
-<h2>Node originators</h2>
-<div class="cbi-map-descr"></div>
-<div id="extra-info" class="info">
-	<br />
-	<center>
-	Click icon <img src="<%=resource%>/bmx6/world.png" /> to see individual node information
-	</center>
-</div>
-<fieldset class="cbi-section">
-	<legend><%:Mesh nodes%></legend>
-	<table class="cbi-section-table" id="descriptions_table">
-		<tr class="cbi-section-table-titles">
-			<th class="cbi-section-table-cell"></th>
-			<th class="cbi-section-table-cell"><%:Hostname%></th>
-			<th class="cbi-section-table-cell"><%:Primary IP%></th>
-			<th class="cbi-section-table-cell"><%:Via Device%></th>
-			<th class="cbi-section-table-cell"><%:Metric%></th>
-			<th class="cbi-section-table-cell"><%:Last Desc%></th>
-			<th class="cbi-section-table-cell"><%:Last Ref%></th>
-			<th class="cbi-section-table-cell"><%:Blocked%></th>
-		</tr>
-		<tr class="cbi-section-table-row">
-			<td colspan="8"><br /><center><em><%:Collecting data...%></em></center></td>
-		</tr>
-	</table>
-</fieldset>
-
-</div>
-
-<script type="text/javascript">//<![CDATA[
-		var displayExtraInfo = function ( id ) {
-		  document.getElementById('extra-info').innerHTML = document.getElementById(id).innerHTML;
-		}
-	
-		new TablePooler(5,"/cgi-bin/bmx6-info", {'neighbours':''}, "descriptions_table", function(st){
-	  	  var infoicon = "<%=resource%>/bmx6/world_small.png";
-		  var nodeicon = "<%=resource%>/bmx6/world.png";
-	  	  var originators = st.neighbours[0].originators;
-	  	  var descriptions = st.neighbours[1].descriptions;
-	  	  var res = Array();
-	  	  var error = "";
-
-	  	  if ( originators.length != descriptions.length )
-	  	  {
-	  		error = '<em><br /><%:Some problem with JSON: lenght of originators and descriptions differs. %> \
-	  		<%: Please perform a cache flush from a console it this persists: bmx6 -c --flushAll %></em>';
-	  		res.push([[error,7]]);
-	  		return res;
-	  	  }  
-
-	  	  for ( var i = 0; i < descriptions.length; i++ ){
-			var nodename =  descriptions[i].DESC_ADV.globalId.replace(/\.[^\.]+$/,"");		
-			var extensions = descriptions[i].DESC_ADV.extensions;
-			//var extrainfo = '<a onclick="displayExtraInfo(\'ip-' + i + '\')"><img src="' + infoicon + '" / ></a>';
-			var extrainfo_link = '<a onclick="displayExtraInfo(\'ip-' + i + '\')">' +  '<img src="' + infoicon + '" />' + '</a>';
-			// Looking for the extensions
-			var hna6 = [];
-			var tun4in6 = [];
-			var tun6in6 = [];
-
-			for( var e = 0; e < extensions.length; e++)
-				{
-				if( extensions[e].HNA6_EXTENSION )
-				hna6 = extensions[e].HNA6_EXTENSION;
-				if ( extensions[e].TUN4IN6_NET_EXTENSION )
-				tun4in6 = extensions[e].TUN4IN6_NET_EXTENSION;
-				tun6in6 = extensions[e].TUN6IN6_NET_EXTENSION;
-				}
-
-			// Gateways
-			var gateways = '<ul>';
-			if ( typeof(tun4in6) !== "undefined" && tun4in6 !== null )
-			for ( var t = 0; t < tun4in6.length; t++)
-				{
-				if ( tun4in6[t].networklen == "32" )
-					gateways += '<li><a href="http://' + tun4in6[t].network + '">' + tun4in6[t].network + '</a></li>';
-				else
-					gateways += "<li>"+tun4in6[t].network+'/'+tun4in6[t].networklen + ' | ' + tun4in6[t].bandwidth+'</li>';
-				}
-
-			if ( typeof(tun6in6) !== "undefined" && tun6in6 !== null )
-			for ( var t = 0; t < tun6in6.length; t++)
-				{
-				if ( tun6in6[t].networklen == "128" )
-					gateways += '<li><a href="http://' + tun6in6[t].network + '">' + tun6in6[t].network + '</a></li>';
-				else
-					gateways += "<li>"+tun6in6[t].network+'/'+tun6in6[t].networklen + ' | ' + tun6in6[t].bandwidth+'</li>';
-				}
-
-			gateways += '</ul>';
-
-			//Adding HNAs with prefix=128 as main address
-			var ipstxt = '';
-			var address;
-			var first = 1;
-			var ipstxt_hidden = '<ul>';
-			var hna6list = '<ul>';
-			var extrainfo = "";
-
-			for( var e = 0; e < hna6.length; e++ )
-			{
-				address = hna6[e].address;
-				prefix = hna6[e].prefixlen;
-				if ( prefix == '128' )
-					{
-					if (first)
-						{
-						ipstxt += address;
-						ipstxt_hidden += '<li><a href="http://['+address+']" >'+address+"</a></li>";
-						first = 0;
-						}
-					else 	{
-						ipstxt_hidden += '<li><a href="http://['+address+']" >'+address+"</a></li>";
-						}
-					}
-				else	{
-					hna6list += '<li>'+address+'/'+prefix+'</li>';
-					}
-			}
-			hna6list += '</ul>';
-			ipstxt_hidden += '</ul>';
-
-			extrainfo = '<div id="ip-'+ i +'" class="hideme">'
-			+ "<div class='inforow'>" 
-			+ "<h4>" + nodename  + '</h4>\n' + '<img src="' + nodeicon + '" />'+ "</div>"
-			
-			+ "<div class='inforow'>"
-			+ "<h5>Available IPs</h5>\n"
-			+ ipstxt_hidden + "</div>\n"
-			
-			+ "<div class='inforow'>"
-			+ "<h5>Gateways announced</h5>\n"
-			+ gateways + "</div>\n"
-			
-			+ "<div class='inforow'>"
-			+ "<h5>Networks announced</h5>\n"
-			+ hna6list +  "</div>\n"
-			+ "\n</div>";
-			
-			res.push([extrainfo_link,nodename, ipstxt, originators[i].viaDev, originators[i].metric,
-			originators[i].lastDesc, originators[i].lastRef, originators[i].blocked, extrainfo]);
-
-		  }
-		  return res;
-		});
-//]]></script>
-
-<%+footer%>
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/view/bmx6/status_j.htm

@@ -1,88 +0,0 @@
-<%+header%>
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript" src="<%=resource%>/bmx6/js/polling.js"></script>
-
-
-<style>
-
-	div.hideme{
-		display: none;
-	}
-
-	div.info{
-		background: #FFF;
-		border: solid 1px;
-		height: 80px;
-		display: block;
-		overflow: auto;
-	}
-
-	div.inforow{
-		text-align:left;
-		display:inline-block;
-		width:20%;
-		margin:5px;
-		vertical-align:top;
-
-	}
-
-#extra-info ul { list-style: none outside none; margin-left: 0em; }
-
-</style>
-<div class="cbi-map">
-<center>
-<img src="<%=resource%>/bmx6/bmx6logo.png" />
-<br />
-<br />
-a mesh routing protocol for Linux devices.<br />
-Visit <a href="http://bmx6.net">bmx6.net</a> for more info.
-<br />
-<br />
-</center>
-
-<h2>status</h2>
-<div class="cbi-map-descr"></div>
-<fieldset class="cbi-section">
-	<legend><%:status%></legend>
-	<table class="cbi-section-table" id="status_table">
-		<tr class="cbi-section-table-titles">
-			<th class="cbi-section-table-cell"><%:Version%></th>
-			<th class="cbi-section-table-cell"><%:Primary IP%></th>
-			<th class="cbi-section-table-cell"><%:Tun6Address%></th>
-			<th class="cbi-section-table-cell"><%:Tun4Address%></th>
-			<th class="cbi-section-table-cell"><%:Uptime%></th>
-			<th class="cbi-section-table-cell"><%:Cpu load%></th>
-			<th class="cbi-section-table-cell"><%:Nodes seen%></th>
-		</tr>
-	        <tr class="cbi-section-table-row">
-			<td colspan="7"><em><br /><%:Collecting data...%></em></td>
-		</tr>
-	</table>
-</fieldset>
-
-</div>
-
-<script type="text/javascript">//<![CDATA[
-		new TablePooler(5,"/cgi-bin/bmx6-info", {'info':''}, "status_table", function(st){
-		var res = Array();
-		var sta = st.info[0].status;
-		var ifaces = st.info[1].interfaces;
-
-		res.push([sta.version+'/'+sta.compat,sta.primaryIp,sta.tun6Address,
-			sta.tun4Address,sta.uptime,sta.cpu,sta.nodes]);
-		res.push(['<br/>','','','','','','',''])
-		res.push(['','','','','','','',''])
-		res.push(['<b>Interface Name</b>','<b>State</b>','<b>Type</b>','<b>Rate</b>','<b>Local IP</b>','<b>Global IP</b>','<b>is Primary</b>'])
-
-		for ( var i = 0; i < ifaces.length; i++)
-			{
-			res.push([ifaces[i].devName,ifaces[i].state,ifaces[i].type,ifaces[i].rateMin+"/"+ifaces[i].rateMax,
-                              ifaces[i].llocalIp,ifaces[i].globalIp,ifaces[i].primary],'');
-			}
-
-		return res;
-		});
-//]]></script>
-
-<%+footer%>
-

luci-app-bmx6/bmx6/usr/lib/lua/luci/view/bmx6/tunnels_j.htm

@@ -1,106 +0,0 @@
-<%#
-   Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-   Contributors Lluis Esquerda <eskerda@gmail.com>
-
-   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 2 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, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   The full GNU General Public License is included in this distribution in
-   the file called "COPYING".
--%>
-
-
-<%+header%>
-<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript" src="<%=resource%>/bmx6/js/polling.js"></script>
-
-
-<style>
-
-	div.hideme{
-		display: none;
-	}
-
-	div.info{
-		background: #FFF;
-		border: solid 1px;
-		height: 80px;
-		display: block;
-		overflow: auto;
-	}
-
-	div.inforow{
-		text-align:left;
-		display:inline-block;
-		width:20%;
-		margin:5px;
-		vertical-align:top;
-
-	}
-
-#extra-info ul { list-style: none outside none; margin-left: 0em; }
-
-</style>
-<div class="cbi-map">
-
-<h2>Gateways tunnel announcements</h2>
-<div class="cbi-map-descr"></div>
-<fieldset class="cbi-section">
-	<legend><%:Mesh gateways%></legend>
-	<table class="cbi-section-table" id="descriptions_table">
-		<tr class="cbi-section-table-titles">
-			<th class="cbi-section-table-cell"></th>
-			<th class="cbi-section-table-cell"><%:Tunnel%></th>
-			<th class="cbi-section-table-cell"><%:Node%></th>
-			<th class="cbi-section-table-cell"><%:Network%></th>
-			<th class="cbi-section-table-cell"><%:Bandwidth%></th>
-			<th class="cbi-section-table-cell"><%:SearchNet%></th>
-			<th class="cbi-section-table-cell"><%:Path Metric%></th>
-			<th class="cbi-section-table-cell"><%:Tun metric%></th>
-			<th class="cbi-section-table-cell"><%:Rating%></th>
-			<th class="cbi-section-table-cell"><%:Src%></th>
-			<th class="cbi-section-table-cell"><%:Search id%></th>
-		</tr>
-		<tr class="cbi-section-table-row">
-			<td colspan="10"><em><br /><%:Collecting data...%></em></td>
-		</tr>
-	</table>
-</fieldset>
-
-</div>
-
-<script type="text/javascript">//<![CDATA[
-		new TablePooler(5,"/cgi-bin/bmx6-info", {'tunnels':''}, "descriptions_table", function(st){
-                  var tunicon = "<%=resource%>/icons/tunnel.png";
-                  var tunicon_dis = "<%=resource%>/icons/tunnel_disabled.png";
-                  var applyicon = "<%=resource%>/cbi/apply.gif";
-		  var res = Array();
-                  for ( var k in st.tunnels ){
-                        var tunnel = st.tunnels[k];
-                        var nodename = tunnel.remoteName.replace(/\..+$/,'');
-			var advnet = tunnel.advNet;
-			var status = '<img src="'+tunicon_dis+'"/>';
-
-			if ( tunnel.tunName != "---" ) status = '<img src="'+tunicon+'"/>';
-			if ( advnet == "0.0.0.0/0" ) advnet = "<b>Internet</b>";
-
-			res.push([status, tunnel.name, nodename, advnet, tunnel.advBw, tunnel.net,
-				tunnel.pathMtc, tunnel.tunMtc, tunnel.rating, tunnel.srcIngress, tunnel.id]);
-		  }
-		  return res;
-		});
-//]]></script>
-
-<%+footer%>
-

luci-app-bmx6/bmx6/www/cgi-bin/bmx6-info

@@ -1,126 +0,0 @@
-#!/bin/sh
-# This script gives information about bmx6
-# Can be executed from a linux shell: ./bmx6-info -s links
-# Or from web interfae (with cgi enabled): http://host/cgi-bin/bmx6-info?links
-# Special methods are tagged with '$', like $myself or $neighbours: http://host/cgi-bin/bmx6-info?$myself
-# When '$' is not used, raw bmx6 information from the filesystem is returned (/var/runb/bmx6/json/)
-
-BMX6_DIR="$(uci get bmx6.general.runtimeDir 2>/dev/null)" || BMX6_DIR="/var/run/bmx6/json"
-
-#Checking if shell mode or cgi-bin mode
-if [ "$1" == "-s" ]; then
-  QUERY="$2"
-else
-  QUERY="${QUERY_STRING%%=*}"
-  QUERY="${QUERY%%\?*}"
-  QUERY="${QUERY%%\&*}"
-  echo "Content-type: application/json"
-  echo ""
-fi
-
-# workaround to support old format starting with '$'
-QUERY="$(echo "$QUERY" | sed s/'\$'//)"
-
-check_path() {
-  [ -d "$1" ] && path=$(cd $1; pwd)
-  [ -f "$1" ] && path=$(cd $1/..; pwd)
-  [ $(echo "$path" | grep -c "^$BMX6_DIR") -ne 1 ] && exit 1
-}
-
-print_query() {
-  # If the query is a directory
-  [ -d "$BMX6_DIR/$1" ] &&
-  {
-    # If /all has not been specified
-    [ -z "$QALL" ] &&
-    {
-      total=$(ls $BMX6_DIR/$1 | wc -w)
-      i=1
-      echo -n "{ \"$1\": [ "
-      for f in $(ls $BMX6_DIR/$1); do
-        echo -n "{ \"name\": \"$f\" }"
-        [ $i -lt $total ]  && echo -n ','
-        i=$(( $i + 1 ))
-      done
-      echo -n " ] }"
-
-      # If /all has been specified, printing all the files together
-      } || {
-      comma=""
-      echo -n "[ "
-      for entry in "$BMX6_DIR/$1/"*; do
-        [ -f "$entry" ] &&
-        {
-          ${comma:+echo -n "$comma"}
-          tr -d '\n' < "$entry"
-          comma=","
-        }
-      done
-      echo -n " ]"
-    }
-  }
-  # If the query is a file, just printing the file
-  [ -f "$BMX6_DIR/$1" ] && cat "$BMX6_DIR/$1";
-}
-
-if [ "${QUERY##*/}" == "all" ]; then
-  QUERY="${QUERY%/all}"
-  QALL=1
-fi
-
-if [ "$QUERY" == 'myself' ]; then
-  hostname="$(cat /proc/sys/kernel/hostname)"
-  ip6="$(bmx6 -c show=status | grep ^BMX | awk '{print $5}')"
-  ip4="$(bmx6 -c show=status | grep ^BMX | awk '{print $6}')"
-  cidr6=$(lua -l luci.ip -e "ip=luci.ip.new(\"$ip6\"); print(ip:network():string()..'/'..ip:prefix())")
-  cidr4=$(lua -l luci.ip -e "ip=luci.ip.new(\"$ip4\"); print(ip:network():string()..'/'..ip:prefix())")
-  echo -n "{\"myself\":{\"hostname\":\"$hostname\",\"ip6\":\"$ip6\",\"ip4\":\"$ip4\",\"net6\":\"$cidr6\",\"net4\":\"$cidr4\"}}"
-  exit 0
-fi
-
-if [ "$QUERY" == 'info' ]; then
-  echo -n '{ "info": [ '
-  print_query status
-  echo -n ","
-  print_query interfaces
-  echo -n "] }"
-  exit 0
-fi
-
-if [ "$QUERY" == 'neighbours' ]; then
-  QALL=1
-  echo -n '{ "neighbours": [ '
-  echo -n '{ "originators": '
-  print_query originators
-  echo -n '}, '
-  echo -n '{ "descriptions": '
-  print_query descriptions
-  echo -n "} ] }"
-  exit 0
-fi
-
-if [ "$QUERY" == 'tunnels' ]; then
-  tunnels=$(bmx6 -c --jshow tunnels /r=0)
-  if [ -z "$tunnels" ]; then
-    echo '{ "tunnels" : [] }'
-  else
-    echo $tunnels
-  fi
-  exit 0
-fi
-
-if [ "$QUERY" == "" ]; then
-  echo -n '{ "queries": ['
-  echo -n '{ "name": "myself", "info": "basic network information of self node" },'
-  echo -n '{ "name": "info", "info": "full network and device information of self node" },'
-  echo -n '{ "name": "tunnels", "info": "accnouncements (tunnels) published by the mesh network" },'
-  echo -n '{ "name": "neighbours", "info": "list of all my neighbours and their information" },'
-  echo -n '{ "name": "/", "info": "raw bmx6 json API" }]}'
-  exit 0
-fi
-
-check_path "$BMX6_DIR/$QUERY"
-print_query $QUERY
-
-#ls -1F "$BMX6_DIR"
-exit 0

luci-app-bmx6/bmx6/www/luci-static/resources/bmx6/js/bmx6-graph.js

@@ -1,234 +0,0 @@
-var graph, canvas, layouter, renderer, divwait, nodes, announcements, nodesIndex, palette, localInfo;
-document.addEventListener( "DOMContentLoaded", init, false);
-
-/**
- * Returns an index of nodes by name
- */
-function createNodeIndex(nodes) {
-  var inode, index = {};
-
-  for (inode in nodes)
-    index[nodes[inode].name] = nodes[inode];
-
-  return index;
-}
-
-/**
- * Updates to have announcements in nodes list
- */
-function processNodeAnnouncements(nodes, announcements) {
-  var iannouncement, remoteNode, announcement;
-  nodesIndex = createNodeIndex(nodes);
-
-  for(iannouncement in announcements) {
-    announcement = announcements[iannouncement];
-    if (announcement.remoteName == '---' ) continue;
-    if (!( announcement.remoteName in nodesIndex )) {
-      newNode = {
-        name: announcement.remoteName,
-        links: []
-      };
-      nodes.push(newNode);
-      nodesIndex[newNode.name] = newNode;
-    };
-
-    remoteNode = nodesIndex[announcement.remoteName];
-    if (!( 'announcements' in remoteNode )) remoteNode.announcements = [];
-    remoteNode.announcements.push(announcement);
-  };
-}
-
-function init() {
-  palette = generatePalette(200);
-
-  graph = new Graph();
-  canvas = document.getElementById('canvas');
-  layouter = new Graph.Layout.Spring(graph);
-  renderer = new Graph.Renderer.Raphael(canvas.id, graph, canvas.offsetWidth, canvas.offsetHeight);
-
-  divwait = document.getElementById("wait");
-
-  XHR.get('/cgi-bin/luci/admin/network/BMX6/topology', null, function(nodesRequest, nodesData) {
-    nodes = nodesData;
-
-    XHR.get('/cgi-bin/bmx6-info?$myself&', null, function(myselfRequest, myselfData) {
-      if (myselfData)
-        localAnnouncements = [
-          {remoteName: myselfData.myself.hostname, advNet: myselfData.myself.net4},
-          {remoteName: myselfData.myself.hostname, advNet: myselfData.myself.net6}
-        ];
-
-      XHR.get('/cgi-bin/bmx6-info?$tunnels=&', null, function(tunnelsRequest, tunnelsData) {
-        var iAnnouncement;
-
-        announcements = tunnelsData.tunnels;
-        for(iAnnouncement in localAnnouncements) {
-          announcements.push(localAnnouncements[iAnnouncement])
-        };
-
-        processNodeAnnouncements(nodes, announcements);
-
-        divwait.parentNode.removeChild(divwait);
-        draw(nodes);
-      });
-    });
-  });
-}
-
-function hashCode(str) {
-  var hash = 0;
-  if (str.length == 0) return hash;
-  for (i = 0; i < str.length; i++) {
-    char = str.charCodeAt(i);
-    hash = ((hash<<5)-hash)+char;
-    hash = hash & hash; // Convert to 32bit integer
-  }
-  return hash;
-}
-
-function generatePalette(size) {
-  var i, arr = [];
-  Raphael.getColor(); // just to remove the grey one
-  for(i = 0; i < size; i++) {
-    arr.push(Raphael.getColor())
-  }
-
-  return arr;
-}
-
-function getFillFromHash(hash) {
-  return palette[Math.abs(hash % palette.length)];
-}
-
-function hashAnnouncementsNames(announcementsNames) {
-  return hashCode(announcementsNames.sort().join('-'));
-}
-
-function getNodeAnnouncements(networkNode) {
-  return networkNode.announcements;
-}
-
-function nodeRenderer(raphael, node) {
-  var nodeFill, renderedNode, options;
-  options = {
-    'fill': 'announcements' in node.networkNode ? getFillFromHash(
-      hashAnnouncementsNames(
-        getNodeAnnouncements(node.networkNode).map(function(ann) {return ann.advNet;})
-      )
-    ) : '#bfbfbf',
-    'stroke-width': 1,
-
-  };
-
-  renderedNode = raphael.set();
-
-  renderedNode.push(raphael.ellipse(node.point[0], node.point[1], 30, 20).attr({"fill": options['fill'], "stroke-width": options['stroke-width']}));
-  renderedNode.push(raphael.text(node.point[0], node.point[1] + 30, node.networkNode.name).attr({}));
-
-  renderedNode.items.forEach(function(el) {
-    var announcements, tooltip = raphael.set();
-    tooltip.push(raphael.rect(-60, -60, 120, 60).attr({"fill": "#fec", "stroke-width": 1, r : "9px"}));
-
-    announcements = getNodeAnnouncements(node.networkNode);
-    if (announcements) {
-
-      announcements = announcements.map(function(ann) {return ann.advNet});
-      tooltip.push(raphael.text(0, -40, 'announcements\n' + announcements.join('\n')).attr({}));
-    };
-
-    el.tooltip(tooltip);
-  });
-
-  return renderedNode;
-}
-
-function genericNodeRenderer(raphael, node) {
-  var renderedNode;
-
-  renderedNode = raphael.set();
-
-  renderedNode.push(raphael.ellipse(node.point[0], node.point[1], 30, 20).attr({"fill": '#bfbfbf', "stroke-width": 1}));
-  renderedNode.push(raphael.text(node.point[0], node.point[1] + 30, node.networkNode.name).attr({}));
-
-  return renderedNode;
-}
-
-function redraw() {
-  layouter.layout();
-  renderer.draw();
-}
-
-function interpolateColor(minColor,maxColor,maxDepth,depth){
-
-  function d2h(d) {return d.toString(16);}
-  function h2d(h) {return parseInt(h,16);}
-
-  if(depth == 0){
-    return minColor;
-  }
-  if(depth == maxDepth){
-    return maxColor;
-  }
-
-  var color = "#";
-
-  for(var i=1; i <= 6; i+=2){
-    var minVal = new Number(h2d(minColor.substr(i,2)));
-    var maxVal = new Number(h2d(maxColor.substr(i,2)));
-    var nVal = minVal + (maxVal-minVal) * (depth/maxDepth);
-    var val = d2h(Math.floor(nVal));
-    while(val.length < 2){
-      val = "0"+val;
-    }
-    color += val;
-  }
-  return color;
-}
-function draw(nodes) {
-  var node, neighbourNode, seenKey, rxRate, txRate, seen, i, j, currentName, linkQuality;
-
-  seen = { };
-
-  for (i = 0; i < (nodes.length); i++) {
-    node = nodes[i];
-    graph.addNode(node.name, {
-      networkNode: node,
-      render: nodeRenderer
-    });
-  };
-
-  for (i = 0; i < (nodes.length); i++) {
-    node = nodes[i];
-
-    if (! node.name) continue;
-
-    currentName = node.name;
-
-    for (j = 0; j < (node.links.length); j++) {
-      neighbourNode = node.links[j];
-
-      graph.addNode(neighbourNode.name, {render: genericNodeRenderer, networkNode: neighbourNode});
-
-      seenKey = (node.name < neighbourNode.name) ? node.name + '|' + neighbourNode.name : neighbourNode.name + '|' + node.name;
-
-      rxRate = neighbourNode.rxRate;
-      txRate = neighbourNode.txRate;
-
-      if (!seen[seenKey] && rxRate > 0 && txRate > 0) {
-        linkQuality = ( rxRate + txRate ) / 2;
-
-        graph.addEdge(node.name, neighbourNode.name, {
-          'label': rxRate + '/' + txRate,
-          'directed': false,
-          'stroke': interpolateColor('FF0000','00FF00', 5, 5 * ( linkQuality - 1 )/100),
-          'fill': interpolateColor('FF0000','00FF00', 5, 5 * ( linkQuality - 1 )/100),
-          'label-style': { 'font-size': 8 }
-        });
-
-        seen[seenKey] = true;
-      }
-    }
-  }
-
-  redraw();
-}

luci-app-bmx6/bmx6/www/luci-static/resources/bmx6/js/polling.js

@@ -1,81 +0,0 @@
-/*
-    Copyright (C) 2011 Pau Escrich <pau@dabax.net>
-    Contributors Lluis Esquerda <eskerda@gmail.com>
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    The full GNU General Public License is included in this distribution in
-    the file called "COPYING".
-*/
-
-		
-/*
-	Table pooler is a function to easy call XHR poller. 
-
-		new TablePooler(5,"/cgi-bin/bmx6-info", {'status':''}, "status_table", function(st){
-			var table = Array()
-			table.push(st.first,st.second)
-			return table
-		}
-	Parameters are: 
-		polling_time: time between pollings
-		json_url: the json url to fetch the data
-		json_call: the json call
-		output_table_id: the table where javascript will put the data
-		callback_function: the function that will be executed each polling_time
-	
-	The callback_function must return an array of arrays (matrix).
-	In the code st is the data obtained from the json call
-*/
-
-	function TablePooler (time, jsonurl, getparams, table_id, callback) {
-		this.table = document.getElementById(table_id);
-		this.callback = callback;
-		this.jsonurl = jsonurl;
-		this.getparams = getparams;
-		this.time = time;
-
-		this.clear = function(){
-                  	/* clear all rows */
-                  	while( this.table.rows.length > 1 ) this.table.deleteRow(1);
-		}
-		this.start = function(){
-			XHR.poll(this.time, this.jsonurl, this.getparams, function(x, st){
-				var data = this.callback(st);
-				var content, tr, td;
-				this.clear();
-				for (var i = 0; i < data.length; i++){
-					tr = this.table.insertRow(-1);
-					tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
-						
-					for (var j = 0; j < data[i].length; j++){
-						td = tr.insertCell(-1);
-						if (data[i][j].length == 2) {
-							td.colSpan = data[i][j][1];
-							content = data[i][j][0];
-						}
-						else content = data[i][j];
-						td.innerHTML = content;
-					}
-				}
-			}.bind(this));
-		}
-
-
-		this.start();
-	}
-
-
-

luci-app-bmx6/bmx6/www/luci-static/resources/bmx6/style.css

@@ -1,22 +0,0 @@
-    table {
-       width:90%;
-       border-top:1px solid #e5eaf8;
-       border-right:1px solid #e5eaf8;
-       margin:1em auto;
-       border-collapse:collapse;
-     }
-
-    td {
-       color:#678197;
-       border-bottom:1px solid #e6eff8;
-       border-left:1px solid #e6eff8;
-       padding:.3em 1em;
-       text-align:center;
-     }
-    th {
-       background:#f4f9fe;
-       text-align:center;
-       font:bold 1.2em/2em Century Gothic,Trebuchet MS,Arial,Helvetica,sans-serif;
-       color:#66a3d3;
-     }
-

luci-app-bmx6/dracula/dracula_graffle.js

@@ -1 +0,0 @@
-Raphael.fn.connection=function(a,b,c){var d=this,e={draw:function(){for(var f=a.getBBox(),g=b.getBBox(),h=0,i=0,j=[{x:f.x+f.width/2,y:f.y-h},{x:f.x+f.width/2,y:f.y+f.height+h},{x:f.x-h,y:f.y+f.height/2},{x:f.x+f.width+h,y:f.y+f.height/2},{x:g.x+g.width/2,y:g.y-i},{x:g.x+g.width/2,y:g.y+g.height+i},{x:g.x-i,y:g.y+g.height/2},{x:g.x+g.width+i,y:g.y+g.height/2}],k={},l=[],m=0;m<4;m++)for(var n=4;n<8;n++){var o=Math.abs(j[m].x-j[n].x),p=Math.abs(j[m].y-j[n].y);(m==n-4||(3!=m&&6!=n||j[m].x<j[n].x)&&(2!=m&&7!=n||j[m].x>j[n].x)&&(0!=m&&5!=n||j[m].y>j[n].y)&&(1!=m&&4!=n||j[m].y<j[n].y))&&(l.push(o+p),k[l[l.length-1].toFixed(3)]=[m,n])}var q=0==l.length?[0,4]:k[Math.min.apply(Math,l).toFixed(3)],r=j[q[0]].x,s=j[q[0]].y,t=j[q[1]].x,u=j[q[1]].y,o=Math.max(Math.abs(r-t)/2,10),p=Math.max(Math.abs(s-u)/2,10),v=[r,r,r-o,r+o][q[0]].toFixed(3),w=[s-p,s+p,s,s][q[0]].toFixed(3),x=[0,0,0,0,t,t,t-o,t+o][q[1]].toFixed(3),y=[0,0,0,0,s+p,s-p,u,u][q[1]].toFixed(3),z=["M",r.toFixed(3),s.toFixed(3),"C",v,w,x,y,t.toFixed(3),u.toFixed(3)].join(",");if(c&&c.directed){var A=Math.sqrt((u-y)*(u-y)+(t-x)*(t-x)),B=function(a,b){return-a*(b||5)/A},C=[{x:(B(t-x)+B(u-y)+t).toFixed(3),y:(B(u-y)+B(t-x)+u).toFixed(3)},{x:(B(t-x)-B(u-y)+t).toFixed(3),y:(B(u-y)-B(t-x)+u).toFixed(3)}];z=z+",M"+C[0].x+","+C[0].y+",L"+t+","+u+",L"+C[1].x+","+C[1].y}var D="attr";e.fg&&e.fg[D]({path:z})||(e.fg=d.path(z).attr({stroke:c&&c.stroke||"#000",fill:"none"}).toBack()),e.bg&&e.bg[D]({path:z})||c&&c.fill&&(e.bg=c.fill.split&&d.path(z).attr({stroke:c.fill.split("|")[0],fill:"none","stroke-width":c.fill.split("|")[1]||3}).toBack()),c&&c.label&&(e.label&&e.label.attr({x:(r+t)/2,y:(s+u)/2})||(e.label=d.text((r+t)/2,(s+u)/2,c.label).attr({fill:"#000","font-size":c["font-size"]||"12px"}))),c&&c.label&&c["label-style"]&&e.label&&e.label.attr(c["label-style"]),c&&c.callback&&c.callback(e)}};return e.draw(),e};

luci-app-bmx6/jquery/jquery-1.4.js

@@ -1,154 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.2
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Sat Feb 13 22:33:48 2010 -0500
- */
-(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
-e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
-j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
-"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
-true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
-Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
-(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
-a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
-"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
-function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
-c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
-L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
-"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
-a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
-d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
-a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
-!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
-true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
-parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
-false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
-s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
-applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
-else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
-a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
-w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
-cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
-i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
-" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
-this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
-e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
-c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
-a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
-function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
-k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
-C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
-null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
-e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
-f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
-if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
-"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
-a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
-isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
-{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
-if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
-e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
-"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
-d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
-!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
-toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
-u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
-function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
-if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
-t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
-g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
-for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
-1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
-relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
-l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
-h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
-CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
-g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
-text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
-setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
-h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
-m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
-"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
-h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
-!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
-h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
-q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
-if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
-(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
-function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
-gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
-c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
-{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
-"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
-d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
-a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
-1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
-a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
-c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
-wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
-prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
-this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
-return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
-""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
-this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
-u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
-1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
-return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
-""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
-c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
-c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
-function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
-Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
-"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
-a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
-a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
-"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
-serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
-function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
-global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
-e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
-"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
-false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
-false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
-c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
-d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
-g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
-1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
-"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
-if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
-this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
-"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
-animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
-j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
-this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
-"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
-c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
-this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
-this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
-e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
-c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
-function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
-this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
-k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
-f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
-c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
-d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
-"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
-e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);

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];
 	}
 
 });

mesh11sd/Makefile

@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mesh11sd
-PKG_VERSION:=1.2.0
-PKG_RELEASE:=3
+PKG_VERSION:=2.0.0
+PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Rob White <rob@blue-wave.net>
 PKG_LICENSE:=GPL-2.0-or-later
@@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/opennds/mesh11sd/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=b719eaacf63eb3684d0cd6a026f4357a4f400f2339f5d5a6cf74ba3744fe30d8
+PKG_HASH:=741d219ea9c6fcb5e58771130c319c5b983274caf08f5c1cd5a458864e928649
 PKG_BUILD_DIR:=$(BUILD_DIR)/mesh11sd-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
@@ -41,6 +41,9 @@ define Package/mesh11sd/description
   Without mesh11sd, many mesh parameters cannot be set in the uci wireless config file as the mesh interface must be up before the parameters can be set.
   Some of those that are supported, would fail to be implemented when the network is (re)started resulting in errors or dropped nodes.
   The mesh11sd daemon dynamically checks configured parameters and sets them as required.
+  Upstream wan connectivity is checked (eg Internet feed) and when not present, layer 2 peer mode is autonomously enabled,
+  and when it is present, layer 3 portal mode is enabled. This allows the same simple router configuration to be used on all meshnodes in the layer 2 mesh.
+  Remote terminal sessions and remote file transfers are supported using the meshnode mac address as an identifier.
   This version does not require a Captive Portal to be running.
 endef
 

nodogsplash/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
-PKG_VERSION:=5.0.0
+PKG_VERSION:=5.0.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/nodogsplash/nodogsplash/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=a7665f4a42997746a31e9217f2f54e360aa7fc4bc72bd89faa08f1ccf7875b5e
+PKG_HASH:=908d3674e93726fdcefb4c3b6705c745753435df9d46425781a57e3f6b417797
 
 PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de>
 PKG_LICENSE:=GPL-2.0-or-later
@@ -26,39 +26,37 @@ define Package/nodogsplash
   SUBMENU:=Captive Portals
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpthread +iptables-mod-ipopt +libmicrohttpd-no-ssl
+  DEPENDS:=+libpthread +libmicrohttpd-no-ssl +iptables-nft \
+           +iptables-mod-nat-extra +iptables-mod-ipopt \
+           +iptables-mod-conntrack-extra
   TITLE:=Open public network gateway daemon
   URL:=https://github.com/nodogsplash/nodogsplash
-  CONFLICTS:=nodogsplash2
 endef
 
 define Package/nodogsplash/description
   Nodogsplash is a Captive Portal that offers a simple way to
   provide restricted access to the Internet by showing a splash
   page to the user before Internet access is granted.
-  It also incorporates an API that allows the creation of
-  sophisticated authentication applications.
 endef
 
 define Package/nodogsplash/install
-
+	$(INSTALL_DIR) $(1)/usr/lib/nodogsplash
+	$(INSTALL_BIN) ./files/usr/lib/nodogsplash/restart.sh $(1)/usr/lib/nodogsplash/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nodogsplash $(1)/usr/bin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ndsctl $(1)/usr/bin/
-
+	$(INSTALL_DIR) $(1)/etc/nodogsplash/htdocs/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/resources/splash.html $(1)/etc/nodogsplash/htdocs/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/resources/splash.css $(1)/etc/nodogsplash/htdocs/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/resources/status.html $(1)/etc/nodogsplash/htdocs/
 	$(INSTALL_DIR) $(1)/etc/nodogsplash/htdocs/images
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/resources/splash.jpg $(1)/etc/nodogsplash/htdocs/images/
 	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/etc/config/nodogsplash $(1)/etc/config/
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/etc/init.d/nodogsplash $(1)/etc/init.d/
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DIR) $(1)/usr/lib/nodogsplash
-	$(CP) $(PKG_BUILD_DIR)/resources/splash.html $(1)/etc/nodogsplash/htdocs/
-	$(CP) $(PKG_BUILD_DIR)/resources/splash.css $(1)/etc/nodogsplash/htdocs/
-	$(CP) $(PKG_BUILD_DIR)/resources/status.html $(1)/etc/nodogsplash/htdocs/
-	$(CP) $(PKG_BUILD_DIR)/resources/splash.jpg $(1)/etc/nodogsplash/htdocs/images/
-	$(CP) $(PKG_BUILD_DIR)/openwrt/nodogsplash/files/etc/config/nodogsplash $(1)/etc/config/
-	$(CP) $(PKG_BUILD_DIR)/openwrt/nodogsplash/files/etc/init.d/nodogsplash $(1)/etc/init.d/
-	$(CP) $(PKG_BUILD_DIR)/openwrt/nodogsplash/files/etc/uci-defaults/40_nodogsplash $(1)/etc/uci-defaults/
-	$(CP) $(PKG_BUILD_DIR)/openwrt/nodogsplash/files/usr/lib/nodogsplash/restart.sh $(1)/usr/lib/nodogsplash/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/40_nodogsplash $(1)/etc/uci-defaults/
 endef
 
 define Package/nodogsplash/postrm

nodogsplash/files/etc/config/nodogsplash

@@ -0,0 +1,152 @@
+
+# The options available here are an adaptation of the settings used in nodogsplash.conf.
+# See https://github.com/nodogsplash/nodogsplash/blob/master/resources/nodogsplash.conf
+
+config nodogsplash
+  # Set to 0 to disable nodogsplash
+  option enabled 1
+
+  # Set to 0 to disable hook that makes nodogsplash restart when the firewall restarts.
+  # This hook is needed as a restart of Firewall overwrites nodogsplash iptables entries.
+  option fwhook_enabled '1'
+
+  # WebRoot
+  # Default: /etc/nodogsplash/htdocs
+  #
+  # The local path where the splash page content resides.
+  # ie. Serve the file splash.html from this directory
+  #option webroot '/etc/nodogsplash/htdocs'
+
+  # Use plain configuration file
+  #option config '/etc/nodogsplash/nodogsplash.conf'
+
+  # Use this option to set the device nodogsplash will bind to.
+  # The value may be an interface section in /etc/config/network or a device name such as br-lan.
+  option gatewayinterface 'br-lan'
+
+  # GatewayPort
+  # Default: 2050
+  #
+  # Nodogsplash's own http server uses gateway address as its IP address.
+  # The port it listens to at that IP can be set here; default is 2050.
+  #
+  #option gatewayport '2050'
+
+
+  option gatewayname 'OpenWrt Nodogsplash'
+  option maxclients '250'
+
+  # Enables debug output (0-3)
+  #option debuglevel '1'
+
+  # Client timeouts in minutes
+  option preauthidletimeout '30'
+  option authidletimeout '120'
+  # Session Timeout is the interval after which clients are forced out (a value of 0 means never)
+  option sessiontimeout '1200'
+
+  # The interval in seconds at which nodogsplash checks client timeout status
+  option checkinterval '600'
+
+  # Enable BinAuth Support.
+  # If set, a program is called with several parameters on authentication (request) and deauthentication.
+  # Request for authentication:
+  # $<BinAuth> auth_client <client_mac> '<username>' '<password>'
+  #
+  # The username and password values may be empty strings and are URL encoded.
+  # The program is expected to output the number of seconds the client
+  # is to be authenticated. Zero or negative seconds will cause the authentification request
+  # to be rejected. The same goes for an exit code that is not 0.
+  # The output may contain a user specific download and upload limit in KBit/s:
+  # <seconds> <upload> <download>
+  #
+  # Called on authentication or deauthentication:
+  # $<BinAuth> <*auth|*deauth> <incoming_bytes> <outgoing_bytes> <session_start> <session_end>
+  #
+  # "client_auth": Client authenticated via this script.
+  # "client_deauth": Client deauthenticated by the client via splash page.
+  # "idle_deauth": Client was deauthenticated because of inactivity.
+  # "timeout_deauth": Client was deauthenticated because the session timed out.
+  # "ndsctl_auth": Client was authenticated manually by the ndsctl tool.
+  # "ndsctl_deauth": Client was deauthenticated by the ndsctl tool.
+  # "shutdown_deauth": Client was deauthenticated by Nodogsplash terminating.
+  #
+  # Values session_start and session_start are in seconds since 1970 or 0 for unknown/unlimited.
+  #
+  #option binauth '/bin/myauth.sh'
+  # Enable PreAuth Support.
+  #
+  # A simple login script is provided in the package.
+  # This generates a login page asking for usename and email address.
+  # User logins are recorded in the log file /tmp/ndslog.log
+  # Details of how the script works are contained in comments in the script itself.
+  #
+  # The Preauth program will output html code that will be served to the client by NDS
+  # Using html GET the Preauth program may call:
+  # /nodogsplash_preauth/ to ask the client for more information
+  # or
+  # /nodogsplash_auth/ to authenticate the client
+  #
+  # The Preauth program should append at least the client ip to the query string
+  # (using html input type hidden) for all calls to /nodogsplash_preauth/
+  # It must also obtain the client token using ndsctl (or the original query string if fas_secure_enabled=0)
+  # for NDS authentication when calling /nodogsplash_auth/
+  #
+  #option preauth '/usr/lib/nodogsplash/login.sh'
+
+  # Your router may have several interfaces, and you
+  # probably want to keep them private from the gatewayinterface.
+  # If so, you should block the entire subnets on those interfaces, e.g.:
+  #list authenticated_users 'block to 192.168.0.0/16'
+  #list authenticated_users 'block to 10.0.0.0/8'
+
+  # Typical ports you will probably want to open up.
+  #list authenticated_users 'allow tcp port 22'
+  #list authenticated_users 'allow tcp port 53'
+  #list authenticated_users 'allow udp port 53'
+  #list authenticated_users 'allow tcp port 80'
+  #list authenticated_users 'allow tcp port 443'
+  # Or for happy customers allow all
+  list authenticated_users 'allow all'
+
+  # For preauthenticated users to resolve IP addresses in their
+  # initial request not using the router itself as a DNS server,
+  # Leave commented to help prevent DNS tunnelling
+  #list preauthenticated_users 'allow tcp port 53'
+  #list preauthenticated_users 'allow udp port 53'
+
+  # Allow ports for SSH/Telnet/DNS/DHCP/HTTP/HTTPS
+  list users_to_router 'allow tcp port 22'
+  list users_to_router 'allow tcp port 23'
+  list users_to_router 'allow tcp port 53'
+  list users_to_router 'allow udp port 53'
+  list users_to_router 'allow udp port 67'
+  list users_to_router 'allow tcp port 80'
+
+  # MAC addresses that are / are not allowed to access the splash page
+  # Value is either 'allow' or 'block'. The allowedmac or blockedmac list is used.
+  #option macmechanism 'allow'
+  #list allowedmac '00:00:C0:01:D0:0D'
+  #list allowedmac '00:00:C0:01:D0:1D'
+  #list blockedmac '00:00:C0:01:D0:2D'
+
+  # MAC addresses that do not need to authenticate
+  #list trustedmac '00:00:C0:01:D0:1D'
+
+  # Nodogsplash uses specific HEXADECIMAL values to mark packets used by iptables as a bitwise mask.
+  # This mask can conflict with the requirements of other packages such as mwan3, sqm etc
+  # Any values set here are interpreted as in hex format.
+  #
+  # List: fw_mark_authenticated
+  # Default: 30000 (0011|0000|0000|0000|0000 binary)
+  #
+  # List: fw_mark_trusted
+  # Default: 20000 (0010|0000|0000|0000|0000 binary)
+  #
+  # List: fw_mark_blocked
+  # Default: 10000 (0001|0000|0000|0000|0000 binary)
+  #
+  #option fw_mark_authenticated '30000'
+  #option fw_mark_trusted '20000'
+  #option fw_mark_blocked '10000'
+

nodogsplash/files/etc/init.d/nodogsplash

@@ -0,0 +1,215 @@
+#!/bin/sh /etc/rc.common
+
+#
+# Startup/shutdown script for nodogsplash captive portal
+#
+
+START=95
+STOP=95
+
+USE_PROCD=1
+
+IPT=/usr/sbin/iptables
+WD_DIR=/usr/bin
+
+# Run in PROCD (-f) and log to SYSLOG (-s)
+OPTIONS="-f -s"
+#
+
+CONFIG=""
+
+
+addline() {
+  append CONFIG "$1" "$N"
+}
+
+setup_mac_lists() {
+  local cfg="$1"
+  local macs=""
+  local val
+
+  append_mac() {
+    append macs "$1" ","
+  }
+
+  config_get val "$cfg" macmechanism
+  if [ -z "$val" ]; then
+    # Check if we have AllowedMACList or BlockedMACList defined they will be ignored
+    config_get val "$cfg" allowedmac
+    if [ -n "$val" ]; then
+      echo "Ignoring allowedmac - macmechanism not \"allow\"" >&2
+    fi
+
+    config_get val "$cfg" blockedmac
+    if [ -n "$val" ]; then
+      echo "Ignoring blockedmac - macmechanism not \"block\"" >&2
+    fi
+  elif [ "$val" = "allow" ]; then
+    config_list_foreach "$cfg" allowedmac append_mac
+    addline "MACmechanism allow"
+    addline "AllowedMACList $macs"
+  elif [ "$val" = "block" ]; then
+    config_list_foreach "$cfg" blockedmac append_mac
+    addline "MACmechanism block"
+    addline "BlockedMACList $macs"
+  else
+    echo "Invalid macmechanism '$val' - allow or block are valid." >&2
+    return 1
+  fi
+
+  macs=""
+  config_list_foreach "$cfg" trustedmac append_mac
+  if [ -n "$macs" ]; then
+    addline "TrustedMACList $macs"
+  fi
+
+  return 0
+}
+
+setup_firewall() {
+  local cfg="$1"
+  local uci_name
+  local val
+
+  append_firewall() {
+    addline "  FirewallRule $1"
+  }
+
+  for rule in authenticated-users preauthenticated-users users-to-router trusted-users trusted-users-to-router; do
+    # uci does not allow dashes
+    uci_name=${rule//-/_}
+    addline "FirewallRuleSet $rule {"
+    config_list_foreach "$cfg" "$uci_name" append_firewall
+    addline "}"
+    config_get val "$cfg" "policy_${uci_name}"
+    if [ -n "$val" ]; then
+      addline "EmptyRuleSetPolicy $rule $val"
+    fi
+  done
+}
+
+wait_for_interface() {
+  local ifname="$1"
+  local timeout=10
+
+  for i in $(seq $timeout); do
+    if [ $(ip -4 addr show dev $ifname 2> /dev/null | grep -c inet) -ne 0 ]; then
+      break
+    fi
+    sleep 1
+    if [ $i = $timeout ]; then
+      echo "Interface $ifname not detected." >&2
+      return 1
+    fi
+  done
+
+  return 0
+}
+
+generate_uci_config() {
+  local cfg="$1"
+  local val
+  local ifname
+  local download
+  local upload
+
+  # Init config file content
+  CONFIG="# auto-generated config file from /etc/config/nodogsplash"
+
+  config_get val "$cfg" config
+  if [ -n "$val" ]; then
+    if [ ! -f "$val" ]; then
+      echo "Configuration file '$file' doesn't exist." >&2
+      return 1
+    fi
+    addline "$(cat $val)"
+  fi
+
+  config_get ifname "$cfg" gatewayinterface
+
+  # Get device name if interface name is a section name in /etc/config/network
+  if network_get_device tmp "$ifname"; then
+    ifname="$tmp"
+  fi
+
+  if [ -z "$ifname" ]; then
+    echo "Option network or gatewayinterface missing." >&2
+    return 1
+  fi
+
+  wait_for_interface "$ifname" || return 1
+
+  addline "GatewayInterface $ifname"
+
+  for option in preauth binauth \
+    daemon debuglevel maxclients gatewayname gatewayinterface gatewayiprange \
+    gatewayaddress gatewayport webroot splashpage statuspage \
+    redirecturl sessiontimeout preauthidletimeout authidletimeout checkinterval \
+    setmss mssvalue trafficcontrol downloadlimit uploadlimit \
+    syslogfacility ndsctlsocket fw_mark_authenticated \
+    fw_mark_blocked fw_mark_trusted
+  do
+    config_get val "$cfg" "$option"
+
+    if [ -n "$val" ]; then
+      addline "$option $val"
+    fi
+  done
+  for option in fasport fasremoteip faspath fas_secure_enabled ; do
+    config_get val "$cfg" "$option"
+    if [ -n "$val" ]; then
+      echo "Warning: nodogsplash does not support $val"
+      return 1
+    fi
+  done
+  config_get download "$cfg" downloadlimit
+  config_get upload "$cfg" uploadlimit
+
+  if [ -n "$upload" -o -n "$download" ]; then
+    addline "TrafficControl yes"
+  fi
+
+  setup_mac_lists "$cfg" || return 1
+  setup_firewall "$cfg"
+
+  echo "$CONFIG" > "/tmp/etc/nodogsplash_$cfg.conf"
+  return 0
+}
+
+# setup configuration and start instance
+create_instance() {
+  local cfg="$1"
+  local val
+
+  config_get_bool val "$cfg" enabled 0
+  [ $val -gt 0 ] || return 0
+
+  if ! generate_uci_config "$cfg"; then
+    echo "Can not generate uci config. Will not start instance $cfg." >&2
+    return 1
+  fi
+
+  procd_open_instance $cfg
+  procd_set_param command /usr/bin/nodogsplash -c "/tmp/etc/nodogsplash_$cfg.conf" $OPTIONS
+  procd_set_param respawn
+  procd_set_param file "/tmp/etc/nodogsplash_$cfg.conf"
+  procd_close_instance
+}
+
+start_service() {
+  # For network_get_device()
+  include /lib/functions
+
+  # For nodogsplash.conf file
+  mkdir -p /tmp/etc/
+
+  config_load nodogsplash
+  config_foreach create_instance nodogsplash
+}
+
+stop_service() {
+  # When procd terminates nodogsplash, it does not exit fast enough.
+  # Otherwise procd will restart nodogsplash twice. First time starting
+  # nodogsplash fails, second time it succeeds.
+  sleep 1
+}

nodogsplash/files/etc/uci-defaults/40_nodogsplash

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+uci -q batch <<-EOF
+	delete firewall.nodogsplash
+	set firewall.nodogsplash=include
+	set firewall.nodogsplash.type=script
+	set firewall.nodogsplash.path=/usr/lib/nodogsplash/restart.sh
+	commit firewall
+EOF

nodogsplash/files/usr/lib/nodogsplash/restart.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Check if nodogsplash is running
+if ndsctl status &> /dev/null; then
+  if [ "$(uci -q get nodogsplash.@nodogsplash[0].fwhook_enabled)" = "1" ]; then
+    /etc/init.d/nodogsplash restart
+  fi
+fi