diff mbox

[OpenWrt-Devel,2/2,gre] multicast flag control

Message ID B4EFE0128BCDD542A8E7DC55F7D7FCF633C90EA8@bb-corp-mbx02.corp.cubic.cub
State Changes Requested
Headers show

Commit Message

Podolak, Nicholas Nov. 19, 2015, 7:51 p.m. UTC 
Original patchset was not applying correctly, let's try again.


Signed-off-by: Nick Podolak <nicholas.podolak@dtechlabs.com>

---
 package/network/config/gre/files/gre.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Rafał Miłecki Nov. 19, 2015, 8:48 p.m. UTC | #1 
On 19 November 2015 at 20:51, Podolak, Nicholas
<nicholas.podolak@dtechlabs.com> wrote:
> Original patchset was not applying correctly, let's try again.

It's a bit useless message for the repo log.
Podolak, Nicholas Nov. 19, 2015, 8:52 p.m. UTC | #2 
You're right.  That would be an awful commit message.  Try this.

Adds multicast flag control to the gre protocol script
diff mbox

Patch

diff --git a/package/network/config/gre/files/gre.sh b/package/network/config/gre/files/gre.sh
index 4483a08..5c7982e 100755
--- a/package/network/config/gre/files/gre.sh
+++ b/package/network/config/gre/files/gre.sh
@@ -13,10 +13,11 @@  gre_generic_setup() {
 	local local="$3"
 	local remote="$4"
 	local link="$5"
-	local mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno
-	json_get_vars mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno
+	local mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno multicast
+	json_get_vars mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno multicast
 
 	[ -z "$zone" ] && zone="wan"
+	[ -z "$multicast" ] && multicast="1"
 
 	proto_init_update "$link" 1
 
@@ -30,6 +31,7 @@  gre_generic_setup() {
 	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}"
+	[ -n "$multicast" ] && json_add_boolean multicast "$multicast"
 	proto_close_tunnel
 
 	proto_add_data
@@ -203,6 +205,7 @@  gre_generic_init_config() {
 	proto_config_add_boolean "ocsum"
 	proto_config_add_boolean "iseqno"
 	proto_config_add_boolean "oseqno"
+	proto_config_add_boolean "multicast"
 }
 
 proto_gre_init_config() {