]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - html/cgi-bin/tor.cgi
suricata: Change midstream policy to "pass-flow"
[ipfire-2.x.git] / html / cgi-bin / tor.cgi
index 2a31dd4bf8ebc51875e7d53516f750316c444b55..9aa2bc95a1985e2f0e3b23311f0e34a26a10a2ec 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2023  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;
 
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/location-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -35,10 +35,10 @@ my @dummy = ( ${Header::colouryellow} );
 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,
@@ -48,33 +48,66 @@ my @bandwidth_limits = (
           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/ipfire/include/colors.txt", \%color);
+
 our %settings = ();
 
 $settings{'TOR_ENABLED'} = 'off';
 $settings{'TOR_SOCKS_PORT'} = 9050;
 $settings{'TOR_EXIT_COUNTRY'} = '';
 $settings{'TOR_USE_EXIT_NODES'} = '';
+$settings{'TOR_GUARD_COUNTRY'} = '';
+$settings{'TOR_USE_GUARD_NODES'} = '';
 $settings{'TOR_ALLOWED_SUBNETS'} = "$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}";
 if (&Header::blue_used()) {
        $settings{'TOR_ALLOWED_SUBNETS'} .= ",$netsettings{'BLUE_NETADDRESS'}\/$netsettings{'BLUE_NETMASK'}";
 }
 
 $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_BANDWIDTH_RATE'} = 0;
@@ -110,6 +143,11 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
        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'}))) {
@@ -142,6 +180,15 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
                }
        }
 
