qos.cgi: Add control to change link-layer encapsulation

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Michael Tremer
2021-12-02 12:37:46 +00:00
committed by Arne Fitzenreiter
parent 2d42f1df3b
commit ca26f73220
12 changed files with 348 additions and 10 deletions

View File

@@ -856,6 +856,21 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val vlan tag range error
WARNING: translation string unused: zoneconf val zoneslave amount error
WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes)
WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes)
WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes)
WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes)
WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes)
WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes)
WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes)
WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes)
WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes)
WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
WARNING: untranslated string: desired = Desired
WARNING: untranslated string: disable = Disable
WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
@@ -895,6 +910,7 @@ WARNING: untranslated string: guardian service = unknown string
WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es)
WARNING: untranslated string: ipsec invalid ip address or fqdn for rw endpoint = Invalid IP address or FQDN for Host-to-Net Endpoint
WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: optional = Optional

View File

@@ -372,6 +372,21 @@ WARNING: untranslated string: ca name = CA name
WARNING: untranslated string: cached = cached
WARNING: untranslated string: cached memory = Cached Memory
WARNING: untranslated string: cached swap = Cached Swap
WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes)
WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes)
WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes)
WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes)
WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes)
WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes)
WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes)
WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes)
WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes)
WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
WARNING: untranslated string: calamaris available reports = Available reports
WARNING: untranslated string: calamaris byte unit = Byte unit
WARNING: untranslated string: calamaris create report = Create report
@@ -1170,6 +1185,7 @@ WARNING: untranslated string: lease expires = Lease expires
WARNING: untranslated string: least preferred = least preferred
WARNING: untranslated string: legend = Legend
WARNING: untranslated string: lifetime = Lifetime:
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: linkq = Link Quality
WARNING: untranslated string: local ip address = Local IP Address
WARNING: untranslated string: local ntp server specified but not enabled = Local NTP server specified but not enabled

View File

@@ -836,6 +836,21 @@ WARNING: untranslated string: bit = bit
WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes)
WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes)
WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes)
WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes)
WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes)
WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes)
WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes)
WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes)
WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes)
WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
WARNING: untranslated string: capabilities = Capabilities
WARNING: untranslated string: ccd add = Add network
WARNING: untranslated string: ccd choose net = Choose network
@@ -1249,6 +1264,7 @@ WARNING: untranslated string: itlb multihit = iTLB MultiHit
WARNING: untranslated string: last = Last
WARNING: untranslated string: least preferred = least preferred
WARNING: untranslated string: lifetime = Lifetime:
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: local ip address = Local IP Address
WARNING: untranslated string: log server protocol = protocol:
WARNING: untranslated string: mac filter = MAC filter

View File

@@ -900,6 +900,21 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val vlan tag range error
WARNING: translation string unused: zoneconf val zoneslave amount error
WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes)
WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes)
WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes)
WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes)
WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes)
WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes)
WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes)
WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes)
WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes)
WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
WARNING: untranslated string: false max bandwidth = Maximum bandwidth is false.
WARNING: untranslated string: false min bandwidth = Minimum bandwidth is false.
@@ -935,6 +950,7 @@ WARNING: untranslated string: guardian logtarget_file = unknown string
WARNING: untranslated string: guardian logtarget_syslog = unknown string
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: max bandwidth = Maximum bandwidth
WARNING: untranslated string: pakfire ago = ago.
WARNING: untranslated string: route config changed = unknown string

View File

@@ -921,6 +921,21 @@ WARNING: untranslated string: available = available
WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes)
WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes)
WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes)
WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes)
WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes)
WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes)
WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes)
WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes)
WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes)
WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
WARNING: untranslated string: check all = Check all
WARNING: untranslated string: cpu frequency = CPU frequency
WARNING: untranslated string: crypto error = Cryptographic error
@@ -1084,6 +1099,7 @@ WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint
WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table Entries
WARNING: untranslated string: ipsec settings = IPsec Settings
WARNING: untranslated string: itlb multihit = iTLB MultiHit
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: local ip address = Local IP Address
WARNING: untranslated string: location = Location
WARNING: untranslated string: locationblock = Location Block

