diff options
author | Adam Frisby | 2007-07-14 22:35:47 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-14 22:35:47 +0000 |
commit | 2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e (patch) | |
tree | 0855803d694abaad00b87c3ab7766dd16dff69ee /OpenSim/Grid/GridServer | |
parent | * libterrain now builds again (diff) | |
download | opensim-SC-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.zip opensim-SC-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.gz opensim-SC-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.bz2 opensim-SC-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.xz |
* Excelsior!
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index d2cb6c2..64b51b4 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -659,12 +659,18 @@ namespace OpenSim.Grid.GridServer | |||
659 | TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; | 659 | TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; |
660 | 660 | ||
661 | bool requirePublic = false; | 661 | bool requirePublic = false; |
662 | bool requireValid = true; | ||
662 | 663 | ||
663 | if (requirePublic && (TheSim.serverIP.StartsWith("172.16") || TheSim.serverIP.StartsWith("192.168") || TheSim.serverIP.StartsWith("10.") || TheSim.serverIP.StartsWith("0.") || TheSim.serverIP.StartsWith("255."))) | 664 | if (requirePublic && (TheSim.serverIP.StartsWith("172.16") || TheSim.serverIP.StartsWith("192.168") || TheSim.serverIP.StartsWith("10.") || TheSim.serverIP.StartsWith("0.") || TheSim.serverIP.StartsWith("255."))) |
664 | { | 665 | { |
665 | return "ERROR! Servers must register with public addresses."; | 666 | return "ERROR! Servers must register with public addresses."; |
666 | } | 667 | } |
667 | 668 | ||
669 | if (requireValid && (TheSim.serverIP.StartsWith("0."))) | ||
670 | { | ||
671 | return "ERROR! 0.*.*.* Addresses are invalid, please check your server config and try again"; | ||
672 | } | ||
673 | |||
668 | 674 | ||
669 | try | 675 | try |
670 | { | 676 | { |