+       @temp = split(/[\n,]/,$settings{'TOR_USE_GUARD_NODES'});
+       $settings{'TOR_USE_GUARD_NODES'} = "";
+       foreach (@temp) {
+               s/^\s+//g; s/\s+$//g;
+               if ($_) {
+                       $settings{'TOR_USE_GUARD_NODES'} .= $_.",";
+               }
+       }
+
        # Burst bandwidth must be less or equal to bandwidth rate.
        if ($settings{'TOR_RELAY_BANDWIDTH_RATE'} == 0) {
                $settings{'TOR_RELAY_BANDWIDTH_BURST'} = 0;
@@ -192,17 +239,42 @@ sub showMainBox() {
 
        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'}:&nbsp;<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>
@@ -220,14 +292,16 @@ END
        @temp = split(",", $settings{'TOR_USE_EXIT_NODES'});
        $settings{'TOR_USE_EXIT_NODES'} = join("\n", @temp);
 
+       @temp = split(",", $settings{'TOR_USE_GUARD_NODES'});
+       $settings{'TOR_USE_GUARD_NODES'} = join("\n", @temp);
+
        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%'>
@@ -243,13 +317,61 @@ END
                        </tr>
                </table>
 
-               <br>
-               <hr size='1'>
-               <br>
+               <br />
+               <br />
+
+               <table width='95%'>
+                       <tr>
+                               <td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor guard nodes'}</b></td>
+                       </tr>
+                       <tr>
+                               <td colspan='2' class='base' width='55%'></td>
+                               <td colspan='2' class='base' width='45%'>$Lang::tr{'tor use guard nodes'}:</td>
+                       </tr>
+                       <tr>
+                               <td width='50%' colspan='2'>
+                                       <select name='TOR_GUARD_COUNTRY' multiple='multiple'>
+                                               <option value=''>- $Lang::tr{'tor guard country any'} -</option>
+END
+
+               # Convert Guard country strings into lists to make comparison easier
+               my @guard_countries;
+               if ($settings{'TOR_GUARD_COUNTRY'} ne '') {
+                       @guard_countries = split(/\|/, $settings{'TOR_GUARD_COUNTRY'});
+               }
+
+               my @country_codes = &Location::Functions::get_locations("no_special_locations");
+               foreach my $country_code (@country_codes) {
+                       # Convert country code into upper case format.
+                       $country_code = uc($country_code);
+
+                       # Get country name.
+                       my $country_name = &Location::Functions::get_full_country_name($country_code);
+
+                       print "<option value='$country_code'";
+
+                       if ($settings{'TOR_GUARD_COUNTRY'} ne '') {
+                               print " selected" if grep /$country_code/, @guard_countries;
+                       }
+
+                       print ">$country_name ($country_code)</option>\n";
+               }
+
+       print <<END;
+                                       </select>
+                               </td>
+                               <td width='50%' colspan='2'>
+                                       <textarea name='TOR_USE_GUARD_NODES' cols='32' rows='3' wrap='off'>$settings{'TOR_USE_GUARD_NODES'}</textarea>
+                               </td>
+                       </tr>
+               </table>
+
+               <br />
+               <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>
@@ -257,15 +379,31 @@ END
                        </tr>
                        <tr>
                                <td width='50%' colspan='2'>
-                                       <select name='TOR_EXIT_COUNTRY'>
+                                       <select name='TOR_EXIT_COUNTRY' multiple='multiple'>
                                                <option value=''>- $Lang::tr{'tor exit country any'} -</option>
 END
+               my @country_codes = &Location::Functions::get_locations("no_special_locations");
+
+               # Convert Exit country strings into lists to make comparison easier
+               my @exit_countries;
+               if ($settings{'TOR_EXIT_COUNTRY'} ne '') {
+                       @exit_countries = split(/\|/, $settings{'TOR_EXIT_COUNTRY'});
+               }
 
-               my @country_names = Locale::Country::all_country_names();
-               foreach my $country_name (sort @country_names) {
-                       my $country_code = Locale::Country::country2code($country_name);
+               foreach my $country_code (@country_codes) {
+                       # Convert country code into upper case format.
                        $country_code = uc($country_code);
-                       print "<option value='$country_code'>$country_name ($country_code)</option>\n";
+
+                       # Get country name.
+                       my $country_name = &Location::Functions::get_full_country_name($country_code);
+
+                       print "<option value='$country_code'";
+
+                       if ($settings{'TOR_EXIT_COUNTRY'} ne '') {
+                               print " selected" if grep /$country_code/, @exit_countries;
+                       }
+
+                       print ">$country_name ($country_code)</option>\n";
                }
 
        print <<END;
@@ -276,7 +414,6 @@ END
                                </td>
                        </tr>
                </table>
-               <br><br>
 END
 
        &Header::closebox();
@@ -305,10 +442,10 @@ END
        }
        $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%'>
@@ -319,34 +456,42 @@ END
                                                <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'}:&nbsp;<img src='/blob.gif' alt='*' /></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'}' />
+                                       <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'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+                               <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'}:</td>
+                               <td width='25%' class='base'>$Lang::tr{'tor relay port'}:&nbsp;<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%' class='base'>$Lang::tr{'tor contact info'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+                               <td width='25%'>&nbsp;</td>
+                               <td width='30%'>&nbsp;</td>
+                               <td width='25%' class='base'>$Lang::tr{'tor directory port'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+                               <td width='20%'>
+                                       <input type='text' name='TOR_RELAY_DIRPORT' value='$settings{'TOR_RELAY_DIRPORT'}' size='5' />&nbsp;$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%'>
+               <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>
@@ -356,9 +501,9 @@ END
 
        foreach (@bandwidth_limits) {
                if ($_ >= 1024) {
-                       print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_}>". $_ / 1024 ." MBit/s</option>\n";
+                       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 "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_}>$_ kbit/s</option>\n";
                }
        }
 
@@ -366,7 +511,7 @@ 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='25%' class='base'>$Lang::tr{'tor accounting limit'}:&nbsp;<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>
@@ -379,9 +524,9 @@ END
 
        foreach (@bandwidth_limits) {
                if ($_ >= 1024) {
-                       print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_}>". $_ / 1024 ." MBit/s</option>\n";
+                       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 "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_}>$_ kbit/s</option>\n";
                }
        }
        print <<END;
@@ -407,18 +552,16 @@ END
        &Header::closebox();
 
        print <<END;
-               <table width='100%'>
+               <table width='95%'>
                        <tr>
-                               <td>
-                                       <img src='/blob.gif' align='top' alt='*' />&nbsp;<font class='base'>$Lang::tr{'this field may be blank'}</font>
-                               </td>
+                               <td><img src='/blob.gif' align='top' alt='*' />&nbsp;<font class='base'>$Lang::tr{'required field'}</font></td>
                                <td align='right'>&nbsp;</td>
                        </tr>
                </table>
 
                <hr>
 
-               <table width='100%'>
+               <table width='95%'>
                        <tr>
                                <td>&nbsp;</td>
                                <td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
@@ -429,13 +572,13 @@ END
 
        # 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') {
@@ -445,7 +588,7 @@ END
                                        <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
@@ -476,7 +619,7 @@ 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>
@@ -527,7 +670,7 @@ END
                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>
@@ -538,7 +681,7 @@ END
                                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>