View File

@@ -917,6 +917,21 @@ WARNING: untranslated string: available = available
WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes)
WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes)
WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes)
WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes)
WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes)
WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes)
WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes)
WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes)
WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes)
WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
WARNING: untranslated string: capabilities = Capabilities
WARNING: untranslated string: check all = Check all
WARNING: untranslated string: cpu frequency = CPU frequency
@@ -1095,6 +1110,7 @@ WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint
WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table Entries
WARNING: untranslated string: ipsec settings = IPsec Settings
WARNING: untranslated string: itlb multihit = iTLB MultiHit
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: local ip address = Local IP Address
WARNING: untranslated string: location = Location
WARNING: untranslated string: locationblock = Location Block

View File

@@ -851,6 +851,21 @@ WARNING: untranslated string: bit = bit
WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes)
WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes)
WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes)
WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes)
WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes)
WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes)
WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes)
WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes)
WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes)
WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
WARNING: untranslated string: capabilities = Capabilities
WARNING: untranslated string: ccd add = Add network
WARNING: untranslated string: ccd choose net = Choose network
@@ -1254,6 +1269,7 @@ WARNING: untranslated string: itlb multihit = iTLB MultiHit
WARNING: untranslated string: last = Last
WARNING: untranslated string: least preferred = least preferred
WARNING: untranslated string: lifetime = Lifetime:
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: local ip address = Local IP Address
WARNING: untranslated string: location = Location
WARNING: untranslated string: locationblock = Location Block

View File

@@ -847,6 +847,21 @@ WARNING: untranslated string: bit = bit
WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes)
WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes)
WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes)
WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes)
WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes)
WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes)
WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes)
WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes)
WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes)
WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
WARNING: untranslated string: capabilities = Capabilities
WARNING: untranslated string: ccd add = Add network
WARNING: untranslated string: ccd choose net = Choose network
@@ -1252,6 +1267,7 @@ WARNING: untranslated string: itlb multihit = iTLB MultiHit
WARNING: untranslated string: last = Last
WARNING: untranslated string: least preferred = least preferred
WARNING: untranslated string: lifetime = Lifetime:
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: local ip address = Local IP Address
WARNING: untranslated string: location = Location
WARNING: untranslated string: locationblock = Location Block

View File

@@ -908,6 +908,21 @@ WARNING: untranslated string: autonomous system = Autonomous System
WARNING: untranslated string: available = available
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes)
WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes)
WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes)
WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes)
WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes)
WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes)
WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes)
WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes)
WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes)
WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
WARNING: untranslated string: cpu frequency = CPU frequency
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
@@ -1021,6 +1036,7 @@ WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint
WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table Entries
WARNING: untranslated string: ipsec settings = IPsec Settings
WARNING: untranslated string: itlb multihit = iTLB MultiHit
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: local ip address = Local IP Address
WARNING: untranslated string: meltdown = Meltdown
WARNING: untranslated string: mitigated = Mitigated

View File

