From 8bb5edc1c9054d835ef79c9f1ab3e021b0693303 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sat, 26 Mar 2011 13:01:27 +0100 Subject: Allow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at build time(statically linked). Thanks joepie91 for the translation of the new copyright notices into Dutch. Thanks sipa for the translation of the new copyright notices into French. Thanks megu for the translation of the new copyright notices into Spanish. Thanks justmoon/Blitzboom for the translation of the new copyright notices into German. Thanks Joozero for the translation of the new copyright notices into Italian. Remaining translations were provided by Google Translate. --- init.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'init.cpp') diff --git a/init.cpp b/init.cpp index 8c70ba2eba..903ef4c5c5 100644 --- a/init.cpp +++ b/init.cpp @@ -157,6 +157,13 @@ bool AppInit2(int argc, char* argv[]) " -addnode= \t " + _("Add a node to connect to\n") + " -connect= \t\t " + _("Connect only to the specified node\n") + " -nolisten \t " + _("Don't accept connections from outside\n") + +#ifdef USE_UPNP +#if USE_UPNP + " -noupnp \t " + _("Don't attempt to use UPnP to map the listening port\n") + +#else + " -upnp \t " + _("Attempt to use UPnP to map the listening port\n") + +#endif +#endif " -paytxfee= \t " + _("Fee per KB to add to transactions you send\n") + #ifdef GUI " -server \t\t " + _("Accept command line and JSON-RPC commands\n") + @@ -449,6 +456,17 @@ bool AppInit2(int argc, char* argv[]) wxMessageBox(_("Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."), "Bitcoin", wxOK | wxICON_EXCLAMATION); } + if (fHaveUPnP) + { +#if USE_UPNP + if (GetBoolArg("-noupnp")) + fUseUPnP = false; +#else + if (GetBoolArg("-upnp")) + fUseUPnP = true; +#endif + } + // // Create the main window and start the node // -- cgit v1.2.3