Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge r4050 r4049 r4046 r4039 r4026

Browse source
This commit is contained in:
Steven Barth 2009-01-16 20:29:47 +00:00
parent fa9f794755
commit 0ab8119bf2
12 changed files with 55 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
applications/luci-fw/luasrc/i18n/luci-fw.de.lua
View file

@ -11,8 +11,9 @@ firewall_rule_desc = 'Mit erweiterten Regeln kann die Firewall an die eigenen Be
fw_fw1 = 'Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um den Netzverkehr zu trennen.'
fw_src = 'Quelle'
fw_dest = 'Ziel'
fw_mtufix = 'MSS-Korrektur'
fw_traffic = 'Verkehrskontrolle'
fw_mtufix = 'MSS-Korrektur'
fw_dropinvalid = 'Ungültig Pakete verwerfen'
firewall_rule_src = 'Eingangszone'
firewall_rule_dest = 'Ausgangszone'
firewall_rule_srcip = 'Quelladresse'
@ -34,7 +35,7 @@ firewall_redirect_destport = 'Interner Port (optional)'
firewall_redirect_destport_desc = 'Port od. Erster-Letzter Port'
firewall_redirect_srcip = 'Quelladresse'
firewall_redirect_srcmac = 'Quell-MAC-Adresse'
fw_forwarding1 = 'An dieser Stelle kann festgelegt zwischen welchen Zonen Netzverkehr hin und her fließen kann. Es werden nur neue Verbindungen betrachtet. Pakete, die zu bereits bestehenden Verbindungen gehören werden automatisch akzeptiert. Bei gelegentlich auftretenden Verbindungsproblemen kann eine MSS-Korrektur helfen, ansonsten sollte dies aus Performancegründen deaktiviert bleiben.'
fw_forwarding1 = 'An dieser Stelle kann festgelegt zwischen welchen Zonen Netzverkehr hin und her fließen kann. Es werden nur neue Verbindungen betrachtet. Pakete, die zu bereits bestehenden Verbindungen gehören werden automatisch akzeptiert. Bei gelegentlich auftretenden Verbindungsproblemen kann eine MSS-Korrektur helfen, ansonsten sollte dies aus Performancegründen deaktiviert bleiben.'
firewall_forwarding_src = 'Eingang'
firewall_forwarding_dest = 'Ausgang'
firewall_defaults = 'Grundeinstellungen'
@ -52,4 +53,4 @@ firewall_zone_forward = 'Weitergeleiteter Verkehr'
firewall_zone_forward_desc = 'Standardaktion'
firewall_zone_masq = 'MASQ'
firewall_zone_network = 'Netzwerke'
firewall_zone_network_desc = 'verbundene Netzwerke'
firewall_zone_network_desc = 'verbundene Netzwerke'

4
applications/luci-fw/luasrc/i18n/luci-fw.de.xml
View file

@ -16,6 +16,8 @@
<i18n:msg xml:id="fw_src">Quelle</i18n:msg>
<i18n:msg xml:id="fw_dest">Ziel</i18n:msg>
<i18n:msg xml:id="fw_traffic">Verkehrskontrolle</i18n:msg>
<i18n:msg xml:id="fw_mtufix">MSS-Korrektur</i18n:msg>
<i18n:msg xml:id="fw_dropinvalid">Ungültig Pakete verwerfen</i18n:msg>
<i18n:msg xml:id="firewall_rule_src">Eingangszone</i18n:msg>
<i18n:msg xml:id="firewall_rule_dest">Ausgangszone</i18n:msg>
<i18n:msg xml:id="firewall_rule_srcip">Quelladresse</i18n:msg>
@ -40,7 +42,7 @@
<i18n:msg xml:id="firewall_redirect_srcmac">Quell-MAC-Adresse</i18n:msg>
<i18n:msg xml:id="fw_forwarding1">An dieser Stelle kann festgelegt zwischen welchen Zonen Netzverkehr hin und her fließen kann. Es werden nur neue Verbindungen betrachtet. Pakete, die zu bereits bestehenden Verbindungen gehören werden automatisch akzeptiert.</i18n:msg>
<i18n:msg xml:id="fw_forwarding1">An dieser Stelle kann festgelegt zwischen welchen Zonen Netzverkehr hin und her fließen kann. Es werden nur neue Verbindungen betrachtet. Pakete, die zu bereits bestehenden Verbindungen gehören werden automatisch akzeptiert. Bei gelegentlich auftretenden Verbindungsproblemen kann eine MSS-Korrektur helfen, ansonsten sollte dies aus Performancegründen deaktiviert bleiben.</i18n:msg>
<i18n:msg xml:id="firewall_forwarding_src">Eingang</i18n:msg>
<i18n:msg xml:id="firewall_forwarding_dest">Ausgang</i18n:msg>

