status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

python module: UPnP_addportmapping() lease duration is unsigned int 

Also, this is the server that will check for the maximum value (604800 seconds)
This commit is contained in:
Thomas Bernard 2019-05-20 20:59:13 +02:00
parent d457eacec6
commit 14f6ed5111
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
miniupnpc/miniupnpcmodule.c
View File

@ -1,8 +1,9 @@
/* $Id: miniupnpcmodule.c,v 1.24 2014/06/10 09:48:11 nanard Exp $*/ /* $Id: miniupnpcmodule.c,v 1.34 2019/05/20 19:07:16 nanard Exp $*/
/* Project : miniupnp /* vim: tabstop=4 shiftwidth=4 noexpandtab
* Project : miniupnp
* Author : Thomas BERNARD * Author : Thomas BERNARD
* website : https://miniupnp.tuxfamily.org/ * website : https://miniupnp.tuxfamily.org/
* copyright (c) 2007-2018 Thomas Bernard * copyright (c) 2007-2019 Thomas Bernard
* This software is subjet to the conditions detailed in the * This software is subjet to the conditions detailed in the
* provided LICENCE file. */ * provided LICENCE file. */
#include <Python.h> #include <Python.h>
@ -305,21 +306,21 @@ UPnP_addportmapping(UPnPObject *self, PyObject *args)
const char * host; const char * host;
const char * desc; const char * desc;
const char * remoteHost; const char * remoteHost;
int intLeaseDuration = 0; unsigned int intLeaseDuration = 0;
/* char strLeaseDuration[12];
* According to the IGD spec, the maximum lease is 604800 seconds, ie one week.
* char leaseDuration[7] is big enough to accommodate "604800\0".
* Cf. spec : http://upnp.org/specs/gw/UPnP-gw-WANIPConnection-v2-Service.pdf
*/
char strLeaseDuration[7];
int r; int r;
if (!PyArg_ParseTuple(args, "HssHzz|i", &ePort, &proto, #if (PY_MAJOR_VERSION >= 3) || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 3)
if (!PyArg_ParseTuple(args, "HssHzz|I", &ePort, &proto,
&host, &iPort, &desc, &remoteHost, &intLeaseDuration)) &host, &iPort, &desc, &remoteHost, &intLeaseDuration))
#else
if (!PyArg_ParseTuple(args, "HssHzz|i", &ePort, &proto,
&host, &iPort, &desc, &remoteHost, (int *)&intLeaseDuration))
#endif
return NULL; return NULL;
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
sprintf(extPort, "%hu", ePort); sprintf(extPort, "%hu", ePort);
sprintf(inPort, "%hu", iPort); sprintf(inPort, "%hu", iPort);
sprintf(strLeaseDuration, "%hu", intLeaseDuration); sprintf(strLeaseDuration, "%u", intLeaseDuration);
r = UPNP_AddPortMapping(self->urls.controlURL, self->data.first.servicetype, r = UPNP_AddPortMapping(self->urls.controlURL, self->data.first.servicetype,
extPort, inPort, host, desc, proto, extPort, inPort, host, desc, proto,
remoteHost, strLeaseDuration); remoteHost, strLeaseDuration);