Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-25 01:01:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged branch v0.5-gxs-b1 into trunk (from -r 5351 -> 5995)

Browse source 
This brings a huge amount of goodness into the trunk,
but there is still a big chunk todo before it can be released.

 * GXS Backend.
 * GXS Services:
	- Identities.
	- Circles
	- Photos
	- Wiki
	- GxsForums
	- Posted.
 * SSH no-gui server.

See branch commits for more info.

To switch on GXS stuff, enable CONFIG += gxs
in both libretroshare.pro and retroshare-gui.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-12-16 19:17:11 +00:00
commit 069b72e0b2
549 changed files with 111171 additions and 25579 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/pqi/authgpg.h
View file

@ -39,7 +39,6 @@
#ifndef RS_GPG_AUTH_HEADER
#define RS_GPG_AUTH_HEADER
#include "util/rswin.h"
#include <openssl/ssl.h>
#include <openssl/evp.h>
#include "util/rsthreads.h"

4
libretroshare/src/pqi/authssl.cc
View file

@ -28,6 +28,10 @@
*
*/
#ifdef WINDOWS_SYS
#include "util/rswin.h"
#endif // WINDOWS_SYS
#include "authssl.h"
#include "sslfns.h"

2
libretroshare/src/pqi/authssl.h
View file

@ -39,8 +39,6 @@
*
*/
#include "util/rswin.h"
#include <openssl/ssl.h>
#include <openssl/evp.h>

20
libretroshare/src/pqi/pqiassist.h
View file

@ -64,6 +64,20 @@ virtual int tick() { return 0; } /* for internal accounting */
};
#define PFP_TYPE_UDP 0x0001
#define PFP_TYPE_TCP 0x0002
class PortForwardParams
{
public:
uint32_t fwdId;
uint32_t status;
uint32_t typeFlags;
struct sockaddr_in intAddr;
struct sockaddr_in extaddr;
};
class pqiNetAssistFirewall: public pqiNetAssist
{
public:
@ -78,6 +92,12 @@ virtual void setExternalPort(unsigned short eport_in) = 0;
virtual bool getInternalAddress(struct sockaddr_in &addr) = 0;
virtual bool getExternalAddress(struct sockaddr_in &addr) = 0;
/* New Port Forward interface to support as many ports as necessary */
virtual bool requestPortForward(const PortForwardParams &params) = 0;
virtual bool statusPortForward(const uint32_t fwdId, PortForwardParams &params) = 0;
};

6
libretroshare/src/pqi/pqihash.h
View file

@ -23,10 +23,14 @@
*
*/
#ifndef PQI_HASH_
#define PQI_HASH_
#include <openssl/sha.h>
#include <string>
#include <iomanip>
#include "util/rsstring.h"
#include <inttypes.h>
class pqihash
{
@ -85,4 +89,4 @@ void Complete(std::string &hash)
SHA_CTX *sha_ctx;
};
#endif

6
libretroshare/src/pqi/pqinetwork.cc
View file

@ -23,8 +23,10 @@
*
*/
#ifdef WINDOWS_SYS
#include "util/rswin.h"
#include <ws2tcpip.h>
#endif // WINDOWS_SYS
#include "pqi/pqinetwork.h"
#include "util/rsnet.h"

2
libretroshare/src/pqi/pqinetwork.h
View file

@ -45,12 +45,10 @@
#else
#include "util/rswin.h"
#include "util/rsnet.h" /* more generic networking header */
#include <winsock2.h>
#include <ws2tcpip.h>
typedef int socklen_t;
//typedef unsigned long in_addr_t;

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

@ -28,8 +28,6 @@
#ifndef MRK_PQI_SSL_HEADER
#define MRK_PQI_SSL_HEADER
#include "util/rswin.h"
#include <openssl/ssl.h>
// operating system specific network header.

2
libretroshare/src/pqi/pqissludp.h
View file

@ -28,8 +28,6 @@
#ifndef MRK_PQI_SSL_UDP_HEADER
#define MRK_PQI_SSL_UDP_HEADER
#include "util/rswin.h"
#include <openssl/ssl.h>
// operating system specific network header.

2
libretroshare/src/pqi/sslfns.h
View file

@ -33,8 +33,6 @@
/******************** notify of new Cert **************************/
#include "util/rswin.h"
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/ssl.h>