#ifdef Q_OS_WIN32
# include <windows.h>
#else
+# include <unistd.h>
# include <termios.h>
#endif /* Q_OS_WIN32 */
+// umask
+#ifndef Q_OS_WIN32
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif /* Q_OS_WIN32 */
+
// ==============================
// Custom Events
// ==============================
Core::Core()
: _storage(0)
{
+#ifndef Q_OS_WIN32
+ umask(S_IRWXG | S_IRWXO);
+#endif /* Q_OS_WIN32 */
_startTime = QDateTime::currentDateTime().toUTC(); // for uptime :)
Quassel::loadTranslation(QLocale::system());
}
setupData["AdminUser"] = "AdminUser";
setupData["AdminPasswd"] = QString::number(pass);
- setupData["Backend"] = _storageBackends[_storageBackends.keys().first()]->displayName();
+ setupData["Backend"] = QString("SQLite"); // mono client currently needs sqlite
return setupCore(setupData);
}
if(user.isEmpty() || password.isEmpty()) {
return tr("Admin user or password not set.");
}
- _configured = initStorage(setupData, true);
- if(!_configured) {
+ if(_configured || !(_configured = initStorage(setupData, true))) {
return tr("Could not setup storage!");
}
CoreSettings s;
);
} else {
switch(addr.protocol()) {
- case QAbstractSocket::IPv4Protocol:
- if(_server.listen(addr, port)) {
+ case QAbstractSocket::IPv6Protocol:
+ if(_v6server.listen(addr, port)) {
quInfo() << qPrintable(
- tr("Listening for GUI clients on IPv4 %1 port %2 using protocol version %3")
+ tr("Listening for GUI clients on IPv6 %1 port %2 using protocol version %3")
.arg(addr.toString())
- .arg(_server.serverPort())
+ .arg(_v6server.serverPort())
.arg(Quassel::buildInfo().protocolVersion)
);
success = true;
} else
quWarning() << qPrintable(
- tr("Could not open IPv4 interface %1:%2: %3")
+ tr("Could not open IPv6 interface %1:%2: %3")
.arg(addr.toString())
.arg(port)
- .arg(_server.errorString()));
+ .arg(_v6server.errorString()));
break;
- case QAbstractSocket::IPv6Protocol:
- if(_v6server.listen(addr, port)) {
+ case QAbstractSocket::IPv4Protocol:
+ if(_server.listen(addr, port)) {
quInfo() << qPrintable(
- tr("Listening for GUI clients on IPv6 %1 port %2 using protocol version %3")
+ tr("Listening for GUI clients on IPv4 %1 port %2 using protocol version %3")
.arg(addr.toString())
- .arg(_v6server.serverPort())
+ .arg(_server.serverPort())
.arg(Quassel::buildInfo().protocolVersion)
);
success = true;
} else {
- // if v4 succeeded on Any, the port will be already in use - don't display the error then
- // FIXME: handle this more sanely, make sure we can listen to both v4 and v6 by default!
- if(!success || _v6server.serverError() != QAbstractSocket::AddressInUseError)
+ // if v6 succeeded on Any, the port will be already in use - don't display the error then
+ if(!success || _server.serverError() != QAbstractSocket::AddressInUseError)
quWarning() << qPrintable(
- tr("Could not open IPv6 interface %1:%2: %3")
+ tr("Could not open IPv4 interface %1:%2: %3")
.arg(addr.toString())
.arg(port)
- .arg(_v6server.errorString()));
+ .arg(_server.errorString()));
}
break;
default:
socket->close(); return;
}
+ reply["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;
reply["CoreVersion"] = Quassel::buildInfo().fancyVersionString;
reply["CoreDate"] = Quassel::buildInfo().buildDate;
- reply["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;
- // TODO: Make the core info configurable
+ reply["CoreStartTime"] = startTime(); // v10 clients don't necessarily parse this, see below
+
+ // FIXME: newer clients no longer use the hardcoded CoreInfo (for now), since it gets the
+ // time zone wrong. With the next protocol bump (10 -> 11), we should remove this
+ // or make it properly configurable.
+
int uptime = startTime().secsTo(QDateTime::currentDateTime().toUTC());
int updays = uptime / 86400; uptime %= 86400;
int uphours = uptime / 3600; uptime %= 3600;
.arg(Quassel::buildInfo().buildDate)
.arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime().toString(Qt::TextDate));
+ reply["CoreFeatures"] = (int)Quassel::features();
+
#ifdef HAVE_SSL
SslServer *sslServer = qobject_cast<SslServer *>(&_server);
QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
return;
}
- if(_storage->addUser(username, password).isValid()) {
+ if(_configured && _storage->addUser(username, password).isValid()) {
out << "Added user " << username << " successfully!" << endl;
} else {
qWarning() << "Unable to add user:" << qPrintable(username);
return;
}
- if(_storage->updateUser(userId, password)) {
+ if(_configured && _storage->updateUser(userId, password)) {
out << "Password changed successfuly!" << endl;
} else {
qWarning() << "Failed to change password!";