github.com/livingcomputermuseum.IFS
1
0
Fork 0
mirror of https://github.com/livingcomputermuseum/IFS.git synced 2026-04-28 20:58:08 +00:00
Code Issues Releases Wiki Activity

Cleanup, cleanup, cleanup. Fixed guest account a bit.

Browse Source
This commit is contained in:
Josh Dersch
2016-12-12 12:42:00 -08:00
parent c03d930bec
commit ef6bd4cc97
30 changed files with 782 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PUP/EFTP/EFTPChannel.cs
View File

@@ -1,4 +1,5 @@
using IFS.Logging;
using IFS.Gateway;
using IFS.Logging;
using System;
using System.Collections.Generic;
@@ -32,6 +33,11 @@ namespace IFS.EFTP
get { return _serverConnectionPort; }
}
public PUPPort ClientPort
{
get { return _clientConnectionPort; }
}
public delegate void DestroyDelegate();
public DestroyDelegate OnDestroy;
@@ -81,7 +87,7 @@ namespace IFS.EFTP
// Send the data.
PUP dataPup = new PUP(PupType.EFTPData, _sendPos, _clientConnectionPort, _serverConnectionPort, chunk);
PUPProtocolDispatcher.Instance.SendPup(dataPup);
Router.Instance.SendPup(dataPup);
// Await an ACK. We will retry several times and resend as necessary.
int retry = 0;
@@ -95,7 +101,7 @@ namespace IFS.EFTP
else
{
// timeout: resend the PUP and wait for an ACK again.
PUPProtocolDispatcher.Instance.SendPup(dataPup);
Router.Instance.SendPup(dataPup);
}
}
@@ -135,7 +141,7 @@ namespace IFS.EFTP
public void SendEnd()
{
PUP endPup = new PUP(PupType.EFTPEnd, _sendPos, _clientConnectionPort, _serverConnectionPort, new byte[0]);
PUPProtocolDispatcher.Instance.SendPup(endPup);
Router.Instance.SendPup(endPup);
// Await an ack
_outputAckEvent.WaitOne(EFTPAckTimeoutPeriod);
@@ -144,7 +150,7 @@ namespace IFS.EFTP
// Send another end to close things off.
endPup = new PUP(PupType.EFTPEnd, _sendPos, _clientConnectionPort, _serverConnectionPort, new byte[0]);
PUPProtocolDispatcher.Instance.SendPup(endPup);
Router.Instance.SendPup(endPup);
}
public void RecvData(PUP p)
@@ -186,7 +192,7 @@ namespace IFS.EFTP
// Send this directly, do not wait for the client to be ready (since it may be wedged, and we don't expect anyone to actually notice
// this anyway).
//
PUPProtocolDispatcher.Instance.SendPup(abortPup);
Router.Instance.SendPup(abortPup);
*/
}