iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set HTTP server to listen on all addresses, but use IP address of socket

Browse Source 
connected to MPD for HTTP URLs.
This commit is contained in:
Craig Drummond
2015-08-14 18:57:15 +01:00
committed by Craig Drummond
parent 87b61ed8d2
commit 77ae58a9d0
13 changed files with 66 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
http/httpserver.cpp
View File

@@ -29,6 +29,7 @@
#include "gui/settings.h"
#include "support/thread.h"
#include "support/globalstatic.h"
#include "mpd-interface/mpdconnection.h"
#include <QFile>
#include <QUrl>
#include <QTimer>
@@ -70,6 +71,7 @@ HttpServer::HttpServer()
connect(MPDConnection::self(), SIGNAL(cantataStreams(QList<Song>,bool)), this, SLOT(cantataStreams(QList<Song>,bool)));
connect(MPDConnection::self(), SIGNAL(cantataStreams(QStringList)), this, SLOT(cantataStreams(QStringList)));
connect(MPDConnection::self(), SIGNAL(removedIds(QSet<qint32>)), this, SLOT(removedIds(QSet<qint32>)));
connect(MPDConnection::self(), SIGNAL(ifaceIp(QString)), this, SLOT(ifaceIp(QString)));
}
bool HttpServer::start()
@@ -128,14 +130,29 @@ void HttpServer::readConfig()
}
}
static inline QString serverUrl(const QString &ip, quint16 port)
{
return QLatin1String("http://")+ip+QLatin1Char(':')+QString::number(port);
}
QString HttpServer::address() const
{
return socket ? socket->urlAddress() : QLatin1String("http://127.0.0.1:*");
return socket ? serverUrl(currentIfaceIp, socket->serverPort()) : QLatin1String("http://127.0.0.1:*");
}
bool HttpServer::isOurs(const QString &url) const
{
return 0!=socket ? url.startsWith(address()+"/") : false;
if (0==socket || !url.startsWith(QLatin1String("http://"))) {
return false;
}
foreach (const QString &ip, ipAddresses) {
if (url.startsWith(serverUrl(ip, socket->serverPort()))) {
return true;
}
}
return false;
}
QByteArray HttpServer::encodeUrl(const Song &s)
@@ -152,7 +169,7 @@ QByteArray HttpServer::encodeUrl(const Song &s)
QUrlQuery query;
#endif
url.setScheme("http");
url.setHost(socket->address());
url.setHost(currentIfaceIp);
url.setPort(socket->serverPort());
url.setPath(s.file);
if (!s.album.isEmpty()) {
@@ -348,4 +365,13 @@ void HttpServer::removedIds(const QSet<qint32> &ids)
}
}
void HttpServer::ifaceIp(const QString &ip)
{
if (ip.isEmpty()) {
return;
}
currentIfaceIp=ip;
ipAddresses.insert(ip);
}
#endif