projects
/
librecmc
/
librecmc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fresh pull from upstream
[librecmc/librecmc.git]
/
package
/
network
/
config
/
gre
/
files
/
gre.sh
diff --git
a/package/network/config/gre/files/gre.sh
b/package/network/config/gre/files/gre.sh
index 3f472c447388998b9fdff8eb5ac5281c20cef7e8..cd327ea2daa88ef218266582b4504f17819b86fb 100755
(executable)
--- a/
package/network/config/gre/files/gre.sh
+++ b/
package/network/config/gre/files/gre.sh
@@
-25,7
+25,7
@@
gre_generic_setup() {
json_add_string mode "$mode"
json_add_int mtu "${mtu:-1280}"
[ -n "$df" ] && json_add_boolean df "$df"
json_add_string mode "$mode"
json_add_int mtu "${mtu:-1280}"
[ -n "$df" ] && json_add_boolean df "$df"
-
json_add_int ttl "${ttl:-64}
"
+
[ -n "ttl" ] && json_add_int ttl "$ttl
"
[ -n "$tos" ] && json_add_string tos "$tos"
json_add_boolean multicast "$multicast"
json_add_string local "$local"
[ -n "$tos" ] && json_add_string tos "$tos"
json_add_boolean multicast "$multicast"
json_add_string local "$local"
@@
-84,7
+84,14
@@
gre_setup() {
[ -z "$df" ] && df="1"
[ -z "$df" ] && df="1"
- gre_generic_setup $cfg $mode $ipaddr $peeraddr "gre-$cfg"
+ case "$mode" in
+ gretapip)
+ gre_generic_setup $cfg $mode $ipaddr $peeraddr "gre4t-$cfg"
+ ;;
+ *)
+ gre_generic_setup $cfg $mode $ipaddr $peeraddr "gre4-$cfg"
+ ;;
+ esac
}
proto_gre_setup() {
}
proto_gre_setup() {
@@
-102,7
+109,7
@@
proto_gretap_setup() {
gre_setup $cfg "gretapip"
json_init
gre_setup $cfg "gretapip"
json_init
- json_add_string name "gre-$cfg"
+ json_add_string name "gre
4t
-$cfg"
json_add_boolean link-ext 0
json_close_object
json_add_boolean link-ext 0
json_close_object
@@
-155,7
+162,14
@@
grev6_setup() {
fi
}
fi
}
- gre_generic_setup $cfg $mode $ip6addr $peer6addr "grev6-$cfg"
+ case "$mode" in
+ gretapip6)
+ gre_generic_setup $cfg $mode $ip6addr $peer6addr "gre6t-$cfg"
+ ;;
+ *)
+ gre_generic_setup $cfg $mode $ip6addr $peer6addr "gre6-$cfg"
+ ;;
+ esac
}
proto_grev6_setup() {
}
proto_grev6_setup() {
@@
-173,7
+187,7
@@
proto_grev6tap_setup() {
grev6_setup $cfg "gretapip6"
json_init
grev6_setup $cfg "gretapip6"
json_init
- json_add_string name "gre
v6
-$cfg"
+ json_add_string name "gre
6t
-$cfg"
json_add_boolean link-ext 0
json_close_object
json_add_boolean link-ext 0
json_close_object
@@
-203,7
+217,7
@@
proto_gre_teardown() {
proto_gretap_teardown() {
local cfg="$1"
proto_gretap_teardown() {
local cfg="$1"
- gretap_generic_teardown "gre-$cfg"
+ gretap_generic_teardown "gre
4t
-$cfg"
}
proto_grev6_teardown() {
}
proto_grev6_teardown() {
@@
-213,7
+227,7
@@
proto_grev6_teardown() {
proto_grev6tap_teardown() {
local cfg="$1"
proto_grev6tap_teardown() {
local cfg="$1"
- gretap_generic_teardown "gre
v6
-$cfg"
+ gretap_generic_teardown "gre
6t
-$cfg"
}
gre_generic_init_config() {
}
gre_generic_init_config() {