From 91c11314acbec75bfdfa878b69b02543629b2b17 Mon Sep 17 00:00:00 2001
From: jhurliman
Date: Fri, 2 Mar 2007 08:36:57 +0000
Subject: * 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
---
src/Main.cs | 2 +-
src/OpenSimClient.cs | 2 +-
src/Second-server.csproj | 36 ++++++++++++++++++++----------------
src/Second-server.sln | 14 +++-----------
src/Second-server.suo | Bin 27648 -> 0 bytes
5 files changed, 25 insertions(+), 29 deletions(-)
delete mode 100644 src/Second-server.suo
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
Console.WriteLine("Main.cs:MainServerListener() - New thread started");
Console.WriteLine("Main.cs:MainServerListener() - Opening UDP socket on " + cfg.IPListenAddr + ":" + cfg.IPListenPort);
- ServerIncoming = new IPEndPoint(IPAddress.Parse(cfg.IPListenAddr),cfg.IPListenPort);
+ ServerIncoming = new IPEndPoint(IPAddress.Any, cfg.IPListenPort);
Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
Server.Bind(ServerIncoming);
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
String grTest = sr.ReadLine();
sr.Close();
GridResponse.Close();
- if(grTest.Equals("1")) { // YAY! Valid login
+ if(String.IsNullOrEmpty(grTest) || grTest.Equals("1")) { // YAY! Valid login
Console.WriteLine("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
this.AgentID=cirpack.CircuitCode.ID;
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 @@
Debug
AnyCPU
{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}
- OpenSim.Controller
+ OpenSim.OpenSim_Main
- bin\Debug\
+ ..\bin\
False
DEBUG;TRACE
True
@@ -17,7 +17,7 @@
True
- bin\Release\
+ ..\bin\
True
TRACE
False
@@ -29,6 +29,7 @@
False
..\bin\Axiom.MathLib.dll
+
False
..\bin\libsecondlife.dll
@@ -42,19 +43,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.1.0.2017
+# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Second-server", "Second-server.csproj", "{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}"
EndProject
Global
@@ -12,21 +12,13 @@ Global
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU
+ {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|.NET 1.1.Build.0 = Debug|Any CPU
{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|.NET 1.1.ActiveCfg = Release|Any CPU
+ {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|.NET 1.1.Build.0 = Release|.NET 1.1
{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|Any CPU.Build.0 = Release|Any CPU
- {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|.NET 1.1.ActiveCfg = Debug|.NET 1.1
- {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|.NET 1.1.Build.0 = Debug|.NET 1.1
- {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|.NET 1.1.ActiveCfg = Release|.NET 1.1
- {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|.NET 1.1.Build.0 = Release|.NET 1.1
- {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|Any CPU.Build.0 = Release|Any CPU
- {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|.NET 1.1.Build.0 = Debug|.NET 1.1
- {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|.NET 1.1.Build.0 = Release|.NET 1.1
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/Second-server.suo b/src/Second-server.suo
deleted file mode 100644
index 4ed1adc..0000000
Binary files a/src/Second-server.suo and /dev/null differ
--
cgit v1.1