From 7564e6a288813b6d733b4edc118f93a6a01b2c70 Mon Sep 17 00:00:00 2001 From: Charl Wentzel Date: Tue, 23 Aug 2016 13:19:43 +0200 Subject: [PATCH] Major update: - Rename Function LocalIO -> Channel (Parameters & Methods) --- FileCore.cpp | 20 ++--- FileCore.h | 4 +- FunctionCore.cpp | 187 ++++++++++++++++++++++----------------------- FunctionCore.h | 48 ++++++------ SelectableCore.cpp | 28 +++---- SelectableCore.h | 6 +- 6 files changed, 146 insertions(+), 147 deletions(-) diff --git a/FileCore.cpp b/FileCore.cpp index 55f13ff..0a50f6c 100644 --- a/FileCore.cpp +++ b/FileCore.cpp @@ -63,7 +63,7 @@ CFileCore::~CFileCore() } //--------------------------------------------------------------------------- -TFileHandle * CFileCore::AddFile( const char * Name, const char * Path, bool Append, bool CreateLocalIO ) +TFileHandle * CFileCore::AddFile( const char * Name, const char * Path, bool Append, bool CreateChannel ) { TFileHandle ** FileHandle = NULL; @@ -91,9 +91,9 @@ TFileHandle * CFileCore::AddFile( const char * Name, const char * Path, bool Ap strcpy( (*FileHandle)->Path, Path ); } - // Create IO if necessary - if (CreateLocalIO) { - AddLocalIO( Name ); + // Create Channel if necessary + if (CreateChannel) { + AddChannel( Name ); } // Set Parameters @@ -265,29 +265,29 @@ int CFileCore::WriteToFD( int FD, const char * Data, int Len ) //--------------------------------------------------------------------------- // Manual Data Input/Output -int CFileCore::Input( const char * IOName, const char * Data, int MaxLen ) +int CFileCore::Input( const char * ChannelName, const char * Data, int MaxLen ) { TFileHandle * FileHandle = NULL; int BytesWritten = 0; // Validate - if (!IOName || !Data) { + if (!ChannelName || !Data) { return 0; } else if (MaxLen == -1) { MaxLen = strlen( Data ); }; - // Get IO - if (!(FileHandle = GetFile( IOName ))) + // Get Channel + if (!(FileHandle = GetFile( ChannelName ))) { // Log event - if (Log) Log->Message( DebugLevel, dlHigh, "%s: Local IO '%s' - Input rejected, Local IO not found", Name, IOName ); + if (Log) Log->Message( DebugLevel, dlHigh, "%s: Channel '%s' - Input rejected, Channel not found", Name, ChannelName ); return 0; } // Log event - //ShowOutput( DebugLevel, dlHigh, OutputDisplay, Data, MaxLen, "%s: Local IO '%s' - IN:", Name, IOName ); + //ShowOutput( DebugLevel, dlHigh, OutputDisplay, Data, MaxLen, "%s: Channel '%s' - IN:", Name, ChannelName ); // Open file if (!OpenFile( FileHandle )) { diff --git a/FileCore.h b/FileCore.h index 7f759e3..aba0fa4 100644 --- a/FileCore.h +++ b/FileCore.h @@ -69,11 +69,11 @@ public: ~CFileCore(); // Manage files - virtual TFileHandle * AddFile( const char * Name, const char * Path, bool Append = true, bool CreateLocalIO = true ); + virtual TFileHandle * AddFile( const char * Name, const char * Path, bool Append = true, bool CreateChannel = true ); virtual bool SetFilePersistence( TFileHandle * FileHandle, bool Persistent, int PersistTimeout ); // Data Input - virtual int Input( const char * IOName, const char * Data, int MaxLen = -1 ); + virtual int Input( const char * ChannelName, const char * Data, int MaxLen = -1 ); // Processing data virtual bool Process(); diff --git a/FunctionCore.cpp b/FunctionCore.cpp index ab9530d..7ef7f90 100644 --- a/FunctionCore.cpp +++ b/FunctionCore.cpp @@ -33,8 +33,8 @@ CFunctionCore::CFunctionCore( const char * FunctionName, CLogCore * pLog, EDebug Name = NULL; } - // IO Functions - FirstIO = NULL; + // Channels + FirstChannel = NULL; // Output Log = pLog; @@ -48,42 +48,41 @@ CFunctionCore::CFunctionCore( const char * FunctionName, CLogCore * pLog, EDebug CFunctionCore::~CFunctionCore() { - TLocalIO * NextIO = NULL; - TLinkedIO * NextLinkedIO = NULL; + TChannel * NextChannel = NULL; + TChannelLink * NextLinkedChannel = NULL; - // Destroy IO - while (FirstIO) + // Destroy Channels + while (FirstChannel) { // Destroy Parameters - if (FirstIO->Name) { - free( FirstIO->Name ); + if (FirstChannel->Name) { + free( FirstChannel->Name ); } // Destroy Linked Inputs - while (FirstIO->FirstInput) { - if (FirstIO->FirstInput->IOName) { - free( FirstIO->FirstInput->IOName ); + while (FirstChannel->FirstInput) { + if (FirstChannel->FirstInput->Name) { + free( FirstChannel->FirstInput->Name ); } - NextLinkedIO = FirstIO->FirstInput->Next; - free( FirstIO->FirstInput ); - FirstIO->FirstInput = NextLinkedIO; + NextLinkedChannel = FirstChannel->FirstInput->Next; + free( FirstChannel->FirstInput ); + FirstChannel->FirstInput = NextLinkedChannel; } // Destroy Linked Outputs - while (FirstIO->FirstOutput) { - if (FirstIO->FirstOutput->IOName) { - free( FirstIO->FirstOutput->IOName ); + while (FirstChannel->FirstOutput) { + if (FirstChannel->FirstOutput->Name) { + free( FirstChannel->FirstOutput->Name ); } - NextLinkedIO = FirstIO->FirstOutput->Next; - free( FirstIO->FirstOutput ); - FirstIO->FirstOutput = NextLinkedIO; + NextLinkedChannel = FirstChannel->FirstOutput->Next; + free( FirstChannel->FirstOutput ); + FirstChannel->FirstOutput = NextLinkedChannel; } - // Destroy Local IO - // Destroy Local IO - NextIO = FirstIO->Next; - free( FirstIO ); - FirstIO = NextIO; + // Destroy Channel + NextChannel = FirstChannel->Next; + free( FirstChannel ); + FirstChannel = NextChannel; } // Report status @@ -97,116 +96,116 @@ CFunctionCore::~CFunctionCore() } //--------------------------------------------------------------------------- -TLocalIO * CFunctionCore::AddLocalIO( const char * IOName ) +TChannel * CFunctionCore::AddChannel( const char * ChannelName ) { - TLocalIO ** LocalIO = NULL; + TChannel ** Channel = NULL; // Validate - if (!IOName) { + if (!ChannelName) { return NULL; } // Check if exists - LocalIO = &FirstIO; - while (*LocalIO && strcmp( IOName, (*LocalIO)->Name )) { - LocalIO = &((*LocalIO)->Next); + Channel = &FirstChannel; + while (*Channel && strcmp( ChannelName, (*Channel)->Name )) { + Channel = &((*Channel)->Next); } // Create if not exist - if (!*LocalIO) { + if (!*Channel) { // Create - *LocalIO = (TLocalIO*)malloc( sizeof(TLocalIO) ); - memset( *LocalIO, 0, sizeof(TLocalIO) ); + *Channel = (TChannel*)malloc( sizeof(TChannel) ); + memset( *Channel, 0, sizeof(TChannel) ); // Set Name - (*LocalIO)->Name = (char*)malloc( strlen(IOName)+1 ); - strcpy( (*LocalIO)->Name, IOName ); + (*Channel)->Name = (char*)malloc( strlen(ChannelName)+1 ); + strcpy( (*Channel)->Name, ChannelName ); // Log Event - if (Log) Log->Message( DebugLevel, dlLow, "%s: Local IO '%s' - Created", Name, IOName ); + if (Log) Log->Message( DebugLevel, dlLow, "%s: Channel '%s' - Created", Name, ChannelName ); } - return *LocalIO; + return *Channel; } //--------------------------------------------------------------------------- // Automated Data Input/Output -bool CFunctionCore::AddInput( const char * IOName, CFunctionCore * OutFunction, const char * OutputName, bool Bidirectional ) +bool CFunctionCore::LinkInputChannel( const char * ChannelName, CFunctionCore * OutFunction, const char * OutChannelName, bool Bidirectional ) { - TLocalIO * LocalIO = NULL; - TLinkedIO ** LinkedIO = NULL; + TChannel * Channel = NULL; + TChannelLink ** LinkedChannel = NULL; - // Get IO - if (!OutFunction || !OutFunction || !(LocalIO = GetLocalIO( IOName ))) { + // Get Channel + if (!OutFunction || !OutFunction || !(Channel = GetChannel( ChannelName ))) { return false; } - // Check if linked IO exists - LinkedIO = &(LocalIO->FirstInput); - while (*LinkedIO && (((*LinkedIO)->Function != OutFunction) || strcmp( (*LinkedIO)->IOName, OutputName ) )) { - LinkedIO = &((*LinkedIO)->Next); + // Check if linked Channel exists + LinkedChannel = &(Channel->FirstInput); + while (*LinkedChannel && (((*LinkedChannel)->Function != OutFunction) || strcmp( (*LinkedChannel)->Name, OutChannelName ) )) { + LinkedChannel = &((*LinkedChannel)->Next); } // Create if not found - if (!*LinkedIO) + if (!*LinkedChannel) { // Create - *LinkedIO = (TLinkedIO*)malloc( sizeof(TLinkedIO) ); - memset( *LinkedIO, 0, sizeof( TLinkedIO )); + *LinkedChannel = (TChannelLink*)malloc( sizeof(TChannelLink) ); + memset( *LinkedChannel, 0, sizeof( TChannelLink )); // Set Parameters - (*LinkedIO)->Function = OutFunction; - (*LinkedIO)->IOName = (char*)malloc( strlen(OutputName)+1 ); - strcpy( (*LinkedIO)->IOName, OutputName ); + (*LinkedChannel)->Function = OutFunction; + (*LinkedChannel)->Name = (char*)malloc( strlen(OutChannelName)+1 ); + strcpy( (*LinkedChannel)->Name, OutChannelName ); // Log Event - if (Log) Log->Message( DebugLevel, dlLow, "%s: Input Linked - '%s'/'%s' <-- '%s'/'%s'", Name, Name, IOName, OutFunction->GetName(), OutputName ); + if (Log) Log->Message( DebugLevel, dlLow, "%s: Input Linked - '%s'/'%s' <-- '%s'/'%s'", Name, Name, ChannelName, OutFunction->GetName(), OutChannelName ); } // Link Return direction as well if (Bidirectional) { - return OutFunction->AddInput( OutputName, this, IOName, false ); + return OutFunction->LinkInputChannel( OutChannelName, this, ChannelName, false ); } return true; } //--------------------------------------------------------------------------- -bool CFunctionCore::AddOutput( const char * IOName, CFunctionCore * InFunction, const char * InputName, bool Bidirectional ) +bool CFunctionCore::LinkOutputChannel( const char * ChannelName, CFunctionCore * InFunction, const char * InChannelName, bool Bidirectional ) { - TLocalIO * LocalIO = NULL; - TLinkedIO ** LinkedIO = NULL; + TChannel * Channel = NULL; + TChannelLink ** LinkedChannel = NULL; - // Get IO - if (!InFunction || !InputName || !(LocalIO = GetLocalIO( IOName ))) { + // Get Channel + if (!InFunction || !InChannelName || !(Channel = GetChannel( ChannelName ))) { return false; } - // Check if linked IO exists - LinkedIO = &(LocalIO->FirstOutput); - while (*LinkedIO && (((*LinkedIO)->Function != InFunction) || strcmp( (*LinkedIO)->IOName, InputName ) )) { - LinkedIO = &((*LinkedIO)->Next); + // Check if linked Channel exists + LinkedChannel = &(Channel->FirstOutput); + while (*LinkedChannel && (((*LinkedChannel)->Function != InFunction) || strcmp( (*LinkedChannel)->Name, InChannelName ) )) { + LinkedChannel = &((*LinkedChannel)->Next); } // Create if not found - if (!*LinkedIO) + if (!*LinkedChannel) { // Create - *LinkedIO = (TLinkedIO*)malloc( sizeof(TLinkedIO) ); - memset( *LinkedIO, 0, sizeof( TLinkedIO )); + *LinkedChannel = (TChannelLink*)malloc( sizeof(TChannelLink) ); + memset( *LinkedChannel, 0, sizeof( TChannelLink )); // Set Parameters - (*LinkedIO)->Function = InFunction; - (*LinkedIO)->IOName = (char*)malloc( strlen(InputName)+1 ); - strcpy( (*LinkedIO)->IOName, InputName ); + (*LinkedChannel)->Function = InFunction; + (*LinkedChannel)->Name = (char*)malloc( strlen(InChannelName)+1 ); + strcpy( (*LinkedChannel)->Name, InChannelName ); // Log Event - if (Log) Log->Message( DebugLevel, dlLow, "%s: Output Linked - '%s'/'%s' --> '%s'/'%s'", Name, Name, IOName, InFunction->GetName(), InputName ); + if (Log) Log->Message( DebugLevel, dlLow, "%s: Output Linked - '%s'/'%s' --> '%s'/'%s'", Name, Name, ChannelName, InFunction->GetName(), InChannelName ); } // Link return direction as well if (Bidirectional) { - return InFunction->AddOutput( InputName, this, IOName, false ); + return InFunction->LinkOutputChannel( InChannelName, this, ChannelName, false ); } return true; @@ -214,77 +213,77 @@ bool CFunctionCore::AddOutput( const char * IOName, CFunctionCore * InFunction, //--------------------------------------------------------------------------- // Manual Data Input/Output -int CFunctionCore::Input( const char * IOName, const char * Data, int MaxLen ) +int CFunctionCore::Input( const char * ChannelName, const char * Data, int MaxLen ) { - TLocalIO * LocalIO = NULL; + TChannel * Channel = NULL; // Validate - if (!IOName || !Data) { + if (!ChannelName || !Data) { return 0; } else if (MaxLen == -1) { MaxLen = strlen( Data ); } - // Get IO - if (!(LocalIO = GetLocalIO( IOName ))) + // Get Channel + if (!(Channel = GetChannel( ChannelName ))) { // Log event - if (Log) Log->Message( DebugLevel, dlHigh, "%s: Local IO '%s' - Input rejected, Local IO not found", Name, IOName ); + if (Log) Log->Message( DebugLevel, dlHigh, "%s: Channel '%s' - Input rejected, Channel not found", Name, ChannelName ); return 0; } // Log event - if (Log) Log->Output( DebugLevel, dlHigh, OutputDisplay, Data, MaxLen, "%s: Local IO '%s' - IN:", Name, IOName ); + if (Log) Log->Output( DebugLevel, dlHigh, OutputDisplay, Data, MaxLen, "%s: Channel '%s' - IN:", Name, ChannelName ); // Return processed bytes return MaxLen; } //--------------------------------------------------------------------------- -int CFunctionCore::Output( const char * IOName, const char * Data, int Len ) +int CFunctionCore::Output( const char * ChanelName, const char * Data, int Len ) { - TLocalIO * LocalIO = NULL; + TChannel * Channel = NULL; // Validate - if (!IOName || !Data) { + if (!ChanelName || !Data) { return 0; } else if (Len == -1) { Len = strlen( Data ); } - // Get IO - if (!(LocalIO = GetLocalIO( IOName ))) + // Get Channel + if (!(Channel = GetChannel( ChanelName ))) { // Log Event - if (Log) Log->Message( DebugLevel, dlHigh, "%s: Local IO '%s' - Output rejected, Local IO not found", Name, IOName ); + if (Log) Log->Message( DebugLevel, dlHigh, "%s: Channel '%s' - Output rejected, Channel not found", Name, ChanelName ); return 0; } // Return processed bytes - return Output( LocalIO, Data, Len ); + return Output( Channel, Data, Len ); } //--------------------------------------------------------------------------- -int CFunctionCore::Output( const TLocalIO * LocalIO, const char * Data, int Len ) +int CFunctionCore::Output( const TChannel * Channel, const char * Data, int Len ) { - TLinkedIO * Output = NULL; + TChannelLink * OutChannel = NULL; // Validate - if (!LocalIO || !Data) { + if (!Channel || !Data) { return 0; } else if (Len == -1) { Len = strlen( Data ); } // Log event - if (Log) Log->Output( DebugLevel, dlHigh, OutputDisplay, Data, Len, "%s: Local IO '%s' - OUT:", Name, LocalIO->Name ); + if (Log) Log->Output( DebugLevel, dlHigh, OutputDisplay, Data, Len, "%s: Channel '%s' - OUT:", Name, Channel->Name ); // Pass output to all linked inputs - Output = LocalIO->FirstOutput; - while (Output) { - Output->Function->Input( Output->IOName, Data, Len ); - Output = Output->Next; + OutChannel = Channel->FirstOutput; + while (OutChannel) { + OutChannel->Function->Input( OutChannel->Name, Data, Len ); + OutChannel = OutChannel->Next; } // Return processed bytes diff --git a/FunctionCore.h b/FunctionCore.h index 7b67256..a25510b 100644 --- a/FunctionCore.h +++ b/FunctionCore.h @@ -19,30 +19,30 @@ //--------------------------------------------------------------------------- // Preview -typedef struct SLocalIO TLocalIO; -typedef struct SLinkedIO TLinkedIO; +typedef struct SChannel TChannel; +typedef struct SChannelLink TChannelLink; class CFunctionCore; //--------------------------------------------------------------------------- -struct SLocalIO +struct SChannel { char * Name; - TLinkedIO * FirstInput; - TLinkedIO * FirstOutput; + TChannelLink * FirstInput; + TChannelLink * FirstOutput; - TLocalIO * Next; + TChannel * Next; }; //--------------------------------------------------------------------------- -struct SLinkedIO +struct SChannelLink { CFunctionCore * Function; - char * IOName; + char * Name; - SLinkedIO * Next; + SChannelLink * Next; }; //--------------------------------------------------------------------------- @@ -52,25 +52,25 @@ protected: // Function Definition char * Name; - // IOs - TLocalIO * FirstIO; + // Channels + TChannel * FirstChannel; // Output CLogCore * Log; EDebugLevel DebugLevel; int OutputDisplay; - // Manage IO - inline TLocalIO * GetLocalIO( const char * Name ) { - TLocalIO * LocalIO = FirstIO; - while (LocalIO && strcmp( Name, LocalIO->Name )) { - LocalIO = LocalIO->Next; + // Manage Channel + inline TChannel * GetChannel( const char * Name ) { + TChannel * Channel = FirstChannel; + while (Channel && strcmp( Name, Channel->Name )) { + Channel = Channel->Next; } - return LocalIO; + return Channel; } // Manual Data Input/Output - virtual int Output( const TLocalIO * LocalIO, const char * Data, int Len ); + virtual int Output( const TChannel * Channel, const char * Data, int Len ); public: // Life cycle @@ -80,16 +80,16 @@ public: // Miscellaneous inline const char * GetName() { return Name; }; - // Manage IOs - virtual TLocalIO * AddLocalIO( const char * IOName ); + // Manage Channels + virtual TChannel * AddChannel( const char * ChannelName ); // Manual Data Input/Output - virtual int Input( const char * IOName, const char * Data, int MaxLen = -1 ); - virtual int Output( const char * IOName, const char * Data, int Len = -1 ); + virtual int Input( const char * ChannelName, const char * Data, int MaxLen = -1 ); + virtual int Output( const char * ChannelName, const char * Data, int Len = -1 ); // Automated Data Input/Output - virtual bool AddInput( const char * IOName, CFunctionCore * OutFunction, const char * OutputName, bool Bidirectional ); - virtual bool AddOutput( const char * IOName, CFunctionCore * InFunction, const char * InputName, bool Bidirectional ); + virtual bool LinkInputChannel( const char * ChannelName, CFunctionCore * OutFunction, const char * OutChannelName, bool Bidirectional ); + virtual bool LinkOutputChannel( const char * ChannelName, CFunctionCore * InFunction, const char * InChannelName, bool Bidirectional ); virtual bool Process() = 0; }; diff --git a/SelectableCore.cpp b/SelectableCore.cpp index b5cec82..98793b3 100644 --- a/SelectableCore.cpp +++ b/SelectableCore.cpp @@ -60,7 +60,7 @@ CSelectableCore::~CSelectableCore() } //--------------------------------------------------------------------------- -THandle * CSelectableCore::CreateHandle( const char * HandleName, bool CreateLocalIO ) +THandle * CSelectableCore::CreateHandle( const char * HandleName, bool CreateChannel ) { THandle ** Handle = NULL; @@ -88,9 +88,9 @@ THandle * CSelectableCore::CreateHandle( const char * HandleName, bool CreateLo if (Log) Log->Message( DebugLevel, dlMedium, "%s: Handle '%s' - Created", Name, HandleName ); } - // Create Matching IO point - if (CreateLocalIO) { - (*Handle)->LocalIO = AddLocalIO( HandleName ); + // Create Matching Channel + if (CreateChannel) { + (*Handle)->Channel = AddChannel( HandleName ); } return *Handle; @@ -1037,9 +1037,9 @@ bool CSelectableCore::ProcessBuffer( THandle * Handle, bool Force ) // Write buffer to Outputs if (Handle->Type == ctRemoteClient) { - Output( Handle->Parent->LocalIO, Data, Len ); + Output( Handle->Parent->Channel, Data, Len ); } else { - Output( Handle->LocalIO, Data, Len ); + Output( Handle->Channel, Data, Len ); } // Clear processed bytes from buffer @@ -1056,9 +1056,9 @@ bool CSelectableCore::ProcessBuffer( THandle * Handle, bool Force ) // Write buffer to Outputs if (Handle->Type == ctRemoteClient) { - Output( Handle->Parent->LocalIO, Data, Len ); + Output( Handle->Parent->Channel, Data, Len ); } else { - Output( Handle->LocalIO, Data, Len ); + Output( Handle->Channel, Data, Len ); } // Clear processed bytes from buffer @@ -1127,14 +1127,14 @@ int CSelectableCore::WriteToFD( int FD, const char * Data, int Len, bool Force ) } //--------------------------------------------------------------------------- -int CSelectableCore::Input( const char * IOName, const char * Data, int Len ) +int CSelectableCore::Input( const char * ChannelName, const char * Data, int Len ) { THandle * Handle = NULL; THandle * ChildHandle = NULL; int BytesWritten = 0; // Validate - if (!IOName || !Data) { + if (!ChannelName || !Data) { return 0; } else if (Len == -1) { @@ -1142,22 +1142,22 @@ int CSelectableCore::Input( const char * IOName, const char * Data, int Len ) } // Get File handle - if (!(Handle = GetHandle( IOName ))) + if (!(Handle = GetHandle( ChannelName ))) { // Log event - if (Log) Log->Message( DebugLevel, dlHigh, "%s: Local IO '%s' - Input rejected, Input not found", Name, IOName ); + if (Log) Log->Message( DebugLevel, dlHigh, "%s: Channel '%s' - Input rejected, Input not found", Name, ChannelName ); return 0; } // Check that handle is open else if (Handle->State != csOpen) { // Log event - if (Log) Log->Message( DebugLevel, dlHigh, "%s: Local IO '%s' - Input rejected, Handle not Open", Name, IOName ); + if (Log) Log->Message( DebugLevel, dlHigh, "%s: Channel '%s' - Input rejected, Handle not Open", Name, ChannelName ); return 0; } // Log event - if (Log) Log->Output( DebugLevel, dlHigh, OutputDisplay, Data, Len, "%s: Local IO '%s' - IN:", Name, IOName ); + if (Log) Log->Output( DebugLevel, dlHigh, OutputDisplay, Data, Len, "%s: Channel '%s' - IN:", Name, ChannelName ); if (Handle->Type == ctServer) { diff --git a/SelectableCore.h b/SelectableCore.h index ef3bc83..fca14b0 100644 --- a/SelectableCore.h +++ b/SelectableCore.h @@ -102,7 +102,7 @@ struct SHandle { long ReopenTimeout; // millisecs // List / Tree - TLocalIO * LocalIO; + TChannel * Channel; THandle * Parent; THandle * Next; }; @@ -224,7 +224,7 @@ public: } // Configuration - THandle * CreateHandle( const char * HandleName, bool CreateIO ); + THandle * CreateHandle( const char * HandleName, bool CreateChannel ); bool SetAutoManage( THandle * Handle, bool AutoManage, int ReopenTime = 0 ); bool SetBuffers( THandle * Handle, int InBufSize, int OutBufSize, int InTimeout, const char * InMarker, int InMarkerLen ); bool SerialConfig( THandle * Handle, int Baud, short DataBits, short StopBits, short Parity, short FlowCtrl, int Wait ); @@ -248,7 +248,7 @@ public: inline virtual bool Write( int FD ) { return (Write( GetHandle( FD ))); }; // Function Interface - virtual int Input( const char *IOName, const char * Buffer, int BufLen = -1 ); + virtual int Input( const char *ChannelName, const char * Buffer, int BufLen = -1 ); virtual bool Process(); };