From fbbb08966cb6620ed208d491f8fdf3c18734774e Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Mon, 8 Apr 2024 23:02:07 +0100 Subject: [PATCH] ok fix this one too --- debian/changelog | 1 - upnp.c.bak | 187 ----------------------------------------------- 2 files changed, 188 deletions(-) delete mode 100644 upnp.c.bak diff --git a/debian/changelog b/debian/changelog index 4185ac7..7bcbab8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,6 @@ linbpq (6.0.24.34-jammy2) jammy; urgency=medium -- Dave Hibberd Mon, 08 Apr 2024 22:27:02 +0100 linbpq (6.0.24.34-jammy1) jammy; urgency=medium ->>>>>>> debian/latest * Upstream bump diff --git a/upnp.c.bak b/upnp.c.bak deleted file mode 100644 index cdc68a4..0000000 --- a/upnp.c.bak +++ /dev/null @@ -1,187 +0,0 @@ -// Includes code from MiniUPnPc, used subject to the following conditions: - -/* - -MiniUPnPc -Copyright (c) 2005-2020, Thomas BERNARD -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -*/ - -#define MINIUPNP_STATICLIB - -#include -#ifdef _WIN32 -#include "upnpcommands.h" -#include "miniupnpc.h" -#include "upnperrors.h" -#include -#else -#include -#include -#include -#include -#endif - -int AddMap(char * controlURL, char * eport, char * iport, char * proto); -int DeleteMap(char * controlURL, char * eport, char * iport, char * proto); - -void Consoleprintf(const char * format, ...); - -struct UPNP -{ - struct UPNP * Next; - char * Protocol; - char * LANport; - char * WANPort; -}; - -extern struct UPNP * UPNPConfig; - -char * controlURL = 0; -char * servicetype = 0; -char iaddr[] = "IP"; -char * inClient = NULL; -#ifdef LINBPQ -char desc[] = "LinBPQ "; -#else -char desc[] = "BPQ32 "; -#endif -char * remoteHost = NULL; -char * leaseDuration = NULL; - -struct UPNPDev * devlist = 0; -char lanaddr[64] = "unset"; /* my ip address on the LAN */ -struct UPNPUrls urls; -struct IGDdatas data; - -int i; -const char * rootdescurl = 0; -const char * multicastif = 0; -const char * minissdpdpath = 0; -int localport = UPNP_LOCAL_PORT_ANY; -int retcode = 0; -int error = 0; -int ipv6 = 0; -int ignore = 0; -unsigned char ttl = 2; - - -int upnpInit() -{ - struct UPNP * Config = UPNPConfig; - int i; -#ifdef WIN32 - WSADATA wsaData; - int nResult = WSAStartup(MAKEWORD(2,2), &wsaData); - if(nResult != NO_ERROR) - { - fprintf(stderr, "WSAStartup() failed.\n"); - return -1; - } -#endif - - while (Config) - { - if (devlist == NULL) - { - devlist = upnpDiscover(2000, multicastif, minissdpdpath, localport, ipv6, ttl, &error); - - if (devlist == NULL) - { - Consoleprintf("Failed to find a UPNP device"); - return 0; - } - - i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); - } - - AddMap(devlist->descURL, Config->LANport, Config->WANPort, Config->Protocol); - Config = Config->Next; - } - - return 0; -} - -int upnpClose() -{ - struct UPNP * Config = UPNPConfig; - int i; - - while (Config) - { - if (devlist == NULL) - { - devlist = upnpDiscover(2000, multicastif, minissdpdpath, localport, ipv6, ttl, &error); - - if (devlist == NULL) - { - Consoleprintf("Failed to find a UPNP device"); - return 0; - } - - i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); - } - - DeleteMap(devlist->descURL, Config->LANport, Config->WANPort, Config->Protocol); - Config = Config->Next; - } - - return 0; -} - -int AddMap(char * controlURL, char * eport, char * iport, char * proto) -{ - int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, - eport, iport, lanaddr, desc, - proto, remoteHost, leaseDuration); - - if (r != UPNPCOMMAND_SUCCESS) - { - Consoleprintf("UPNP AddPortMapping(%s, %s, %s) failed with code %d (%s)", eport, iport, lanaddr, r, strupnperror(r)); - return -2; - } - Consoleprintf("UPNP AddPortMapping(%s, %s, %s) Succeeded", eport, iport, lanaddr, r); - return 0; -} - -int DeleteMap(char * controlURL, char * eport, char * iport, char * proto) -{ - int r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, eport, proto, remoteHost); - - if(r != UPNPCOMMAND_SUCCESS) - { - Consoleprintf("UPNP DeletePortMapping(%s, %s, %s) failed with code %d (%s)", eport, iport, lanaddr, r, strupnperror(r)); - return -2; - } - Consoleprintf("UPNP DeletePortMapping(%s, %s, %s) Succeeded", eport, iport, lanaddr, r); - - return 0; -} - - - -