Skip to content

Commit

Permalink
~ update EVESharp dependencies to fix a infinite loop issue with Begi…
Browse files Browse the repository at this point in the history
…nReceive

Signed-off-by: Alexis Maiquez Murcia <[email protected]>
  • Loading branch information
Almamu committed Feb 16, 2021
1 parent 63de146 commit 3411748
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 30 deletions.
28 changes: 2 additions & 26 deletions Editor/LiveClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public LiveClient(int index, EVEClientSocket socket, EVEClientSocket serverSocke
this.mServerSocket.SetReceiveCallback(ServerReceive);
this.mClientSocket.SetReceiveCallback(ClientReceive);
// setup connection close callbacks
this.mServerSocket.SetOnConnectionLostHandler(OnConnectionLost);
this.mClientSocket.SetOnConnectionLostHandler(OnConnectionLost);
this.mServerSocket.SetOnConnectionLostHandler(Stop);
this.mClientSocket.SetOnConnectionLostHandler(Stop);
}

private void ServerReceive(PyDataType data)
Expand Down Expand Up @@ -70,7 +70,6 @@ private void ClientReceive(PyDataType data)
};

// try to parse a PyPacket, if it fails just store the raw data

try
{
entry.Packet = data;
Expand All @@ -84,28 +83,6 @@ private void ClientReceive(PyDataType data)
this.mMainWindow.OnPacketReceived(entry);
}

private void OnConnectionLost()
{
// forcefully disconnect sockets
try
{
this.mClientSocket.ForcefullyDisconnect();
}
catch (Exception)
{
// ignored
}

try
{
this.mServerSocket.ForcefullyDisconnect();
}
catch (Exception)
{
// ignored
}
}

public void Stop()
{
// forcefully disconnect sockets
Expand All @@ -126,7 +103,6 @@ public void Stop()
{
// ignored
}

}
}
}
5 changes: 2 additions & 3 deletions Editor/MainWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,10 @@ public void ServerConnectionAccept(IAsyncResult ar)
{
try
{
EVEBridgeServer server = ar.AsyncState as EVEBridgeServer;
EVEClientSocket client = server.EndAccept(ar);
EVEClientSocket client = this.mServer.EndAccept(ar);

// open a connection to the server to relay info from this client
EVEClientSocket serverSocket = new EVEClientSocket(server.Log);
EVEClientSocket serverSocket = new EVEClientSocket(this.mServer.Log);
serverSocket.Connect(this.mServerAddress, this.mServerPort);

LiveClient newLiveClient = new LiveClient(this.mClients.Count, client, serverSocket, this);
Expand Down
2 changes: 1 addition & 1 deletion External/EVESharp
Submodule EVESharp updated 56 files
+2 −0 .gitignore
+0 −53 Database/Dynamic.sql
+30 −43 Database/Server/04-entity.sql
+4 −4 Database/Server/07-mktTransactions.sql
+6 −5 Database/Server/15-chrBounties.sql
+2 −0 Database/Server/26-stations.sql
+34 −0 Database/Server/27-mktOrders.sql
+17 −0 Database/Server/28-mktHistoryOld.sql
+2 −0 Documentation/Pre-requirements.md
+2 −1 Documentation/Setup.md
+19 −12 Server/ClusterController/ClientConnection.cs
+35 −0 Server/ClusterController/ConnectionManager.cs
+1 −1 Server/ClusterController/Database/SolarSystemDB.cs
+6 −16 Server/ClusterController/NodeConnection.cs
+20 −28 Server/Common/Network/EVEClientSocket.cs
+33 −7 Server/Common/Network/EVESocket.cs
+14 −20 Server/Common/Network/StreamPacketizer.cs
+5 −0 Server/Common/Services/ServiceManager.cs
+5 −0 Server/Node/BoundServiceManager.cs
+13 −7 Server/Node/Cache/CacheStorage.cs
+2 −2 Server/Node/Client.cs
+12 −11 Server/Node/Database/CharacterDB.cs
+1 −1 Server/Node/Database/ChatDB.cs
+113 −2 Server/Node/Database/ConfigDB.cs
+3 −3 Server/Node/Database/CorporationDB.cs
+1 −1 Server/Node/Database/InsuranceDB.cs
+17 −7 Server/Node/Database/ItemDB.cs
+6 −6 Server/Node/Database/LookupDB.cs
+39 −12 Server/Node/Database/MarketDB.cs
+1 −1 Server/Node/Database/StandingDB.cs
+13 −0 Server/Node/Exceptions/character/FailedPlugInImplant.cs
+13 −0 Server/Node/Exceptions/character/OnlyOneImplantActive.cs
+13 −0 Server/Node/Exceptions/character/PrereqImplantMissing.cs
+2 −1 Server/Node/Inventory/AttributeManager.cs
+25 −4 Server/Node/Inventory/ItemManager.cs
+66 −0 Server/Node/Inventory/Items/ItemEntity.cs
+27 −0 Server/Node/Inventory/Items/Types/Character.cs
+16 −0 Server/Node/Inventory/Items/Types/EVESystem.cs
+33 −0 Server/Node/Inventory/Items/Types/Implant.cs
+0 −55 Server/Node/Inventory/Items/Types/Ship.cs
+27 −3 Server/Node/Services/Characters/charmgr.cs
+75 −0 Server/Node/Services/Characters/skillMgr.cs
+51 −1 Server/Node/Services/Config/config.cs
+3 −3 Server/Node/Services/Inventory/BoundInventory.cs
+2 −4 Server/Node/Services/Inventory/ship.cs
+20 −1 Server/Node/Services/Market/marketProxy.cs
+5 −0 Server/Node/Services/Navigation/map.cs
+1 −1 Server/Node/Services/Network/alert.cs
+27 −11 Server/Node/Services/Network/slash.cs
+2 −1 Server/PythonTypes/Compression/ZlibHelper.cs
+0 −13 Server/PythonTypes/Types/Complex/PyCacheHint.cs
+2 −2 Server/PythonTypes/Types/Complex/PyCachedObject.cs
+3 −3 Server/PythonTypes/Types/Database/Utils.cs
+1 −0 Tools/precalculateSolarSystemJumps/.gitignore
+98 −0 Tools/precalculateSolarSystemJumps/precalculateSolarSystemJumps.py
+2 −0 Tools/precalculateSolarSystemJumps/requirements.txt

0 comments on commit 3411748

Please sign in to comment.