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

Add option to specify HTTP server listen address/interface.

Browse Source
This commit is contained in:
craig.p.drummond@gmail.com
2012-06-15 11:40:53 +00:00
committed by craig.p.drummond@gmail.com
parent dcc47d1b57
commit fc7f4ab98e
10 changed files with 120 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
http/httpserver.cpp
View File

@@ -60,9 +60,9 @@ void HttpServer::stop()
}
}
bool HttpServer::setPort(quint16 port)
bool HttpServer::setDetails(const QString &addr, quint16 port)
{
if (socket && port==socket->port()) {
if (socket && port==socket->serverPort() && addr==socket->configuredAddress()) {
return true;
}
@@ -78,7 +78,7 @@ bool HttpServer::setPort(quint16 port)
if (0!=port) {
thread=new QThread(0);
socket=new HttpSocket(port);
socket=new HttpSocket(addr, port);
socket->moveToThread(thread);
thread->start();
return socket->isListening();
@@ -94,7 +94,8 @@ bool HttpServer::isAlive() const
QString HttpServer::address() const
{
return QLatin1String("http://127.0.0.1:")+QString::number(socket ? socket->port() : Settings::self()->httpPort());
return socket ? QLatin1String("http://")+socket->address()+QChar(':')+QString::number(socket->serverPort())
: QLatin1String("http://127.0.0.1:")+QString::number(Settings::self()->httpPort());
}
bool HttpServer::isOurs(const QString &url) const
@@ -109,8 +110,8 @@ QByteArray HttpServer::encodeUrl(const Song &s) const
}
QUrl url;
url.setScheme("http");
url.setHost("127.0.0.1");
url.setPort(socket->port());
url.setHost(socket->address());
url.setPort(socket->serverPort());
url.setPath(s.file);
if (!s.album.isEmpty()) {
url.addQueryItem("album", s.album);