OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

missing file

0.9.1.0-post-fixes
UbitUmarov 2019-09-02 22:56:57 +01:00
parent ae130d9f25
commit eedb0a1c85
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Framework/Util.cs
View File

@ -434,9 +434,11 @@ namespace OpenSim.Framework
} }
public static bool checkServiceURI(string uristr, out string serviceURI) public static bool checkServiceURI(string uristr, out string serviceURI, out string serviceHost, out string serviceIPstr)
{ {
serviceURI = string.Empty; serviceURI = string.Empty;
serviceHost = string.Empty;
serviceIPstr = string.Empty;
try try
{ {
Uri uri = new Uri(uristr); Uri uri = new Uri(uristr);
@ -445,6 +447,13 @@ namespace OpenSim.Framework
serviceURI = serviceURI.Trim(new char[] { '/', ' ' }) +":80/"; serviceURI = serviceURI.Trim(new char[] { '/', ' ' }) +":80/";
else if(uri.Port == 443) else if(uri.Port == 443)
serviceURI = serviceURI.Trim(new char[] { '/', ' ' }) +":443/"; serviceURI = serviceURI.Trim(new char[] { '/', ' ' }) +":443/";
serviceHost = uri.Host;
IPEndPoint ep = Util.getEndPoint(serviceHost,uri.Port);
if(ep == null)
return false;
serviceIPstr = ep.Address.ToString();
return true; return true;
} }
catch catch
@ -454,9 +463,10 @@ namespace OpenSim.Framework
return false; return false;
} }
public static bool buildHGRegionURI(string inputName, out string serverURI, out string regionName) public static bool buildHGRegionURI(string inputName, out string serverURI, out string serverHost, out string regionName)
{ {
serverURI = string.Empty; serverURI = string.Empty;
serverHost = string.Empty;
regionName = string.Empty; regionName = string.Empty;
inputName = inputName.Trim(); inputName = inputName.Trim();
@ -565,6 +575,7 @@ namespace OpenSim.Framework
serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":80/"; serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":80/";
else if(uri.Port == 443) else if(uri.Port == 443)
serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":443/"; serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":443/";
serverHost = uri.Host;
return true; return true;
} }