Projet

Général

Profil

« Précédent | Suivant » 

Révision 213e9de2

Ajouté par Ermal Luçi il y a plus de 15 ans

Fix ticket #1837.

Voir les différences:

usr/local/www/wizards/traffic_shaper_wizard.inc
1356 1356
				$remainbw = 100 - $remainbw;
1357 1357
			//}
1358 1358

  
1359
                        if ($sched == "PRIQ")
1360
                                $q =& new priq_queue();
1361
                        else if ($sched == "CBQ")
1362
                                $q =& new cbq_queue();
1363
                        else if ($sched == "HFSC")
1364
                                $q =& new hfsc_queue();
1365
                        $tmpcf = array();
1366
                        $tmpcf['name'] = "qInternet";
1367
                        //$tmpcf['priority'] = 6;
1368
                        $tmpcf['ecn'] = "on";
1369
                        $tmpcf['enabled'] = "on";
1370
                        If ($sched == "CBQ") {
1371
                                $tmpcf['bandwidth'] = $lanbw/1000;
1372
                                $tmpcf['bandwidthtype'] = "Kb";
1373
                        }
1374
                        else if ($sched == "HFSC") {
1375
                                $tmpcf['linkshare1'] = $tmpcf['linkshare3'] = $lanbw/1000 ."Kb";
1376
                                        
1377

  
1378
                                $tmpcf['upperlimit'] = "on";
1379
                                $tmpcf['upperlimit3'] = $lanbw/1000 ."Kb";
1380

  
1381

  
1382
                                $tmpcf['linkshare2'] = 100;
1383
                                //$tmpcf['linkshare1'] = "0b";
1384
                                $tmpcf['linkshare'] = "on";
1385
                                $tmpcf['bandwidth'] =  $lanbw/1000;
1386
                                $tmpcf['bandwidthtype'] = "Kb";
1387
                        }
1388
                        array_push($tmppath, "qInternet");
1389
                        $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
1390
                        //array_pop($tmppath);
1391
                        //echo "qInternet <br />";
1392
                        //var_dump($input_errors);
1393
                        $qtmp->wconfig();
1394
                        $altq =& $qtmp;
1359
                        if ($sched != "PRIQ") {
1360
                        	if ($sched == "CBQ")
1361
                                	$q =& new cbq_queue();
1362
                        	else if ($sched == "HFSC")
1363
                                	$q =& new hfsc_queue();
1364
                        	$tmpcf = array();
1365
                        	$tmpcf['name'] = "qInternet";
1366
                        	//$tmpcf['priority'] = 6;
1367
                        	$tmpcf['ecn'] = "on";
1368
                        	$tmpcf['enabled'] = "on";
1369
                        	If ($sched == "CBQ") {
1370
                                	$tmpcf['bandwidth'] = $lanbw/1000;
1371
                                	$tmpcf['bandwidthtype'] = "Kb";
1372
                        	}
1373
                        	else if ($sched == "HFSC") {
1374
                                	$tmpcf['linkshare1'] = $tmpcf['linkshare3'] = $lanbw/1000 ."Kb";
1375
                                	$tmpcf['upperlimit'] = "on";
1376
                                	$tmpcf['upperlimit3'] = $lanbw/1000 ."Kb";
1377

  
1378

  
1379
                                	$tmpcf['linkshare2'] = 100;
1380
                                	//$tmpcf['linkshare1'] = "0b";
1381
                                	$tmpcf['linkshare'] = "on";
1382
                                	$tmpcf['bandwidth'] =  $lanbw/1000;
1383
                                	$tmpcf['bandwidthtype'] = "Kb";
1384
                        	}
1385
                        	array_push($tmppath, "qInternet");
1386
                        	$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
1387
                        	//array_pop($tmppath);
1388
                        	//echo "qInternet <br />";
1389
                        	//var_dump($input_errors);
1390
                        	$qtmp->wconfig();
1391
                        	$altq =& $qtmp;
1392
			}
