Changes to integrate bitdht into libretroshare.

Mainly re-organising tcponudp... tests->test area network->trash (uses libbitdht classes). new udp interfaces (udppeer + udpstunner) Changes include: * p3bitdht: added "addReceiver() call, and more debugging. * p3bitdht: added DO_IDLE flag so searches are continous. * p3bitdht/pqiassist: matched up Assist interface. * fixed pqiNetListener interface. * rsinit/p3connmgr: setup udp init * tcpstream: switched to new udp receiver. * added "blogs" switch in libretroshare.pro (was stopping compiling ;) * added "bitdht" switch in libretroshare.pro git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3323 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2025-05-12 02:55:18 -04:00 · 2010-07-31 18:14:10 +00:00 · 2010-07-31 18:14:10 +00:00 · fcdd7ee113
commit fcdd7ee113
parent c1b624832f
34 changed files with 627 additions and 1770 deletions
--- a/libretroshare/src/tcponudp/udppeer.cc
+++ b/libretroshare/src/tcponudp/udppeer.cc
@ -0,0 +1,144 @@
+/*
+ * tcponudp/udppeer.cc
+ *
+ * libretroshare.
+ *
+ * Copyright 2010 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 3 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 "udppeer.h"
+#include <iostream>
+
+/*
+ * #define DEBUG_UDP_PEER 1
+ */
+
+
+UdpPeerReceiver::UdpPeerReceiver(UdpPublisher *pub)
+	:UdpSubReceiver(pub)
+{
+	return;
+}
+
+/* higher level interface */
+int UdpPeerReceiver::recvPkt(void *data, int size, struct sockaddr_in &from)
+{
+	/* print packet information */
+#ifdef DEBUG_UDP_PEER
+	std::cerr << "UdpPeerReceiver::recvPkt(" << size << ") from: " << from;
+	std::cerr << std::endl;
+#endif
+
+        RsStackMutex stack(peerMtx);   /********** LOCK MUTEX *********/
+
+	/* look for a peer */
+        std::map<struct sockaddr_in, UdpPeer *>::iterator it;
+	it = streams.find(from);
+
+	if (it == streams.end())
+	{
+		/* peer unknown */
+#ifdef DEBUG_UDP_PEER
+		std::cerr << "UdpPeerReceiver::recvPkt() Peer Unknown!";
+		std::cerr << std::endl;
+#endif
+		return 0;
+	}
+	else
+	{
+		/* forward to them */
+#ifdef DEBUG_UDP_PEER
+		std::cerr << "UdpPeerReceiver::recvPkt() Sending to UdpPeer: ";
+		std::cerr << it->first;
+		std::cerr << std::endl;
+#endif
+		(it->second)->recvPkt(data, size);
+		return 1;
+	}
+	/* done */
+}
+
+	
+int     UdpPeerReceiver::status(std::ostream &out)
+{
+        RsStackMutex stack(peerMtx);   /********** LOCK MUTEX *********/
+
+	out << "UdpPeerReceiver::status()" << std::endl;
+	out << "UdpPeerReceiver::peers:" << std::endl;
+        std::map<struct sockaddr_in, UdpPeer *>::iterator it;
+	for(it = streams.begin(); it != streams.end(); it++)
+	{
+		out << "\t" << it->first << std::endl;
+	}
+	out << std::endl;
+
+	return 1;
+}
+
+        /* add a TCPonUDP stream */
+int UdpPeerReceiver::addUdpPeer(UdpPeer *peer, const struct sockaddr_in &raddr)
+{
+        RsStackMutex stack(peerMtx);   /********** LOCK MUTEX *********/
+
+
+	/* check for duplicate */
+        std::map<struct sockaddr_in, UdpPeer *>::iterator it;
+	it = streams.find(raddr);
+	bool ok = (it == streams.end());
+	if (!ok)
+	{
+#ifdef DEBUG_UDP_PEER
+		std::cerr << "UdpPeerReceiver::addUdpPeer() Peer already exists!" << std::endl;
+		std::cerr << "UdpPeerReceiver::addUdpPeer() ERROR" << std::endl;
+#endif
+	}
+	else
+	{
+		streams[raddr] = peer;
+	}
+
+	return ok;
+}
+
+int UdpPeerReceiver::removeUdpPeer(UdpPeer *peer)
+{
+        RsStackMutex stack(peerMtx);   /********** LOCK MUTEX *********/
+
+	/* check for duplicate */
+        std::map<struct sockaddr_in, UdpPeer *>::iterator it;
+	for(it = streams.begin(); it != streams.end(); it++)
+	{
+		if (it->second == peer)
+		{
+#ifdef DEBUG_UDP_PEER
+			std::cerr << "UdpPeerReceiver::removeUdpPeer() SUCCESS" << std::endl;
+#endif
+			streams.erase(it);
+			return 1;
+		}
+	}
+
+#ifdef DEBUG_UDP_PEER
+	std::cerr << "UdpPeerReceiver::removeUdpPeer() ERROR" << std::endl;
+#endif
+	return 0;
+}
+
+