@@ -20,6 +20,21 @@
< backup protect key password
< bewan adsl pci st
< bewan adsl usb
< cake profile bridged-llcsnap 32
< cake profile bridged-ptm 19
< cake profile bridged-vcmux 24
< cake profile conservative 48
< cake profile docsis 18
< cake profile ethernet 38
< cake profile ethernet vlan 42
< cake profile ipoa-llcsnap 16
< cake profile ipoa-vcmux 8
< cake profile pppoa-llc 14
< cake profile pppoa-vcmux 10
< cake profile pppoe-llcsnap 40
< cake profile pppoe-ptm 27
< cake profile pppoe-vcmux 32
< cake profile raw 0
< Captive heading terms
< Captive heading voucher
< Captive invalid coupon
@@ -43,6 +58,7 @@
< ipsec dns server address is invalid
< ipsec invalid ip address or fqdn for rw endpoint
< ipsec roadwarrior endpoint
< link-layer encapsulation
< netbios nameserver daemon
< no entries
< notes
@@ -118,6 +134,21 @@
< bit
< block
< broken
< cake profile bridged-llcsnap 32
< cake profile bridged-ptm 19
< cake profile bridged-vcmux 24
< cake profile conservative 48
< cake profile docsis 18
< cake profile ethernet 38
< cake profile ethernet vlan 42
< cake profile ipoa-llcsnap 16
< cake profile ipoa-vcmux 8
< cake profile pppoa-llc 14
< cake profile pppoa-vcmux 10
< cake profile pppoe-llcsnap 40
< cake profile pppoe-ptm 27
< cake profile pppoe-vcmux 32
< cake profile raw 0
< capabilities
< ccd add
< ccd choose net
@@ -566,6 +597,7 @@
< least preferred
< legacy architecture warning
< lifetime
< link-layer encapsulation
< local ip address
< log server protocol
< mac filter
@@ -938,12 +970,28 @@
< ansi t1.483
< bewan adsl pci st
< bewan adsl usb
< cake profile bridged-llcsnap 32
< cake profile bridged-ptm 19
< cake profile bridged-vcmux 24
< cake profile conservative 48
< cake profile docsis 18
< cake profile ethernet 38
< cake profile ethernet vlan 42
< cake profile ipoa-llcsnap 16
< cake profile ipoa-vcmux 8
< cake profile pppoa-llc 14
< cake profile pppoa-vcmux 10
< cake profile pppoe-llcsnap 40
< cake profile pppoe-ptm 27
< cake profile pppoe-vcmux 32
< cake profile raw 0
< eol architecture warning
< false max bandwidth
< false min bandwidth
< g.dtm
< g.lite
< guaranteed bandwidth
< link-layer encapsulation
< max bandwidth
< upload fcdsl.o
############################################################################
@@ -978,6 +1026,21 @@
< available
< block
< broken
< cake profile bridged-llcsnap 32
< cake profile bridged-ptm 19
< cake profile bridged-vcmux 24
< cake profile conservative 48
< cake profile docsis 18
< cake profile ethernet 38
< cake profile ethernet vlan 42
< cake profile ipoa-llcsnap 16
< cake profile ipoa-vcmux 8
< cake profile pppoa-llc 14
< cake profile pppoa-vcmux 10
< cake profile pppoe-llcsnap 40
< cake profile pppoe-ptm 27
< cake profile pppoe-vcmux 32
< cake profile raw 0
< Captive
< Captive 1day
< Captive 1month
@@ -1175,6 +1238,7 @@
< ipsec settings
< itlb multihit
< legacy architecture warning
< link-layer encapsulation
< local ip address
< location
< locationblock
@@ -1385,6 +1449,21 @@
< available
< block
< broken
< cake profile bridged-llcsnap 32
< cake profile bridged-ptm 19
< cake profile bridged-vcmux 24
< cake profile conservative 48
< cake profile docsis 18
< cake profile ethernet 38
< cake profile ethernet vlan 42
< cake profile ipoa-llcsnap 16
< cake profile ipoa-vcmux 8
< cake profile pppoa-llc 14
< cake profile pppoa-vcmux 10
< cake profile pppoe-llcsnap 40
< cake profile pppoe-ptm 27
< cake profile pppoe-vcmux 32
< cake profile raw 0
< capabilities
< Captive
< Captive 1day
@@ -1600,6 +1679,7 @@
< ipsec settings
< itlb multihit
< legacy architecture warning
< link-layer encapsulation
< local ip address
< location
< locationblock
@@ -1858,6 +1938,21 @@
< bit
< block
< broken
< cake profile bridged-llcsnap 32
< cake profile bridged-ptm 19
< cake profile bridged-vcmux 24
< cake profile conservative 48
< cake profile docsis 18
< cake profile ethernet 38
< cake profile ethernet vlan 42
< cake profile ipoa-llcsnap 16
< cake profile ipoa-vcmux 8
< cake profile pppoa-llc 14
< cake profile pppoa-vcmux 10
< cake profile pppoe-llcsnap 40
< cake profile pppoe-ptm 27
< cake profile pppoe-vcmux 32
< cake profile raw 0
< capabilities
< Captive
< Captive 1day
@@ -2352,6 +2447,7 @@
< least preferred
< legacy architecture warning
< lifetime
< link-layer encapsulation
< local ip address
< location
< locationblock
@@ -2760,6 +2856,21 @@
< bit
< block
< broken
< cake profile bridged-llcsnap 32
< cake profile bridged-ptm 19
< cake profile bridged-vcmux 24
< cake profile conservative 48
< cake profile docsis 18
< cake profile ethernet 38
< cake profile ethernet vlan 42
< cake profile ipoa-llcsnap 16
< cake profile ipoa-vcmux 8
< cake profile pppoa-llc 14
< cake profile pppoa-vcmux 10
< cake profile pppoe-llcsnap 40
< cake profile pppoe-ptm 27
< cake profile pppoe-vcmux 32
< cake profile raw 0
< capabilities
< Captive
< Captive 1day
@@ -3260,6 +3371,7 @@
< least preferred
< legacy architecture warning
< lifetime
< link-layer encapsulation
< local ip address
< location
< locationblock
@@ -3643,6 +3755,21 @@
< autonomous system
< available
< broken
< cake profile bridged-llcsnap 32
< cake profile bridged-ptm 19
< cake profile bridged-vcmux 24
< cake profile conservative 48
< cake profile docsis 18
< cake profile ethernet 38
< cake profile ethernet vlan 42
< cake profile ipoa-llcsnap 16
< cake profile ipoa-vcmux 8
< cake profile pppoa-llc 14
< cake profile pppoa-vcmux 10
< cake profile pppoe-llcsnap 40
< cake profile pppoe-ptm 27
< cake profile pppoe-vcmux 32
< cake profile raw 0
< Captive delete logo
< cpu frequency
< crypto error
@@ -3731,6 +3858,7 @@
< ipsec settings
< itlb multihit
< legacy architecture warning
< link-layer encapsulation
< local ip address
< meltdown
< mitigated

