###############################################################################
use strict;
-use Locale::Country;
+use Locale::Codes::Country;
# enable only the following on debugging purpose
use warnings;
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_MODE'} = 'exit';
$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_BANDWIDTH_RATE'} = 0;
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'}))) {
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>
print <<END;
<br>
- <hr size='1'>
<br>
- <table width='100%'>
+ <table width='95%'>
<tr>
- <td colspan='4' class='base'><b>$Lang::tr{'tor acls'}</b></td>
+ <td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor acls'}</b></td>
</tr>
<tr>
<td colspan='2' class='base' width='55%'>
</table>
<br>
- <hr size='1'>
<br>
- <table width='100%'>
+ <table width='95%'>
<tr>
- <td colspan='4' class='base'><b>$Lang::tr{'tor exit nodes'}</b></td>
+ <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>
<option value=''>- $Lang::tr{'tor exit country any'} -</option>
END
- my @country_names = Locale::Country::all_country_names();
+ my @country_names = Locale::Codes::Country::all_country_names();
foreach my $country_name (sort @country_names) {
- my $country_code = Locale::Country::country2code($country_name);
+ my $country_code = Locale::Codes::Country::country2code($country_name);
$country_code = uc($country_code);
- print "<option value='$country_code'>$country_name ($country_code)</option>\n";
+ print "<option value='$country_code'";
+
+ if ($settings{'TOR_EXIT_COUNTRY'} eq $country_code) {
+ print " selected";
+ }
+
+ print ">$country_name ($country_code)</option>\n";
}
print <<END;
</td>
</tr>
</table>
- <br><br>
END
&Header::closebox();
}
$selected{'TOR_RELAY_ACCOUNTING_PERIOD'}{$settings{'TOR_RELAY_ACCOUNTING_PERIOD'}} = 'selected';
- &Header::openbox('100%', 'left', $Lang::tr{'tor relay configuration'});
+ &Header::openbox('100%', 'center', $Lang::tr{'tor relay configuration'});
print <<END;
- <table width='100%'>
+ <table width='95%'>
<tr>
<td width='25%' class='base'>$Lang::tr{'tor relay mode'}:</td>
<td width='30%'>
</td>
<td width='25%' class='base'>$Lang::tr{'tor relay nickname'}: <img src='/blob.gif' alt='*' /></td>
<td width='20%'>
- <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' />
+ <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' maxlength='19' />
</td>
</tr>
<tr>
<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'}:</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'}: <img src='/blob.gif' alt='*' /></td>
<td width='75%' colspan='3'>
</tr>
</table>
- <hr size='1'>
+ <br>
- <table width='100%'>
+ <table width='95%'>
<tr>
- <td colspan='4' class='base'><b>$Lang::tr{'tor bandwidth settings'}</b></td>
+ <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>
&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>
<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') {
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>
END
if (exists($node->{'country_code'})) {
+ if (!$node->{'country_code'} or $node->{'country_code'} eq '??') {
+ print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>";
+ } else {
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>";
+ }
}
print <<END;
print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n";
+ if ($settings{'TOR_RELAY_DIRPORT'} ne '0') {
+ print FILE "DirPort $settings{'TOR_RELAY_DIRPORT'}\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() {