diff options
| author | Adam Frisby | 2007-06-29 20:09:29 +0000 |
|---|---|---|
| committer | Adam Frisby | 2007-06-29 20:09:29 +0000 |
| commit | 72cd28be1b743a61c739d7d13f933cf41e948fdf (patch) | |
| tree | 2a52efa2178ccd3cf3c509fe8b42f72e52018e8c /OpenSim | |
| parent | * Applying Danx0r's BasicPhysics update. (diff) | |
| download | opensim-SC-72cd28be1b743a61c739d7d13f933cf41e948fdf.zip opensim-SC-72cd28be1b743a61c739d7d13f933cf41e948fdf.tar.gz opensim-SC-72cd28be1b743a61c739d7d13f933cf41e948fdf.tar.bz2 opensim-SC-72cd28be1b743a61c739d7d13f933cf41e948fdf.tar.xz | |
* Experimental patch: Replaced IPAddress.Any with IPAddress.Parse("0.0.0.0") to force IPv4
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/Servers/UDPServerBase.cs | 6 | ||||
| -rw-r--r-- | OpenSim/Region/ClientStack/UDPServer.cs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs index 610d23b..2617c56 100644 --- a/OpenSim/Framework/Servers/UDPServerBase.cs +++ b/OpenSim/Framework/Servers/UDPServerBase.cs | |||
| @@ -58,7 +58,7 @@ namespace OpenSim.Framework.Servers | |||
| 58 | 58 | ||
| 59 | protected virtual void OnReceivedData(IAsyncResult result) | 59 | protected virtual void OnReceivedData(IAsyncResult result) |
| 60 | { | 60 | { |
| 61 | ipeSender = new IPEndPoint(IPAddress.Any, 0); | 61 | ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); |
| 62 | epSender = (EndPoint)ipeSender; | 62 | epSender = (EndPoint)ipeSender; |
| 63 | Packet packet = null; | 63 | Packet packet = null; |
| 64 | int numBytes = Server.EndReceiveFrom(result, ref epSender); | 64 | int numBytes = Server.EndReceiveFrom(result, ref epSender); |
| @@ -76,11 +76,11 @@ namespace OpenSim.Framework.Servers | |||
| 76 | public virtual void ServerListener() | 76 | public virtual void ServerListener() |
| 77 | { | 77 | { |
| 78 | 78 | ||
| 79 | ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort); | 79 | ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort); |
| 80 | Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); | 80 | Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); |
| 81 | Server.Bind(ServerIncoming); | 81 | Server.Bind(ServerIncoming); |
| 82 | 82 | ||
| 83 | ipeSender = new IPEndPoint(IPAddress.Any, 0); | 83 | ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); |
| 84 | epSender = (EndPoint)ipeSender; | 84 | epSender = (EndPoint)ipeSender; |
| 85 | ReceivedData = new AsyncCallback(this.OnReceivedData); | 85 | ReceivedData = new AsyncCallback(this.OnReceivedData); |
| 86 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); | 86 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); |
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index 259352c..b764519 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs | |||
| @@ -112,7 +112,7 @@ namespace OpenSim.Region.ClientStack | |||
| 112 | 112 | ||
| 113 | protected virtual void OnReceivedData(IAsyncResult result) | 113 | protected virtual void OnReceivedData(IAsyncResult result) |
| 114 | { | 114 | { |
| 115 | ipeSender = new IPEndPoint(IPAddress.Any, 0); | 115 | ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); |
| 116 | epSender = (EndPoint)ipeSender; | 116 | epSender = (EndPoint)ipeSender; |
| 117 | Packet packet = null; | 117 | Packet packet = null; |
| 118 | int numBytes = Server.EndReceiveFrom(result, ref epSender); | 118 | int numBytes = Server.EndReceiveFrom(result, ref epSender); |
| @@ -151,13 +151,13 @@ namespace OpenSim.Region.ClientStack | |||
| 151 | { | 151 | { |
| 152 | m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort); | 152 | m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort); |
| 153 | 153 | ||
| 154 | ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort); | 154 | ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort); |
| 155 | Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); | 155 | Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); |
| 156 | Server.Bind(ServerIncoming); | 156 | Server.Bind(ServerIncoming); |
| 157 | 157 | ||
| 158 | m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen"); | 158 | m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen"); |
| 159 | 159 | ||
| 160 | ipeSender = new IPEndPoint(IPAddress.Any, 0); | 160 | ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); |
| 161 | epSender = (EndPoint)ipeSender; | 161 | epSender = (EndPoint)ipeSender; |
| 162 | ReceivedData = new AsyncCallback(this.OnReceivedData); | 162 | ReceivedData = new AsyncCallback(this.OnReceivedData); |
| 163 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); | 163 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); |