# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2014-03-04 22:02:55
# Node ID 693a5cadf0d0220fe159bcf3f4badb5e9b48fff1
# Parent  d8fc977da79470ddf6b0f9ebb0b3e6925a391e44
# Parent  1caae561a67ea8cba3088875af5cf2f65b3a55af

merge

diff --git a/Scripts/traffic_statistics.pl b/Scripts/traffic_statistics.pl
--- a/Scripts/traffic_statistics.pl
+++ b/Scripts/traffic_statistics.pl
@@ -14,10 +14,14 @@ use Chart::Clicker::Data::Series;
 use Chart::Clicker::Renderer::Area;
 use Geometry::Primitive::Rectangle;
 use Graphics::Color::RGB;
+
+############### [Which year] ###########################################
+$select_year = 2014;
+$select_year = shift 	if $ARGV[0] =~ /^\d{4}$/;
 ############### [Create new statistics image] ##########################
 $cc = Chart::Clicker->new(width => 1248, height => 800);
 $ds = Chart::Clicker::Data::DataSet->new();
-@months = qw(1 2 3 4 5 6 7 8 9 10 11 12);
+@months = 1..12;
 @series;
 @traffix;
 ########################################################################
@@ -45,7 +49,7 @@ foreach $server_name (@servers) {
 	die "[-] '$server_name' Failed!\n" unless $server_response->{success};
 	@xml_content = split(/\n/,$server_response->{content});
 	foreach $xml_line (@xml_content) {
-		if ($xml_line =~ /\<month id="(\d+)"\>\<date\>\<year\>(\d+)\<\/year\>\<month\>(\d+)\<\/month\>\<\/date\>\<rx\>(\d+)\<\/rx\>\<tx\>(\d+)\<\/tx\>\<\/month\>/ig) {
+		if ($xml_line =~ /\<month id="(\d+)"\>\<date\>\<year\>($select_year)\<\/year\>\<month\>(\d+)\<\/month\>\<\/date\>\<rx\>(\d+)\<\/rx\>\<tx\>(\d+)\<\/tx\>\<\/month\>/ig) {
 			($id,$year,$month,$rx,$tx) = ($1,$2,$3,$4,$5,$6);
 			$rxtx = ($tx + $rx) * 10e-10;
 			$traffic = $1 if $rxtx =~ /^(\d+\.?\d{5})/;
@@ -53,7 +57,8 @@ foreach $server_name (@servers) {
 		}
 	}
 	for (scalar @traffix..11) {
-		unshift @traffix, 0;
+		push @traffix, 0 	if $select_year == 2014;
+		unshift @traffix, 0 	unless $select_year == 2014;
 	}
 
 	$ds->add_to_series(Chart::Clicker::Data::Series->new(
@@ -73,10 +78,11 @@ foreach $server_name (@servers) {
 $area = Chart::Clicker::Renderer::Area->new(opacity => .2);
 $area->brush->width(3);
 $def->renderer($area);
-$def->range_axis->tick_values([qw(20 40 60 80 100 120 140 160 180 200 220)]);
+$def->range_axis->tick_values([qw(20 40 60 80 100 120 140 160 300)]);
 $def->range_axis->format('%d');
 $def->domain_axis->ticks(11);
 $def->domain_axis->tick_labels([qw(January February Mars April June July August September October November December)]);
 $def->domain_axis->format('%d');
 
 $cc->write_output('stats.png');
+
diff --git a/Scripts/update_server.pl b/Scripts/update_server.pl
--- a/Scripts/update_server.pl
+++ b/Scripts/update_server.pl
@@ -35,7 +35,7 @@ for (1..scalar @configs) {
             $server_type = 'Bridge' if /^BridgeRelay 1/i;
             $data_dir    = $1       if /^DataDirectory (.*)/i;
             $pidfile     = $1       if /^PidFile (.*)/i;
-            $obfs        = 'True'   if /^ServerTransportPlugin obfs2,obfs3/i;
+            $obfs        = 'True'   if /^ServerTransportPlugin (obfs\d+|scramblesuit)/i;
             $ip          = $1       if /^OutboundBindAddress (\d+\.\d+\.\d+\.\d+)/i;
         }
     close config;
@@ -44,7 +44,7 @@ for (1..scalar @configs) {
 print $obfs . "\n";
 ######## [ip check] ########    
     if ($ip == "") {
-        $socket = new IO::Socket::INET ( PeerAddr => "google.com",
+        $socket = new IO::Socket::INET ( PeerAddr => "enn.lu",
                                          PeerPort => 80,
                                          Proto => 'tcp');
         $ip = $socket->sockhost;