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

Update Csocket to e00323f9f18

Browse Source 
This breaks API for Csock::SockError()!

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter
2012-01-14 11:33:38 +01:00
parent 02e42958f0
commit c87e7cf5ba
12 changed files with 975 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/IRCSock.cpp
View File

@@ -953,22 +953,8 @@ void CIRCSock::Disconnected() {
m_scUserModes.clear();
}
void CIRCSock::SockError(int iErrno) {
CString sError;
if (iErrno == EDOM) {
sError = "Your bind host could not be resolved";
} else if (iErrno == EADDRNOTAVAIL) {
// Csocket uses this if it can't resolve the dest host name
// ...but it also does generate this if bind() fails -.-
sError = strerror(iErrno);
if (GetBindHost().empty())
sError += " (Is your IRC server's host name valid?)";
else
sError += " (Is your IRC server's host name and ZNC bind host valid?)";
} else {
sError = strerror(iErrno);
}
void CIRCSock::SockError(int iErrno, const CString& sDescription) {
CString sError = sDescription;
DEBUG(GetSockName() << " == SockError(" << iErrno << " "
<< sError << ")");
@@ -976,7 +962,7 @@ void CIRCSock::SockError(int iErrno) {
if (GetConState() != CST_OK) {
m_pNetwork->PutStatus("Cannot connect to IRC (" + sError + "). Retrying...");
} else {
m_pNetwork->PutStatus("Disconnected from IRC (" + sError + "). Reconnecting...");
m_pNetwork->PutStatus("Disconnected from IRC (" + sError + "). Reconnecting...");
}
}
m_pNetwork->ClearRawBuffer();