Browse Source

comgt: add metric, defaultroute and peerdns options for directip protocol

Adds generic network options for directip protocol dynamic interfaces
as suggested by Felix in
https://lists.openwrt.org/pipermail/openwrt-devel/2016-February/039794.html.

This depends on netifd patch https://patchwork.ozlabs.org/patch/686820/.

Signed-off-by: Marcin Jurkowski <[email protected]>
Marcin Jurkowski 9 years ago
parent
commit
72eb2b8e22
1 changed files with 5 additions and 2 deletions
  1. 5 2
      package/network/utils/comgt/files/directip.sh

+ 5 - 2
package/network/utils/comgt/files/directip.sh

@@ -15,14 +15,15 @@ proto_directip_init_config() {
 	proto_config_add_string "auth"
 	proto_config_add_string "auth"
 	proto_config_add_string "username"
 	proto_config_add_string "username"
 	proto_config_add_string "password"
 	proto_config_add_string "password"
+	proto_config_add_defaults
 }
 }
 
 
 proto_directip_setup() {
 proto_directip_setup() {
 	local interface="$1"
 	local interface="$1"
 	local chat devpath devname
 	local chat devpath devname
 
 
-	local device apn pincode ifname auth username password
-	json_get_vars device apn pincode auth username password
+	local device apn pincode ifname auth username password $PROTO_DEFAULT_OPTIONS
+	json_get_vars device apn pincode auth username password $PROTO_DEFAULT_OPTIONS
 
 
 	[ -n "$ctl_device" ] && device=$ctl_device
 	[ -n "$ctl_device" ] && device=$ctl_device
 
 
@@ -80,6 +81,7 @@ proto_directip_setup() {
 	json_add_string name "${interface}_4"
 	json_add_string name "${interface}_4"
 	json_add_string ifname "@$interface"
 	json_add_string ifname "@$interface"
 	json_add_string proto "dhcp"
 	json_add_string proto "dhcp"
+	proto_add_dynamic_defaults
 	ubus call network add_dynamic "$(json_dump)"
 	ubus call network add_dynamic "$(json_dump)"
 
 
 	json_init
 	json_init
@@ -87,6 +89,7 @@ proto_directip_setup() {
 	json_add_string ifname "@$interface"
 	json_add_string ifname "@$interface"
 	json_add_string proto "dhcpv6"
 	json_add_string proto "dhcpv6"
 	json_add_string extendprefix 1
 	json_add_string extendprefix 1
+	proto_add_dynamic_defaults
 	ubus call network add_dynamic "$(json_dump)"
 	ubus call network add_dynamic "$(json_dump)"
 
 
 	return 0
 	return 0