iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

TDNS: Fix few incompabilities with last Csocket.

Browse Source
This commit is contained in:
Alexey Sokolov
2012-01-15 13:11:56 +07:00
parent 6bf026599c
commit ff8065ed32
4 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/znc/Csocket.h
View File

@@ -910,14 +910,6 @@ public:
* Don't bother using these callbacks if you are using this class directly (without Socket Manager)
* as the Socket Manager calls most of these callbacks
*
* A sock error occured event
*/
virtual void SockTextError( const CS_STRING & sError ) { SockError(-1); }
/**
* Override these functions for an easy interface when using the Socket Manager
* Don't bother using these callbacks if you are using this class directly (without Socket Manager)
* as the Socket Manager calls most of these callbacks
*
*
* Incoming Connection Event
* return false and the connection will fail

1
include/znc/IRCSock.h
View File

@@ -50,7 +50,6 @@ public:
virtual void Disconnected();
virtual void ConnectionRefused();
virtual void SockError(int iErrno);
virtual void SockTextError(const CString& sError);
virtual void Timeout();
virtual void ReachedMaxBuffer();

5
src/IRCSock.cpp
View File

@@ -972,11 +972,6 @@ void CIRCSock::SockError(int iErrno) {
DEBUG(GetSockName() << " == SockError(" << iErrno << " "
<< sError << ")");
SockTextError(sError);
}
void CIRCSock::SockTextError(const CString& sError) {
DEBUG(GetSockName() << " == SockError(" << sError << ")");
if (!m_pNetwork->GetUser()->IsBeingDeleted()) {
if (GetConState() != CST_OK) {
m_pNetwork->PutStatus("Cannot connect to IRC (" + sError + "). Retrying...");

2
src/Socket.cpp
View File

@@ -196,7 +196,7 @@ void CSockManager::TryToFinishTDNSTask(TDNSTask* task) {
} catch (const char* s) {
DEBUG(task->sSockName << ", dns resolving error: " << s);
task->pcSock->SetSockName(task->sSockName);
task->pcSock->SockTextError(s);
task->pcSock->SockError(-1, s);
delete task->pcSock;
}