From d9dcc6fa8b6b17efbca60d959bcf18d6dc9934ae Mon Sep 17 00:00:00 2001
From: gareth
Date: Sat, 24 Mar 2007 18:29:35 +0000
Subject: Moved gridserver into main trunk (but no prebuild yet)
---
OpenGridServices.GridServer/default.build | 64 ++++++++
OpenGridServices.GridServer/src/ConsoleCmds.cs | 57 +++++++
OpenGridServices.GridServer/src/GridHttp.cs | 166 +++++++++++++++++++++
OpenGridServices.GridServer/src/Main.cs | 94 ++++++++++++
.../src/OGS-GridServer.csproj | 63 ++++++++
.../src/Properties/AssemblyInfo.cs | 33 ++++
OpenGridServices.GridServer/src/SimProfiles.cs | 114 ++++++++++++++
7 files changed, 591 insertions(+)
create mode 100644 OpenGridServices.GridServer/default.build
create mode 100644 OpenGridServices.GridServer/src/ConsoleCmds.cs
create mode 100644 OpenGridServices.GridServer/src/GridHttp.cs
create mode 100644 OpenGridServices.GridServer/src/Main.cs
create mode 100644 OpenGridServices.GridServer/src/OGS-GridServer.csproj
create mode 100644 OpenGridServices.GridServer/src/Properties/AssemblyInfo.cs
create mode 100644 OpenGridServices.GridServer/src/SimProfiles.cs
(limited to 'OpenGridServices.GridServer')
diff --git a/OpenGridServices.GridServer/default.build b/OpenGridServices.GridServer/default.build
new file mode 100644
index 0000000..b113b83
--- /dev/null
+++ b/OpenGridServices.GridServer/default.build
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenGridServices.GridServer/src/ConsoleCmds.cs b/OpenGridServices.GridServer/src/ConsoleCmds.cs
new file mode 100644
index 0000000..82a2279
--- /dev/null
+++ b/OpenGridServices.GridServer/src/ConsoleCmds.cs
@@ -0,0 +1,57 @@
+/*
+Copyright (c) OpenSim project, http://osgrid.org/
+
+
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+using System;
+using System.Text;
+using ServerConsole;
+
+namespace OpenGridServices
+{
+
+ public class GridConsole : conscmd_callback {
+ public GridConsole() { }
+
+ public override void RunCmd(string cmd, string[] cmdparams) {
+ switch(cmd) {
+ case "help":
+ ServerConsole.MainConsole.Instance.WriteLine("shutdown - shutdown the grid (USE CAUTION!)"
+);
+ break;
+
+ case "shutdown":
+ ServerConsole.MainConsole.Instance.Close();
+ Environment.Exit(0);
+ break;
+ }
+ }
+
+ public override void Show(string ShowWhat) {
+ }
+ }
+}
diff --git a/OpenGridServices.GridServer/src/GridHttp.cs b/OpenGridServices.GridServer/src/GridHttp.cs
new file mode 100644
index 0000000..496a3bc
--- /dev/null
+++ b/OpenGridServices.GridServer/src/GridHttp.cs
@@ -0,0 +1,166 @@
+/*
+Copyright (c) OpenGrid project, http://osgrid.org/
+
+
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+using System;
+using System.Text;
+using Nwc.XmlRpc;
+using System.Threading;
+using System.Text.RegularExpressions;
+using System.Net;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using ServerConsole;
+using OpenSim.Framework.Sims;
+
+namespace OpenGridServices
+{
+ public class GridHTTPServer {
+ public Thread HTTPD;
+ public HttpListener Listener;
+
+ public GridHTTPServer() {
+ ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server");
+ HTTPD = new Thread(new ThreadStart(StartHTTP));
+ HTTPD.Start();
+ }
+
+ public void StartHTTP() {
+ ServerConsole.MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK");
+ Listener = new HttpListener();
+
+ Listener.Prefixes.Add("http://+:8001/gridserver/");
+ Listener.Start();
+
+ HttpListenerContext context;
+ while(true) {
+ context = Listener.GetContext();
+ ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
+ }
+ }
+
+ static string ParseXMLRPC(string requestBody) {
+ try{
+ XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
+
+ Hashtable requestData = (Hashtable)request.Params[0];
+ switch(request.MethodName) {
+ case "get_sim_info":
+ ulong req_handle=(ulong)Convert.ToInt64(requestData["region_handle"]);
+ SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle);
+ string RecvKey="";
+ string caller=(string)requestData["caller"];
+ switch(caller) {
+ case "userserver":
+ RecvKey=OpenGrid_Main.thegrid.UserRecvKey;
+ break;
+ case "assetserver":
+ RecvKey=OpenGrid_Main.thegrid.AssetRecvKey;
+ break;
+ }
+ if((TheSim!=null) && (string)requestData["authkey"]==RecvKey) {
+ XmlRpcResponse SimInfoResp = new XmlRpcResponse();
+ Hashtable SimInfoData = new Hashtable();
+ SimInfoData["UUID"]=TheSim.UUID.ToString();
+ SimInfoData["regionhandle"]=TheSim.regionhandle.ToString();
+ SimInfoData["regionname"]=TheSim.regionname;
+ SimInfoData["sim_ip"]=TheSim.sim_ip;
+ SimInfoData["sim_port"]=TheSim.sim_port.ToString();
+ SimInfoData["caps_url"]=TheSim.caps_url;
+ SimInfoData["RegionLocX"]=TheSim.RegionLocX.ToString();
+ SimInfoData["RegionLocY"]=TheSim.RegionLocY.ToString();
+ SimInfoData["sendkey"]=TheSim.sendkey;
+ SimInfoData["recvkey"]=TheSim.recvkey;
+ SimInfoResp.Value=SimInfoData;
+ return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(SimInfoResp),"utf-16","utf-8"));
+ } else {
+ XmlRpcResponse SimErrorResp = new XmlRpcResponse();
+ Hashtable SimErrorData = new Hashtable();
+ SimErrorData["error"]="sim not found";
+ SimErrorResp.Value=SimErrorData;
+ return(XmlRpcResponseSerializer.Singleton.Serialize(SimErrorResp));
+ }
+ break;
+ }
+ } catch(Exception e) {
+ Console.WriteLine(e.ToString());
+ }
+ return "";
+ }
+
+ static string ParseREST(string requestBody, string requestURL) {
+ return "";
+ }
+
+
+ static void HandleRequest(Object stateinfo) {
+ HttpListenerContext context=(HttpListenerContext)stateinfo;
+
+ HttpListenerRequest request = context.Request;
+ HttpListenerResponse response = context.Response;
+
+ response.KeepAlive=false;
+ response.SendChunked=false;
+
+ System.IO.Stream body = request.InputStream;
+ System.Text.Encoding encoding = System.Text.Encoding.UTF8;
+ System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
+
+ string requestBody = reader.ReadToEnd();
+ body.Close();
+ reader.Close();
+
+ string responseString="";
+ switch(request.ContentType) {
+ case "text/xml":
+ // must be XML-RPC, so pass to the XML-RPC parser
+
+ responseString=ParseXMLRPC(requestBody);
+ response.AddHeader("Content-type","text/xml");
+ break;
+
+ case null:
+ // must be REST or invalid crap, so pass to the REST parser
+ responseString=ParseREST(request.Url.OriginalString,requestBody);
+ break;
+ }
+
+
+ byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
+ System.IO.Stream output = response.OutputStream;
+ response.SendChunked=false;
+ response.ContentLength64=buffer.Length;
+ output.Write(buffer,0,buffer.Length);
+ output.Close();
+ }
+ }
+
+
+}
diff --git a/OpenGridServices.GridServer/src/Main.cs b/OpenGridServices.GridServer/src/Main.cs
new file mode 100644
index 0000000..d29a1ae
--- /dev/null
+++ b/OpenGridServices.GridServer/src/Main.cs
@@ -0,0 +1,94 @@
+/*
+Copyright (c) OpenSim project, http://osgrid.org/
+
+
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+using System;
+using System.Text;
+using libsecondlife;
+using ServerConsole;
+
+namespace OpenGridServices
+{
+ ///
+ ///
+ public class OpenGrid_Main
+ {
+
+ public static OpenGrid_Main thegrid;
+ public string GridOwner;
+ public string DefaultStartupMsg;
+ public string DefaultAssetServer;
+ public string AssetSendKey;
+ public string AssetRecvKey;
+ public string DefaultUserServer;
+ public string UserSendKey;
+ public string UserRecvKey;
+
+ public GridHTTPServer _httpd;
+ public SimProfileManager _regionmanager;
+
+ [STAThread]
+ public static void Main( string[] args )
+ {
+ Console.WriteLine("OpenGrid " + VersionInfo.Version + "\n");
+ Console.WriteLine("Starting...\n");
+ ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local, "", 0, "opengrid-console.log", "OpenGrid", new GridConsole());
+
+ thegrid = new OpenGrid_Main();
+ thegrid.Startup();
+
+ ServerConsole.MainConsole.Instance.WriteLine("\nEnter help for a list of commands\n");
+
+ while(true) {
+ ServerConsole.MainConsole.Instance.MainConsolePrompt();
+ }
+ }
+
+ public void Startup() {
+ ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings");
+
+ this.GridOwner=ServerConsole.MainConsole.Instance.CmdPrompt("Grid owner [OGS development team]: ","OGS development team");
+ this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!]: ","Welcome to OGS!");
+
+ this.DefaultAssetServer=ServerConsole.MainConsole.Instance.CmdPrompt("Default asset server [no default]: ");
+ this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to asset server: ");
+ this.AssetRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from asset server: ");
+
+ this.DefaultUserServer=ServerConsole.MainConsole.Instance.CmdPrompt("Default user server [no default]: ");
+ this.UserSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to user server: ");
+ this.UserRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from user server: ");
+
+ ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process");
+ _httpd = new GridHTTPServer();
+
+ this._regionmanager=new SimProfileManager();
+ _regionmanager.CreateNewProfile("OpenSim Test", "http://there-is-no-caps.com", "4.78.190.75", 9000, 997, 996, this.UserSendKey, this.UserRecvKey);
+
+ }
+ }
+}
diff --git a/OpenGridServices.GridServer/src/OGS-GridServer.csproj b/OpenGridServices.GridServer/src/OGS-GridServer.csproj
new file mode 100644
index 0000000..b957d40
--- /dev/null
+++ b/OpenGridServices.GridServer/src/OGS-GridServer.csproj
@@ -0,0 +1,63 @@
+
+
+ Debug
+ AnyCPU
+ 8.0.50727
+ 2.0
+ {FE50A574-C8ED-433B-95F0-213A5EED2AB2}
+ Exe
+ Properties
+ OGS_GridServer
+ OGS-GridServer
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ False
+ ..\..\common\bin\libsecondlife.dll
+
+
+
+
+
+
+
+ OGS-Console.cs
+
+
+ VersionInfo.cs
+
+
+
+
+
+
+
+
+
+ {2E46A825-3168-492F-93BC-637126B5B72B}
+ OpenSim.Framework
+
+
+ {7667E6E2-F227-41A2-B1B2-315613E1BAFC}
+ ServerConsole
+
+
+
+
\ No newline at end of file
diff --git a/OpenGridServices.GridServer/src/Properties/AssemblyInfo.cs b/OpenGridServices.GridServer/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..8471e6b
--- /dev/null
+++ b/OpenGridServices.GridServer/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OGS-GridServer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OGS-GridServer")]
+[assembly: AssemblyCopyright("Copyright © 2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenGridServices.GridServer/src/SimProfiles.cs b/OpenGridServices.GridServer/src/SimProfiles.cs
new file mode 100644
index 0000000..6db8331
--- /dev/null
+++ b/OpenGridServices.GridServer/src/SimProfiles.cs
@@ -0,0 +1,114 @@
+/*
+Copyright (c) OpenGrid project, http://osgrid.org/
+
+
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using ServerConsole;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Sims;
+
+namespace OpenGridServices
+{
+ ///
+ ///
+ public class SimProfileManager {
+
+ public Dictionary SimProfiles = new Dictionary();
+
+ public SimProfileManager() {
+ }
+
+ public void InitSimProfiles() {
+ // TODO: need to load from database
+ }
+
+ public SimProfileBase GetProfileByHandle(ulong reqhandle) {
+ foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) {
+ if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID];
+ }
+ return null;
+ }
+
+ public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID) {
+ return SimProfiles[ProfileLLUUID];
+ }
+
+ public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) {
+ SimProfileBase TheSim=GetProfileByHandle(regionhandle);
+ if(TheSim != null)
+ if(TheSim.recvkey==simrecvkey) {
+ return true;
+ } else {
+ return false;
+ } else return false;
+
+ }
+
+ public SimProfileBase CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) {
+ SimProfileBase newprofile = new SimProfileBase();
+ newprofile.regionname=regionname;
+ newprofile.sim_ip=sim_ip;
+ newprofile.sim_port=sim_port;
+ newprofile.RegionLocX=RegionLocX;
+ newprofile.RegionLocY=RegionLocY;
+ newprofile.caps_url="http://" + sim_ip + ":9000/";
+ newprofile.sendkey=sendkey;
+ newprofile.recvkey=recvkey;
+ newprofile.regionhandle=Util.UIntsToLong((RegionLocX*256), (RegionLocY*256));
+ newprofile.UUID=LLUUID.Random();
+ this.SimProfiles.Add(newprofile.UUID,newprofile);
+ return newprofile;
+ }
+
+ }
+
+ /* is in OpenSim.Framework
+ public class SimProfileBase {
+ public LLUUID UUID;
+ public ulong regionhandle;
+ public string regionname;
+ public string sim_ip;
+ public uint sim_port;
+ public string caps_url;
+ public uint RegionLocX;
+ public uint RegionLocY;
+ public string sendkey;
+ public string recvkey;
+
+
+ public SimProfileBase() {
+ }
+
+
+ }*/
+
+}
--
cgit v1.1