fff-babeld: use functions for setting initial rules and filters #83

adschm · 2021-01-22T18:51:28+01:00

adschm commented

2021-01-22 18:51:28 +01:00

The current initial setup for fff-babeld is quite static, hard
to adjust and full of redundancy. Make it more flexible and improve
general readability by using functions.
These may be reused by other routines or scripts later.

This also drops the static file /etc/config/babeld that was replacing
an existing babeld config file, and moves the code to the already
existing uci-defaults script. With this step, it will be easier to
add conditionals to the uci-defaults script when the original file
should not be overwritten later.

The current initial setup for fff-babeld is quite static, hard to adjust and full of redundancy. Make it more flexible and improve general readability by using functions. These may be reused by other routines or scripts later. This also drops the static file /etc/config/babeld that was replacing an existing babeld config file, and moves the code to the already existing uci-defaults script. With this step, it will be easier to add conditionals to the uci-defaults script when the original file should not be overwritten later.

adschm added the

layer3

packages/fff

labels 2021-01-22 18:51:28 +01:00

adschm reviewed 2021-01-22 19:46:30 +01:00

src/packages/fff/fff-babeld/files/lib/functions/fff/babel Outdated

						
				@ -1,0 +27,4 @@

					local table="$3"

					local prio="$4"

					uci add network rule

adschm commented

2021-01-22 19:46:30 +01:00

These add commands all need >/dev/null

adschm marked this conversation as resolved

rohammer reviewed 2021-02-07 18:04:54 +01:00

src/packages/fff/fff-babeld/files/lib/functions/fff/babel Outdated

						
				@ -1,0 +13,4 @@

				babel_add_local_ipfilter() {

					[ "$#" -ne "1" ] && return 1

					babel_add_filter "$1" || return 1

rohammer commented

2021-02-07 18:04:54 +01:00

Hi,
hier soll sicherlich die Funktion von oben gerufen werden.

Was mir eigentlich aufgefallen ist, dass die local-rules die hier angelegt werden hinter der "local deny" aus dem uci-defaults landen und somit unwirksam sind.

Hi, hier soll sicherlich die Funktion von oben gerufen werden. Was mir eigentlich aufgefallen ist, dass die local-rules die hier angelegt werden hinter der "local deny" aus dem uci-defaults landen und somit unwirksam sind.

adschm commented

2021-02-07 18:20:09 +01:00

Ja, beides richtig, muss ich hier korrigieren, danke für den Hinweis.

adschm marked this conversation as resolved

adschm force-pushed babeluci from 04ef6d02fb to c982b81fe8

2021-02-09 23:22:37 +01:00

Compare

adschm commented

2021-02-09 23:23:09 +01:00

Updated.

adschm closed this pull request

2021-08-24 02:09:27 +02:00