aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTedd Hansen2007-09-12 05:37:46 +0000
committerTedd Hansen2007-09-12 05:37:46 +0000
commit5ade01bb493919c65eb3a9c0fc3f76710eea018c (patch)
tree31356ad7d62c2f2ea6d3045b5f3204ae6f47804e /OpenSim
parentdebug for mysql issue (diff)
downloadopensim-SC_OLD-5ade01bb493919c65eb3a9c0fc3f76710eea018c.zip
opensim-SC_OLD-5ade01bb493919c65eb3a9c0fc3f76710eea018c.tar.gz
opensim-SC_OLD-5ade01bb493919c65eb3a9c0fc3f76710eea018c.tar.bz2
opensim-SC_OLD-5ade01bb493919c65eb3a9c0fc3f76710eea018c.tar.xz
Fixed DNS resolve bug for Grid mode on multi-Homer systems.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Data/SimProfileData.cs1
-rw-r--r--OpenSim/Framework/General/Util.cs7
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
index abde1f3..27bbd60 100644
--- a/OpenSim/Framework/Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/SimProfileData.cs
@@ -164,6 +164,7 @@ namespace OpenSim.Framework.Data
164 ArrayList SendParams = new ArrayList(); 164 ArrayList SendParams = new ArrayList();
165 SendParams.Add(requestData); 165 SendParams.Add(requestData);
166 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams); 166 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
167 Console.WriteLine("Requesting response from GridServer URL: " + gridserver_url);
167 XmlRpcResponse GridResp = GridReq.Send(gridserver_url, 3000); 168 XmlRpcResponse GridResp = GridReq.Send(gridserver_url, 3000);
168 169
169 Hashtable responseData = (Hashtable)GridResp.Value; 170 Hashtable responseData = (Hashtable)GridResp.Value;
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs
index a263d7e..fe4ce29 100644
--- a/OpenSim/Framework/General/Util.cs
+++ b/OpenSim/Framework/General/Util.cs
@@ -249,6 +249,13 @@ namespace OpenSim.Framework.Utilities
249 /// <returns>An IP address, or null</returns> 249 /// <returns>An IP address, or null</returns>
250 public static IPAddress GetHostFromDNS(string dnsAddress) 250 public static IPAddress GetHostFromDNS(string dnsAddress)
251 { 251 {
252
253 // Is it already a valid IP? No need to look it up.
254 IPAddress ipa;
255 if (IPAddress.TryParse(dnsAddress, out ipa))
256 return ipa;
257
258 // Not an IP, lookup required
252 IPAddress[] hosts = Dns.GetHostEntry(dnsAddress).AddressList; 259 IPAddress[] hosts = Dns.GetHostEntry(dnsAddress).AddressList;
253 260
254 foreach (IPAddress host in hosts) 261 foreach (IPAddress host in hosts)