Major improvements to the serialiser to make it work with retroshare.

This is still a first draft - the message types will surely change.

-corrected ids and added service classes.
-Added disc/msg/chat/cache/file messages
-Extended serialiser to handle service extensions.
-corrected IpAddrPort code.
-More debugging code.
-Added some tests.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@270 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/serialiser/rsdiscitems.h

@@ -0,0 +1,113 @@
+/*
+ * libretroshare/src/serialiser: rsdiscitems.h
+ *
+ * Serialiser for RetroShare.
+ *
+ * Copyright 2004-2008 by Robert Fernie.
+ *
+ * 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".
+ *
+ */
+
+
+
+#ifndef RS_DISC_ITEMS_H
+#define RS_DISC_ITEMS_H
+
+#include "serialiser/rsserial.h"
+#include "serialiser/rstlvbase.h"
+#include "serialiser/rstlvtypes.h"
+#include "serialiser/rsserviceids.h"
+		
+const uint8_t RS_PKT_SUBTYPE_DISC_ITEM  = 0x01;
+const uint8_t RS_PKT_SUBTYPE_DISC_REPLY = 0x02;
+
+class RsDiscItem: public RsItem
+{
+	protected:
+	RsDiscItem(uint8_t subtype)
+        :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_DISC, 
+                subtype)
+	{ return; }
+
+	public:
+
+	RsDiscItem()
+        :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_DISC, 
+                RS_PKT_SUBTYPE_DISC_ITEM)
+	{ return; }
+
+virtual ~RsDiscItem();
+
+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 connect_tr;
+	uint16_t receive_tr;
+	// flags...
+	uint32_t discFlags;
+};
+
+class RsDiscReply: public RsDiscItem
+{
+	public:
+
+	RsDiscReply()
+	:RsDiscItem(RS_PKT_SUBTYPE_DISC_REPLY), 
+	certDER(TLV_TYPE_CERT_XPGP_DER)
+	{ return; }
+
+virtual ~RsDiscReply();
+
+virtual  void clear();  
+virtual std::ostream &print(std::ostream &out, uint16_t indent = 0);
+
+	RsTlvBinaryData certDER;
+};
+
+class RsDiscSerialiser: public RsSerialType
+{
+        public:
+        RsDiscSerialiser()
+        :RsSerialType(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_DISC)
+        { return; }
+
+virtual     ~RsDiscSerialiser() { 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(RsDiscItem *);
+virtual bool        serialiseItem  (RsDiscItem *item, void *data, uint32_t *size);
+virtual RsDiscItem *deserialiseItem(void *data, uint32_t *size);
+
+virtual uint32_t    sizeReply(RsDiscReply *);
+virtual bool        serialiseReply   (RsDiscReply *item, void *data, uint32_t *size);
+virtual RsDiscReply *deserialiseReply(void *data, uint32_t *size);
+
+};
+
+
+#endif // RS_DISC_ITEMS_H
+