diff --git a/.gitignore b/.gitignore index b64cec2..a7601e3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ igdgui ui_*.h moc_*.cpp Makefile +.qmake.stash +igdgui.pro.user *~ *.bak *.kate-swp diff --git a/igddevice.cpp b/igddevice.cpp index 101431c..a0e8fc1 100644 --- a/igddevice.cpp +++ b/igddevice.cpp @@ -9,7 +9,7 @@ void ScanThread::run() { int upnp_error; UPNPDev* my_devlist; - my_devlist = upnpDiscover(2000, NULL, NULL, 0, 0, &upnp_error); + my_devlist = upnpDiscover(2000, NULL, UPNP_LOCAL_PORT_ANY, 0, 0, 2, &upnp_error); devlist_mutex.lock(); if(devlist != NULL) @@ -87,7 +87,7 @@ void IGDDevice::readPortMappingsIntoModel() { enabled[0] = '\0'; rHost[0] = '\0'; duration[0] = '\0'; - r = UPNP_GetGenericPortMappingEntry(urls.controlURL, data.first.servicetype, index.toAscii().constData(), extPort, + r = UPNP_GetGenericPortMappingEntry(urls.controlURL, data.first.servicetype, index.toLatin1().constData(), extPort, intClient, intPort, protocol, description, enabled, rHost, duration); if(r==0) { q = new QStandardItem; @@ -135,7 +135,7 @@ bool IGDDevice::deletePortMapping(QString &error, QStandardItem *m) { pStr = "UDP"; else return false; - r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, m->data(ExternalPortRole).toString().toAscii().constData(), pStr, NULL); + r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, m->data(ExternalPortRole).toString().toLatin1().constData(), pStr, NULL); if(!r) { mForwardData->clear(); readPortMappingsIntoModel(); @@ -148,11 +148,11 @@ bool IGDDevice::deletePortMapping(QString &error, QStandardItem *m) { bool IGDDevice::addPortMappingFromStrings(QString &error, const QString &ExtPort, const QString &Protocol, const QString &IntPort, const QString &IntClient, const QString &Description) { int r; r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, - ExtPort.toAscii().constData(), - IntPort.toAscii().constData(), - IntClient.toAscii().constData(), - Description.toAscii().constData(), - Protocol.toAscii().constData(), + ExtPort.toLatin1().constData(), + IntPort.toLatin1().constData(), + IntClient.toLatin1().constData(), + Description.toLatin1().constData(), + Protocol.toLatin1().constData(), NULL, NULL); if(!r) { diff --git a/igdgui.pro b/igdgui.pro index 3bc20e7..c944893 100644 --- a/igdgui.pro +++ b/igdgui.pro @@ -9,3 +9,4 @@ sources.path = . INSTALLS += target sources LIBS += -lminiupnpc #CONFIG += debug +QT += core widgets