projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.1.6
[fms.git]
/
src
/
nntp
/
nntpconnection.cpp
diff --git
a/src/nntp/nntpconnection.cpp
b/src/nntp/nntpconnection.cpp
index
ac75d4d
..
d909c36
100644
(file)
--- a/
src/nntp/nntpconnection.cpp
+++ b/
src/nntp/nntpconnection.cpp
@@
-7,7
+7,10
@@
#include "../../include/messagelist.h"
\r
#include "../../include/option.h"
\r
\r
#include "../../include/messagelist.h"
\r
#include "../../include/option.h"
\r
\r
-#include <zthread/Thread.h>
\r
+#include <algorithm>
\r
+
\r
+//#include <zthread/Thread.h>
\r
+#include "../../include/pthreadwrapper/thread.h"
\r
\r
#ifdef XMEM
\r
#include <xmem.h>
\r
\r
#ifdef XMEM
\r
#include <xmem.h>
\r
@@
-26,7
+29,7
@@
NNTPConnection::NNTPConnection(SOCKET sock)
m_status.m_messageid=-1;
\r
m_status.m_mode=MODE_NONE;
\r
\r
m_status.m_messageid=-1;
\r
m_status.m_mode=MODE_NONE;
\r
\r
- Option::
i
nstance()->Get("NNTPAllowPost",tempval);
\r
+ Option::
I
nstance()->Get("NNTPAllowPost",tempval);
\r
if(tempval=="true")
\r
{
\r
m_status.m_allowpost=true;
\r
if(tempval=="true")
\r
{
\r
m_status.m_allowpost=true;
\r
@@
-230,7
+233,7
@@
const bool NNTPConnection::HandleLastCommand(const NNTPCommand &command)
{
\r
Message mess;
\r
\r
{
\r
Message mess;
\r
\r
- if(mess.Load(m_status.m_messageid,m_status.m_boardid))
\r
+ if(mess.Load
Previous
(m_status.m_messageid,m_status.m_boardid))
\r
{
\r
std::ostringstream tempstr;
\r
\r
{
\r
std::ostringstream tempstr;
\r
\r
@@
-316,7
+319,7
@@
const bool NNTPConnection::HandleListCommand(const NNTPCommand &command)
\r
if(show==true)
\r
{
\r
\r
if(show==true)
\r
{
\r
- tempstr << (*i).GetBoardName() << "
\t" << (*i).GetHighMessageID() << "\t" << (*i).GetLowMessageID() << "\t
" << (m_status.m_allowpost ? "y" : "n");
\r
+ tempstr << (*i).GetBoardName() << "
" << (*i).GetHighMessageID() << " " << (*i).GetLowMessageID() << "
" << (m_status.m_allowpost ? "y" : "n");
\r
SendBufferedLine(tempstr.str());
\r
}
\r
}
\r
SendBufferedLine(tempstr.str());
\r
}
\r
}
\r
@@
-583,7
+586,7
@@
const bool NNTPConnection::HandleNextCommand(const NNTPCommand &command)
{
\r
Message mess;
\r
\r
{
\r
Message mess;
\r
\r
- if(mess.Load(m_status.m_messageid,m_status.m_boardid))
\r
+ if(mess.Load
Next
(m_status.m_messageid,m_status.m_boardid))
\r
{
\r
std::ostringstream tempstr;
\r
\r
{
\r
std::ostringstream tempstr;
\r
\r
@@
-862,7
+865,7
@@
const bool NNTPConnection::HandleQuitCommand(const NNTPCommand &command)
return true;
\r
}
\r
\r
return true;
\r
}
\r
\r
-void NNTPConnection::
r
un()
\r
+void NNTPConnection::
R
un()
\r
{
\r
struct timeval tv;
\r
fd_set writefs,readfs;
\r
{
\r
struct timeval tv;
\r
fd_set writefs,readfs;
\r
@@
-908,15
+911,16
@@
void NNTPConnection::run()
SocketSend();
\r
}
\r
}
\r
SocketSend();
\r
}
\r
}
\r
- else if(rval==
-1
)
\r
+ else if(rval==
SOCKET_ERROR
)
\r
{
\r
m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPConnection::run select returned -1 : "+GetSocketErrorMessage());
\r
}
\r
\r
{
\r
m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPConnection::run select returned -1 : "+GetSocketErrorMessage());
\r
}
\r
\r
- }while(!Disconnected() && !ZThread::Thread::interrupted());
\r
-
\r
+// }while(!Disconnected() && !ZThread::Thread::interrupted());
\r
+ }while(!Disconnected() && !IsCancelled());
\r
+
\r
Disconnect();
\r
Disconnect();
\r
-
\r
+
\r
}
\r
\r
void NNTPConnection::SendArticleOverInfo(Message &message)
\r
}
\r
\r
void NNTPConnection::SendArticleOverInfo(Message &message)
\r
@@
-1163,9
+1167,11
@@
void NNTPConnection::SocketReceive()
}
\r
else if(rval==-1)
\r
{
\r
}
\r
else if(rval==-1)
\r
{
\r
+ std::string errnostr;
\r
+ StringFunctions::Convert(GetSocketErrorNumber(),errnostr);
\r
// error on receive - close the connection
\r
Disconnect();
\r
// error on receive - close the connection
\r
Disconnect();
\r
- m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPConnection::SocketReceive recv returned -1 : "+GetSocketErrorMessage());
\r
+ m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPConnection::SocketReceive recv returned -1 : "+
errnostr+" - "+
GetSocketErrorMessage());
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-1180,7
+1186,9
@@
void NNTPConnection::SocketSend()
}
\r
else if(rval==-1)
\r
{
\r
}
\r
else if(rval==-1)
\r
{
\r
- m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPConnection::SocketSend returned -1 : "+GetSocketErrorMessage());
\r
+ std::string errnostr;
\r
+ StringFunctions::Convert(GetSocketErrorNumber(),errnostr);
\r
+ m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"NNTPConnection::SocketSend returned -1 : "+errnostr+" - "+GetSocketErrorMessage());
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r