Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 17:09:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added network message objects for the Status service - RsStatusItem

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@554 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
vinnyx 2008-05-14 10:35:12 +00:00
parent 5913872a77
commit 9cd24b315f
4 changed files with 258 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libretroshare/src/serialiser/Makefile
View File

@ -14,6 +14,7 @@ RSOBJ += rsmsgitems.o rsrankitems.o # RsItems
RSOBJ += rsphotoitems.o # RsItems
RSOBJ += rsgameitems.o # RsItems
RSOBJ += rsqblogitems.o # RsItems
RSOBJ += rsstatusitems.o # RsItems
TESTOBJ = tlvbase_test.o tlvbase_test2.o tlvfileitem_test.o
TESTOBJ += tlvitems_test.o tlvstack_test.o tlvconfig_test.o

4
libretroshare/src/serialiser/rsserviceids.h
View File

@ -46,14 +46,12 @@ const uint16_t RS_SERVICE_TYPE_PHOTO = 0x0003;
const uint16_t RS_SERVICE_TYPE_DISC = 0x0011;
const uint16_t RS_SERVICE_TYPE_CHAT = 0x0012;
const uint16_t RS_SERVICE_TYPE_MSG = 0x0013;
const uint16_t RS_SERVICE_TYPE_STATUS = 0x0014;
/****************** BELOW ARE ONLY THEORETICAL (CAN BE CHANGED) *****/
const uint16_t RS_SERVICE_TYPE_STATUS = 0x0012;
const uint16_t RS_SERVICE_TYPE_CHANNEL_MSG = 0x0015;
const uint16_t RS_SERVICE_TYPE_PROXY_MSG = 0x0016;

175
libretroshare/src/serialiser/rsstatusitems.cc Normal file
View File

@ -0,0 +1,175 @@
/*
* libretroshare/src/serialiser: rsstatusitems.cc
*
* RetroShare Serialiser.
*
* Copyright 2007-2008 by Vinny Do.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License Version 2 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#include "serialiser/rsstatusitems.h"
#include "serialiser/rsbaseserial.h"
/***
#define RSSERIAL_DEBUG 1
***/
#include <iostream>
/*************************************************************************/
RsStatusItem::~RsStatusItem()
{
return;
}
void RsStatusItem::clear()
{
sendTime = 0;
status = 0;
}
std::ostream &RsStatusItem::print(std::ostream &out, uint16_t indent)
{
printRsItemBase(out, "RsStatusItem", indent);
uint16_t int_Indent = indent + 2;
printIndent(out, int_Indent);
out << "sendTime: " << sendTime << std::endl;
printIndent(out, int_Indent);
out << "status: " << status << std::endl;
printRsItemEnd(out, "RsStatusItem", indent);
return out;
}
uint32_t RsStatusSerialiser::sizeItem(RsStatusItem *item)
{
uint32_t s = 8; /* header */
s += 4; /* sendTime */
s += 4; /* status */
return s;
}
/* serialise the data to the buffer */
bool RsStatusSerialiser::serialiseItem(RsStatusItem *item, void *data, uint32_t *pktsize)
{
uint32_t tlvsize = sizeItem(item);
uint32_t offset = 0;
if (*pktsize < tlvsize)
return false; /* not enough space */
*pktsize = tlvsize;
bool ok = true;
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsStatusSerialiser::serialiseItem() Header: " << ok << std::endl;
std::cerr << "RsStatusSerialiser::serialiseItem() Size: " << tlvsize << std::endl;
#endif
/* skip the header */
offset += 8;
/* add mandatory parts first */
ok &= setRawUInt32(data, tlvsize, &offset, item->sendTime);
ok &= setRawUInt32(data, tlvsize, &offset, item->status);
if (offset != tlvsize)
{
ok = false;
#ifdef RSSERIAL_DEBUG
std::cerr << "RsStatusSerialiser::serialiseItem() Size Error! " << std::endl;
#endif
}
return ok;
}
RsStatusItem *RsStatusSerialiser::deserialiseItem(void *data, uint32_t *pktsize)
{
/* get the type and size */
uint32_t rstype = getRsItemId(data);
uint32_t rssize = getRsItemSize(data);
uint32_t offset = 0;
if ((RS_PKT_VERSION_SERVICE != getRsItemVersion(rstype)) ||
(RS_SERVICE_TYPE_STATUS != getRsItemService(rstype)) ||
(RS_PKT_SUBTYPE_DEFAULT != getRsItemSubType(rstype)))
{
return NULL; /* wrong type */
}
if (*pktsize < rssize) /* check size */
return NULL; /* not enough data */
/* set the packet length */
*pktsize = rssize;
bool ok = true;
/* ready to load */
RsStatusItem *item = new RsStatusItem();
item->clear();
/* skip the header */
offset += 8;
/* get mandatory parts first */
ok &= getRawUInt32(data, rssize, &offset, &(item->sendTime));
ok &= getRawUInt32(data, rssize, &offset, &(item->status));
if (offset != rssize)
{
/* error */
delete item;
return NULL;
}
if (!ok)
{
delete item;
return NULL;
}
return item;
}
uint32_t RsStatusSerialiser::size(RsItem *item)
{
return sizeItem((RsStatusItem *) item);
}
bool RsStatusSerialiser::serialise(RsItem *item, void *data, uint32_t *pktsize)
{
return serialiseItem((RsStatusItem *) item, data, pktsize);
}
RsItem *RsStatusSerialiser::deserialise(void *data, uint32_t *pktsize)
{
return deserialiseItem(data, pktsize);
}
/*************************************************************************/

81
libretroshare/src/serialiser/rsstatusitems.h Normal file
View File

@ -0,0 +1,81 @@
#ifndef RS_STATUS_ITEMS_H
#define RS_STATUS_ITEMS_H
/*
* libretroshare/src/serialiser: rsstatusitems.h
*
* RetroShare Serialiser.
*
* Copyright 2007-2008 by Vinny Do.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License Version 2 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#include <map>
#include "serialiser/rsserviceids.h"
#include "serialiser/rsserial.h"
/**************************************************************************/
class RsStatusItem: public RsItem
{
public:
RsStatusItem()
:RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_STATUS,
RS_PKT_SUBTYPE_DEFAULT)
{ return; }
virtual ~RsStatusItem();
virtual void clear();
std::ostream &print(std::ostream &out, uint16_t indent = 0);
uint32_t sendTime;
uint32_t status;
/* not serialised */
uint32_t recvTime;
};
class RsStatusSerialiser: public RsSerialType
{
public:
RsStatusSerialiser()
:RsSerialType(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_STATUS)
{ return; }
virtual ~RsStatusSerialiser()
{ return; }
virtual uint32_t size(RsItem *);
virtual bool serialise (RsItem *item, void *data, uint32_t *size);
virtual RsItem * deserialise(void *data, uint32_t *size);
private:
virtual uint32_t sizeItem(RsStatusItem *);
virtual bool serialiseItem (RsStatusItem *item, void *data, uint32_t *size);
virtual RsStatusItem *deserialiseItem(void *data, uint32_t *size);
};
/**************************************************************************/
#endif /* RS_STATUS_ITEMS_H */