1395 1393

  
1396 1394

  
1397 1395
			if ($sched == "PRIQ")
usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
1023 1023
				$remainbw = 100 - $remainbw;
1024 1024
			//}
1025 1025

  
1026
                        if ($sched == "PRIQ")
1027
                                $q =& new priq_queue();
1028
                        else if ($sched == "CBQ")
1026
                        if ($sched != "PRIQ") {
1027
                        if ($sched == "CBQ")
1029 1028
                                $q =& new cbq_queue();
1030 1029
                        else if ($sched == "HFSC")
1031 1030
                                $q =& new hfsc_queue();
......
1060 1059
                        //var_dump($input_errors);
1061 1060
                        $qtmp->wconfig();
1062 1061
                        $altq =& $qtmp;
1062
			}
1063 1063

  
1064 1064
			if ($sched == "PRIQ")
1065 1065
				$q =& new priq_queue();
......
1431 1431
				$remainbw = 100 - $remainbw;
1432 1432
			//}
1433 1433

  
1434
                        if ($sched == "PRIQ")
1435
                                $q =& new priq_queue();
1436
                        else if ($sched == "CBQ")
1434
                        if ($sched != "PRIQ") {
1435
                        if ($sched == "CBQ")
1437 1436
                                $q =& new cbq_queue();
1438 1437
                        else if ($sched == "HFSC")
1439 1438
                                $q =& new hfsc_queue();
......
1467 1466
                        //var_dump($input_errors);
1468 1467
                        $qtmp->wconfig();
1469 1468
                        $altq =& $qtmp;
1469
			}
1470 1470

  
1471 1471
			if ($sched == "PRIQ")
1472 1472
				$q =& new priq_queue();
usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
1068 1068
				$remainbw = 100 - $remainbw;
1069 1069
			//}
1070 1070

  
1071
                        if ($sched == "PRIQ")
1072
                                $q =& new priq_queue();
1073
                        else if ($sched == "CBQ")
1071
                        if ($sched != "PRIQ") {
1072
                        if ($sched == "CBQ")
1074 1073
                                $q =& new cbq_queue();
1075 1074
                        else if ($sched == "HFSC")
1076 1075
                                $q =& new hfsc_queue();
......
1104 1103
                        //var_dump($input_errors);
1105 1104
                        $qtmp->wconfig();
1106 1105
                        $altq =& $qtmp;
1106
			}
1107 1107

  
1108 1108
			if ($sched == "PRIQ")
1109 1109
				$q =& new priq_queue();
......
1484 1484
				$remainbw = 100 - $remainbw;
1485 1485
			//}
1486 1486

  
1487
                        if ($sched == "PRIQ")
1488
                                $q =& new priq_queue();
1489
                        else if ($sched == "CBQ")
1487
                        if ($sched != "PRIQ") {
1488
                        if ($sched == "CBQ")
1490 1489
                                $q =& new cbq_queue();
1491 1490
                        else if ($sched == "HFSC")
1492 1491
                                $q =& new hfsc_queue();
......
1516 1515
                        //var_dump($input_errors);
1517 1516
                        $qtmp->wconfig();
1518 1517
                        $altq =& $qtmp;
1518
			}
1519 1519

  
1520 1520
			if ($sched == "PRIQ")
1521 1521
				$q =& new priq_queue();
usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
845 845
				$remainbw = 100 - $remainbw;
846 846
			//}
847 847

  
848
 			if ($sched == "PRIQ")
849
                                $q =& new priq_queue();
850
                        else if ($sched == "CBQ")
848
 			if ($sched != "PRIQ") {
849
                        if ($sched == "CBQ")
851 850
                                $q =& new cbq_queue();
852 851
                        else if ($sched == "HFSC")
853 852
                                $q =& new hfsc_queue();
......
880 879
                        //var_dump($input_errors);
881 880
                        $qtmp->wconfig();
882 881
			$altq =& $qtmp;
882
			}
883 883

  
884 884

  
885 885
			if ($sched == "PRIQ")

Formats disponibles : Unified diff