From 44129f02e55c123be09030a6c213dd580b9ff546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Thu, 16 Jun 2022 19:07:17 +0200
Subject: [PATCH] olsr remove fw

---
 .../upgrade/310-gluon-mesh-olsrd-firewall     | 57 -------------------
 .../430-gluon-mesh-olsrd-add-mmfd-interface   | 10 ----
 2 files changed, 67 deletions(-)
 delete mode 100755 package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/430-gluon-mesh-olsrd-add-mmfd-interface

diff --git a/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/310-gluon-mesh-olsrd-firewall b/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/310-gluon-mesh-olsrd-firewall
index 0df69876..aaaea253 100755
--- a/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/310-gluon-mesh-olsrd-firewall
+++ b/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/310-gluon-mesh-olsrd-firewall
@@ -3,55 +3,6 @@
 local uci = require('simple-uci').cursor()
 local site = require "gluon.site"
 
-uci:section('firewall', 'zone', 'l3roamd', {
-	name = 'l3roamd',
-	input = 'ACCEPT',
-	output = 'ACCEPT',
-	forward = 'REJECT',
-	device = 'l3roam+',
-	log = '1',
-})
-
-uci:section('firewall', 'zone', 'mmfd', {
-	name = 'mmfd',
-	input = 'REJECT',
-	output = 'accept',
-	forward = 'REJECT',
-	device = 'mmfd+',
-	log = '1',
-})
-
--- forwardings and respective rules
-uci:section('firewall', 'forwarding', 'fcc', {
-	src = 'loc_client',
-	dest = 'loc_client',
-})
-
-uci:section('firewall', 'forwarding', 'fcm', {
-	src = 'loc_client',
-	dest = 'mesh',
-})
-
-uci:section('firewall', 'forwarding', 'fmc', {
-	src = 'mesh',
-	dest = 'loc_client',
-})
-
-uci:section('firewall', 'forwarding', 'fmm', {
-	src = 'mesh',
-	dest = 'mesh',
-})
-
-uci:section('firewall', 'forwarding', 'flc', {
-	src = 'l3roamd',
-	dest = 'loc_client',
-})
-
-uci:section('firewall', 'forwarding', 'fcl', {
-	src = 'loc_client',
-	dest = 'l3roamd',
-})
-
 uci:section('firewall', 'rule',  'mesh_respondd_mcast_ll', {
 	src = 'mesh',
 	src_ip = 'fe80::/64' ,
@@ -84,12 +35,4 @@ uci:section('firewall', 'rule',  'mmfd_respondd_mesh', {
 	target = 'ACCEPT',
 })
 
-uci:section('firewall', 'rule',  'mesh_mmfd', {
-	src = 'mesh',
-	src_ip = 'fe80::/64',
-	dest_port = '27275',
-	proto = 'udp',
-	target = 'ACCEPT',
-})
-
 uci:save('firewall')
diff --git a/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/430-gluon-mesh-olsrd-add-mmfd-interface b/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/430-gluon-mesh-olsrd-add-mmfd-interface
deleted file mode 100755
index 073d288e..00000000
--- a/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/430-gluon-mesh-olsrd-add-mmfd-interface
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/lua
-
-local uci = require('simple-uci').cursor()
-
-uci:section('network', 'interface', 'mmfd', {
-	proto = 'static',
-	ifname = 'mmfd0',
-	ip6addr = 'fe80::1/64'
-})
-uci:save('network')