7
applications/luci-fw/luasrc/i18n/luci-fw.en.lua
View file

@ -8,7 +8,7 @@ fw_zones = 'Zones'
fw_custfwd = 'Custom forwarding'
fw_fw1 = 'The firewall creates zones over your network interfaces to control network traffic flow.'
firewall_rule = 'Advanced Rules'
firewall_rule_desc = 'Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.'
firewall_rule_desc = 'Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS-Correction otherwise disable it for performance reasons.'
firewall_rule_src = 'Input Zone'
firewall_rule_dest = 'Output Zone'
firewall_rule_srcip = 'Source address'
@ -22,8 +22,9 @@ fw_reject = 'reject'
fw_drop = 'drop'
fw_src = 'Source'
fw_dest = 'Destination'
fw_mtufix = 'MSS-Correction'
fw_traffic = 'Traffic Control'
fw_mtufix = 'MSS-Correction'
fw_dropinvalid = 'Drop invalid packets'
fw_portfw1 = 'Port forwarding allows to provide network services in the internal network to an external network.'
firewall_redirect_src_desc = 'External Zone'
firewall_redirect_srcdport = 'External port'
@ -34,7 +35,7 @@ firewall_redirect_destip = 'Internal address'
firewall_redirect_destip_desc = 'IP-Address'
firewall_redirect_destport = 'Internal port (optional)'
firewall_redirect_destport_desc = 'port or range as first-last'
fw_forwarding1 = 'Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS-Correction otherwise disable it for performance resons.'
fw_forwarding1 = 'Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.'
firewall_forwarding_src = 'Input'
firewall_forwarding_dest = 'Output'
firewall_defaults = 'Defaults'

4
applications/luci-fw/luasrc/i18n/luci-fw.en.xml
View file

@ -12,7 +12,7 @@
<i18n:msg xml:id="fw_custfwd">Custom forwarding</i18n:msg>
<i18n:msg xml:id="fw_fw1">The firewall creates zones over your network interfaces to control network traffic flow.</i18n:msg>
<i18n:msg xml:id="firewall_rule">Advanced Rules</i18n:msg>
<i18n:msg xml:id="firewall_rule_desc">Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.</i18n:msg>
<i18n:msg xml:id="firewall_rule_desc">Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS-Correction otherwise disable it for performance reasons.</i18n:msg>
<i18n:msg xml:id="firewall_rule_src">Input Zone</i18n:msg>
<i18n:msg xml:id="firewall_rule_dest">Output Zone</i18n:msg>
<i18n:msg xml:id="firewall_rule_srcip">Source address</i18n:msg>
@ -27,6 +27,8 @@
<i18n:msg xml:id="fw_src">Source</i18n:msg>
<i18n:msg xml:id="fw_dest">Destination</i18n:msg>
<i18n:msg xml:id="fw_traffic">Traffic Control</i18n:msg>
<i18n:msg xml:id="fw_mtufix">MSS-Correction</i18n:msg>
<i18n:msg xml:id="fw_dropinvalid">Drop invalid packets</i18n:msg>
<i18n:msg xml:id="fw_portfw1">Port forwarding allows to provide network services in the internal network to an external network.</i18n:msg>
<i18n:msg xml:id="firewall_redirect_src_desc">External Zone</i18n:msg>

2
applications/luci-fw/luasrc/i18n/luci-fw.fr.lua
View file

@ -23,6 +23,8 @@ fw_drop = 'ignorer (drop)'
fw_src = 'Source'
fw_dest = 'Destination'
fw_traffic = 'Contrôle de Trafic'
fw_mtufix = 'MSS-Correction'
fw_dropinvalid = 'Drop incorrect packets'
fw_portfw1 = 'La redirection de port vous permet d&#39;exposer des services réseaux de votre réseau local au réseau externe.'
firewall_redirect_src_desc = 'Zone externe'
firewall_redirect_srcdport = 'Port externe'

2
applications/luci-fw/luasrc/i18n/luci-fw.fr.xml
View file

@ -27,6 +27,8 @@
<i18n:msg xml:id="fw_src">Source</i18n:msg>
<i18n:msg xml:id="fw_dest">Destination</i18n:msg>
<i18n:msg xml:id="fw_traffic">Contrôle de Trafic</i18n:msg>
<i18n:msg xml:id="fw_mtufix">MSS-Correction</i18n:msg>
<i18n:msg xml:id="fw_dropinvalid">Drop incorrect packets</i18n:msg>
<i18n:msg xml:id="fw_portfw1">La redirection de port vous permet d'exposer des services réseaux de votre réseau local au réseau externe.</i18n:msg>
<i18n:msg xml:id="firewall_redirect_src_desc">Zone externe</i18n:msg>

