[freenet-cvs] r11962 - in trunk/plugins/MDNSDiscovery: . javax/jmdns

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-03-04 19:18:00 +0000 (Sun, 04 Mar 2007)
New Revision: 11962

Modified:
   trunk/plugins/MDNSDiscovery/MDNSDiscovery.java
   trunk/plugins/MDNSDiscovery/javax/jmdns/HostInfo.java
Log:
plugins: Fix some issues with MDNSDiscovery:
	* it wasn't stopping right away
	* thatjoe was experiencing problems with long interface names on winXP64

Modified: trunk/plugins/MDNSDiscovery/MDNSDiscovery.java
===================================================================
--- trunk/plugins/MDNSDiscovery/MDNSDiscovery.java	2007-03-04 18:59:36 UTC (rev 11961)
+++ trunk/plugins/MDNSDiscovery/MDNSDiscovery.java	2007-03-04 19:18:00 UTC (rev 11962)
@@ -44,6 +44,9 @@
 	public void terminate() {
 		jmdns.unregisterAllServices();
 		goon = false;
+		synchronized (this) {
+			notify();
+		}
 	}
 
 	public void runPlugin(PluginRespirator pr) {
@@ -60,7 +63,7 @@
 		try{
 			// Create the multicast listener
 			jmdns = new JmDNS();
-			final String address = "server on " + jmdns.getLocalHost() + " (" + pr.getNode().getMyName();
+			final String address = "server on " + jmdns.getLocalHost().getName();
 			
 			// Advertise Fproxy
 			if(nodeConfig.get("fproxy").getBoolean("enabled")){
@@ -155,7 +158,7 @@
 			for(int i=0; i<foundNodes.length; i++){
 				peerRow.addChild("td", "class", "peer-name").addChild("#", foundNodes[i].getServer());
 				peerRow.addChild("td", "class", "peer-address").addChild("#", foundNodes[i].getHostAddress()+':'+foundNodes[i].getPort());
-				peerRow.addChild("td", "class", "peer-private-darknet-comment-note").addChild("#", foundNodes[i].getName());
+				peerRow.addChild("td", "class", "peer-private-darknet-comment-note").addChild("#", foundNodes[i].getTextString());
 			}
 		}else{
 			HTMLNode peerTableInfobox = contentNode.addChild("div", "class", "infobox infobox-warning");

Modified: trunk/plugins/MDNSDiscovery/javax/jmdns/HostInfo.java
===================================================================
--- trunk/plugins/MDNSDiscovery/javax/jmdns/HostInfo.java	2007-03-04 18:59:36 UTC (rev 11961)
+++ trunk/plugins/MDNSDiscovery/javax/jmdns/HostInfo.java	2007-03-04 19:18:00 UTC (rev 11962)
@@ -16,7 +16,7 @@
  * @version %I%, %G%
  * @author	Pierre Frisch, Werner Randelshofer
  */
-class HostInfo
+public class HostInfo
 {
     private static Logger logger = Logger.getLogger(HostInfo.class.toString());
     protected String name;