Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-15 04:22:27 -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 pqi code, 
and provides the majority of the improvements.

(1) Introduced new interfaces for DHT and UPnP abstraction: p3dhtmgr.h, p3upnpmgr.h
(2) Introduces abstraction for Authentication: p3authmgr.h
(3) New Connection Manager to coordinate networking code: p3connmgr.h
(4) New Configuration Manager: p3cfgmgr.h

This library has been significantly modified to support DHT synced connections
to enable connections between Firewalled Friends. The connection code has
been rewritten within a new framework, which should make extensions easier to code.

Also removed significant amount of old code relating to Tunnels, Channels etc.
This will be recycled later as higher level services that should not be
part of the core networking library.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@306 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-01-25 06:36:40 +00:00
parent de0ce110b9
commit 6435357c07
63 changed files with 8336 additions and 10839 deletions
Download patch file Download diff file Expand all files Collapse all files

79
libretroshare/src/pqi/pqissl.h
View file

@ -49,13 +49,10 @@
#define WAITING_NOT 0
#define WAITING_PROXY_CONNECT 1
#define WAITING_LOCAL_ADDR 2
#define WAITING_REMOTE_ADDR 3
#define WAITING_SOCK_CONNECT 4
#define WAITING_SSL_CONNECTION 5
#define WAITING_SSL_AUTHORISE 6
#define WAITING_FAIL_INTERFACE 7
#define WAITING_SOCK_CONNECT 1
#define WAITING_SSL_CONNECTION 2
#define WAITING_SSL_AUTHORISE 3
#define WAITING_FAIL_INTERFACE 4
#define PQISSL_PASSIVE 0x00
@ -93,63 +90,14 @@ class cert;
class pqissllistener;
#if 0 /* REMOVING pqissllistener */
class pqissllistener
{
public:
pqissllistener(struct sockaddr_in addr);
int addlistenaddr(cert *c, pqissl *acc);
int removeListenPort(cert *c);
int setListenAddr(struct sockaddr_in addr);
int setuplisten();
int resetlisten();
int acceptconnection();
int continueaccepts();
int continueSSL(SSL *ssl, bool);
int continueSocket(int fd, bool);
//int connectCertExchange(cert *);
//
int tick();
int status();
private:
// fn to get cert, anyway
int Extract_Failed_SSL_Certificate(SSL *ssl, struct sockaddr_in *inaddr);
struct sockaddr_in raddr;
struct sockaddr_in laddr;
socklen_t addrlen;
bool active;
int lsock;
cert *localcert;
std::map<cert *, pqissl *> listenaddr;
std::list<SSL *> incoming_ssl;
std::list<int> incoming_skts;
sslroot *sslccr;
};
#endif /* removing pqisllistener */
class pqissl: public NetBinInterface
{
public:
pqissl(cert *c, pqissllistener *l, PQInterface *parent);
pqissl(pqissllistener *l, PQInterface *parent);
virtual ~pqissl();
// NetInterface
virtual int connectattempt();
virtual int connect(struct sockaddr_in raddr);
virtual int listen();
virtual int stoplistening();
virtual int reset();
@ -165,6 +113,7 @@ virtual int netstatus();
virtual int isactive();
virtual bool moretoread();
virtual bool cansend();
virtual std::string gethash(); /* not used here */
virtual bool bandwidthLimited();
protected:
@ -177,14 +126,9 @@ protected:
int ConnectAttempt();
int waiting;
// These first five fns are overloaded for udp/etc connections.
virtual int Reattempt_Connection();
virtual int Request_Proxy_Connection();
virtual int Check_Proxy_Connection();
virtual int Request_Local_Address();
virtual int Determine_Local_Address();
virtual int Determine_Remote_Address();
virtual int Failed_Connection();
// These two fns are overloaded for udp/etc connections.
virtual int Initiate_Connection();
virtual int Basic_Connection_Complete();
@ -223,14 +167,9 @@ virtual int net_internal_fcntl_nonblock(int fd) { return unix_fcntl_nonblock(fd)
SSL *ssl_connection;
int sockfd;
cert *sslcert;
sslroot *sslccr;
pqissllistener *pqil;
struct sockaddr_in remote_addr;
void *readpkt;
int pktlen;