diff --git a/GS-IPv6-Forwarder b/GS-IPv6-Forwarder index 16ddcb8..f1cef10 160000 --- a/GS-IPv6-Forwarder +++ b/GS-IPv6-Forwarder @@ -1 +1 @@ -Subproject commit 16ddcb82d94dd99a8bee8887434acd528411773c +Subproject commit f1cef10928ec39862e1bf08eda27736f05c45bd5 diff --git a/libs/include/miniupnpc/miniupnpc.h b/libs/include/miniupnpc/miniupnpc.h index e96e5bd..a10bd95 100644 --- a/libs/include/miniupnpc/miniupnpc.h +++ b/libs/include/miniupnpc/miniupnpc.h @@ -1,9 +1,9 @@ -/* $Id: miniupnpc.h,v 1.55 2020/11/09 19:49:32 nanard Exp $ */ +/* $Id: miniupnpc.h,v 1.59 2021/09/28 21:39:17 nanard Exp $ */ /* vim: tabstop=4 shiftwidth=4 noexpandtab * Project: miniupnp * http://miniupnp.free.fr/ * Author: Thomas Bernard - * Copyright (c) 2005-2018 Thomas Bernard + * Copyright (c) 2005-2021 Thomas Bernard * This software is subjects to the conditions detailed * in the LICENCE file provided within this distribution */ #ifndef MINIUPNPC_H_INCLUDED @@ -20,7 +20,7 @@ #define UPNPDISCOVER_MEMORY_ERROR (-102) /* versions : */ -#define MINIUPNPC_VERSION "2.2.0" +#define MINIUPNPC_VERSION "2.2.3" #define MINIUPNPC_API_VERSION 17 /* Source port: diff --git a/libs/include/miniupnpc/miniupnpc_socketdef.h b/libs/include/miniupnpc/miniupnpc_socketdef.h index d4f79a7..5986e58 100644 --- a/libs/include/miniupnpc/miniupnpc_socketdef.h +++ b/libs/include/miniupnpc/miniupnpc_socketdef.h @@ -7,7 +7,7 @@ #ifndef MINIUPNPC_SOCKETDEF_H_INCLUDED #define MINIUPNPC_SOCKETDEF_H_INCLUDED -#ifdef _MSC_VER +#ifdef _WIN32 #define ISINVALID(s) (INVALID_SOCKET==(s)) diff --git a/libs/include/miniupnpc/miniupnpctypes.h b/libs/include/miniupnpc/miniupnpctypes.h index 307ce39..26ed4f0 100644 --- a/libs/include/miniupnpc/miniupnpctypes.h +++ b/libs/include/miniupnpc/miniupnpctypes.h @@ -1,13 +1,15 @@ /* $Id: miniupnpctypes.h,v 1.1 2011/02/15 11:10:40 nanard Exp $ */ /* Miniupnp project : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org * Author : Thomas Bernard - * Copyright (c) 2011 Thomas Bernard + * Copyright (c) 2021 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided within this distribution */ #ifndef MINIUPNPCTYPES_H_INCLUDED #define MINIUPNPCTYPES_H_INCLUDED -#if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) +/* Use unsigned long long when available : + * strtoull is C99 */ +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L #define UNSIGNED_INTEGER unsigned long long #define STRTOUI strtoull #else diff --git a/libs/include/miniupnpc/portlistingparse.h b/libs/include/miniupnpc/portlistingparse.h new file mode 100644 index 0000000..e3957a3 --- /dev/null +++ b/libs/include/miniupnpc/portlistingparse.h @@ -0,0 +1,65 @@ +/* $Id: portlistingparse.h,v 1.10 2014/11/01 10:37:32 nanard Exp $ */ +/* MiniUPnP project + * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ + * (c) 2011-2015 Thomas Bernard + * This software is subject to the conditions detailed + * in the LICENCE file provided within the distribution */ +#ifndef PORTLISTINGPARSE_H_INCLUDED +#define PORTLISTINGPARSE_H_INCLUDED + +#include "miniupnpc_declspec.h" +/* for the definition of UNSIGNED_INTEGER */ +#include "miniupnpctypes.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* sample of PortMappingEntry : + + 202.233.2.1 + 2345 + TCP + 2345 + 192.168.1.137 + 1 + dooom + 345 + + */ +typedef enum { PortMappingEltNone, + PortMappingEntry, NewRemoteHost, + NewExternalPort, NewProtocol, + NewInternalPort, NewInternalClient, + NewEnabled, NewDescription, + NewLeaseTime } portMappingElt; + +struct PortMapping { + struct PortMapping * l_next; /* list next element */ + UNSIGNED_INTEGER leaseTime; + unsigned short externalPort; + unsigned short internalPort; + char remoteHost[64]; + char internalClient[64]; + char description[64]; + char protocol[4]; + unsigned char enabled; +}; + +struct PortMappingParserData { + struct PortMapping * l_head; /* list head */ + portMappingElt curelt; +}; + +MINIUPNP_LIBSPEC void +ParsePortListing(const char * buffer, int bufsize, + struct PortMappingParserData * pdata); + +MINIUPNP_LIBSPEC void +FreePortListing(struct PortMappingParserData * pdata); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/libs/include/miniupnpc/upnpdev.h b/libs/include/miniupnpc/upnpdev.h index 9b2cb43..171d495 100644 --- a/libs/include/miniupnpc/upnpdev.h +++ b/libs/include/miniupnpc/upnpdev.h @@ -1,8 +1,8 @@ -/* $Id: upnpdev.h,v 1.3 2020/05/29 15:57:42 nanard Exp $ */ +/* $Id: upnpdev.h,v 1.4 2021/08/21 09:45:01 nanard Exp $ */ /* Project : miniupnp * Web : http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ * Author : Thomas BERNARD - * copyright (c) 2005-2020 Thomas Bernard + * copyright (c) 2005-2021 Thomas Bernard * This software is subjet to the conditions detailed in the * provided LICENSE file. */ #ifndef UPNPDEV_H_INCLUDED @@ -20,7 +20,7 @@ struct UPNPDev { char * st; char * usn; unsigned int scope_id; -#if defined(__STDC_VERSION) && __STDC_VERSION__ >= 199901L +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 flexible array member */ char buffer[]; #elif defined(__GNUC__) diff --git a/libs/include/miniupnpc/upnpreplyparse.h b/libs/include/miniupnpc/upnpreplyparse.h new file mode 100644 index 0000000..6badd15 --- /dev/null +++ b/libs/include/miniupnpc/upnpreplyparse.h @@ -0,0 +1,63 @@ +/* $Id: upnpreplyparse.h,v 1.19 2014/10/27 16:33:19 nanard Exp $ */ +/* MiniUPnP project + * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ + * (c) 2006-2013 Thomas Bernard + * This software is subject to the conditions detailed + * in the LICENCE file provided within the distribution */ + +#ifndef UPNPREPLYPARSE_H_INCLUDED +#define UPNPREPLYPARSE_H_INCLUDED + +#ifdef __cplusplus +extern "C" { +#endif + +struct NameValue { + struct NameValue * l_next; + char name[64]; + char value[128]; +}; + +struct NameValueParserData { + struct NameValue * l_head; + char curelt[64]; + char * portListing; + int portListingLength; + int topelt; + const char * cdata; + int cdatalen; +}; + +/* ParseNameValue() */ +void +ParseNameValue(const char * buffer, int bufsize, + struct NameValueParserData * data); + +/* ClearNameValueList() */ +void +ClearNameValueList(struct NameValueParserData * pdata); + +/* GetValueFromNameValueList() */ +char * +GetValueFromNameValueList(struct NameValueParserData * pdata, + const char * Name); + +#if 0 +/* GetValueFromNameValueListIgnoreNS() */ +char * +GetValueFromNameValueListIgnoreNS(struct NameValueParserData * pdata, + const char * Name); +#endif + +/* DisplayNameValueList() */ +#ifdef DEBUG +void +DisplayNameValueList(char * buffer, int bufsize); +#endif + +#ifdef __cplusplus +} +#endif + +#endif + diff --git a/libs/include/natpmp_declspec.h b/libs/include/natpmp_declspec.h index 770135a..49ce27f 100644 --- a/libs/include/natpmp_declspec.h +++ b/libs/include/natpmp_declspec.h @@ -1,5 +1,5 @@ -#ifndef DECLSPEC_H_INCLUDED -#define DECLSPEC_H_INCLUDED +#ifndef NATPMP_DECLSPEC_H_INCLUDED +#define NATPMP_DECLSPEC_H_INCLUDED #if defined(_WIN32) && !defined(NATPMP_STATICLIB) /* for windows dll */ diff --git a/libs/x86/Debug/libnatpmp.dll b/libs/x86/Debug/libnatpmp.dll index 0f84e97..90328c8 100644 Binary files a/libs/x86/Debug/libnatpmp.dll and b/libs/x86/Debug/libnatpmp.dll differ diff --git a/libs/x86/Debug/libnatpmp.lib b/libs/x86/Debug/libnatpmp.lib index c6a8b20..f9648a3 100644 Binary files a/libs/x86/Debug/libnatpmp.lib and b/libs/x86/Debug/libnatpmp.lib differ diff --git a/libs/x86/Debug/libnatpmp.pdb b/libs/x86/Debug/libnatpmp.pdb index d08b385..857235d 100644 Binary files a/libs/x86/Debug/libnatpmp.pdb and b/libs/x86/Debug/libnatpmp.pdb differ diff --git a/libs/x86/Debug/miniupnpc.dll b/libs/x86/Debug/miniupnpc.dll index 64d34ef..e7797ae 100644 Binary files a/libs/x86/Debug/miniupnpc.dll and b/libs/x86/Debug/miniupnpc.dll differ diff --git a/libs/x86/Debug/miniupnpc.lib b/libs/x86/Debug/miniupnpc.lib index 2099549..b364c94 100644 Binary files a/libs/x86/Debug/miniupnpc.lib and b/libs/x86/Debug/miniupnpc.lib differ diff --git a/libs/x86/Debug/miniupnpc.pdb b/libs/x86/Debug/miniupnpc.pdb index a251ebd..95ccfd7 100644 Binary files a/libs/x86/Debug/miniupnpc.pdb and b/libs/x86/Debug/miniupnpc.pdb differ diff --git a/libs/x86/Release/libnatpmp.dll b/libs/x86/Release/libnatpmp.dll index 751971d..3e200db 100644 Binary files a/libs/x86/Release/libnatpmp.dll and b/libs/x86/Release/libnatpmp.dll differ diff --git a/libs/x86/Release/libnatpmp.lib b/libs/x86/Release/libnatpmp.lib index c40a581..988fde9 100644 Binary files a/libs/x86/Release/libnatpmp.lib and b/libs/x86/Release/libnatpmp.lib differ diff --git a/libs/x86/Release/libnatpmp.pdb b/libs/x86/Release/libnatpmp.pdb index 94bc147..1fb5056 100644 Binary files a/libs/x86/Release/libnatpmp.pdb and b/libs/x86/Release/libnatpmp.pdb differ diff --git a/libs/x86/Release/miniupnpc.dll b/libs/x86/Release/miniupnpc.dll index f1e56ce..59363b7 100644 Binary files a/libs/x86/Release/miniupnpc.dll and b/libs/x86/Release/miniupnpc.dll differ diff --git a/libs/x86/Release/miniupnpc.lib b/libs/x86/Release/miniupnpc.lib index 36dc9dc..679517a 100644 Binary files a/libs/x86/Release/miniupnpc.lib and b/libs/x86/Release/miniupnpc.lib differ diff --git a/libs/x86/Release/miniupnpc.pdb b/libs/x86/Release/miniupnpc.pdb index a5a76d5..74ea53e 100644 Binary files a/libs/x86/Release/miniupnpc.pdb and b/libs/x86/Release/miniupnpc.pdb differ