Skip to content

Fix for newer miniupnpc and port to Qt5 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gasinvein wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix for newer miniupnpc and port to Qt5 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c8e8c2
add qmake and qtcreator files
gasinvein Mar 6, 2017
6db7f48
fix for newer miniupnpc
gasinvein Mar 6, 2017
7883f05
move to Qt5
gasinvein Mar 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ igdgui
ui_*.h
moc_*.cpp
Makefile
.qmake.stash
igdgui.pro.user
*~
*.bak
*.kate-swp
16 changes: 8 additions & 8 deletions igddevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions igdgui.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ sources.path = .
INSTALLS += target sources
LIBS += -lminiupnpc
#CONFIG += debug
QT += core widgets