From ac3894bded360035aa470afda0e42aa080ea9e7f Mon Sep 17 00:00:00 2001 From: Stuart Cardall Date: Sun, 14 Sep 2014 21:06:06 +0000 Subject: testing/namecoin: update to 0.3.76 update to 0.3.76 --- testing/namecoin/12-fix-miniupnpc.patch | 48 ++------------------------------- 1 file changed, 2 insertions(+), 46 deletions(-) (limited to 'testing/namecoin/12-fix-miniupnpc.patch') diff --git a/testing/namecoin/12-fix-miniupnpc.patch b/testing/namecoin/12-fix-miniupnpc.patch index c911f0a8b0..bf226df8a4 100644 --- a/testing/namecoin/12-fix-miniupnpc.patch +++ b/testing/namecoin/12-fix-miniupnpc.patch @@ -1,5 +1,5 @@ ---- namecoin-nc0.3.75/src/net.cpp -+++ namecoin-nc0.3.75/src/net.cpp.new +--- namecoin-nc*/src/net.cpp ++++ namecoin-nc*/src/net.cpp @@ -19,10 +19,10 @@ #endif @@ -15,47 +15,3 @@ #endif using namespace std; -@@ -1088,8 +1088,7 @@ - { - printf("ThreadMapPort started\n"); - -- char port[6]; -- sprintf(port, "%d", GetListenPort()); -+ std::string port = strprintf("%u", GetListenPort()); - - const char * rootdescurl = 0; - const char * multicastif = 0; -@@ -1113,25 +1112,26 @@ - r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); - if (r == 1) - { -- char intClient[16]; -- char intPort[6]; -+ string strDesc = "Namecoin " + FormatFullVersion(); - --#if !defined(__WXMSW__) && !defined(MAC_OSX) -+#ifndef UPNPDISCOVER_SUCCESS -+ /* miniupnpc 1.5 */ - r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, -- port, port, lanaddr, 0, "TCP", 0); -+ port.c_str(), port.c_str(), lanaddr, strDesc.c_str(), "TCP", 0); - #else -+ /* miniupnpc 1.6 */ - r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, -- port, port, lanaddr, 0, "TCP", 0, "0"); -+ port.c_str(), port.c_str(), lanaddr, strDesc.c_str(), "TCP", 0, "0"); - #endif - if(r!=UPNPCOMMAND_SUCCESS) - printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n", -- port, port, lanaddr, r, strupnperror(r)); -+ port.c_str(), port.c_str(), lanaddr, r, strupnperror(r)); - else - printf("UPnP Port Mapping successful.\n"); - loop { - if (fShutdown || !fUseUPnP) - { -- r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port, "TCP", 0); -+ r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port.c_str(), "TCP", 0); - printf("UPNP_DeletePortMapping() returned : %d\n", r); - freeUPNPDevlist(devlist); devlist = 0; - FreeUPNPUrls(&urls); -- cgit v1.2.3