1 files changed, 87 insertions, 87 deletions
diff --git a/OpenSim/Framework/Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs
index 508eb9d..8113207 100644
--- a/OpenSim/Framework/Servers/UDPServerBase.cs
+++ b/OpenSim/Framework/Servers/UDPServerBase.cs
@@ -1,87 +1,87 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System;
+using System;
-using System.Net;
+using System.Net;
-using System.Net.Sockets;
+using System.Net.Sockets;
-using libsecondlife.Packets;
+using libsecondlife.Packets;
-namespace OpenSim.Framework.Servers
+namespace OpenSim.Framework.Servers
-{
+{
-    public class UDPServerBase
+    public class UDPServerBase
-    {
+    {
-        public Socket Server;
+        public Socket Server;
-        protected IPEndPoint ServerIncoming;
+        protected IPEndPoint ServerIncoming;
-        protected byte[] RecvBuffer = new byte[4096];
+        protected byte[] RecvBuffer = new byte[4096];
-        protected byte[] ZeroBuffer = new byte[8192];
+        protected byte[] ZeroBuffer = new byte[8192];
-        protected IPEndPoint ipeSender;
+        protected IPEndPoint ipeSender;
-        protected EndPoint epSender;
+        protected EndPoint epSender;
-        protected AsyncCallback ReceivedData;
+        protected AsyncCallback ReceivedData;
-        protected int listenPort;
+        protected int listenPort;
-        public UDPServerBase(int port)
+        public UDPServerBase(int port)
-        {
+        {
-            listenPort = port;
+            listenPort = port;
-        }
+        }
-        protected virtual void OnReceivedData(IAsyncResult result)
+        protected virtual void OnReceivedData(IAsyncResult result)
-        {
+        {
-            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
-            epSender = (EndPoint)ipeSender;
+            epSender = (EndPoint)ipeSender;
-            Packet packet = null;
+            Packet packet = null;
-            int numBytes = Server.EndReceiveFrom(result, ref epSender);
+            int numBytes = Server.EndReceiveFrom(result, ref epSender);
-            int packetEnd = numBytes - 1;
+            int packetEnd = numBytes - 1;
-            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
+            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
-        }
+        }
-        protected virtual void AddNewClient(Packet packet)
+        protected virtual void AddNewClient(Packet packet)
-        {
+        {
-        }
+        }
-        public virtual void ServerListener()
+        public virtual void ServerListener()
-        {
+        {
-            ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort);
+            ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort);
-            Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+            Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-            Server.Bind(ServerIncoming);
+            Server.Bind(ServerIncoming);
-            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
-            epSender = (EndPoint)ipeSender;
+            epSender = (EndPoint)ipeSender;
-            ReceivedData = new AsyncCallback(this.OnReceivedData);
+            ReceivedData = new AsyncCallback(this.OnReceivedData);
-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
-        }
+        }
-        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
+        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
-        {
+        {
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Framework/Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs index 508eb9d..8113207 100644 --- a/OpenSim/Framework/Servers/UDPServerBase.cs +++ b/OpenSim/Framework/Servers/UDPServerBase.cs
@@ -1,87 +1,87 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/	2	* Copyright (c) Contributors, http://www.openmetaverse.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28	using System;	28	using System;
29	using System.Net;	29	using System.Net;
30	using System.Net.Sockets;	30	using System.Net.Sockets;
31	using libsecondlife.Packets;	31	using libsecondlife.Packets;
32		32
33	namespace OpenSim.Framework.Servers	33	namespace OpenSim.Framework.Servers
34	{	34	{
35	public class UDPServerBase	35	public class UDPServerBase
36	{	36	{
37	public Socket Server;	37	public Socket Server;
38	protected IPEndPoint ServerIncoming;	38	protected IPEndPoint ServerIncoming;
39	protected byte[] RecvBuffer = new byte[4096];	39	protected byte[] RecvBuffer = new byte[4096];
40	protected byte[] ZeroBuffer = new byte[8192];	40	protected byte[] ZeroBuffer = new byte[8192];
41	protected IPEndPoint ipeSender;	41	protected IPEndPoint ipeSender;
42	protected EndPoint epSender;	42	protected EndPoint epSender;
43	protected AsyncCallback ReceivedData;	43	protected AsyncCallback ReceivedData;
44	protected int listenPort;	44	protected int listenPort;
45		45
46	public UDPServerBase(int port)	46	public UDPServerBase(int port)
47	{	47	{
48	listenPort = port;	48	listenPort = port;
49	}	49	}
50		50
51	protected virtual void OnReceivedData(IAsyncResult result)	51	protected virtual void OnReceivedData(IAsyncResult result)
52	{	52	{
53	ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);	53	ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
54	epSender = (EndPoint)ipeSender;	54	epSender = (EndPoint)ipeSender;
55	Packet packet = null;	55	Packet packet = null;
56	int numBytes = Server.EndReceiveFrom(result, ref epSender);	56	int numBytes = Server.EndReceiveFrom(result, ref epSender);
57	int packetEnd = numBytes - 1;	57	int packetEnd = numBytes - 1;
58		58
59	packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);	59	packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
60		60
61	Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);	61	Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
62	}	62	}
63		63
64	protected virtual void AddNewClient(Packet packet)	64	protected virtual void AddNewClient(Packet packet)
65	{	65	{
66	}	66	}
67		67
68	public virtual void ServerListener()	68	public virtual void ServerListener()
69	{	69	{
70		70
71	ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort);	71	ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort);
72	Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);	72	Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
73	Server.Bind(ServerIncoming);	73	Server.Bind(ServerIncoming);
74		74
75	ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);	75	ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
76	epSender = (EndPoint)ipeSender;	76	epSender = (EndPoint)ipeSender;
77	ReceivedData = new AsyncCallback(this.OnReceivedData);	77	ReceivedData = new AsyncCallback(this.OnReceivedData);
78	Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);	78	Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
79	}	79	}
80		80
81	public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)	81	public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
82	{	82	{
83		83
84	}	84	}
85	}	85	}
86	}	86	}
87		87