From: Christian Schmidt Date: Tue, 8 Feb 2011 21:05:30 +0000 (+0100) Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x X-Git-Tag: v2.9-core46~4^2~1 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=bf7466f5d1069a6b46fe8eb7b8c52dffa656c95e;hp=fc5385b65486118593131358656c2932211f5873 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x --- diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 4dba22f535..2912b44217 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -249,6 +249,7 @@ $checked{'SERVICE'}{'nsupdate'} = ''; $checked{'SERVICE'}{'ovh.com'} = ''; $checked{'SERVICE'}{'regfish.com'} = ''; $checked{'SERVICE'}{'selfhost.de'} = ''; +$checked{'SERVICE'}{'strato.com'} = ''; $checked{'SERVICE'}{'tzo.com'} = ''; $checked{'SERVICE'}{'zoneedit.com'} = ''; $checked{'SERVICE'}{$settings{'SERVICE'}} = "selected='selected'"; @@ -342,6 +343,7 @@ print <ovh.com + diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi index 4b8ee47e69..a0e7655ab9 100644 --- a/html/cgi-bin/system.cgi +++ b/html/cgi-bin/system.cgi @@ -56,16 +56,16 @@ if ( $querry[0] =~ "cpufreq"){ &Header::openpage($Lang::tr{'status information'}, 1, ''); &Header::openbigbox('100%', 'left'); + &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); + &Graphs::makegraphbox("system.cgi","cpu","day","325"); + &Header::closebox(); + if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){ &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); &Graphs::makegraphbox("system.cgi","cpufreq","day","325"); &Header::closebox(); } - &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); - &Graphs::makegraphbox("system.cgi","cpu","day","325"); - &Header::closebox(); - &Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}"); &Graphs::makegraphbox("system.cgi","load","day"); &Header::closebox(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b4db1feee2..808092e249 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -18,6 +18,7 @@ 'ConnSched ipsecstart' => 'IPSec (neu)starten', 'ConnSched ipsecstop' => 'IPSec stop', 'ConnSched reconnect' => 'Neu verbinden', +'cpu frequency per' => 'CPU Frequenz pro', 'ConnSched scheduled actions' => 'Geplante Aktionen', 'ConnSched scheduler' => 'Scheduler', 'ConnSched select profile' => 'Wähle Profil', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a1d687d05f..26349e1925 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -17,6 +17,7 @@ 'ConnSched down' => 'Down', 'ConnSched ipsecstart' => 'IPSec (re)start', 'ConnSched ipsecstop' => 'IPSec stop', +'cpu frequency per' => 'CPU frequency per', 'ConnSched reconnect' => 'Reconnect', 'ConnSched scheduled actions' => 'Scheduled actions', 'ConnSched scheduler' => 'Scheduler', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index f5640cf538..cad4406acb 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -535,6 +535,7 @@ 'cpu idle usage' => 'Uso de CPU inactivo', 'cpu interrupt usage' => 'Uso de interrupción de CPU', 'cpu iowait usage' => 'CPU esperando IO', +'cpu frequency per' => 'CPU frecuencia por', 'cpu irq usage' => 'Uso de IRQ del CPU', 'cpu nice usage' => 'Buen uso de CPU', 'cpu steal usage' => 'uso de CPU steal', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 6ccb4d507c..eb81c5227e 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -16,6 +16,7 @@ 'ConnSched days' => 'Jours :', 'ConnSched down' => 'Arrêt', 'ConnSched ipsecstart' => 'IPSec (re)démarrage', +'cpu frequency per' => 'CPU fréquence par', 'ConnSched ipsecstop' => 'IPSec arrêt', 'ConnSched reconnect' => 'Reconnecter', 'ConnSched scheduled actions' => 'Actions planifiées', diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl index beb9af8b88..a71590402d 100644 --- a/src/scripts/setddns.pl +++ b/src/scripts/setddns.pl @@ -390,7 +390,7 @@ if ($ip ne $ipcache) { &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure (could not connect to server)"); } } - elsif ($settings{'SERVICE'} eq 'regfish') { + elsif ($settings{'SERVICE'} eq 'strato') { # use proxy ? my %proxysettings; &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); @@ -398,25 +398,62 @@ if ($ip ne $ipcache) { my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/); Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} ); } - my ($out, $response) = Net::SSLeay::get_https( 'dyndns.regfish.de', - 443, - "/?fqdn=$settings{'DOMAIN'}&ipv4=$ip&forcehost=1&authtype=secure&token=$settings{'LOGIN'}", - Net::SSLeay::make_headers('User-Agent' => 'Ipfire' ) - ); - #Valid responses from service are: - # success|100|update succeeded! - # success|101|no update needed at this time.. + + if ($settings{'HOSTNAME'} eq '') { + $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'}; + } else { + $settings{'HOSTDOMAIN'} = "$settings{'HOSTNAME'}.$settings{'DOMAIN'}"; + } + + my ($out, $response) = Net::SSLeay::get_https( 'dyndns.strato.com', + 443, + "/nic/update?hostname=$settings{'HOSTDOMAIN'}&myip=$ip", + Net::SSLeay::make_headers('User-Agent' => 'IPFire', + 'Authorization' => 'Basic ' . encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}") ) + ); + if ($response =~ m%HTTP/1\.. 200 OK%) { - if ( $out !~ m/(success\|(100|101)\|)/ig ) { - &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)"); + #Valid responses from update => ErrCount=0 + if ( $out =~ m/good |nochg /ig) { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : success"); + $success++; } else { - &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success"); + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure1 ($out)"); $success++; } + } elsif ( $out =~ m/(.*)<\/title>/ig ) { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure2 ($1)"); } else { - &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)"); + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure3 ($response)"); } } + elsif ($settings{'SERVICE'} eq 'regfish') { + # use proxy ? + my %proxysettings; + &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); + if ($_=$proxysettings{'UPSTREAM_PROXY'}) { + my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/); + Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} ); + } + my ($out, $response) = Net::SSLeay::get_https( 'dyndns.regfish.de', + 443, + "/?fqdn=$settings{'DOMAIN'}&ipv4=$ip&forcehost=1&authtype=secure&token=$settings{'LOGIN'}", + Net::SSLeay::make_headers('User-Agent' => 'Ipfire' ) + ); + #Valid responses from service are: + #success|100|update succeeded! + #success|101|no update needed at this time.. + if ($response =~ m%HTTP/1\.. 200 OK%) { + if ( $out !~ m/(success\|(100|101)\|)/ig ) { + &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)"); + } else { + &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success"); + $success++; + } + } else { + &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)"); + } + } elsif ($settings{'SERVICE'} eq 'ovh') { my %proxysettings; &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);