From 518e661a82a72a4f36105f3635ce906889361c6e Mon Sep 17 00:00:00 2001 From: seb Date: Thu, 19 May 2011 06:49:03 +0000 Subject: [PATCH] Parallelize UPnP search for WANIPConnection and WANPPPConnection. --- lib/weupnp-0.1.2-SNAPSHOT.jar | Bin 26038 -> 26190 bytes src/org/ice4j/ice/harvest/UPNPHarvester.java | 132 ++++++++++++++++++- 2 files changed, 125 insertions(+), 7 deletions(-) diff --git a/lib/weupnp-0.1.2-SNAPSHOT.jar b/lib/weupnp-0.1.2-SNAPSHOT.jar index e3ff0f7caab699b98388c744810d7ea39f69611e..8b08fcdb8e69eb9ea33d96aaf1db407dd541a74b 100644 GIT binary patch delta 3423 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 delta 3217 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 diff --git a/src/org/ice4j/ice/harvest/UPNPHarvester.java b/src/org/ice4j/ice/harvest/UPNPHarvester.java index 3638681..41f5420 100644 --- a/src/org/ice4j/ice/harvest/UPNPHarvester.java +++ b/src/org/ice4j/ice/harvest/UPNPHarvester.java @@ -38,9 +38,31 @@ public class UPNPHarvester private static final int MAX_RETRIES = 5; /** - * The UPnP discover. + * ST search field for WANIPConnection. */ - private GatewayDiscover discover = new GatewayDiscover(); + private static final String stIP = + "urn:schemas-upnp-org:service:WANIPConnection:1"; + + /** + * ST search field for WANPPPConnection. + */ + private static final String stPPP = + "urn:schemas-upnp-org:service:WANPPPConnection:1"; + + /** + * Synchronization object. + */ + private final Object rootSync = new Object(); + + /** + * Gateway device. + */ + private GatewayDevice device = null; + + /** + * Number of UPnP discover threads that have finished. + */ + private int finishThreads = 0; /** * Constructor. @@ -49,7 +71,31 @@ public class UPNPHarvester { try { - discover.discover(); + logger.info("Begin UPnP harvesting"); + + UPNPThread wanIPThread = new UPNPThread(stIP); + UPNPThread wanPPPThread = new UPNPThread(stPPP); + + wanIPThread.start(); + wanPPPThread.start(); + + while(finishThreads != 2) + { + synchronized(rootSync) + { + rootSync.wait(); + } + } + + if(wanIPThread.getDevice() != null) + { + device = wanIPThread.getDevice(); + } + else if(wanPPPThread.getDevice() != null) + { + device = wanPPPThread.getDevice(); + } + } catch(Exception e) { @@ -75,9 +121,6 @@ public class UPNPHarvester try { - logger.info("Begin UPnP harvesting"); - GatewayDevice device = discover.getValidGateway(); - if(device == null) { return candidates; @@ -108,7 +151,7 @@ public class UPNPHarvester localAddress, externalIPAddress, externalPort, component, device); - logger.info("Add UPnP port mapping: " + + logger.info("Add UPnP port mapping: " + externalIPAddress + " " + externalPort); // we have to add the UPNPCandidate and also the base. @@ -176,4 +219,79 @@ public class UPNPHarvester return ret; } + + /** + * UPnP discover thread. + */ + private class UPNPThread + extends Thread + { + /** + * Gateway device. + */ + private GatewayDevice device = null; + + /** + * ST search field. + */ + private final String st; + + /** + * Constructor. + * + * @param st ST search field + */ + public UPNPThread(String st) + { + this.st = st; + } + + /** + * Returns gateway device. + * + * @return gateway device + */ + public GatewayDevice getDevice() + { + return device; + } + + /** + * Thread Entry point. + */ + public void run() + { + try + { + GatewayDiscover gd = new GatewayDiscover(st); + + gd.discover(); + + if(gd.getValidGateway() != null) + { + device = gd.getValidGateway(); + } + } + catch(Throwable e) + { + logger.info("Failed to harvest UPnP: " + e); + + /* + * The Javadoc on ThreadDeath says: If ThreadDeath is caught by + * a method, it is important that it be rethrown so that the + * thread actually dies. + */ + if(e instanceof ThreadDeath) + throw (ThreadDeath)e; + } + finally + { + synchronized(rootSync) + { + finishThreads++; + rootSync.notify(); + } + } + } + } }