Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-20 20:34:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Commit of the new UDP Connection methods and

Browse source 
the rewrite of the retroshare core networking stack.

This check-in commits the changes to the services code.
Modifications to match the switch to p3connmgr.h and p3authmgr.h



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-01-25 07:49:28 +00:00
parent 059d43244a
commit 37d6a4b968
7 changed files with 52 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

43
libretroshare/src/services/p3msgservice.cc
View file

@ -27,30 +27,15 @@
#include "pqi/pqibin.h"
#include "pqi/pqiarchive.h"
#include "pqi/pqidebug.h"
#include "pqi/p3connmgr.h"
#include "services/p3msgservice.h"
#include <sstream>
#include <iomanip>
/**************** PQI_USE_XPGP ******************/
#if defined(PQI_USE_XPGP)
#include "pqi/xpgpcert.h"
#else /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
#include "pqi/sslcert.h"
#endif /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
const int msgservicezone = 54319;
/* Another little hack ..... unique message Ids
* will be handled in this class.....
* These are unique within this run of the server,
@ -68,11 +53,10 @@ unsigned int getNewUniqueMsgId()
return msgUniqueId++;
}
p3MsgService::p3MsgService()
:p3Service(RS_SERVICE_TYPE_MSG),
p3MsgService::p3MsgService(p3ConnectMgr *cm)
:p3Service(RS_SERVICE_TYPE_MSG), mConnMgr(cm),
msgChanged(1), msgMajorChanged(1)
{
sslr = getSSLRoot();
}
@ -110,7 +94,7 @@ int p3MsgService::incomingMsgs()
mi -> recvTime = time(NULL);
std::string mesg;
if (mi -> PeerId() == sslr->getOwnCert()->PeerId())
if (mi -> PeerId() == mConnMgr->getOwnId())
{
/* from the loopback device */
mi -> msgFlags = RS_MSG_FLAGS_OUTGOING;
@ -219,18 +203,23 @@ int p3MsgService::checkOutgoingMessages()
* if online, send
*/
const std::string ownId = mConnMgr->getOwnId();
std::list<RsMsgItem *>::iterator it;
for(it = msgOutgoing.begin(); it != msgOutgoing.end();)
{
/* find the certificate */
certsign sign;
convert_to_certsign((*it)->PeerId(), sign);
cert *peer = sslr -> findcertsign(sign);
std::string pid = (*it)->PeerId();
peerConnectState pstate;
if (!mConnMgr->getFriendNetStatus(pid, pstate))
{
delete(*it);
it = msgOutgoing.erase(it);
}
/* if online, send it */
if ((peer -> Status() & PERSON_STATUS_CONNECTED)
|| (peer == sslr->getOwnCert()))
else if ((pstate.state & RS_PEER_S_ONLINE)
|| (pid == ownId))
{
/* send msg */
pqioutput(PQL_ALERT, msgservicezone,
@ -359,7 +348,7 @@ void p3MsgService::loadWelcomeMsg()
/* Load Welcome Message */
RsMsgItem *msg = new RsMsgItem();
msg -> PeerId(sslr->getOwnCert()->PeerId());
msg -> PeerId(mConnMgr->getOwnId());
msg -> sendTime = 0;