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

LEDE Commits lede-commits at lists.infradead.org
Wed Oct 26 03:46:37 PDT 2016


blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/72eb2b8e22b92839b2e5bb0db86eb8be27790a72

commit 72eb2b8e22b92839b2e5bb0db86eb8be27790a72
Author: Marcin Jurkowski <marcin1j at gmail.com>
AuthorDate: Mon Oct 17 02:39:08 2016 +0200

    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 <marcin1j at gmail.com>
---
 package/network/utils/comgt/files/directip.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/network/utils/comgt/files/directip.sh b/package/network/utils/comgt/files/directip.sh
index d828052..79b8c32 100644
--- a/package/network/utils/comgt/files/directip.sh
+++ b/package/network/utils/comgt/files/directip.sh
@@ -15,14 +15,15 @@ proto_directip_init_config() {
 	proto_config_add_string "auth"
 	proto_config_add_string "username"
 	proto_config_add_string "password"
+	proto_config_add_defaults
 }
 
 proto_directip_setup() {
 	local interface="$1"
 	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
 
@@ -80,6 +81,7 @@ proto_directip_setup() {
 	json_add_string name "${interface}_4"
 	json_add_string ifname "@$interface"
 	json_add_string proto "dhcp"
+	proto_add_dynamic_defaults
 	ubus call network add_dynamic "$(json_dump)"
 
 	json_init
@@ -87,6 +89,7 @@ proto_directip_setup() {
 	json_add_string ifname "@$interface"
 	json_add_string proto "dhcpv6"
 	json_add_string extendprefix 1
+	proto_add_dynamic_defaults
 	ubus call network add_dynamic "$(json_dump)"
 
 	return 0



More information about the lede-commits mailing list