Rename AddListener() variants into AddTCPListener() and AddUnixListener

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter
2017-11-06 15:29:44 +01:00
parent 29a646b773
commit 7621a31af5
2 changed files with 19 additions and 11 deletions
+12 -4
View File
@@ -201,12 +201,20 @@ class CZNC {
CListener* FindListener(u_short uPort, const CString& BindHost,
EAddrType eAddr);
bool AddListener(CListener*);
bool AddTCPListener(unsigned short uPort, const CString& sBindHost,
const CString& sURIPrefix, bool bSSL, EAddrType eAddr,
CListener::EAcceptType eAccept, CString& sError);
bool AddUnixListener(const CString& sPath, const CString& sURIPrefix, bool bSSL,
CListener::EAcceptType eAccept, CString& sError);
bool DelListener(CListener*);
// For backwards-compatibility TODO: Remove
/// @deprecated use AddTCPListener
bool AddListener(unsigned short uPort, const CString& sBindHost,
const CString& sURIPrefix, bool bSSL, EAddrType eAddr,
CListener::EAcceptType eAccept, CString& sError);
bool AddListener(const CString& sPath, const CString& sURIPrefix, bool bSSL,
CListener::EAcceptType eAccept, CString& sError);
bool DelListener(CListener*);
CListener::EAcceptType eAccept, CString& sError) {
return AddTCPListener(uPort, sBindHost, sURIPrefix, bSSL, eAddr, eAccept, sError);
}
// Message of the Day
void SetMotd(const CString& sMessage) {
+7 -7
View File
@@ -1623,7 +1623,7 @@ bool CZNC::AddListener(const CString& sLine, CString& sError) {
sError);
}
bool CZNC::AddListener(unsigned short uPort, const CString& sBindHost,
bool CZNC::AddTCPListener(unsigned short uPort, const CString& sBindHost,
const CString& sURIPrefixRaw, bool bSSL, EAddrType eAddr,
CListener::EAcceptType eAccept, CString& sError) {
CString sHostComment;
@@ -1717,9 +1717,9 @@ bool CZNC::AddListener(unsigned short uPort, const CString& sBindHost,
return true;
}
bool CZNC::AddListener(const CString& sPath, const CString& sURIPrefixRaw,
bool bSSL, CListener::EAcceptType eAccept,
CString& sError) {
bool CZNC::AddUnixListener(const CString& sPath, const CString& sURIPrefixRaw,
bool bSSL, CListener::EAcceptType eAccept,
CString& sError) {
CUtils::PrintAction("Binding to path [" + sPath + "]");
#ifndef HAVE_LIBSSL
@@ -1838,10 +1838,10 @@ bool CZNC::AddListener(CConfig* pConfig, CString& sError) {
return false;
}
return AddListener(uPort, sBindHost, sURIPrefix, bSSL, eAddr, eAccept,
sError);
return AddTCPListener(uPort, sBindHost, sURIPrefix, bSSL, eAddr,
eAccept, sError);
}
return AddListener(sPath, sURIPrefix, bSSL, eAccept, sError);
return AddUnixListener(sPath, sURIPrefix, bSSL, eAccept, sError);
}
bool CZNC::AddListener(CListener* pListener) {