Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2024-06-07 13:33:06 +00:00
Code Issues Projects Releases Wiki Activity

LaunchAPPLServer: use separate OT endpoints for connection

Browse Source
This commit is contained in:
Wolfgang Thaller 2019-01-11 00:46:36 +01:00
parent f1f9cf9099
commit 1fc19efaeb
2 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
LaunchAPPL/Server/OpenTptStream.cc
View File

@ -21,8 +21,8 @@ OpenTptStream::OpenTptStream()
OSStatus err; OSStatus err;
//endpoint = OTOpenEndpoint(OTCreateConfiguration(kTCPName), 0, nullptr, &err); listenerEndpoint = OTOpenEndpoint(OTCreateConfiguration(kTCPName), 0, nullptr, &err);
endpoint = OTOpenEndpoint(OTCreateConfiguration(kTCPName), 0, nullptr, &err); endpoint = nullptr;
InetAddress addr, retAddr; InetAddress addr, retAddr;
OTInitInetAddress(&addr, 1984, 0); OTInitInetAddress(&addr, 1984, 0);
@ -36,10 +36,10 @@ OpenTptStream::OpenTptStream()
ret.addr.buf = (UInt8*) &retAddr; ret.addr.buf = (UInt8*) &retAddr;
endpoint->Bind(&req, &ret); listenerEndpoint->Bind(&req, &ret);
endpoint->SetSynchronous(); listenerEndpoint->SetSynchronous();
endpoint->SetNonBlocking();
tryListening(); tryListening();
} }
@ -55,8 +55,9 @@ void OpenTptStream::tryListening()
call.addr.buf = (UInt8*) &clientAddr; call.addr.buf = (UInt8*) &clientAddr;
OSStatus err; OSStatus err;
err = endpoint->Listen(&call); listenerEndpoint->SetNonBlocking();
err = listenerEndpoint->Listen(&call);
#ifdef DEBUG_CONSOLE #ifdef DEBUG_CONSOLE
printf("Listen: err = %d.\n", (int)err); printf("Listen: err = %d.\n", (int)err);
#endif #endif
@ -64,9 +65,15 @@ void OpenTptStream::tryListening()
if(err < 0) if(err < 0)
return; // hopefully, kOTNoData return; // hopefully, kOTNoData
endpoint->SetBlocking(); if(!endpoint)
{
endpoint = OTOpenEndpoint(OTCreateConfiguration(kTCPName), 0, nullptr, &err);
endpoint->SetSynchronous();
}
listenerEndpoint->SetBlocking();
err = endpoint->Accept(endpoint, &call); err = listenerEndpoint->Accept(endpoint, &call);
#ifdef DEBUG_CONSOLE #ifdef DEBUG_CONSOLE
printf("Accept: err = %d.\n", (int)err); printf("Accept: err = %d.\n", (int)err);
#endif #endif
@ -79,12 +86,17 @@ void OpenTptStream::tryListening()
OpenTptStream::~OpenTptStream() OpenTptStream::~OpenTptStream()
{ {
endpoint->SetSynchronous(); if(endpoint)
endpoint->SetNonBlocking(); {
if(connected) endpoint->SetNonBlocking();
endpoint->SndDisconnect(&call); if(connected)
endpoint->Unbind(); endpoint->SndDisconnect(&call);
OTCloseProvider(endpoint); endpoint->Unbind();
OTCloseProvider(endpoint);
}
listenerEndpoint->SetNonBlocking();
listenerEndpoint->Unbind();
OTCloseProvider(listenerEndpoint);
CloseOpenTransport(); CloseOpenTransport();
} }
@ -112,25 +124,34 @@ void OpenTptStream::tryReading()
void OpenTptStream::idle() void OpenTptStream::idle()
{ {
OSStatus err; OSStatus err;
switch(endpoint->Look()) if(connected)
{ {
case T_DISCONNECT: switch(endpoint->Look())
endpoint->RcvDisconnect(nullptr); {
connected = false; case T_DISCONNECT:
tryListening(); endpoint->RcvDisconnect(nullptr);
break; connected = false;
case T_ORDREL: tryListening();
err = endpoint->RcvOrderlyDisconnect(); break;
if(err == noErr) case T_ORDREL:
endpoint->SndOrderlyDisconnect(); err = endpoint->RcvOrderlyDisconnect();
connected = false; if(err == noErr)
tryListening(); endpoint->SndOrderlyDisconnect();
break; connected = false;
case T_LISTEN: tryListening();
tryListening(); break;
break; case T_DATA:
case T_DATA: tryReading();
tryReading(); break;
break; }
}
else
{
switch(listenerEndpoint->Look())
{
case T_LISTEN:
tryListening();
break;
}
} }
} }

1
LaunchAPPL/Server/OpenTptStream.h
View File

@ -11,6 +11,7 @@ class OpenTptStream : public Stream
bool connected = false; bool connected = false;
TEndpoint *listenerEndpoint;
TEndpoint *endpoint; TEndpoint *endpoint;
TCall call; TCall call;