[freenet-cvs] r10322 - in trunk/plugins/JSTUN: . de/javawi/jstun/test

[t...@freenetproject.org]

Author: toad
Date: 2006-09-01 17:33:48 +0000 (Fri, 01 Sep 2006)
New Revision: 10322

Modified:
   trunk/plugins/JSTUN/JSTUN.java
   trunk/plugins/JSTUN/de/javawi/jstun/test/DiscoveryInfo.java
Log:
Handle server down

Modified: trunk/plugins/JSTUN/JSTUN.java
===================================================================
--- trunk/plugins/JSTUN/JSTUN.java      2006-09-01 16:33:16 UTC (rev 10321)
+++ trunk/plugins/JSTUN/JSTUN.java      2006-09-01 17:33:48 UTC (rev 10322)
@@ -47,7 +47,12 @@
                                // larry.gloo.net:3478
                                // stun.xten.net:3478
                                DiscoveryInfo info = test.test();
-                               System.out.println("Successful STUN 
discovery!:");
+                               if(info.isBlockedUDP() && !v.isEmpty()) {
+                                       blockCount++;
+                                       System.err.println("Server 
unreachable?: "+stunServer);
+                                       continue;
+                               }
+                               System.out.println("Successful STUN discovery 
from "+stunServer+"!:");
                                System.out.println(info);
                                return convert(info);
                        } catch (BindException be) {

Modified: trunk/plugins/JSTUN/de/javawi/jstun/test/DiscoveryInfo.java
===================================================================
--- trunk/plugins/JSTUN/de/javawi/jstun/test/DiscoveryInfo.java 2006-09-01 
16:33:16 UTC (rev 10321)
+++ trunk/plugins/JSTUN/de/javawi/jstun/test/DiscoveryInfo.java 2006-09-01 
17:33:48 UTC (rev 10322)
@@ -139,7 +139,7 @@
                }
                sb.append("Result: ");
                if (openAccess) sb.append("Open access to the Internet.\n");
-               if (blockedUDP) sb.append("Firewall blocks UDP.\n");
+               if (blockedUDP) sb.append("Firewall blocks UDP or server 
down.\n");
                if (fullCone) sb.append("Full Cone NAT handles connections.\n");
                if (restrictedCone) sb.append("Restricted Cone NAT handles 
connections.\n");
                if (portRestrictedCone) sb.append("Port restricted Cone NAT 
handles connections.\n");