Project

General

Profile

Bug #12003 » shaper-ecn-003.patch

Anonymous, 06/29/2021 12:54 PM

View differences:

/etc/inc/shaper.inc 2021-06-28 13:00:22.474614000 -0500
3989 3989
		if (!empty($data['aqm']) && !$selectedAqm) {
3990 3990
			$input_errors[] = gettext("Selected AQM not recognized.");
3991 3991
		}
3992
		if ($data['ecn'] && $data['ecn'] == 'on' && !$selectedScheduler["ecn"] && !$selectedAqm["ecn"]) {
3993
			$input_errors[] = gettext("Explicit Congestion Notification is selected, but neither " . $selectedAqm["name"] . " nor " . $selectedScheduler["name"] . " support it.");
3994
		}
3995 3992
		/* End limiter patch */
3996 3993
	}
3997 3994

  
......
4560 4557

  
4561 4558
		$selectedScheduler = getSchedulers()[$this->getScheduler()];
4562 4559

  
4563
		$section->addInput(new Form_Checkbox(
4564
			'ecn',
4565
			'ECN',
4566
			'Enable Explicit Congestion Notification (ECN)',
4567
			($this->GetECN() == "on"),
4568
			'on'
4569
		))->setHelp('ECN sets a reserved TCP flag when the queue is nearing or exceeding capacity. Not all AQMs or schedulers support this.');
4560
		if ($selectedScheduler["ecn"]) {
4561
			$section->addInput(new Form_Checkbox(
4562
				'ecn',
4563
				'ECN',
4564
				'Enable Explicit Congestion Notification (ECN)',
4565
				($this->GetECN() == "on"),
4566
				'on'
4567
			))->setHelp('ECN sets a reserved TCP flag when the queue is nearing or exceeding capacity. Not all AQMs or schedulers support this.');
4568
		}
4570 4569

  
4571 4570
		if ($selectedScheduler["pie_onoff"]) {
4572 4571
			$section->addInput(new Form_Checkbox(
......
4788 4787
		if (!empty($data['aqm']) && !$selectedAqm) {
4789 4788
			$input_errors[] = gettext("Selected AQM not recognized.");
4790 4789
		}
4791
		if ($data['ecn'] && $data['ecn'] == 'on' && !$selectedAqm["ecn"]) {
4792
			$input_errors[] = gettext("Explicit Congestion Notification is selected, but " . $selectedAqm["name"] . " does not support it.");
4793
		}
4794 4790
		/* End limiter patch */
4795 4791

  
4796 4792
		if ($data['weight'] && ((!is_numeric($data['weight'])) ||
......
5098 5094

  
5099 5095
		$selectedAQM = getAQMs()[$this->getAQM()];
5100 5096

  
5101
		$section->addInput(new Form_Checkbox(
5102
			'ecn',
5103
			'ECN',
5104
			'Enable Explicit Congestion Notification (ECN)',
5105
			($this->GetECN() == "on"),
5106
			'on'
5107
		))->setHelp('ECN sets a reserved TCP flag when the queue is nearing or exceeding capacity. Not all AQMs or schedulers support this.');
5097
		if ($selectedAQM["ecn"]) {
5098
			$section->addInput(new Form_Checkbox(
5099
				'ecn',
5100
				'ECN',
5101
				'Enable Explicit Congestion Notification (ECN)',
5102
				($this->GetECN() == "on"),
5103
				'on'
5104
			))->setHelp('ECN sets a reserved TCP flag when the queue is nearing or exceeding capacity. Not all AQMs or schedulers support this.');
5105
		}
5108 5106

  
5109 5107
		if ($selectedAQM["pie_onoff"]) {
5110 5108
			$section->addInput(new Form_Checkbox(
(7-7/8)