@@ -546,7 +689,15 @@ END
 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 = &Location::Functions::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;
@@ -579,6 +730,9 @@ sub BuildConfiguration() {
        open(FILE, ">$torrc");
 
        # Global settings.
+       print FILE "Sandbox 1\n";
+       print FILE "HardwareAccel 1\n";
+       print FILE "ClientUseIPv6 0\n";
        print FILE "ControlPort $TOR_CONTROL_PORT\n";
 
        if ($settings{'TOR_ENABLED'} eq 'on') {
@@ -592,10 +746,43 @@ sub BuildConfiguration() {
                }
                print FILE "SocksPolicy reject *\n" if (@subnets);
 
+               if ($settings{'TOR_GUARD_COUNTRY'} ne '') {
+                       $strict_nodes = 1;
+                       my $countrylist;
+
+                       for my $singlecountry (split(/\|/, $settings{'TOR_GUARD_COUNTRY'})) {
+                               if ($countrylist eq '') {
+                                       $countrylist = "{" . lc $singlecountry . "}";
+                               } else {
+                                       $countrylist = $countrylist . "," . "{" . lc $singlecountry . "}";
+                               }
+                       }
+
+                       print FILE "EntryNodes $countrylist\n";
+               }
+
+               if ($settings{'TOR_USE_GUARD_NODES'} ne '') {
+                       $strict_nodes = 1;
+
+                       my @nodes = split(",", $settings{'TOR_USE_GUARD_NODES'});
+                       foreach (@nodes) {
+                               print FILE "EntryNode $_\n";
+                       }
+               }
+
                if ($settings{'TOR_EXIT_COUNTRY'} ne '') {
                        $strict_nodes = 1;
+                       my $countrylist;
+
+                       for my $singlecountry (split(/\|/, $settings{'TOR_EXIT_COUNTRY'})) {
+                               if ($countrylist eq '') {
+                                       $countrylist = "{" . lc $singlecountry . "}";
+                               } else {
+                                       $countrylist = $countrylist . "," . "{" . lc $singlecountry . "}";
+                               }
+                       }
 
-                       print FILE "ExitNodes {$settings{'TOR_EXIT_COUNTRY'}}\n";
+                       print FILE "ExitNodes $countrylist\n";
                }
 
                if ($settings{'TOR_USE_EXIT_NODES'} ne '') {
@@ -603,20 +790,26 @@ sub BuildConfiguration() {
 
                        my @nodes = split(",", $settings{'TOR_USE_EXIT_NODES'});
                        foreach (@nodes) {
-                               print FILE "ExitNode $_\n";
+                               print FILE "ExitNodes $_\n";
                        }
                }
 
                if ($strict_nodes > 0) {
                        print FILE "StrictNodes 1\n";
                }
-       }
+        } else {
+               print FILE "SocksPort 0\n";
+        }
 
        if ($settings{'TOR_RELAY_ENABLED'} eq 'on') {
                # Reject access to private networks.
                print FILE "ExitPolicyRejectPrivate 1\n";
 
-               print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n";
+               print FILE "ORPort $settings{'TOR_RELAY_PORT'} IPv4Only\n";
+
+               if ($settings{'TOR_RELAY_DIRPORT'} ne '0') {
+                       print FILE "DirPort $settings{'TOR_RELAY_DIRPORT'} IPv4Only\n";
+               }
 
                if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
                        print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n";
@@ -685,10 +878,12 @@ sub BuildConfiguration() {
 
        # Restart the service.
        if (($settings{'TOR_ENABLED'} eq 'on') || ($settings{'TOR_RELAY_ENABLED'} eq 'on')) {
-               system("/usr/local/bin/torctrl restart &>/dev/null");
+               &General::system("/usr/local/bin/torctrl", "restart");
        } else {
-               system("/usr/local/bin/torctrl stop &>/dev/null");
+               &General::system("/usr/local/bin/torctrl", "stop");
        }
+       # Update pid and memory
+       daemonstats();
 }
 
 sub TorConnect() {
@@ -822,7 +1017,7 @@ sub TorNodeDescription() {
                        $node->{'address'} = $3;
                        $node->{'port'}    = $4;
 
-                       my $country_code = &TorGetInfo($tor, "ip-to-country/$node->{'address'}");
+                       my $country_code = &Location::Functions::lookup_country_code($node->{'address'});
                        $node->{'country_code'} = $country_code;
 
                # Flags
@@ -890,7 +1085,7 @@ sub FormatBytes() {
 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)) {