Projet

Général

Profil

« Précédent | Suivant » 

Révision c15b5ed8

Ajouté par Renato Botelho il y a presque 10 ans

Fix dscp values and provide a config upgrade to fix values stored in config.xml. This is a proper fix for #3688

Voir les différences:

etc/inc/filter.inc
2399 2399
			case 'cs5': $aline['dscp'] = " dscp 40 "; break;
2400 2400
			case 'cs6': $aline['dscp'] = " dscp 48 "; break;
2401 2401
			case 'cs7': $aline['dscp'] = " dscp 56 "; break;
2402
			default:    $aline['dscp'] = " dscp " . preg_replace('/\s.*$/', '', $rule['dscp']) . " "; break;
2402
			default:    $aline['dscp'] = " dscp " . $rule['dscp'] . " "; break;
2403 2403
		}
2404 2404
	}
2405 2405
	if (!empty($rule['vlanprio']) && ($rule['vlanprio'] != "none"))
etc/inc/globals.inc
73 73
	"disablecrashreporter" => false,
74 74
	"crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php",
75 75
	"debug" => false,
76
	"latest_config" => "10.8",
76
	"latest_config" => "10.9",
77 77
	"nopkg_platforms" => array("cdrom"),
78 78
	"minimum_ram_warning" => "101",
79 79
	"minimum_ram_warning_text" => "128 MB",
etc/inc/upgrade_config.inc
3342 3342
		$config['system']['webgui']['loginautocomplete'] = true;
3343 3343
}
3344 3344

  
3345
function upgrade_108_to_109() {
3346
	global $config;
3347

  
3348
	if (!isset($config['filter']['rule']) || !is_array($config['filter']['rule']))
3349
		return;
3350

  
3351
	foreach ($config['filter']['rule'] as &$rule) {
3352
		if (!isset($rule['dscp']) || empty($rule['dscp']))
3353
			continue;
3354

  
3355
		$pos = strpos($rule['dscp'], ' ');
3356
		if ($pos !== false)
3357
			$rule['dscp'] = substr($rule['dscp'], 0, $pos);
3358
		unset($pos);
3359
	}
3360
}
3361

  
3345 3362
?>
usr/local/www/guiconfig.inc
129 129
				"cs5",
130 130
				"cs6",
131 131
				"cs7",
132
				"0x01 (reliability, ToS 0x04)",
133
				"0x02 (throughput, ToS 0x08)",
134
				"0x04 (lowdelay, ToS 0x10)");
132
				"0x01",
133
				"0x02",
134
				"0x04");
135 135

  
136 136
$auth_server_types = array(
137 137
	'ldap' => "LDAP",

Formats disponibles : Unified diff