View File

@@ -98,7 +98,25 @@ $qossettings{'CLASS'} = '';
$qossettings{'CLASSPRFX'} = '';
$qossettings{'DEV'} = '';
$qossettings{'TOS'} = '';
$qossettings{'CAKE_PROFILE'} = 'conservative';
my %CAKE_PROFILES = (
"ethernet" => $Lang::tr{'cake profile ethernet 38'},
"ethernet ether-vlan" => $Lang::tr{'cake profile ethernet vlan 42'},
"raw" => $Lang::tr{'cake profile raw 0'},
"conservative" => $Lang::tr{'cake profile conservative 48'},
"docsis" => $Lang::tr{'cake profile docsis 18'},
"bridged-ptm" => $Lang::tr{'cake profile bridged-ptm 19'},
"pppoe-ptm" => $Lang::tr{'cake profile pppoe-ptm 27'},
"pppoe-llcsnap" => $Lang::tr{'cake profile pppoe-llcsnap 40'},
"pppoe-vcmux" => $Lang::tr{'cake profile pppoe-vcmux 32'},
"pppoa-llc" => $Lang::tr{'cake profile pppoa-llc 14'},
"pppoa-vcmux" => $Lang::tr{'cake profile pppoa-vcmux 10'},
"bridged-llcsnap" => $Lang::tr{'cake profile bridged-llcsnap 32'},
"bridged-vcmux" => $Lang::tr{'cake profile bridged-vcmux 24'},
"ipoa-llcsnap" => $Lang::tr{'cake profile ipoa-llcsnap 16'},
"ipoa-vcmux" => $Lang::tr{'cake profile ipoa-vcmux 8'},
);
&General::readhash("${General::swroot}/qos/settings", \%qossettings);
&Header::getcgihash(\%qossettings);
@@ -110,6 +128,12 @@ my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
$selected{'CAKE_PROFILE'} = ();
foreach my $key (keys %CAKE_PROFILES) {
$selected{'CAKE_PROFILE'}{$key} = '';
}
$selected{'CAKE_PROFILE'}{$qossettings{'CAKE_PROFILE'}} = 'selected';
&Header::showhttpheaders();
&Header::openpage('QoS', 1, '');
@@ -759,27 +783,53 @@ sub changebandwidth {
<input type='hidden' name='DEF_OUT_SPD' value='' /><input type='hidden' name='DEF_INC_SPD' value='' />
<table width='66%'>
<tr>
<td width='100%' colspan='3'>$Lang::tr{'down and up speed'}</td>
<td width='100%' colspan='2'>$Lang::tr{'down and up speed'}</td>
</tr>
<tr>
<td width='50%' align='right'>$Lang::tr{'downlink speed'}:</td>
<td width='30%' align='left'>
<td width='50%' align='left'>
<input type='text' name='INC_SPD' maxlength='8' value="$qossettings{'INC_SPD'}" />
</td>
<td width='20%' align='center' rowspan='2'>
<input type='submit' name='ACTION' value="$Lang::tr{'template'}" />
<br />
<input type='submit' name='ACTION' value="$Lang::tr{'save'}" />
<br />
<input type='reset' name='ACTION' value="$Lang::tr{'reset'}" />
</td>
</tr>
<tr>
<td width='50%' align='right'>$Lang::tr{'uplink speed'}:</td>
<td width='30%' align='left'>
<td width='50%' align='left'>
<input type='text' name='OUT_SPD' maxlength='8' value="$qossettings{'OUT_SPD'}" />
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<td width='50%' align='right'>$Lang::tr{'link-layer encapsulation'}:</td>
<td width='50%' align='left'>
<select name="CAKE_PROFILE">
END
foreach my $key (sort { $CAKE_PROFILES{$a} cmp $CAKE_PROFILES{$b} } keys %CAKE_PROFILES) {
print <<END;
<option value="$key" $selected{'CAKE_PROFILE'}{$key}>$CAKE_PROFILES{$key}</option>
END
}
print <<END;
</select>
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<td width='100%' align='center' colspan="2">
<input type='submit' name='ACTION' value="$Lang::tr{'template'}" />
<input type='submit' name='ACTION' value="$Lang::tr{'save'}" />
<input type='reset' name='ACTION' value="$Lang::tr{'reset'}" />
</td>
</tr>
</table>
</form>
<font color='red'>$Lang::tr{'template warning'}</font>

View File

@@ -529,6 +529,21 @@
'cached' => 'cached',
'cached memory' => 'Cached Memory ',
'cached swap' => 'Cached Swap',
'cake profile bridged-llcsnap 32' => 'Bridged LLC SNAP (32 bytes)',
'cake profile bridged-ptm 19' => 'Bridged PTM (19 bytes)',
'cake profile bridged-vcmux 24' => 'Bridged VC-MUX (24 bytes)',
'cake profile conservative 48' => 'Conservative (should work on all connections, 48 bytes)',
'cake profile docsis 18' => 'DOCSIS (18 bytes)',
'cake profile ethernet 38' => 'Ethernet (38 bytes)',
'cake profile ethernet vlan 42' => 'Ethernet with VLAN (42 bytes)',
'cake profile ipoa-llcsnap 16' => 'IP over ATM LLC SNAP (16 bytes)',
'cake profile ipoa-vcmux 8' => 'IP over ATM VC-MUX (8 bytes)',
'cake profile pppoa-llc 14' => 'PPPoA LLC (14 bytes)',
'cake profile pppoa-vcmux 10' => 'PPPoA VC-MUX (10 bytes)',
'cake profile pppoe-llcsnap 40' => 'PPPoE LLC SNAP (40 bytes)',
'cake profile pppoe-ptm 27' => 'PPPoE PTM (27 bytes)',
'cake profile pppoe-vcmux 32' => 'PPPoE VC-MUX (32 bytes)',
'cake profile raw 0' => 'Raw (no overhead compensation)',
'calamaris available reports' => 'Available reports',
'calamaris byte unit' => 'Byte unit',
'calamaris create report' => 'Create report',
@@ -1596,6 +1611,7 @@
'length' => 'Length',
'lifetime' => 'Lifetime:',
'line' => 'Line',
'link-layer encapsulation' => 'Link-Layer Encapsulation',
'linkq' => 'Link Quality',
'load printer' => 'Load Printer',
'loaded modules' => 'Loaded modules:',