Revision 01c155f2
Added by Phil Davis over 10 years ago
etc/inc/dyndns.class | ||
---|---|---|
46 | 46 |
* - _debug() |
47 | 47 |
* - _checkIP() |
48 | 48 |
* +----------------------------------------------------+ |
49 |
* DynDNS Dynamic - Last Tested: 12 July 2005 |
|
50 |
* DynDNS Static - Last Tested: NEVER |
|
51 |
* DynDNS Custom - Last Tested: NEVER |
|
52 |
* No-IP - Last Tested: 20 July 2008 |
|
53 |
* HN.org - Last Tested: 12 July 2005 |
|
54 |
* EasyDNS - Last Tested: 20 July 2008 |
|
55 |
* DHS - Last Tested: 12 July 2005 |
|
56 |
* ZoneEdit - Last Tested: NEVER |
|
57 |
* Dyns - Last Tested: NEVER |
|
58 |
* ODS - Last Tested: 02 August 2005 |
|
59 |
* FreeDNS - Last Tested: 23 Feb 2011 |
|
60 |
* Loopia - Last Tested: NEVER |
|
61 |
* StaticCling - Last Tested: 27 April 2006 |
|
62 |
* DNSexit - Last Tested: 20 July 2008
|
|
63 |
* OpenDNS - Last Tested: 4 August 2008
|
|
64 |
* Namecheap - Last Tested: 31 August 2010
|
|
65 |
* HE.net - Last Tested: 7 July 2013 |
|
66 |
* HE.net IPv6 - Last Tested: 7 July 2013 |
|
67 |
* HE.net Tunnel - Last Tested: 28 June 2011 |
|
68 |
* SelfHost - Last Tested: 26 December 2011 |
|
49 |
* DynDNS Dynamic - Last Tested: 12 July 2005
|
|
50 |
* DynDNS Static - Last Tested: NEVER
|
|
51 |
* DynDNS Custom - Last Tested: NEVER
|
|
52 |
* No-IP - Last Tested: 20 July 2008
|
|
53 |
* HN.org - Last Tested: 12 July 2005
|
|
54 |
* EasyDNS - Last Tested: 20 July 2008
|
|
55 |
* DHS - Last Tested: 12 July 2005
|
|
56 |
* ZoneEdit - Last Tested: NEVER
|
|
57 |
* Dyns - Last Tested: NEVER
|
|
58 |
* ODS - Last Tested: 02 August 2005
|
|
59 |
* FreeDNS - Last Tested: 23 Feb 2011
|
|
60 |
* Loopia - Last Tested: NEVER
|
|
61 |
* StaticCling - Last Tested: 27 April 2006
|
|
62 |
* DNSexit - Last Tested: 20 July 2008
|
|
63 |
* OpenDNS - Last Tested: 4 August 2008
|
|
64 |
* Namecheap - Last Tested: 31 August 2010
|
|
65 |
* HE.net - Last Tested: 7 July 2013
|
|
66 |
* HE.net IPv6 - Last Tested: 7 July 2013
|
|
67 |
* HE.net Tunnel - Last Tested: 28 June 2011
|
|
68 |
* SelfHost - Last Tested: 26 December 2011
|
|
69 | 69 |
* Amazon Route 53 - Last tested: 01 April 2012 |
70 |
* DNS-O-Matic - Last Tested: 9 September 2010
|
|
71 |
* CloudFlare - Last Tested: 30 May 2013 |
|
72 |
* Eurodns - Last Tested: 27 June 2013
|
|
73 |
* GratisDNS - Last Tested: 15 August 2012 |
|
74 |
* OVH DynHOST - Last Tested: NEVER
|
|
75 |
* City Network - Last Tested: 13 November 2013 |
|
76 |
* GleSYS - Last Tested: 3 February 2015
|
|
70 |
* DNS-O-Matic - Last Tested: 9 September 2010
|
|
71 |
* CloudFlare - Last Tested: 30 May 2013
|
|
72 |
* Eurodns - Last Tested: 27 June 2013
|
|
73 |
* GratisDNS - Last Tested: 15 August 2012
|
|
74 |
* OVH DynHOST - Last Tested: NEVER
|
|
75 |
* City Network - Last Tested: 13 November 2013
|
|
76 |
* GleSYS - Last Tested: 3 February 2015
|
|
77 | 77 |
* +====================================================+ |
78 | 78 |
* |
79 | 79 |
* @author E.Kristensen |
... | ... | |
1125 | 1125 |
$status = "phpDynDNS: (Error) Result did not match."; |
1126 | 1126 |
break; |
1127 | 1127 |
case 'cloudflare': |
1128 |
// recieve multipe results
|
|
1128 |
// receive multiple results
|
|
1129 | 1129 |
$data = explode("\n",$data); |
1130 | 1130 |
$lines = count($data)-1; |
1131 | 1131 |
|
etc/inc/filter.inc | ||
---|---|---|
395 | 395 |
sigkillbypid("{$g['varrun_path']}/filterdns.pid", "HUP"); |
396 | 396 |
else { |
397 | 397 |
/* |
398 |
* FilterDNS has three debugging levels. The default choosen is 1.
|
|
399 |
* Availabe are level 2 and greater then 2. |
|
398 |
* FilterDNS has three debugging levels. The default chosen is 1. |
|
399 |
* Available are level 2 and greater then 2.
|
|
400 | 400 |
*/ |
401 | 401 |
if (isset($config['system']['aliasesresolveinterval']) && is_numeric($config['system']['aliasesresolveinterval'])) |
402 | 402 |
$resolve_interval = $config['system']['aliasesresolveinterval']; |
... | ... | |
534 | 534 |
} |
535 | 535 |
} |
536 | 536 |
} |
537 |
/* We already expanded this alias so there is no neccessity to do it again. */
|
|
537 |
/* We already expanded this alias so there is no necessity to do it again. */ |
|
538 | 538 |
else if(!isset($aliasnesting[$address])) |
539 | 539 |
$tmpline = filter_generate_nested_alias($name, $aliastable[$address], $aliasnesting, $aliasaddrnesting); |
540 | 540 |
} else if(!isset($aliasaddrnesting[$address])) { |
... | ... | |
658 | 658 |
foreach ($config['aliases']['alias'] as $aliased) { |
659 | 659 |
$extralias = ""; |
660 | 660 |
/* |
661 |
* XXX: i am not sure what this does so i am commenting it out for now, because as it is
|
|
661 |
* XXX: i am not sure what this does so I am commenting it out for now, because as it is
|
|
662 | 662 |
* its quite dangerous! |
663 | 663 |
* $ip = find_interface_ip($aliased['address']); |
664 | 664 |
* $extraalias = " " . link_ip_to_carp_interface($ip); |
... | ... | |
2849 | 2849 |
|
2850 | 2850 |
/* |
2851 | 2851 |
* Support for allow limiting of TCP connections by establishment rate |
2852 |
* Useful for protecting against sudden outburts, etc. |
|
2852 |
* Useful for protecting against sudden outbursts, etc.
|
|
2853 | 2853 |
*/ |
2854 | 2854 |
$ipfrules .= "block in {$log['block']} quick from <virusprot> to any tracker 1000000400 label \"virusprot overload table\"\n"; |
2855 | 2855 |
|
... | ... | |
3107 | 3107 |
|
3108 | 3108 |
/* |
3109 | 3109 |
* NB: The loopback rules are needed here since the antispoof would take precedence then. |
3110 |
* If you ever add the 'quick' keyword to the antispoof rules above move the looback |
|
3110 |
* If you ever add the 'quick' keyword to the antispoof rules above move the loopback
|
|
3111 | 3111 |
* rules before them. |
3112 | 3112 |
*/ |
3113 | 3113 |
$ipfrules .= <<<EOD |
usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc | ||
---|---|---|
317 | 317 |
} |
318 | 318 |
} |
319 | 319 |
|
320 |
/* This is necessary since the wizard expects pecnefined fields. */
|
|
320 |
/* This is necessary since the wizard expects predefined fields. */
|
|
321 | 321 |
unset($config['ezshaper']['step2']); |
322 | 322 |
$config['ezshaper']['step2'] = array(); |
323 | 323 |
|
... | ... | |
551 | 551 |
} |
552 | 552 |
} |
553 | 553 |
|
554 |
/* This is necessary since the wizard expects pecnefined fields. */
|
|
555 |
unset($config['ezshaper']['step3']);
|
|
556 |
$config['ezshaper']['step3'] = array();
|
|
554 |
/* This is necessary since the wizard expects predefined fields. */
|
|
555 |
unset($config['ezshaper']['step3']);
|
|
556 |
$config['ezshaper']['step3'] = array();
|
|
557 | 557 |
|
558 | 558 |
for ($i = 0; $i < $steps; $i++) { |
559 | 559 |
$config['ezshaper']['step3']["local{$i}download"] = $_POST["local{$i}download"]; |
... | ... | |
627 | 627 |
global $g, $config; |
628 | 628 |
|
629 | 629 |
/* save the new configuration */ |
630 |
apply_all_choosen_items();
|
|
630 |
apply_all_chosen_items(); |
|
631 | 631 |
|
632 | 632 |
/* reset rrd queues */ |
633 | 633 |
system("rm -f /var/db/rrd/*queuedrops.rrd"); |
... | ... | |
645 | 645 |
exit; |
646 | 646 |
} |
647 | 647 |
|
648 |
function apply_all_choosen_items() {
|
|
648 |
function apply_all_chosen_items() { |
|
649 | 649 |
global $config, $g, $altq_list_queues, $gamesplist, $voiplist, $othersplist, $p2plist; |
650 | 650 |
|
651 | 651 |
require_once("wizardapp.inc"); |
... | ... | |
657 | 657 |
*/ |
658 | 658 |
if(isset($config['shaper']['queue'])) |
659 | 659 |
unset($config['shaper']['queue']); |
660 |
/* XXX: This is ecnundant, because this should be handled by converter at startup. */
|
|
660 |
/* XXX: This is redundant, because this should be handled by converter at startup. */
|
|
661 | 661 |
if(isset($config['shaper']['rule'])) |
662 | 662 |
unset($config['shaper']['rule']); |
663 | 663 |
foreach ($config['filter']['rule'] as $key => $rule) |
... | ... | |
1099 | 1099 |
$factor = wizard_get_bandwidthtype_scale($voipbwunit); |
1100 | 1100 |
$remainbw += floatval($voipbw) * $factor; |
1101 | 1101 |
} else |
1102 |
$remainbw += 32000; /* 32Kbit/s reserved for HFSC linksharing */ |
|
1102 |
$remainbw += 32000; /* 32Kbit/s reserved for HFSC link sharing */
|
|
1103 | 1103 |
} |
1104 | 1104 |
if ($config['ezshaper']['step4']['enable']) { |
1105 | 1105 |
$penalty = true; |
... | ... | |
1611 | 1611 |
if ($otherclient[1] == "tcp") |
1612 | 1612 |
$rule['ackqueue'] = 'qACK'; |
1613 | 1613 |
} else |
1614 |
$loop = 1; /* It automitaclly goes to default queue */
|
|
1614 |
$loop = 1; /* It automatically goes to default queue */
|
|
1615 | 1615 |
break; |
1616 | 1616 |
default: |
1617 | 1617 |
$loop = 1; |
usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc | ||
---|---|---|
349 | 349 |
} |
350 | 350 |
} |
351 | 351 |
|
352 |
/* This is necessary since the wizard expects pecnefined fields. */
|
|
352 |
/* This is necessary since the wizard expects predefined fields. */
|
|
353 | 353 |
unset($config['ezshaper']['step2']); |
354 | 354 |
$config['ezshaper']['step2'] = array(); |
355 | 355 |
|
... | ... | |
599 | 599 |
} |
600 | 600 |
} |
601 | 601 |
|
602 |
/* This is necessary since the wizard expects pecnefined fields. */
|
|
602 |
/* This is necessary since the wizard expects predefined fields. */
|
|
603 | 603 |
unset($config['ezshaper']['step3']); |
604 | 604 |
$config['ezshaper']['step3'] = array(); |
605 | 605 |
|
... | ... | |
675 | 675 |
global $g, $config; |
676 | 676 |
|
677 | 677 |
/* save the new configuration */ |
678 |
apply_all_choosen_items();
|
|
678 |
apply_all_chosen_items(); |
|
679 | 679 |
|
680 | 680 |
/* reset rrd queues */ |
681 | 681 |
system("rm -f /var/db/rrd/*queuedrops.rrd"); |
... | ... | |
693 | 693 |
exit; |
694 | 694 |
} |
695 | 695 |
|
696 |
function apply_all_choosen_items() {
|
|
696 |
function apply_all_chosen_items() { |
|
697 | 697 |
global $config, $g, $altq_list_queues, $gamesplist, $voiplist, $othersplist, $p2plist; |
698 | 698 |
|
699 | 699 |
require_once("wizardapp.inc"); |
... | ... | |
705 | 705 |
*/ |
706 | 706 |
if(isset($config['shaper']['queue'])) |
707 | 707 |
unset($config['shaper']['queue']); |
708 |
/* XXX: This is ecnundant, because this should be handled by converter at startup. */
|
|
708 |
/* XXX: This is redundant, because this should be handled by converter at startup. */
|
|
709 | 709 |
if(isset($config['shaper']['rule'])) |
710 | 710 |
unset($config['shaper']['rule']); |
711 | 711 |
foreach ($config['filter']['rule'] as $key => $rule) |
... | ... | |
1161 | 1161 |
$factor = wizard_get_bandwidthtype_scale($voipbwunit); |
1162 | 1162 |
$remainbw += floatval($voipbw) * $factor; |
1163 | 1163 |
} else |
1164 |
$remainbw += 32000; /* 32Kbit/s reserved for HFSC linksharing */ |
|
1164 |
$remainbw += 32000; /* 32Kbit/s reserved for HFSC link sharing */
|
|
1165 | 1165 |
} |
1166 | 1166 |
if ($config['ezshaper']['step4']['enable']) { |
1167 | 1167 |
$penalty = true; |
... | ... | |
1682 | 1682 |
if ($otherclient[1] == "tcp") |
1683 | 1683 |
$rule['ackqueue'] = 'qACK'; |
1684 | 1684 |
} else |
1685 |
$loop = 1; /* It automitaclly goes to default queue */
|
|
1685 |
$loop = 1; /* It automatically goes to default queue */
|
|
1686 | 1686 |
break; |
1687 | 1687 |
default: |
1688 | 1688 |
$loop = 1; |
Also available in: Unified diff
Random text typos
and I "corrected" function names that had "_choosen_" in them.
That is not technically an error - function names do not have to be
English words. But it does look nicer to read.