###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2013-2019 IPFire Team <info@ipfire.org> #
# #
# 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 #
###############################################################################
use strict;
-use Locale::Country;
+use Locale::Codes::Country;
# enable only the following on debugging purpose
use warnings;
use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/geoip-functions.pl";
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
undef (@dummy);
my @bandwidth_limits = (
- 1000 * 1024, # 1G
+ 1000 * 1024, # 1 GBit/s
500 * 1024,
200 * 1024,
- 100 * 1024, # 100M
+ 100 * 1024, # 100 MBit/s
64 * 1024,
50 * 1024,
25 * 1024,
8 * 1024,
4 * 1024,
2 * 1024,
- 1024, # 1M
- 512,
- 256,
- 160
+ 1024 # 1 MBit/s
);
my @accounting_periods = ('daily', 'weekly', 'monthly');
my $TOR_CONTROL_PORT = 9051;
+my $string=();
+my $memory=();
+my @memory=();
+my @pid=();
+my @tor=();
+sub daemonstats
+{
+ $memory = 0;
+ # for pid and memory
+ open(FILE, '/usr/local/bin/addonctrl tor status | ');
+ @tor = <FILE>;
+ close(FILE);
+ $string = join("", @tor);
+ $string =~ s/[a-z_]//gi;
+ $string =~ s/\[[0-1]\;[0-9]+//gi;
+ $string =~ s/[\(\)\.]//gi;
+ $string =~ s/ //gi;
+ $string =~ s/\e//gi;
+ @pid = split(/\s/,$string);
+ if (open(FILE, "/proc/$pid[0]/statm")){
+ my $temp = <FILE>;
+ @memory = split(/ /,$temp);
+ close(FILE);
+ }
+ $memory+=$memory[0];
+}
+daemonstats();
+
our %netsettings = ();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
+our %color = ();
+our %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
our %settings = ();
$settings{'TOR_ENABLED'} = 'off';
}
$settings{'TOR_RELAY_ENABLED'} = 'off';
-$settings{'TOR_RELAY_MODE'} = 'exit';
+$settings{'TOR_RELAY_MODE'} = 'relay';
+$settings{'TOR_RELAY_ADDRESS'} = '';
$settings{'TOR_RELAY_PORT'} = 9001;
+$settings{'TOR_RELAY_DIRPORT'} = 0;
$settings{'TOR_RELAY_NICKNAME'} = '';
$settings{'TOR_RELAY_CONTACT_INFO'} = '';
-$settings{'TOR_RELAY_NOADVERTISE'} = 'off';
$settings{'TOR_RELAY_BANDWIDTH_RATE'} = 0;
$settings{'TOR_RELAY_BANDWIDTH_BURST'} = 0;
$settings{'TOR_RELAY_ACCOUNTING_LIMIT'} = 0;
# Toggle enable/disable field.
if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
- if ($settings{'TOR_RELAY_NICKNAME'} !~ /^[a-zA-Z0-9]+$/) {
- $errormessage = "$Lang::tr{'tor errmsg invalid relay name'}: $settings{'TOR_RELAY_NICKNAME'}";
+ if ($settings{'TOR_RELAY_NICKNAME'} ne '') {
+ if ($settings{'TOR_RELAY_NICKNAME'} !~ /^[a-zA-Z0-9]+$/) {
+ $errormessage = "$Lang::tr{'tor errmsg invalid relay name'}: $settings{'TOR_RELAY_NICKNAME'}";
+ }
}
if (!&General::validport($settings{'TOR_SOCKS_PORT'})) {
if (!&General::validport($settings{'TOR_RELAY_PORT'})) {
$errormessage = "$Lang::tr{'tor errmsg invalid relay port'}: $settings{'TOR_RELAY_PORT'}";
}
+ if ($settings{'TOR_RELAY_DIRPORT'} ne '0') {
+ if (!&General::validport($settings{'TOR_RELAY_DIRPORT'})) {
+ $errormessage = "$Lang::tr{'tor errmsg invalid directory port'}: $settings{'TOR_RELAY_DIRPORT'}";
+ }
+ }
+
+ if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
+ if ((!&General::validfqdn($settings{'TOR_RELAY_ADDRESS'})) && (!&General::validip($settings{'TOR_RELAY_ADDRESS'}))) {
+ $errormessage = "$Lang::tr{'tor errmsg invalid relay address'}: $settings{'TOR_RELAY_ADDRESS'}";
+ }
+ }
+
+ if ($settings{'TOR_RELAY_ACCOUNTING_LIMIT'} !~ /^\d+$/) {
+ $errormessage = "$Lang::tr{'tor errmsg invalid accounting limit'}: $settings{'TOR_RELAY_ACCOUNTING_LIMIT'}";
+ }
my @temp = split(/[\n,]/,$settings{'TOR_ALLOWED_SUBNETS'});
$settings{'TOR_ALLOWED_SUBNETS'} = "";
print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
- &Header::openbox('100%', 'left', $Lang::tr{'tor configuration'});
+ &Header::openbox('100%', 'center', $Lang::tr{'tor'});
+
+
+if ( ($memory != 0) && (@pid[0] ne "///") ){
+ print "<table width='95%' cellspacing='0' class='tbl'>";
+ print "<tr><th bgcolor='$color{'color20'}' colspan='3' align='left'><strong>$Lang::tr{'tor service'}</strong></th></tr>";
+ print "<tr><td class='base'>$Lang::tr{'tor daemon'}</td>";
+ print "<td align='center' colspan='2' width='75%' bgcolor='${Header::colourgreen}'><font color='white'><strong>$Lang::tr{'running'}</strong></font></td></tr>";
+ print "<tr><td class='base'></td>";
+ print "<td bgcolor='$color{'color20'}' align='center'><strong>PID</strong></td>";
+ print "<td bgcolor='$color{'color20'}' align='center'><strong>$Lang::tr{'memory'}</strong></td></tr>";
+ print "<tr><td class='base'></td>";
+ print "<td bgcolor='$color{'color22'}' align='center'>@pid[0]</td>";
+ print "<td bgcolor='$color{'color22'}' align='center'>$memory KB</td></tr>";
+ print "</table>";
+ } else {
+ print "<table width='95%' cellspacing='0' class='tbl'>";
+ print "<tr><th bgcolor='$color{'color20'}' colspan='3' align='left'><strong>$Lang::tr{'tor service'}</strong></th></tr>";
+ print "<tr><td class='base'>$Lang::tr{'tor daemon'}</td>";
+ print "<td align='center' width='75%' bgcolor='${Header::colourred}'><font color='white'><strong>$Lang::tr{'stopped'}</strong></font></td></tr>";
+ print "</table>";
+ }
+
+ &Header::closebox();
+
+ &Header::openbox('100%', 'center', $Lang::tr{'tor configuration'});
print <<END;
- <table width='100%'>
+ <table width='95%'>
<tr>
- <td colspan='4' class='base'><b>$Lang::tr{'tor common settings'}</b></td>
+ <td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor common settings'}</b></td>
</tr>
<tr>
<td width='25%' class='base'>$Lang::tr{'tor enabled'}:</td>
<td width='30%'><input type='checkbox' name='TOR_ENABLED' $checked{'TOR_ENABLED'}{'on'} /></td>
- <td width='25%' class='base'>$Lang::tr{'tor socks port'}:</td>
+ <td width='25%' class='base'>$Lang::tr{'tor socks port'}: <img src='/blob.gif' alt='*' /></td>
<td width='20%'><input type='text' name='TOR_SOCKS_PORT' value='$settings{'TOR_SOCKS_PORT'}' size='5' /></td>
</tr>
<tr>
</table>
END
- if ($settings{'TOR_ENABLED'} eq 'on') {
- my @temp = split(",", $settings{'TOR_ALLOWED_SUBNETS'});
- $settings{'TOR_ALLOWED_SUBNETS'} = join("\n", @temp);
+ my @temp = split(",", $settings{'TOR_ALLOWED_SUBNETS'});
+ $settings{'TOR_ALLOWED_SUBNETS'} = join("\n", @temp);
- @temp = split(",", $settings{'TOR_USE_EXIT_NODES'});
- $settings{'TOR_USE_EXIT_NODES'} = join("\n", @temp);
+ @temp = split(",", $settings{'TOR_USE_EXIT_NODES'});
+ $settings{'TOR_USE_EXIT_NODES'} = join("\n", @temp);
- print <<END;
- <br>
- <hr size='1'>
- <br>
+ print <<END;
+ <br>
+ <br>
- <table width='100%'>
- <tr>
- <td colspan='4' class='base'><b>$Lang::tr{'tor acls'}</b></td>
- </tr>
- <tr>
- <td colspan='2' class='base' width='55%'>
- $Lang::tr{'tor allowed subnets'}:
- </td>
- <td colspan='2' width='45%'></td>
- </tr>
- <tr>
- <td colspan='2' class='base' width='55%'>
- <textarea name='TOR_ALLOWED_SUBNETS' cols='32' rows='3' wrap='off'>$settings{'TOR_ALLOWED_SUBNETS'}</textarea>
- </td>
- <td colspan='2' width='45%'></td>
- </tr>
- </table>
+ <table width='95%'>
+ <tr>
+ <td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor acls'}</b></td>
+ </tr>
+ <tr>
+ <td colspan='2' class='base' width='55%'>
+ $Lang::tr{'tor allowed subnets'}:
+ </td>
+ <td colspan='2' width='45%'></td>
+ </tr>
+ <tr>
+ <td colspan='2' class='base' width='55%'>
+ <textarea name='TOR_ALLOWED_SUBNETS' cols='32' rows='3' wrap='off'>$settings{'TOR_ALLOWED_SUBNETS'}</textarea>
+ </td>
+ <td colspan='2' width='45%'></td>
+ </tr>
+ </table>
- <br>
- <hr size='1'>
- <br>
+ <br>
+ <br>
- <table width='100%'>
- <tr>
- <td colspan='4' class='base'><b>$Lang::tr{'tor exit nodes'}</b></td>
- </tr>
- <tr>
- <td colspan='2' class='base' width='55%'></td>
- <td colspan='2' class='base' width='45%'>$Lang::tr{'tor use exit nodes'}:</td>
- </tr>
- <tr>
- <td width='50%' colspan='2'>
- <select name='TOR_EXIT_COUNTRY'>
- <option value=''>- $Lang::tr{'tor exit country any'} -</option>
+ <table width='95%'>
+ <tr>
+ <td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor exit nodes'}</b></td>
+ </tr>
+ <tr>
+ <td colspan='2' class='base' width='55%'></td>
+ <td colspan='2' class='base' width='45%'>$Lang::tr{'tor use exit nodes'}:</td>
+ </tr>
+ <tr>
+ <td width='50%' colspan='2'>
+ <select name='TOR_EXIT_COUNTRY'>
+ <option value=''>- $Lang::tr{'tor exit country any'} -</option>
END
- my @country_names = Locale::Country::all_country_names();
- foreach my $country_name (sort @country_names) {
- my $country_code = Locale::Country::country2code($country_name);
- $country_code = uc($country_code);
- print "<option value='$country_code'>$country_name ($country_code)</option>\n";
+ my @country_names = Locale::Codes::Country::all_country_names();
+ foreach my $country_name (sort @country_names) {
+ my $country_code = Locale::Codes::Country::country2code($country_name);
+ $country_code = uc($country_code);
+ print "<option value='$country_code'";
+
+ if ($settings{'TOR_EXIT_COUNTRY'} eq $country_code) {
+ print " selected";
}
- print <<END;
- </select>
- </td>
- <td width='50%' colspan='2'>
- <textarea name='TOR_USE_EXIT_NODES' cols='32' rows='3' wrap='off'>$settings{'TOR_USE_EXIT_NODES'}</textarea>
- </td>
- </tr>
- </table>
- <br><br>
+ print ">$country_name ($country_code)</option>\n";
+ }
+
+ print <<END;
+ </select>
+ </td>
+ <td width='50%' colspan='2'>
+ <textarea name='TOR_USE_EXIT_NODES' cols='32' rows='3' wrap='off'>$settings{'TOR_USE_EXIT_NODES'}</textarea>
+ </td>
+ </tr>
+ </table>
END
- }
&Header::closebox();
- if ($settings{'TOR_RELAY_ENABLED'} eq 'on') {
- $checked{'TOR_RELAY_NOADVERTISE'}{'on'} = '';
- $checked{'TOR_RELAY_NOADVERTISE'}{'off'} = '';
- $checked{'TOR_RELAY_NOADVERTISE'}{$settings{'TOR_RELAY_NOADVERTISE'}} = 'checked';
-
- $selected{'TOR_RELAY_MODE'}{'bridge'} = '';
- $selected{'TOR_RELAY_MODE'}{'exit'} = '';
- $selected{'TOR_RELAY_MODE'}{'private-bridge'} = '';
- $selected{'TOR_RELAY_MODE'}{'relay'} = '';
- $selected{'TOR_RELAY_MODE'}{$settings{'TOR_RELAY_MODE'}} = 'selected';
-
- $selected{'TOR_RELAY_BANDWIDTH_RATE'}{'0'} = '';
- foreach (@bandwidth_limits) {
- $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_} = '';
- }
- $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$settings{'TOR_RELAY_BANDWIDTH_RATE'}} = 'selected';
+ # Tor relay box
+ $selected{'TOR_RELAY_MODE'}{'bridge'} = '';
+ $selected{'TOR_RELAY_MODE'}{'exit'} = '';
+ $selected{'TOR_RELAY_MODE'}{'private-bridge'} = '';
+ $selected{'TOR_RELAY_MODE'}{'relay'} = '';
+ $selected{'TOR_RELAY_MODE'}{$settings{'TOR_RELAY_MODE'}} = 'selected';
- $selected{'TOR_RELAY_BANDWIDTH_BURST'}{'0'} = '';
- foreach (@bandwidth_limits) {
- $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_} = '';
- }
- $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$settings{'TOR_RELAY_BANDWIDTH_BURST'}} = 'selected';
+ $selected{'TOR_RELAY_BANDWIDTH_RATE'}{'0'} = '';
+ foreach (@bandwidth_limits) {
+ $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_} = '';
+ }
+ $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$settings{'TOR_RELAY_BANDWIDTH_RATE'}} = 'selected';
- foreach (@accounting_periods) {
- $selected{'TOR_RELAY_ACCOUNTING_PERIOD'}{$_} = '';
- }
- $selected{'TOR_RELAY_ACCOUNTING_PERIOD'}{$settings{'TOR_RELAY_ACCOUNTING_PERIOD'}} = 'selected';
+ $selected{'TOR_RELAY_BANDWIDTH_BURST'}{'0'} = '';
+ foreach (@bandwidth_limits) {
+ $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_} = '';
+ }
+ $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$settings{'TOR_RELAY_BANDWIDTH_BURST'}} = 'selected';
- &Header::openbox('100%', 'left', $Lang::tr{'tor relay configuration'});
+ foreach (@accounting_periods) {
+ $selected{'TOR_RELAY_ACCOUNTING_PERIOD'}{$_} = '';
+ }
+ $selected{'TOR_RELAY_ACCOUNTING_PERIOD'}{$settings{'TOR_RELAY_ACCOUNTING_PERIOD'}} = 'selected';
- print <<END;
- <table width='100%'>
- <tr>
- <td width='25%' class='base'>$Lang::tr{'tor relay mode'}:</td>
- <td width='30%'>
- <select name='TOR_RELAY_MODE'>
- <option value='exit' $selected{'TOR_RELAY_MODE'}{'exit'}>$Lang::tr{'tor relay mode exit'}</option>
- <option value='relay' $selected{'TOR_RELAY_MODE'}{'relay'}>$Lang::tr{'tor relay mode relay'}</option>
- <option value='bridge' $selected{'TOR_RELAY_MODE'}{'bridge'}>$Lang::tr{'tor relay mode bridge'}</option>
- <option value='private-bridge' $selected{'TOR_RELAY_MODE'}{'private-bridge'}>$Lang::tr{'tor relay mode private bridge'}</option>
- </select>
- </td>
- <td width='25%' class='base'>$Lang::tr{'tor relay port'}:</td>
- <td width='20%'>
- <input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' />
- </td>
- </tr>
- <tr>
- <td width='25%' class='base'>$Lang::tr{'tor relay address'}: <img src='/blob.gif' alt='*' /></td>
- <td width='30%'>
- <input type='text' name='TOR_RELAY_ADDRESS' value='$settings{'TOR_RELAY_ADDRESS'}' />
- </td>
- <td width='25%' class='base'>$Lang::tr{'tor do not advertise relay'}:</td>
- <td width='20%'>
- <input type='checkbox' name='TOR_RELAY_NOADVERTISE' $checked{'TOR_RELAY_NOADVERTISE'}{'on'} />
- </td>
- </tr>
- <tr>
- <td width='25%' class='base'>$Lang::tr{'tor relay nickname'}: <img src='/blob.gif' alt='*' /></td>
- <td width='30%'>
- <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' />
- </td>
- <td colspan='2'></td>
- </tr>
- <tr>
- <td width='25%' class='base'>$Lang::tr{'tor contact info'}: <img src='/blob.gif' alt='*' /></td>
- <td width='75%' colspan='3'>
- <input type='text' name='TOR_RELAY_CONTACT_INFO' value='$settings{'TOR_RELAY_CONTACT_INFO'}' size='60' />
- </td>
- </tr>
- </table>
+ &Header::openbox('100%', 'center', $Lang::tr{'tor relay configuration'});
+
+ print <<END;
+ <table width='95%'>
+ <tr>
+ <td width='25%' class='base'>$Lang::tr{'tor relay mode'}:</td>
+ <td width='30%'>
+ <select name='TOR_RELAY_MODE'>
+ <option value='exit' $selected{'TOR_RELAY_MODE'}{'exit'}>$Lang::tr{'tor relay mode exit'}</option>
+ <option value='relay' $selected{'TOR_RELAY_MODE'}{'relay'}>$Lang::tr{'tor relay mode relay'}</option>
+ <option value='bridge' $selected{'TOR_RELAY_MODE'}{'bridge'}>$Lang::tr{'tor relay mode bridge'}</option>
+ <option value='private-bridge' $selected{'TOR_RELAY_MODE'}{'private-bridge'}>$Lang::tr{'tor relay mode private bridge'}</option>
+ </select>
+ </td>
+ <td width='25%' class='base'>$Lang::tr{'tor relay nickname'}:</td>
+ <td width='20%'>
+ <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' maxlength='19' />
+ </td>
+ </tr>
+ <tr>
+ <td width='25%' class='base'>$Lang::tr{'tor relay address'}:</td>
+ <td width='30%'>
+ <input type='text' name='TOR_RELAY_ADDRESS' value='$settings{'TOR_RELAY_ADDRESS'}' />
+ </td>
+ <td width='25%' class='base'>$Lang::tr{'tor relay port'}: <img src='/blob.gif' alt='*' /></td>
+ <td width='20%'>
+ <input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' />
+ </td>
+ </tr>
+ <tr>
+ <td width='25%'> </td>
+ <td width='30%'> </td>
+ <td width='25%' class='base'>$Lang::tr{'tor directory port'}: <img src='/blob.gif' alt='*' /></td>
+ <td width='20%'>
+ <input type='text' name='TOR_RELAY_DIRPORT' value='$settings{'TOR_RELAY_DIRPORT'}' size='5' /> $Lang::tr{'tor 0 = disabled'}
+ </td>
+ </tr>
+ <tr>
+ <td width='25%' class='base'>$Lang::tr{'tor contact info'}:</td>
+ <td width='75%' colspan='3'>
+ <input type='text' name='TOR_RELAY_CONTACT_INFO' value='$settings{'TOR_RELAY_CONTACT_INFO'}' style='width: 98%;' />
+ </td>
+ </tr>
+ </table>
- <hr size='1'>
+ <br>
- <table width='100%'>
- <tr>
- <td colspan='4' class='base'><b>$Lang::tr{'tor bandwidth settings'}</b></td>
- </tr>
- <tr>
- <td width='25%' class='base'>$Lang::tr{'tor bandwidth rate'}:</td>
- <td width='30%' class='base'>
- <select name='TOR_RELAY_BANDWIDTH_RATE'>
+ <table width='95%'>
+ <tr>
+ <td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor bandwidth settings'}</b></td>
+ </tr>
+ <tr>
+ <td width='25%' class='base'>$Lang::tr{'tor bandwidth rate'}:</td>
+ <td width='30%' class='base'>
+ <select name='TOR_RELAY_BANDWIDTH_RATE'>
END
- foreach (@bandwidth_limits) {
- if ($_ >= 1024) {
- print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_}>". $_ / 1024 ." MBit/s</option>\n";
- } else {
- print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_}>$_ kBit/s</option>\n";
- }
+ foreach (@bandwidth_limits) {
+ if ($_ >= 1024) {
+ print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_}>". $_ / 1024 ." Mbit/s</option>\n";
+ } else {
+ print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_}>$_ kbit/s</option>\n";
}
+ }
- print <<END;
- <option value='0' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{'0'}>$Lang::tr{'tor bandwidth unlimited'}</option>
- </select>
- </td>
- <td width='25%' class='base'>$Lang::tr{'tor accounting limit'}:</td>
- <td width='20%'>
- <input type='text' name='TOR_RELAY_ACCOUNTING_LIMIT' value='$settings{'TOR_RELAY_ACCOUNTING_LIMIT'}' size='12' />
- </td>
- </tr>
- <tr>
- <td width='25%' class='base'>$Lang::tr{'tor bandwidth burst'}:</td>
- <td width='20%' class='base'>
- <select name='TOR_RELAY_BANDWIDTH_BURST'>
+ print <<END;
+ <option value='0' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{'0'}>$Lang::tr{'tor bandwidth unlimited'}</option>
+ </select>
+ </td>
+ <td width='25%' class='base'>$Lang::tr{'tor accounting limit'}: <img src='/blob.gif' alt='*' /></td>
+ <td width='20%'>
+ <input type='text' name='TOR_RELAY_ACCOUNTING_LIMIT' value='$settings{'TOR_RELAY_ACCOUNTING_LIMIT'}' size='12' />
+ </td>
+ </tr>
+ <tr>
+ <td width='25%' class='base'>$Lang::tr{'tor bandwidth burst'}:</td>
+ <td width='20%' class='base'>
+ <select name='TOR_RELAY_BANDWIDTH_BURST'>
END
- foreach (@bandwidth_limits) {
- if ($_ >= 1024) {
- print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_}>". $_ / 1024 ." MBit/s</option>\n";
- } else {
- print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_}>$_ kBit/s</option>\n";
- }
+ foreach (@bandwidth_limits) {
+ if ($_ >= 1024) {
+ print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_}>". $_ / 1024 ." Mbit/s</option>\n";
+ } else {
+ print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_}>$_ kbit/s</option>\n";
}
- print <<END;
- <option value='0' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{'0'}>$Lang::tr{'tor bandwidth unlimited'}</option>
- </select>
- </td>
- <td width='25%' class='base'>$Lang::tr{'tor accounting period'}:</td>
- <td width='20%'>
- <select name='TOR_RELAY_ACCOUNTING_PERIOD'>
+ }
+ print <<END;
+ <option value='0' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{'0'}>$Lang::tr{'tor bandwidth unlimited'}</option>
+ </select>
+ </td>
+ <td width='25%' class='base'>$Lang::tr{'tor accounting period'}:</td>
+ <td width='20%'>
+ <select name='TOR_RELAY_ACCOUNTING_PERIOD'>
END
- foreach (@accounting_periods) {
- print "<option value='$_' $selected{'TOR_RELAY_ACCOUNTING_PERIOD'}{$_}>$Lang::tr{'tor accounting period '.$_}</option>";
- }
+ foreach (@accounting_periods) {
+ print "<option value='$_' $selected{'TOR_RELAY_ACCOUNTING_PERIOD'}{$_}>$Lang::tr{'tor accounting period '.$_}</option>";
+ }
- print <<END;
- </select>
- </td>
- </tr>
- </table>
+ print <<END;
+ </select>
+ </td>
+ </tr>
+ </table>
END
- &Header::closebox();
- }
+ &Header::closebox();
print <<END;
- <table width='100%'>
+ <table width='95%'>
<tr>
- <td>
- <img src='/blob.gif' align='top' alt='*' /> <font class='base'>$Lang::tr{'this field may be blank'}</font>
- </td>
+ <td><img src='/blob.gif' align='top' alt='*' /> <font class='base'>$Lang::tr{'required field'}</font></td>
<td align='right'> </td>
</tr>
</table>
<hr>
- <table width='100%'>
+ <table width='95%'>
<tr>
<td> </td>
<td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
# If we have a control connection, show the stats.
if ($torctrl) {
- &Header::openbox('100%', 'left', $Lang::tr{'tor stats'});
+ &Header::openbox('100%', 'center', $Lang::tr{'tor stats'});
my @traffic = &TorTrafficStats($torctrl);
if (@traffic) {
print <<END;
- <table width='100%'>
+ <table width='95%'>
END
if ($settings{'TOR_RELAY_ENABLED'} eq 'on') {
<tr>
<td width='40%' class='base'>$Lang::tr{'tor relay fingerprint'}:</td>
<td width='60%'>
- <a href='https://atlas.torproject.org/#details/$fingerprint' target='_blank'>$fingerprint</a>
+ <a href='https://metrics.torproject.org/rs.html#details/$fingerprint' target='_blank'>$fingerprint</a>
</td>
</tr>
END
my $accounting = &TorAccountingStats($torctrl);
if ($accounting) {
print <<END;
- <table width='100%'>
+ <table width='95%'>
<tr>
<td colspan='2' class='base'><b>$Lang::tr{'tor accounting'}</b></td>
</tr>
if (@nodes) {
my $nodes_length = scalar @nodes;
print <<END;
- <table width='100%'>
+ <table width='95%'>
<tr>
<td width='40%' class='base'><b>$Lang::tr{'tor connected relays'}</b></td>
<td width='60%' colspan='2'>($nodes_length)</td>
print <<END;
<tr>
<td width='40%'>
- <a href='https://atlas.torproject.org/#details/$node->{'fingerprint'}' target='_blank'>
+ <a href='https://metrics.torproject.org/rs.html#details/$node->{'fingerprint'}' target='_blank'>
$node->{'name'}
</a>
</td>
END
if (exists($node->{'country_code'})) {
- print "<a href='country.cgi#$node->{'country_code'}'><img src='/images/flags/$node->{'country_code'}.png' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>";
+ # Get the flag icon of the country.
+ my $flag_icon = &GeoIP::get_flag_icon($node->{'country_code'});
+
+ # Check if a flag for the given country is available.
+ if ($flag_icon) {
+ print "<a href='country.cgi#$node->{'country_code'}'><img src='$flag_icon' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>";
+ } else {
+ print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>";
+ }
}
print <<END;
# Reject access to private networks.
print FILE "ExitPolicyRejectPrivate 1\n";
- print FILE "ORPort $settings{'TOR_RELAY_PORT'}";
- if ($settings{'TOR_RELAY_NOADVERTISE'} eq 'on') {
- print FILE " NoAdvertise";
+ print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n";
+
+ if ($settings{'TOR_RELAY_DIRPORT'} ne '0') {
+ print FILE "DirPort $settings{'TOR_RELAY_DIRPORT'}\n";
}
- print FILE "\n";
if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n";
} else {
system("/usr/local/bin/torctrl stop &>/dev/null");
}
+ # Update pid and memory
+ daemonstats();
}
sub TorConnect() {
sub FormatBitsPerSecond() {
my $bits = shift;
- my @units = ("Bit/s", "KBit/s", "MBit/s", "GBit/s", "TBit/s");
+ my @units = ("bit/s", "kbit/s", "Mbit/s", "Gbit/s", "Tbit/s");
my $units_index = 0;
while (($units_index <= $#units) && ($bits >= 1024)) {
projects / ipfire-2.x.git / blobdiff