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

pythonmodule: allow to specify root desc url as selectigd() argument 

fixes #571
This commit is contained in:
Thomas Bernard 2021-11-09 19:55:22 +01:00
parent 51a422407b
commit f1dc690c3d
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
miniupnpc/Changelog.txt
View File

@ -1,6 +1,9 @@
$Id: Changelog.txt,v 1.251 2021/09/28 21:53:38 nanard Exp $ $Id: Changelog.txt,v 1.252 2021/11/09 18:34:41 nanard Exp $
miniUPnP client Changelog. miniUPnP client Changelog.
2021/11/09:
python module : Allow to specify the root description url
VERSION 2.2.3 : released 2021/09/28 VERSION 2.2.3 : released 2021/09/28
2021/08/13: 2021/08/13:

16
miniupnpc/src/miniupnpcmodule.c
View File

@ -1,4 +1,4 @@
/* $Id: miniupnpcmodule.c,v 1.37 2021/09/28 21:38:30 nanard Exp $*/ /* $Id: miniupnpcmodule.c,v 1.38 2021/11/09 18:46:49 nanard Exp $*/
/* vim: tabstop=4 shiftwidth=4 noexpandtab /* vim: tabstop=4 shiftwidth=4 noexpandtab
* Project : miniupnp * Project : miniupnp
* Author : Thomas BERNARD * Author : Thomas BERNARD
@ -69,7 +69,7 @@ static PyMemberDef UPnP_members[] = {
"port, any other value will be attempted as the " "port, any other value will be attempted as the "
"source port" "source port"
}, },
/* T_STRING is allways readonly :( */ /* T_STRING is always readonly :( */
{"multicastif", T_STRING, offsetof(UPnPObject, multicastif), {"multicastif", T_STRING, offsetof(UPnPObject, multicastif),
0, "IP of the network interface to be used for multicast operations" 0, "IP of the network interface to be used for multicast operations"
}, },
@ -155,12 +155,20 @@ UPnP_discover(UPnPObject *self)
} }
static PyObject * static PyObject *
UPnP_selectigd(UPnPObject *self) UPnP_selectigd(UPnPObject *self, PyObject *args)
{ {
const char * rootDescUrl = NULL;
int r; int r;
if(!PyArg_ParseTuple(args, "|z", &rootDescUrl))
return NULL;
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
if (rootDescUrl == NULL) {
r = UPNP_GetValidIGD(self->devlist, &self->urls, &self->data, r = UPNP_GetValidIGD(self->devlist, &self->urls, &self->data,
self->lanaddr, sizeof(self->lanaddr)); self->lanaddr, sizeof(self->lanaddr));
} else {
r = UPNP_GetIGDFromUrl(rootDescUrl, &self->urls, &self->data,
self->lanaddr, sizeof(self->lanaddr));
}
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if(r) if(r)
{ {
@ -562,7 +570,7 @@ static PyMethodDef UPnP_methods[] = {
{"discover", (PyCFunction)UPnP_discover, METH_NOARGS, {"discover", (PyCFunction)UPnP_discover, METH_NOARGS,
"discover UPnP IGD devices on the network" "discover UPnP IGD devices on the network"
}, },
{"selectigd", (PyCFunction)UPnP_selectigd, METH_NOARGS, {"selectigd", (PyCFunction)UPnP_selectigd, METH_VARARGS,
"select a valid UPnP IGD among discovered devices" "select a valid UPnP IGD among discovered devices"
}, },
{"totalbytesent", (PyCFunction)UPnP_totalbytesent, METH_NOARGS, {"totalbytesent", (PyCFunction)UPnP_totalbytesent, METH_NOARGS,