Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-04 20:59:05 -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 upnp code.
Modifications to use the new generic p3upnpmgr.h interface.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@310 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-01-25 07:25:05 +00:00
parent 456325dc08
commit 059d43244a
3 changed files with 166 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

159
libretroshare/src/upnp/upnphandler.h
View file

@ -3,13 +3,12 @@
#include <string.h>
#include "util/rsthreads.h"
#include <string>
#include <map>
/* platform independent networking... */
#include "pqi/pqinetwork.h"
#include "pqi/pqiaddrstore.h"
#include "pqi/p3upnpmgr.h"
class upnpentry
{
@ -33,6 +32,7 @@ class upnpforward
int lastTs;
};
#define RS_UPNP_S_UNINITIALISED 0
#define RS_UPNP_S_UNAVAILABLE 1
#define RS_UPNP_S_READY 2
@ -42,153 +42,24 @@ class upnpforward
class uPnPConfigData;
class upnphandler: public RsThread
class upnphandler: public p3UpnpMgr
{
public:
upnphandler()
:toShutdown(false), toEnable(false),
toStart(false), toStop(false),
eport(0), eport_curr(0),
upnpState(RS_UPNP_S_UNINITIALISED),
upnpConfig(NULL)
upnphandler();
virtual ~upnphandler();
{
return;
}
/* External Interface */
virtual void enableUPnP(bool active);
virtual void shutdownUPnP();
~upnphandler()
{
return;
}
virtual bool getUPnPEnabled();
virtual bool getUPnPActive();
/* RsIface */
void enableUPnP(bool active)
{
dataMtx.lock(); /*** LOCK MUTEX ***/
toEnable = active;
dataMtx.unlock(); /*** UNLOCK MUTEX ***/
}
/* RsIface */
void shutdownUPnP()
{
dataMtx.lock(); /*** LOCK MUTEX ***/
toShutdown = true;
dataMtx.unlock(); /*** UNLOCK MUTEX ***/
}
void setupUPnPForwarding()
{
dataMtx.lock(); /*** LOCK MUTEX ***/
toStart = true;
dataMtx.unlock(); /*** UNLOCK MUTEX ***/
}
void shutdownUPnPForwarding()
{
dataMtx.lock(); /*** LOCK MUTEX ***/
toStop = true;
dataMtx.unlock(); /*** UNLOCK MUTEX ***/
}
/* the address that the listening port is on */
void setInternalAddress(struct sockaddr_in iaddr_in)
{
// std::cerr << "UPnPHandler::setInternalAddress() pre Lock!" << std::endl;
dataMtx.lock(); /*** LOCK MUTEX ***/
// std::cerr << "UPnPHandler::setInternalAddress() postLock!" << std::endl;
if ((iaddr.sin_addr.s_addr != iaddr_in.sin_addr.s_addr) ||
(iaddr.sin_port != iaddr_in.sin_port))
{
iaddr = iaddr_in;
if (toEnable)
{
toStop = true;
toStart = true;
}
}
dataMtx.unlock(); /*** UNLOCK MUTEX ***/
}
void setExternalPort(unsigned short eport_in)
{
// std::cerr << "UPnPHandler::getExternalPort() pre Lock!" << std::endl;
dataMtx.lock(); /*** LOCK MUTEX ***/
// std::cerr << "UPnPHandler::getExternalPort() postLock!" << std::endl;
/* flag both shutdown/start -> for restart */
if (eport != eport_in)
{
eport = eport_in;
if (toEnable)
{
toStop = true;
toStart = true;
}
}
dataMtx.unlock(); /*** UNLOCK MUTEX ***/
}
/* as determined by uPnP */
bool getInternalAddress(struct sockaddr_in &addr)
{
// std::cerr << "UPnPHandler::getInternalAddress() pre Lock!" << std::endl;
dataMtx.lock(); /*** LOCK MUTEX ***/
// std::cerr << "UPnPHandler::getInternalAddress() postLock!" << std::endl;
addr = upnp_iaddr;
bool valid = (upnpState >= RS_UPNP_S_READY);
dataMtx.unlock(); /*** UNLOCK MUTEX ***/
return valid;
}
bool getExternalAddress(struct sockaddr_in &addr)
{
// std::cerr << "UPnPHandler::getExternalAddress() pre Lock!" << std::endl;
dataMtx.lock(); /*** LOCK MUTEX ***/
// std::cerr << "UPnPHandler::getExternalAddress() postLock!" << std::endl;
addr = upnp_eaddr;
bool valid = (upnpState >= RS_UPNP_S_READY);
dataMtx.unlock(); /*** UNLOCK MUTEX ***/
return valid;
}
int getUPnPStatus(upnpentry &ent)
{
// std::cerr << "UPnPHandler::getUPnPStatus() pre Lock!" << std::endl;
dataMtx.lock(); /*** LOCK MUTEX ***/
// std::cerr << "UPnPHandler::getUPnPStatus() postLock!" << std::endl;
/* TODO - define data structure first */
int state = upnpState;
dataMtx.unlock(); /*** UNLOCK MUTEX ***/
return state;
}
int init();
int shutdown();
int print();
virtual void setInternalPort(unsigned short iport_in);
virtual void setExternalPort(unsigned short eport_in);
virtual bool getInternalAddress(struct sockaddr_in &addr);
virtual bool getExternalAddress(struct sockaddr_in &addr);
/* must run thread */
virtual void run();
@ -211,7 +82,7 @@ bool updateUPnP();
bool toStart; /* if set start forwarding */
bool toStop; /* if set stop forwarding */
struct sockaddr_in iaddr;
unsigned short iport;
unsigned short eport; /* config */
unsigned short eport_curr; /* current forwarded */