From: Marcin Jurkowski Date: Mon, 17 Oct 2016 00:39:08 +0000 (+0200) Subject: comgt: add metric, defaultroute and peerdns options for directip protocol X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Flynxis.git;a=commitdiff_plain;h=72eb2b8e22b92839b2e5bb0db86eb8be27790a72 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 --- diff --git a/package/network/utils/comgt/files/directip.sh b/package/network/utils/comgt/files/directip.sh index d82805278c..79b8c32c83 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