From 048e84630ea619477312131748ba59dd021536e9 Mon Sep 17 00:00:00 2001 From: drbob Date: Wed, 26 Mar 2008 02:41:01 +0000 Subject: [PATCH] Changes to upnp interface to support miniupnpc-1.0 git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@421 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/upnp/upnphandler.cc | 2 +- libretroshare/src/upnp/upnptest.cc | 2 +- libretroshare/src/upnp/upnputil.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/upnp/upnphandler.cc b/libretroshare/src/upnp/upnphandler.cc index 945c3ea49..fb5077c52 100644 --- a/libretroshare/src/upnp/upnphandler.cc +++ b/libretroshare/src/upnp/upnphandler.cc @@ -132,7 +132,7 @@ bool upnphandler::initUPnPState() /* allocate memory */ uPnPConfigData *upcd = new uPnPConfigData; - upcd->devlist = upnpDiscover(2000); + upcd->devlist = upnpDiscover(2000, NULL, NULL); if(upcd->devlist) { struct UPNPDev * device; diff --git a/libretroshare/src/upnp/upnptest.cc b/libretroshare/src/upnp/upnptest.cc index 5a430d284..e4ea45457 100644 --- a/libretroshare/src/upnp/upnptest.cc +++ b/libretroshare/src/upnp/upnptest.cc @@ -69,7 +69,7 @@ int main(int argc, char **argv) } - if (i % 300 == 20) + if (i % 300 == 120) { /* shutdown a forward */ upnp.enableUPnP(false); diff --git a/libretroshare/src/upnp/upnputil.c b/libretroshare/src/upnp/upnputil.c index bd72375f2..7fde9155a 100644 --- a/libretroshare/src/upnp/upnputil.c +++ b/libretroshare/src/upnp/upnputil.c @@ -27,6 +27,7 @@ void DisplayInfos(struct UPNPUrls * urls, char externalIPAddress[16]; char connectionType[64]; char status[64]; + char lastconnerror[64]; unsigned int uptime; unsigned int brUp, brDown; UPNP_GetConnectionTypeInfo(urls->controlURL, @@ -36,8 +37,8 @@ void DisplayInfos(struct UPNPUrls * urls, printf("Connection Type : %s\n", connectionType); else printf("GetConnectionTypeInfo failed.\n"); - UPNP_GetStatusInfo(urls->controlURL, data->servicetype, status, &uptime); - printf("Status : %s, uptime=%u\n", status, uptime); + UPNP_GetStatusInfo(urls->controlURL, data->servicetype, status, &uptime, lastconnerror); + printf("Status : %s, uptime=%u LastConnError %s\n", status, uptime, lastconnerror); UPNP_GetLinkLayerMaxBitRates(urls->controlURL_CIF, data->servicetype_CIF, &brDown, &brUp); printf("MaxBitRateDown : %u bps MaxBitRateUp %u bps\n", brDown, brUp);