umbim: extract common code from static and dhcp(v6) setup procedure

Beginnings and endings of sub-interface creation procedure were
literally duplicates - extract them outside if "if" blocks

Signed-off-by: Lech Perczak <lech.perczak@gmail.com>

diff --git a/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh b/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
index 7ac3cb1c70c217bc920fb10dc3b5862f3f3d0165..da3f4842233ee54a33ce527c2823b7f1cb604705 100755 (executable)
--- a/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
+++ b/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
@@ -203,11 +203,11 @@ _proto_mbim_setup() {
        [ -z "$dhcpv6" ] && dhcpv6=1
 
        [ "$iptype" != "ipv6" ] && {
+               json_init
+               json_add_string name "${interface}_4"
+               json_add_string ifname "@$interface"
                ipv4address=$(_proto_mbim_get_field ipv4address "$mbimconfig")
                if [ -n "$ipv4address" ]; then
-                       json_init
-                       json_add_string name "${interface}_4"
-                       json_add_string ifname "@$interface"
                        json_add_string proto "static"
 
                        json_add_array ipaddr
@@ -225,32 +225,23 @@ _proto_mbim_setup() {
                                done
                                json_close_array
                        }
-
-                       proto_add_dynamic_defaults
-                       [ -n "$zone" ] && json_add_string zone "$zone"
-                       [ -n "$ip4table" ] && json_add_string ip4table "$ip4table"
-                       json_close_object
-                       ubus call network add_dynamic "$(json_dump)"
                elif [ "$dhcp" != 0 ]; then
                        echo "mbim[$$]" "Starting DHCP on $ifname"
-                       json_init
-                       json_add_string name "${interface}_4"
-                       json_add_string ifname "@$interface"
                        json_add_string proto "dhcp"
-                       proto_add_dynamic_defaults
-                       [ -n "$zone" ] && json_add_string zone "$zone"
-                       [ -n "$ip4table" ] && json_add_string ip4table "$ip4table"
-                       json_close_object
-                       ubus call network add_dynamic "$(json_dump)"
                fi
+               proto_add_dynamic_defaults
+               [ -n "$zone" ] && json_add_string zone "$zone"
+               [ -n "$ip4table" ] && json_add_string ip4table "$ip4table"
+               json_close_object
+               ubus call network add_dynamic "$(json_dump)"
        }
 
        [ "$iptype" != "ipv4" ] && {
+               json_init
+               json_add_string name "${interface}_6"
+               json_add_string ifname "@$interface"
                ipv6address=$(_proto_mbim_get_field ipv6address "$mbimconfig")
                if [ -n "$ipv6address" ]; then
-                       json_init
-                       json_add_string name "${interface}_6"
-                       json_add_string ifname "@$interface"
                        json_add_string proto "static"
 
                        json_add_array ip6addr
@@ -274,25 +265,16 @@ _proto_mbim_setup() {
                                done
                                json_close_array
                        }
-
-                       proto_add_dynamic_defaults
-                       [ -n "$zone" ] && json_add_string zone "$zone"
-                       [ -n "$ip6table" ] && json_add_string ip6table "$ip6table"
-                       json_close_object
-                       ubus call network add_dynamic "$(json_dump)"
                elif [ "$dhcpv6" != 0 ]; then
                        echo "mbim[$$]" "Starting DHCPv6 on $ifname"
-                       json_init
-                       json_add_string name "${interface}_6"
-                       json_add_string ifname "@$interface"
                        json_add_string proto "dhcpv6"
                        json_add_string extendprefix 1
-                       proto_add_dynamic_defaults
-                       [ -n "$zone" ] && json_add_string zone "$zone"
-                       [ -n "$ip6table" ] && json_add_string ip6table "$ip6table"
-                       json_close_object
-                       ubus call network add_dynamic "$(json_dump)"
                fi
+               proto_add_dynamic_defaults
+               [ -n "$zone" ] && json_add_string zone "$zone"
+               [ -n "$ip6table" ] && json_add_string ip6table "$ip6table"
+               json_close_object
+               ubus call network add_dynamic "$(json_dump)"
        }
 
        [ -z "$mtu" ] && {