X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Ftor.cgi;h=befd5083442993a57168fa6315ccdeba3b20b568;hp=b920724de7aeab1e592b851fc51f088a1a9b1879;hb=b128fe7e69304ee26a293d508e31bd7f63c12f2d;hpb=e3c1704453af2ec96e9c99f5f3ed8a2e0979d072

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index b920724de..befd50834 100755
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -108,6 +108,7 @@ $settings{'TOR_RELAY_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;
@@ -143,6 +144,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'}))) {
@@ -382,7 +388,7 @@ END
 				</td>
 				<td width='25%' class='base'>$Lang::tr{'tor relay nickname'}:&nbsp;<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>
@@ -395,6 +401,14 @@ END
 					<input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' />
 				</td>
 			</tr>
+			<tr>
+				<td width='25%'>&nbsp;</td>
+				<td width='30%'>&nbsp;</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' />&nbsp;$Lang::tr{'tor 0 = disabled'}
+				</td>
+			</tr>
 			<tr>
 				<td width='25%' class='base'>$Lang::tr{'tor contact info'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
 				<td width='75%' colspan='3'>
@@ -607,7 +621,7 @@ END
 END
 
 				if (exists($node->{'country_code'})) {
-					if ($node->{'country_code'} eq '??') {
+					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>";
@@ -683,6 +697,10 @@ sub BuildConfiguration() {
 
 		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";
 		}