gre: make encaplimit support configurable

[openwrt/openwrt.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 cab52d30f261ba8c03121e87bf048b80560151ed..ca11e87cfd4502e547d1c255ec25223325d43a40 100755 (executable)
--- a/package/network/config/gre/files/gre.sh
+++ b/package/network/config/gre/files/gre.sh
@@ -25,13 +25,23 @@ 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"
        json_add_string remote "$remote"
        [ -n "$tunlink" ] && json_add_string link "$tunlink"
        [ -n "$tos" ] && json_add_string tos "$tos"
        json_add_boolean multicast "$multicast"
        json_add_string local "$local"
        json_add_string remote "$remote"
        [ -n "$tunlink" ] && json_add_string link "$tunlink"

-       json_add_string info "${ikey:-0},${okey:-0},${icsum:-0},${ocsum:-0},${iseqno:-0},${oseqno:-0}"
+
+       json_add_object 'data'
+       [ -n "$ikey" ] && json_add_int ikey "$ikey"
+       [ -n "$okey" ] && json_add_int okey "$okey"
+       [ -n "$icsum" ] && json_add_boolean icsum "$icsum"
+       [ -n "$ocsum" ] && json_add_boolean ocsum "$ocsum"
+       [ -n "$iseqno" ] && json_add_boolean iseqno "$iseqno"
+       [ -n "$oseqno" ] && json_add_boolean oseqno "$oseqno"
+       [ -n "$encaplimit" ] && json_add_string encaplimit "$encaplimit"
+       json_close_object
+

        proto_close_tunnel
 
        proto_add_data
        proto_close_tunnel
 
        proto_add_data


@@ -44,16 +54,29 @@ gre_generic_setup() {
 gre_setup() {
        local cfg="$1"
        local mode="$2"
 gre_setup() {
        local cfg="$1"
        local mode="$2"

+       local remoteip

 
        local ipaddr peeraddr
        json_get_vars df ipaddr peeraddr tunlink
 
        [ -z "$peeraddr" ] && {
 
        local ipaddr peeraddr
        json_get_vars df ipaddr peeraddr tunlink
 
        [ -z "$peeraddr" ] && {

-               proto_notify_error "$cfg" "MISSING_ADDRESS"
+               proto_notify_error "$cfg" "MISSING_PEER_ADDRESS"

                proto_block_restart "$cfg"
                exit
        }
 
                proto_block_restart "$cfg"
                exit
        }
 

+       remoteip=$(resolveip -t 10 -4 "$peeraddr")
+
+       if [ -z "$remoteip" ]; then
+               proto_notify_error "$cfg" "PEER_RESOLVE_FAIL"
+               exit
+       fi
+
+       for ip in $remoteip; do
+               peeraddr=$ip
+               break
+       done
+

        ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" )
 
        [ -z "$ipaddr" ] && {
        ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" )
 
        [ -z "$ipaddr" ] && {


@@ -71,7 +94,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() {


@@ -89,7 +119,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 "gre4t-$cfg"

        json_add_boolean link-ext 0
        json_close_object
 
        json_add_boolean link-ext 0
        json_close_object
 


@@ -101,16 +131,29 @@ proto_gretap_setup() {
 grev6_setup() {
        local cfg="$1"
        local mode="$2"
 grev6_setup() {
        local cfg="$1"
        local mode="$2"

+       local remoteip6

 
        local ip6addr peer6addr weakif
 
        local ip6addr peer6addr weakif

-       json_get_vars ip6addr peer6addr tunlink weakif
+       json_get_vars ip6addr peer6addr tunlink weakif encaplimit

 
        [ -z "$peer6addr" ] && {
 
        [ -z "$peer6addr" ] && {

-               proto_notify_error "$cfg" "MISSING_ADDRESS"
+               proto_notify_error "$cfg" "MISSING_PEER_ADDRESS"

                proto_block_restart "$cfg"
                exit
        }
 
                proto_block_restart "$cfg"
                exit
        }
 

+       remoteip6=$(resolveip -t 10 -6 "$peer6addr")
+
+       if [ -z "$remoteip6" ]; then
+               proto_notify_error "$cfg" "PEER_RESOLVE_FAIL"
+               exit
+       fi
+
+       for ip6 in $remoteip6; do
+               peer6addr=$ip6
+               break
+       done
+

        ( proto_add_host_dependency "$cfg" "$peer6addr" "$tunlink" )
 
        [ -z "$ip6addr" ] && {
        ( proto_add_host_dependency "$cfg" "$peer6addr" "$tunlink" )
 
        [ -z "$ip6addr" ] && {


@@ -129,7 +172,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() {


@@ -147,7 +197,7 @@ proto_grev6tap_setup() {
        grev6_setup $cfg "gretapip6"
 
        json_init
        grev6_setup $cfg "gretapip6"
 
        json_init

-       json_add_string name "grev6-$cfg"
+       json_add_string name "gre6t-$cfg"

        json_add_boolean link-ext 0
        json_close_object
 
        json_add_boolean link-ext 0
        json_close_object
 


@@ -177,7 +227,7 @@ proto_gre_teardown() {
 proto_gretap_teardown() {
        local cfg="$1"
 
 proto_gretap_teardown() {
        local cfg="$1"
 

-       gretap_generic_teardown "gre-$cfg"
+       gretap_generic_teardown "gre4t-$cfg"

 }
 
 proto_grev6_teardown() {
 }
 
 proto_grev6_teardown() {


@@ -187,7 +237,7 @@ proto_grev6_teardown() {
 proto_grev6tap_teardown() {
        local cfg="$1"
 
 proto_grev6tap_teardown() {
        local cfg="$1"
 

-       gretap_generic_teardown "grev6-$cfg"
+       gretap_generic_teardown "gre6t-$cfg"

 }
 
 gre_generic_init_config() {
 }
 
 gre_generic_init_config() {


@@ -225,6 +275,7 @@ proto_grev6_init_config() {
        proto_config_add_string "ip6addr"
        proto_config_add_string "peer6addr"
        proto_config_add_string "weakif"
        proto_config_add_string "ip6addr"
        proto_config_add_string "peer6addr"
        proto_config_add_string "weakif"

+       proto_config_add_string "encaplimit"

 }
 
 proto_grev6tap_init_config() {
 }
 
 proto_grev6tap_init_config() {