[40821 svn/public] client/trunk/azureus2/src

[<pga...@vu...>]

Revision: 40821
Author:   pgardner
Date:     2014-10-02 23:35:18 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------


Modified Paths:
--------------
    client/trunk/azureus2/src/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminImpl.java
    client/trunk/azureus2/src/org/gudy/azureus2/internat/MessagesBundle.properties

Modified: client/trunk/azureus2/src/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminImpl.java
===================================================================
--- client/trunk/azureus2/src/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminImpl.java	2014-10-02 23:06:26 UTC (rev 40820)
+++ client/trunk/azureus2/src/com/aelitis/azureus/core/networkmanager/admin/impl/NetworkAdminImpl.java	2014-10-02 23:35:18 UTC (rev 40821)
@@ -276,21 +276,36 @@
 	private void
 	checkDNSSPI()
 	{
+		String	error_str	= null;
+		
 		try{
 			InetAddress ia = InetAddress.getByName( "dns.test.client.vuze.com" );
 			
 			if ( ia.isLoopbackAddress()){
 				
-				Debug.out( "DNS SPI looks good" );
+				// looks good!
 				
 			}else{
 				
-				Debug.out( "Loopback address expected, got " + ia );
+				error_str = "Loopback address expected, got " + ia;
 			}
+		}catch( UnknownHostException e ){
+			
+			error_str = "DNS SPI not loaded";
+			
 		}catch( Throwable e ){
 			
-			Debug.out( e );
+			error_str = "Test lookup failed: " + Debug.getNestedExceptionMessage( e );
 		}
+		
+		if ( error_str != null ){
+			
+			Logger.log(					
+				new LogAlert(
+					true,
+					LogAlert.AT_WARNING,
+					MessageText.getString( "network.admin.dns.spi.fail", error_str )));
+		}
 	}
 	
 	protected void
@@ -719,7 +734,7 @@
 					new LogAlert(
 						true,
 						LogAlert.AT_WARNING,
-						"'Enforce IP Bindings' is selected but no bindings have been specified\n\nSee Tools->Options->Connection->Advanced Network Settings" ));
+						MessageText.getString( "network.admin.bind.enforce.fail" )));
 			}
 		}
 		

Modified: client/trunk/azureus2/src/org/gudy/azureus2/internat/MessagesBundle.properties
===================================================================
--- client/trunk/azureus2/src/org/gudy/azureus2/internat/MessagesBundle.properties	2014-10-02 23:06:26 UTC (rev 40820)
+++ client/trunk/azureus2/src/org/gudy/azureus2/internat/MessagesBundle.properties	2014-10-02 23:35:18 UTC (rev 40821)
@@ -4589,4 +4589,7 @@
 label.no.suggestions=No Suggestions
 label.ctrl.space.for.suggestion=Hit Ctrl+<space> or Shift+<space> for suggestions
 
+network.admin.bind.enforce.fail='Enforce IP Bindings' is selected but no bindings have been specified\n\nSee Tools->Options->Connection->Advanced Network Settings
+network.admin.dns.spi.fail=Failed to install DNS manager\n\nThis will impact functions such as forced DNS resolution prevention with SOCKS\n\nError: %1
+
 #PLEASE LEAVE ME AT VERY BOTTOM!