2
applications/luci-fw/luasrc/i18n/luci-fw.pt-br.lua
View file

@ -23,6 +23,8 @@ fw_drop = 'dropar'
fw_src = 'Origem'
fw_dest = 'Destino'
fw_traffic = 'Controle de Tráfego'
fw_mtufix = 'MSS-Correction'
fw_dropinvalid = 'Drop invalid packets'
fw_portfw1 = 'O redirecionamento de portas permite prover serviços de rede na rede interna para uma rede externa.'
firewall_redirect_src_desc = 'Zona Externa'
firewall_redirect_srcdport = 'Porta Externa'

2
applications/luci-fw/luasrc/i18n/luci-fw.pt-br.xml
View file

@ -27,6 +27,8 @@
<i18n:msg xml:id="fw_src">Origem</i18n:msg>
<i18n:msg xml:id="fw_dest">Destino</i18n:msg>
<i18n:msg xml:id="fw_traffic">Controle de Tráfego</i18n:msg>
<i18n:msg xml:id="fw_mtufix">MSS-Correction</i18n:msg>
<i18n:msg xml:id="fw_dropinvalid">Drop invalid packets</i18n:msg>
<i18n:msg xml:id="fw_portfw1">O redirecionamento de portas permite prover serviços de rede na rede interna para uma rede externa.</i18n:msg>
<i18n:msg xml:id="firewall_redirect_src_desc">Zona Externa</i18n:msg>

8
applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua
View file

@ -19,6 +19,12 @@ s.anonymous = true
s:option(Flag, "syn_flood")
local di = s:option(Flag, "drop_invalid", translate("fw_dropinvalid"))
di.rmempty = false
function di.cfgvalue(...)
return AbstractValue.cfgvalue(...) or "1"
end
p = {}
p[1] = s:option(ListValue, "input")
p[2] = s:option(ListValue, "output")
@ -56,7 +62,7 @@ net = s:option(MultiValue, "network")
net.widget = "select"
net.rmempty = true
luci.tools.webadmin.cbi_add_networks(net)
function net.cfgvalue(self, section)
local value = MultiValue.cfgvalue(self, section)
return value or name:cfgvalue(section)

12
applications/luci-fw/root/lib/uci/schema/default/firewall
View file

@ -78,6 +78,12 @@ config variable
option section 'firewall.defaults'
option datatype 'boolean'
config variable
option name 'drop_invalid'
option title 'Do not drop packages with state invalid'
option section 'firewall.defaults'
option datatype 'boolean'
config section
@ -99,6 +105,12 @@ config variable
option valueof 'firewall.zone.name'
option required true
config variable
option name 'mtu_fix'
option title 'Fixup MTU of outgoing packages'
option section 'firewall.forwarding'
option datatype 'boolean'
config section

6
contrib/package/olsrd-luci/Makefile
View file

@ -18,12 +18,14 @@ PKG_RELEASE:=1
#PKG_SOURCE:=$(PKG_HGREV).tar.gz
#PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive
#PKG_MD5SUM:=95af2d8d6075f74d379b752fb8dda3de
#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-0-5-6-$(PKG_HGREV)
#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_HGREV)
#PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
PKG_MD5SUM:=0935688fa0fb5b0e073fe53ec654c5b2
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xjf $(DL_DIR)/$(PKG_SOURCE)
include $(INCLUDE_DIR)/package.mk

12
libs/cbi/luasrc/view/cbi/tblsection.htm
View file

@ -31,7 +31,11 @@ end
<table class="cbi-section-table">
<tr class="cbi-section-table-titles">
<%- if not self.anonymous then -%>
<th>&#160;</th>
<%- if self.sectionhead then -%>
<th class="cbi-section-table-cell"><%=self.sectionhead%></th>
<%- else -%>
<th>&#160;</th>
<%- end -%>
<%- end -%>
<%- for i, k in pairs(self.children) do if not k.optional then -%>
<th class="cbi-section-table-cell">
@ -45,7 +49,11 @@ end
</tr>
<tr class="cbi-section-table-descr">
<%- if not self.anonymous then -%>
<th></th>
<%- if self.sectiondesc then -%>
<th class="cbi-section-table-cell"><%=self.sectiondesc%></th>
<%- else -%>
<th></th>
<%- end -%>
<%- end -%>
<%- for i, k in pairs(self.children) do if not k.optional then -%>
<th class="cbi-section-table-cell"><%=k.description%></th>