Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hopefully handle cases when the connection to the server is lost. This should trigger a reconnect.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40748 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler 2011-02-28 23:16:57 +00:00
parent fecd4735be
commit 8209ab9c98
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp
View File

@ -398,7 +398,13 @@ IMAPInboundProtocol::Reconnect()
bool
IMAPInboundProtocol::IsConnected()
{
return fIsConnected;
if (!fIsConnected)
return false;
if (fIMAPMailbox.IsConnected())
return true;
Disconnect();
return false;
}

27
src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPProtocol.cpp
View File

@ -101,7 +101,7 @@ ConnectionReader::_GetNextDataBunch(BString& line, bigtime_t timeout,
}
int nReaded = fServerConnection->Read(buffer, maxNewLength);
if (nReaded < 0)
if (nReaded <= 0)
return B_ERROR;
fStringBuffer.SetTo(buffer, nReaded);
@ -135,7 +135,8 @@ IMAPProtocol::IMAPProtocol()
fServerConnection(&fOwnServerConnection),
fConnectionReader(fServerConnection),
fCommandId(0),
fStopNow(0)
fStopNow(0),
fIsConnected(false)
{
}
@ -146,7 +147,8 @@ IMAPProtocol::IMAPProtocol(IMAPProtocol& connection)
fServerConnection(connection.fServerConnection),
fConnectionReader(fServerConnection),
fCommandId(0),
fStopNow(0)
fStopNow(0),
fIsConnected(false)
{
}
@ -203,6 +205,7 @@ IMAPProtocol::Connect(const char* server, const char* username,
if (status != B_OK)
return status;
fIsConnected = true;
return B_OK;
}
@ -211,10 +214,18 @@ status_t
IMAPProtocol::Disconnect()
{
ProcessCommand("LOGOUT");
fIsConnected = false;
return fOwnServerConnection.Disconnect();
}
bool
IMAPProtocol::IsConnected()
{
return fIsConnected;
}
ConnectionReader&
IMAPProtocol::GetConnectionReader()
{
@ -281,8 +292,11 @@ IMAPProtocol::SendCommand(const char* command, int32 commandId)
TRACE("_SendCommand: %s\n", cmd);
int commandLength = strlen(cmd);
if (fServerConnection->Write(cmd, commandLength) != commandLength)
if (fServerConnection->Write(cmd, commandLength) != commandLength) {
// we might lost the connection, clear the connection state
Disconnect();
return B_ERROR;
}
fOngoingCommands.push_back(commandId);
return B_OK;
@ -301,7 +315,10 @@ IMAPProtocol::HandleResponse(int32 commandId, bigtime_t timeout)
if (status != B_OK) {
if (status != B_TIMED_OUT)
TRACE("S:read error %s", line.String());
break;
// we might lost the connection, clear the connection state
TRACE("Disconnect\n");
Disconnect();
return status;
}
//TRACE("S: %s", line.String());

3
src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPProtocol.h
View File

@ -75,6 +75,7 @@ public:
const char* username, const char* password,
bool useSSL = true, int32 port = -1);
status_t Disconnect();
bool IsConnected();
ConnectionReader& GetConnectionReader();
status_t SendRawCommand(const char* command);
@ -118,6 +119,8 @@ private:
BString fCommandError;
vint32 fStopNow;
bool fIsConnected;
};