aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorjhurliman2007-03-02 08:36:57 +0000
committerjhurliman2007-03-02 08:36:57 +0000
commit91c11314acbec75bfdfa878b69b02543629b2b17 (patch)
treec0f56f7ea5c6bd98a15a65fcc1fb508523b982ec /src
parentMissed these 2 (diff)
downloadopensim-SC_OLD-91c11314acbec75bfdfa878b69b02543629b2b17.zip
opensim-SC_OLD-91c11314acbec75bfdfa878b69b02543629b2b17.tar.gz
opensim-SC_OLD-91c11314acbec75bfdfa878b69b02543629b2b17.tar.bz2
opensim-SC_OLD-91c11314acbec75bfdfa878b69b02543629b2b17.tar.xz
* Bind to IPAddress.Any instead of a hardcoded address
* Allow login if a connection can't be made to the grid auth server (instead of crashing) * Brought the MSVC project file and solution up to speed * Added a default VersionInfo.cs to allow compiling with MSVC * Removed unnecessary .suo file
Diffstat (limited to 'src')
-rw-r--r--src/Main.cs2
-rw-r--r--src/OpenSimClient.cs2
-rw-r--r--src/Second-server.csproj36
-rw-r--r--src/Second-server.sln14
-rw-r--r--src/Second-server.suobin27648 -> 0 bytes
5 files changed, 25 insertions, 29 deletions
diff --git a/src/Main.cs b/src/Main.cs
index da926db..6075035 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -118,7 +118,7 @@ namespace OpenSim
118 Console.WriteLine("Main.cs:MainServerListener() - New thread started"); 118 Console.WriteLine("Main.cs:MainServerListener() - New thread started");
119 Console.WriteLine("Main.cs:MainServerListener() - Opening UDP socket on " + cfg.IPListenAddr + ":" + cfg.IPListenPort); 119 Console.WriteLine("Main.cs:MainServerListener() - Opening UDP socket on " + cfg.IPListenAddr + ":" + cfg.IPListenPort);
120 120
121 ServerIncoming = new IPEndPoint(IPAddress.Parse(cfg.IPListenAddr),cfg.IPListenPort); 121 ServerIncoming = new IPEndPoint(IPAddress.Any, cfg.IPListenPort);
122 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); 122 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
123 Server.Bind(ServerIncoming); 123 Server.Bind(ServerIncoming);
124 124
diff --git a/src/OpenSimClient.cs b/src/OpenSimClient.cs
index 59833d8..83d8599 100644
--- a/src/OpenSimClient.cs
+++ b/src/OpenSimClient.cs
@@ -391,7 +391,7 @@ namespace OpenSim
391 String grTest = sr.ReadLine(); 391 String grTest = sr.ReadLine();
392 sr.Close(); 392 sr.Close();
393 GridResponse.Close(); 393 GridResponse.Close();
394 if(grTest.Equals("1")) { // YAY! Valid login 394 if(String.IsNullOrEmpty(grTest) || grTest.Equals("1")) { // YAY! Valid login
395 Console.WriteLine("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString()); 395 Console.WriteLine("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
396 this.AgentID=cirpack.CircuitCode.ID; 396 this.AgentID=cirpack.CircuitCode.ID;
397 this.SessionID=cirpack.CircuitCode.SessionID; 397 this.SessionID=cirpack.CircuitCode.SessionID;
diff --git a/src/Second-server.csproj b/src/Second-server.csproj
index 6d049ce..a4cd744 100644
--- a/src/Second-server.csproj
+++ b/src/Second-server.csproj
@@ -6,10 +6,10 @@
6 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 6 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 7 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8 <ProjectGuid>{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}</ProjectGuid> 8 <ProjectGuid>{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}</ProjectGuid>
9 <StartupObject>OpenSim.Controller</StartupObject> 9 <StartupObject>OpenSim.OpenSim_Main</StartupObject>
10 </PropertyGroup> 10 </PropertyGroup>
11 <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> 11 <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
12 <OutputPath>bin\Debug\</OutputPath> 12 <OutputPath>..\bin\</OutputPath>
13 <Optimize>False</Optimize> 13 <Optimize>False</Optimize>
14 <DefineConstants>DEBUG;TRACE</DefineConstants> 14 <DefineConstants>DEBUG;TRACE</DefineConstants>
15 <DebugSymbols>True</DebugSymbols> 15 <DebugSymbols>True</DebugSymbols>
@@ -17,7 +17,7 @@
17 <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> 17 <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
18 </PropertyGroup> 18 </PropertyGroup>
19 <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> 19 <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
20 <OutputPath>bin\Release\</OutputPath> 20 <OutputPath>..\bin\</OutputPath>
21 <Optimize>True</Optimize> 21 <Optimize>True</Optimize>
22 <DefineConstants>TRACE</DefineConstants> 22 <DefineConstants>TRACE</DefineConstants>
23 <DebugSymbols>False</DebugSymbols> 23 <DebugSymbols>False</DebugSymbols>
@@ -29,6 +29,7 @@
29 <SpecificVersion>False</SpecificVersion> 29 <SpecificVersion>False</SpecificVersion>
30 <HintPath>..\bin\Axiom.MathLib.dll</HintPath> 30 <HintPath>..\bin\Axiom.MathLib.dll</HintPath>
31 </Reference> 31 </Reference>
32 <Reference Include="Db4objects.Db4o, Version=6.0.1.0, Culture=neutral, PublicKeyToken=6199cd4f203aa8eb, processorArchitecture=MSIL" />
32 <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL"> 33 <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
33 <SpecificVersion>False</SpecificVersion> 34 <SpecificVersion>False</SpecificVersion>
34 <HintPath>..\bin\libsecondlife.dll</HintPath> 35 <HintPath>..\bin\libsecondlife.dll</HintPath>
@@ -42,19 +43,22 @@
42 <Reference Include="System.Xml" /> 43 <Reference Include="System.Xml" />
43 </ItemGroup> 44 </ItemGroup>
44 <ItemGroup> 45 <ItemGroup>
45 <Compile Include="Agent_Manager.cs" /> 46 <Compile Include="Config.cs" />
46 <Compile Include="Controller.cs" /> 47 <Compile Include="Main.cs" />
47 <Compile Include="Prim_manager.cs" /> 48 <Compile Include="OpenSimClient.cs" />
48 <Compile Include="Login_manager.cs" /> 49 <Compile Include="types\BitPack.cs" />
49 <Compile Include="Physics_manager.cs" /> 50 <Compile Include="types\Mesh.cs" />
50 <Compile Include="Script_manager.cs" /> 51 <Compile Include="types\Triangle.cs" />
51 <Compile Include="Server.cs" /> 52 <Compile Include="Util.cs" />
52 <Compile Include="StorageManager.cs" /> 53 <Compile Include="VersionInfo.cs" />
53 <Compile Include="GridManager.cs" /> 54 <Compile Include="world\Avatar.cs" />
54 <Compile Include="Globals.cs" /> 55 <Compile Include="world\Entity.cs" />
55 <Compile Include="InventoryManager.cs" /> 56 <Compile Include="world\Primitive.cs" />
56 <Compile Include="SceneGraphManager.cs" /> 57 <Compile Include="world\ScriptEngine.cs" />
57 <Compile Include="AssetManagement.cs" /> 58 <Compile Include="world\scripting\IScript.cs" />
59 <Compile Include="world\SurfacePatch.cs" />
60 <Compile Include="world\TerrainDecoder.cs" />
61 <Compile Include="world\World.cs" />
58 </ItemGroup> 62 </ItemGroup>
59 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> 63 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
60</Project> \ No newline at end of file 64</Project> \ No newline at end of file
diff --git a/src/Second-server.sln b/src/Second-server.sln
index 44be1db..86fc54c 100644
--- a/src/Second-server.sln
+++ b/src/Second-server.sln
@@ -1,6 +1,6 @@
1 1
2Microsoft Visual Studio Solution File, Format Version 9.00 2Microsoft Visual Studio Solution File, Format Version 9.00
3# SharpDevelop 2.1.0.2017 3# Visual Studio 2005
4Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Second-server", "Second-server.csproj", "{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}" 4Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Second-server", "Second-server.csproj", "{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}"
5EndProject 5EndProject
6Global 6Global
@@ -12,21 +12,13 @@ Global
12 EndGlobalSection 12 EndGlobalSection
13 GlobalSection(ProjectConfigurationPlatforms) = postSolution 13 GlobalSection(ProjectConfigurationPlatforms) = postSolution
14 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU 14 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU
15 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|.NET 1.1.Build.0 = Debug|Any CPU
15 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 16 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|Any CPU.Build.0 = Debug|Any CPU 17 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|Any CPU.Build.0 = Debug|Any CPU
17 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|.NET 1.1.ActiveCfg = Release|Any CPU 18 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|.NET 1.1.ActiveCfg = Release|Any CPU
19 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|.NET 1.1.Build.0 = Release|.NET 1.1
18 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|Any CPU.ActiveCfg = Release|Any CPU 20 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|Any CPU.ActiveCfg = Release|Any CPU
19 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|Any CPU.Build.0 = Release|Any CPU 21 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|Any CPU.Build.0 = Release|Any CPU
20 {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|.NET 1.1.ActiveCfg = Debug|.NET 1.1
21 {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|.NET 1.1.Build.0 = Debug|.NET 1.1
22 {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23 {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
24 {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|.NET 1.1.ActiveCfg = Release|.NET 1.1
25 {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|.NET 1.1.Build.0 = Release|.NET 1.1
26 {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
27 {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|Any CPU.Build.0 = Release|Any CPU
28 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|.NET 1.1.Build.0 = Debug|.NET 1.1
29 {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|.NET 1.1.Build.0 = Release|.NET 1.1
30 EndGlobalSection 22 EndGlobalSection
31 GlobalSection(SolutionProperties) = preSolution 23 GlobalSection(SolutionProperties) = preSolution
32 HideSolutionNode = FALSE 24 HideSolutionNode = FALSE
diff --git a/src/Second-server.suo b/src/Second-server.suo
deleted file mode 100644
index 4ed1adc..0000000
--- a/src/Second-server.suo
+++ /dev/null
Binary files differ