mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 14:16:16 -04:00
Restored backward compatibility in p3disc:
- created a subclass for Own item parts, which is compatible with old format. - suppressed sending of Issuer packets when not using PGP git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1307 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler
parent
f16c136cbb
commit
bc82110c97
4 changed files with 54 additions and 43 deletions
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
uint32_t RsDiscSerialiser::size(RsItem *i)
|
||||
{
|
||||
RsDiscItem *rdi;
|
||||
RsDiscOwnItem *rdi;
|
||||
RsDiscReply *rdr;
|
||||
RsDiscIssuer *rds;
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ uint32_t RsDiscSerialiser::size(RsItem *i)
|
|||
{
|
||||
return sizeIssuer(rds);
|
||||
}
|
||||
else if (NULL != (rdi = dynamic_cast<RsDiscItem *>(i)))
|
||||
else if (NULL != (rdi = dynamic_cast<RsDiscOwnItem *>(i)))
|
||||
{
|
||||
return sizeItem(rdi);
|
||||
}
|
||||
|
|
@ -69,7 +69,7 @@ uint32_t RsDiscSerialiser::size(RsItem *i)
|
|||
/* serialise the data to the buffer */
|
||||
bool RsDiscSerialiser::serialise(RsItem *i, void *data, uint32_t *pktsize)
|
||||
{
|
||||
RsDiscItem *rdi;
|
||||
RsDiscOwnItem *rdi;
|
||||
RsDiscReply *rdr;
|
||||
RsDiscIssuer *rds;
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ bool RsDiscSerialiser::serialise(RsItem *i, void *data, uint32_t *pktsize)
|
|||
{
|
||||
return serialiseIssuer(rds, data, pktsize);
|
||||
}
|
||||
else if (NULL != (rdi = dynamic_cast<RsDiscItem *>(i)))
|
||||
else if (NULL != (rdi = dynamic_cast<RsDiscOwnItem *>(i)))
|
||||
{
|
||||
return serialiseItem(rdi, data, pktsize);
|
||||
}
|
||||
|
|
@ -107,8 +107,8 @@ RsItem *RsDiscSerialiser::deserialise(void *data, uint32_t *pktsize)
|
|||
case RS_PKT_SUBTYPE_DISC_REPLY:
|
||||
return deserialiseReply(data, pktsize);
|
||||
break;
|
||||
case RS_PKT_SUBTYPE_DISC_ITEM:
|
||||
return deserialiseItem(data, pktsize);
|
||||
case RS_PKT_SUBTYPE_DISC_OWN:
|
||||
return deserialiseOwnItem(data, pktsize);
|
||||
break;
|
||||
case RS_PKT_SUBTYPE_DISC_ISSUER:
|
||||
return deserialiseIssuer(data, pktsize);
|
||||
|
|
@ -122,12 +122,12 @@ RsItem *RsDiscSerialiser::deserialise(void *data, uint32_t *pktsize)
|
|||
|
||||
/*************************************************************************/
|
||||
|
||||
RsDiscItem::~RsDiscItem()
|
||||
RsDiscOwnItem::~RsDiscOwnItem()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void RsDiscItem::clear()
|
||||
void RsDiscOwnItem::clear()
|
||||
{
|
||||
memset(&laddr, 0, sizeof(laddr));
|
||||
memset(&saddr, 0, sizeof(laddr));
|
||||
|
|
@ -135,9 +135,9 @@ void RsDiscItem::clear()
|
|||
discFlags = 0;
|
||||
}
|
||||
|
||||
std::ostream &RsDiscItem::print(std::ostream &out, uint16_t indent)
|
||||
std::ostream &RsDiscOwnItem::print(std::ostream &out, uint16_t indent)
|
||||
{
|
||||
printRsItemBase(out, "RsDiscItem", indent);
|
||||
printRsItemBase(out, "RsDiscOwnItem", indent);
|
||||
uint16_t int_Indent = indent + 2;
|
||||
|
||||
printIndent(out, int_Indent);
|
||||
|
|
@ -155,12 +155,12 @@ std::ostream &RsDiscItem::print(std::ostream &out, uint16_t indent)
|
|||
printIndent(out, int_Indent);
|
||||
out << "DiscFlags: " << discFlags << std::endl;
|
||||
|
||||
printRsItemEnd(out, "RsDiscItem", indent);
|
||||
printRsItemEnd(out, "RsDiscOwnItem", indent);
|
||||
return out;
|
||||
}
|
||||
|
||||
|
||||
uint32_t RsDiscSerialiser::sizeItem(RsDiscItem *item)
|
||||
uint32_t RsDiscSerialiser::sizeItem(RsDiscOwnItem *item)
|
||||
{
|
||||
uint32_t s = 8; /* header */
|
||||
s += GetTlvIpAddrPortV4Size(); /* laddr */
|
||||
|
|
@ -172,7 +172,7 @@ uint32_t RsDiscSerialiser::sizeItem(RsDiscItem *item)
|
|||
}
|
||||
|
||||
/* serialise the data to the buffer */
|
||||
bool RsDiscSerialiser::serialiseItem(RsDiscItem *item, void *data, uint32_t *pktsize)
|
||||
bool RsDiscSerialiser::serialiseItem(RsDiscOwnItem *item, void *data, uint32_t *pktsize)
|
||||
{
|
||||
uint32_t tlvsize = sizeItem(item);
|
||||
uint32_t offset = 0;
|
||||
|
|
@ -213,7 +213,7 @@ bool RsDiscSerialiser::serialiseItem(RsDiscItem *item, void *data, uint32_t
|
|||
return ok;
|
||||
}
|
||||
|
||||
RsDiscItem *RsDiscSerialiser::deserialiseItem(void *data, uint32_t *pktsize)
|
||||
RsDiscOwnItem *RsDiscSerialiser::deserialiseOwnItem(void *data, uint32_t *pktsize)
|
||||
{
|
||||
/* get the type and size */
|
||||
uint32_t rstype = getRsItemId(data);
|
||||
|
|
@ -224,7 +224,7 @@ RsDiscItem *RsDiscSerialiser::deserialiseItem(void *data, uint32_t *pktsize)
|
|||
|
||||
if ((RS_PKT_VERSION_SERVICE != getRsItemVersion(rstype)) ||
|
||||
(RS_SERVICE_TYPE_DISC != getRsItemService(rstype)) ||
|
||||
(RS_PKT_SUBTYPE_DISC_ITEM != getRsItemSubType(rstype)))
|
||||
(RS_PKT_SUBTYPE_DISC_OWN != getRsItemSubType(rstype)))
|
||||
{
|
||||
#ifdef RSSERIAL_DEBUG
|
||||
std::cerr << "RsDiscSerialiser::deserialiseItem() Wrong Type" << std::endl;
|
||||
|
|
@ -246,7 +246,7 @@ RsDiscItem *RsDiscSerialiser::deserialiseItem(void *data, uint32_t *pktsize)
|
|||
bool ok = true;
|
||||
|
||||
/* ready to load */
|
||||
RsDiscItem *item = new RsDiscItem();
|
||||
RsDiscOwnItem *item = new RsDiscOwnItem();
|
||||
item->clear();
|
||||
|
||||
/* skip the header */
|
||||
|
|
|
|||
|
|
@ -33,29 +33,26 @@
|
|||
#include "serialiser/rstlvtypes.h"
|
||||
#include "serialiser/rsserviceids.h"
|
||||
|
||||
const uint8_t RS_PKT_SUBTYPE_DISC_ITEM = 0x01;
|
||||
const uint8_t RS_PKT_SUBTYPE_DISC_OWN = 0x01;
|
||||
const uint8_t RS_PKT_SUBTYPE_DISC_REPLY = 0x02;
|
||||
const uint8_t RS_PKT_SUBTYPE_DISC_ISSUER = 0x03;
|
||||
|
||||
class RsDiscItem: public RsItem
|
||||
{
|
||||
protected:
|
||||
RsDiscItem(uint8_t subtype)
|
||||
:RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_DISC,
|
||||
subtype)
|
||||
{ return; }
|
||||
RsDiscItem(uint8_t subtype) :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_DISC, subtype) {}
|
||||
};
|
||||
|
||||
class RsDiscOwnItem: public RsDiscItem
|
||||
{
|
||||
public:
|
||||
|
||||
RsDiscItem()
|
||||
:RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_DISC,
|
||||
RS_PKT_SUBTYPE_DISC_ITEM)
|
||||
{ return; }
|
||||
RsDiscOwnItem() :RsDiscItem(RS_PKT_SUBTYPE_DISC_OWN ) {}
|
||||
|
||||
virtual ~RsDiscItem();
|
||||
virtual ~RsDiscOwnItem();
|
||||
|
||||
virtual void clear();
|
||||
virtual std::ostream &print(std::ostream &out, uint16_t indent = 0);
|
||||
virtual void clear();
|
||||
virtual std::ostream &print(std::ostream &out, uint16_t indent = 0);
|
||||
|
||||
struct sockaddr_in laddr;
|
||||
struct sockaddr_in saddr;
|
||||
|
|
@ -80,6 +77,14 @@ virtual ~RsDiscReply();
|
|||
virtual void clear();
|
||||
virtual std::ostream &print(std::ostream &out, uint16_t indent = 0);
|
||||
|
||||
struct sockaddr_in laddr;
|
||||
struct sockaddr_in saddr;
|
||||
|
||||
// time frame of recent connections.
|
||||
uint16_t contact_tf;
|
||||
// flags...
|
||||
uint32_t discFlags;
|
||||
|
||||
std::string aboutId;
|
||||
RsTlvBinaryData certDER;
|
||||
};
|
||||
|
|
@ -115,9 +120,9 @@ virtual RsItem * deserialise(void *data, uint32_t *size);
|
|||
|
||||
private:
|
||||
|
||||
virtual uint32_t sizeItem(RsDiscItem *);
|
||||
virtual bool serialiseItem (RsDiscItem *item, void *data, uint32_t *size);
|
||||
virtual RsDiscItem *deserialiseItem(void *data, uint32_t *size);
|
||||
virtual uint32_t sizeItem(RsDiscOwnItem *);
|
||||
virtual bool serialiseItem (RsDiscOwnItem *item, void *data, uint32_t *size);
|
||||
virtual RsDiscOwnItem *deserialiseOwnItem(void *data, uint32_t *size);
|
||||
|
||||
virtual uint32_t sizeReply(RsDiscReply *);
|
||||
virtual bool serialiseReply (RsDiscReply *item, void *data, uint32_t *size);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue