core/redAcore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Important Update:

Browse Source 
- SelectableCore:
  - Bug fix: correct ConnectTypeNames
  - Pass handle reference to Select when adding file discriptor.
  - Rename Select vars Handle -> SelectHandle
  - Show type and name of handle on Select logs
This commit is contained in:
Charl Wentzel
2018-11-04 17:31:12 +02:00
parent 12a8ddb7ba
commit d18e046e57
3 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
SelectableCore.cpp
View File

@@ -582,7 +582,7 @@ int CSelectableCore::OpenSerialPort( THandle * Handle )
// Add to Select Lists
if (Selector) {
Selector->Add( Handle->FD, true, false, this );
Selector->Add( Handle->FD, true, false, Handle, this );
}
// Set state
@@ -622,7 +622,7 @@ int CSelectableCore::OpenLinePrinterPort( THandle * Handle )
// Add to Select Lists
if (Selector) {
Selector->Add( Handle->FD, true, false, this );
Selector->Add( Handle->FD, true, false, Handle, this );
}
// Set state
@@ -718,7 +718,7 @@ int CSelectableCore::OpenForkPipe( THandle * Handle )
// Add to Select Lists
if (Selector) {
Selector->Add( Handle->FD, false, true, this );
Selector->Add( Handle->FD, false, true, Handle, this );
}
// Set state
@@ -910,7 +910,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle, bool DelayResolve )
// Add to Select Lists
if (Selector) {
Selector->Add( Handle->FD, true, false, this );
Selector->Add( Handle->FD, true, false, Handle, this );
}
// Set state
@@ -993,7 +993,7 @@ int CSelectableCore::OpenRemoteClientSocket( THandle * Handle )
// Add to Select Lists
if (Selector) {
Selector->Add( (*RemoteClient)->FD, true, true, this );
Selector->Add( (*RemoteClient)->FD, true, true, Handle, this );
}
return (*RemoteClient)->FD;
@@ -1079,7 +1079,7 @@ int CSelectableCore::OpenClientSocket( THandle * Handle, bool DelayResolve )
// Add to Select Lists
if (Selector) {
Selector->Add( Handle->FD, true, true, this );
Selector->Add( Handle->FD, true, true, Handle, this );
}
// Set status
@@ -1093,7 +1093,7 @@ int CSelectableCore::OpenClientSocket( THandle * Handle, bool DelayResolve )
// Add to Select Lists
if (Selector) {
Selector->Add( Handle->FD, true, true, this );
Selector->Add( Handle->FD, true, true, Handle, this );
}
// Set status
@@ -1278,7 +1278,7 @@ bool CSelectableCore::Read( THandle * Handle )
// Add to Select Lists
if (Selector) {
Selector->Add( ClientFD, true, true, this );
Selector->Add( ClientFD, true, true, Handle, this );
}
return true;
}
@@ -1681,7 +1681,7 @@ int CSelectableCore::OutputHandle( THandle * Handle, const char * Data, int Len
// Add to select write list
if (BytesWritten && Selector) {
Selector->Add( ChildHandle->FD, false, true, this );
Selector->Add( ChildHandle->FD, false, true, ChildHandle, this );
}
}
else
@@ -1713,7 +1713,7 @@ int CSelectableCore::OutputHandle( THandle * Handle, const char * Data, int Len
// Add to select write list
if (BytesWritten && Selector) {
Selector->Add( Handle->FD, false, true, this );
Selector->Add( Handle->FD, false, true, Handle, this );
}
}
else