mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 22:25:04 -04:00
Changes required to get Retroshare V0.4 working under windows.
Most of these changes relate to: (1) rand() is different (2) sleep() don't exist on Windows. (3) networking headers are different - these need to be cleaned up in general. (4) disabled tests that won't compile on Windows. Will probably have to rollback some of these changes for Unix later. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@372 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
9e954e9c0f
commit
9bdd44d0f5
29 changed files with 218 additions and 86 deletions
|
@ -20,7 +20,7 @@ TESTS = upnptest
|
|||
all: librs tests
|
||||
|
||||
upnptest: $(OBJ) upnptest.o
|
||||
$(CC) $(CFLAGS) -o upnptest $(OBJ) upnptest.o $(RSLIBS)
|
||||
$(CC) $(CFLAGS) -o upnptest $(OBJ) upnptest.o $(LIBS)
|
||||
|
||||
###############################################################
|
||||
include $(RS_TOP_DIR)/scripts/rules.mk
|
||||
|
|
|
@ -10,8 +10,8 @@ extern "C" {
|
|||
#endif
|
||||
/* This stuff is actually C */
|
||||
|
||||
#include "upnp/upnputil.h"
|
||||
#include "upnp/upnphandler.h"
|
||||
#include "upnp/upnputil.h"
|
||||
|
||||
class uPnPConfigData
|
||||
{
|
||||
|
|
|
@ -138,9 +138,13 @@ bool SetRedirectAndTest(struct UPNPUrls * urls,
|
|||
printf("ExternalIPAddress = %s\n", externalIPAddress);
|
||||
else
|
||||
printf("GetExternalIPAddress failed.\n");
|
||||
|
||||
|
||||
// Unix at the moment!
|
||||
// r = UPNP_AddPortMapping(urls->controlURL, data->servicetype,
|
||||
// eport, iport, iaddr, 0, leaseDuration, proto);
|
||||
|
||||
r = UPNP_AddPortMapping(urls->controlURL, data->servicetype,
|
||||
eport, iport, iaddr, 0, leaseDuration, proto);
|
||||
eport, iport, iaddr, 0, proto);
|
||||
if(r==0)
|
||||
{
|
||||
printf("AddPortMapping(%s, %s, %s) failed\n", eport, iport, iaddr);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue