Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 18:55:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add settings to change local port

Browse source
This commit is contained in:
Atlante45 2016-08-23 10:29:49 -07:00
parent 713be9fd73
commit a8de6f0a57
9 changed files with 110 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
interface/resources/qml/hifi/dialogs/NetworkingPreferencesDialog.qml Normal file
View file

@ -0,0 +1,19 @@
import QtQuick 2.5
import Qt.labs.settings 1.0
import "../../dialogs"
PreferencesDialog {
id: root
objectName: "NetworkingPreferencesDialog"
title: "Networking Settings"
showCategories: ["Networking"]
property var settings: Settings {
category: root.objectName
property alias x: root.x
property alias y: root.y
property alias width: root.width
property alias height: root.height
}
}

23
interface/src/Menu.cpp
View file

@ -522,21 +522,26 @@ Menu::Menu() {
// Developer > Network >>>
MenuWrapper* networkMenu = developerMenu->addMenu("Network");
action = addActionToQMenuAndActionHash(networkMenu, MenuOption::Networking);
connect(action, &QAction::triggered, [] {
DependencyManager::get<OffscreenUi>()->toggle(QUrl("hifi/dialogs/NetworkingPreferencesDialog.qml"),
"NetworkingPreferencesDialog");
});
addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
addCheckableActionToQMenuAndActionHash(networkMenu,
MenuOption::DisableActivityLogger,
0,
false,
&UserActivityLogger::getInstance(),
SLOT(disable(bool)));
MenuOption::DisableActivityLogger,
0,
false,
&UserActivityLogger::getInstance(),
SLOT(disable(bool)));
addActionToQMenuAndActionHash(networkMenu, MenuOption::CachesSize, 0,
dialogsManager.data(), SLOT(cachesSizeDialog()));
dialogsManager.data(), SLOT(cachesSizeDialog()));
addActionToQMenuAndActionHash(networkMenu, MenuOption::DiskCacheEditor, 0,
dialogsManager.data(), SLOT(toggleDiskCacheEditor()));
dialogsManager.data(), SLOT(toggleDiskCacheEditor()));
addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0,
dialogsManager.data(), SLOT(showDomainConnectionDialog()));
dialogsManager.data(), SLOT(showDomainConnectionDialog()));
addActionToQMenuAndActionHash(networkMenu, MenuOption::BandwidthDetails, 0,
dialogsManager.data(), SLOT(bandwidthDetails()));
dialogsManager.data(), SLOT(bandwidthDetails()));
#if (PR_BUILD || DEV_BUILD)
addCheckableActionToQMenuAndActionHash(networkMenu, MenuOption::SendWrongProtocolVersion, 0, false,

1
interface/src/Menu.h
View file

@ -129,6 +129,7 @@ namespace MenuOption {
const QString MuteEnvironment = "Mute Environment";
const QString MuteFaceTracking = "Mute Face Tracking";
const QString NamesAboveHeads = "Names Above Heads";
const QString Networking = "Networking...";
const QString NoFaceTracking = "None";
const QString OctreeStats = "Entity Statistics";
const QString OnePointCalibration = "1 Point Calibration";

16
interface/src/ui/PreferencesDialog.cpp
View file

@ -332,4 +332,20 @@ void setupPreferences() {
preferences->addPreference(preference);
}
}
{
static const QString RENDER("Networking");
auto nodelist = DependencyManager::get<NodeList>();
{
const int MIN_PORT_NUMBER { 0 };
const int MAX_PORT_NUMBER { 65535 };
auto getter = [nodelist] { return nodelist->getSocketLocalPort(); };
auto setter = [nodelist](quint16 preset) { nodelist->setSocketLocalPort(preset); };
auto preference = new SpinnerPreference(RENDER, "Listening Port", getter, setter);
preference->setMin(MIN_PORT_NUMBER);
preference->setMax(MAX_PORT_NUMBER);
preference->setStep(1);
preferences->addPreference(preference);
}
}
}

21
libraries/networking/src/NodeList.cpp
View file

@ -31,10 +31,18 @@
#include "udt/PacketHeaders.h"
#include "SharedUtil.h"
#include <SettingHandle.h>
const int KEEPALIVE_PING_INTERVAL_MS = 1000;
static Setting::Handle<quint16> NODELIST_LOCAL_PORT("NodeList.LocalPort", 0);
quint16 pickPortHelper(quint16 port) {
return (port != 0) ? port : NODELIST_LOCAL_PORT.get();
}
NodeList::NodeList(char newOwnerType, unsigned short socketListenPort, unsigned short dtlsListenPort) :
LimitedNodeList(socketListenPort, dtlsListenPort),
LimitedNodeList(pickPortHelper(socketListenPort), dtlsListenPort),
_ownerType(newOwnerType),
_nodeTypesOfInterest(),
_domainHandler(this),
@ -238,6 +246,17 @@ void NodeList::reset() {
}
}
void NodeList::setSocketLocalPort(quint16 socketLocalPort) {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "setSocketLocalPort", Qt::QueuedConnection,
Q_ARG(quint16, socketLocalPort));
return;
}
_nodeSocket.rebind(socketLocalPort);
reset();
NODELIST_LOCAL_PORT.set(socketLocalPort);
}
void NodeList::addNodeTypeToInterestSet(NodeType_t nodeTypeToAdd) {
_nodeTypesOfInterest << nodeTypeToAdd;
}

2
libraries/networking/src/NodeList.h
View file

@ -92,6 +92,8 @@ public slots:
void processICEPingPacket(QSharedPointer<ReceivedMessage> message);
void setSocketLocalPort(quint16 socketLocalPort);
#if (PR_BUILD || DEV_BUILD)
void toggleSendNewerDSConnectVersion(bool shouldSendNewerVersion) { _shouldSendNewerVersion = shouldSendNewerVersion; }
#endif

6
libraries/networking/src/udt/Socket.cpp
View file

@ -63,10 +63,12 @@ void Socket::bind(const QHostAddress& address, quint16 port) {
}
void Socket::rebind() {
quint16 oldPort = _udpSocket.localPort();
rebind(_udpSocket.localPort());
}
void Socket::rebind(quint16 localPort) {
_udpSocket.close();
bind(QHostAddress::AnyIPv4, oldPort);
bind(QHostAddress::AnyIPv4, localPort);
}
void Socket::setSystemBufferSizes() {

3
libraries/networking/src/udt/Socket.h
View file

@ -61,8 +61,9 @@ public:
qint64 writeDatagram(const QByteArray& datagram, const HifiSockAddr& sockAddr);
void bind(const QHostAddress& address, quint16 port = 0);
void rebind(quint16 port);
void rebind();
void setPacketFilterOperator(PacketFilterOperator filterOperator) { _packetFilterOperator = filterOperator; }
void setPacketHandler(PacketHandler handler) { _packetHandler = handler; }
void setMessageHandler(MessageHandler handler) { _messageHandler = handler; }

32
libraries/shared/src/Preferences.h
View file

@ -189,6 +189,38 @@ protected:
float _step { 0.1f };
};
class IntPreference : public TypedPreference<int> {
Q_OBJECT
Q_PROPERTY(float value READ getValue WRITE setValue NOTIFY valueChanged)
Q_PROPERTY(float min READ getMin CONSTANT)
Q_PROPERTY(float max READ getMax CONSTANT)
Q_PROPERTY(float step READ getStep CONSTANT)
public:
IntPreference(const QString& category, const QString& name, Getter getter, Setter setter)
: TypedPreference(category, name, getter, setter) { }
float getMin() const { return _min; }
void setMin(float min) { _min = min; };
float getMax() const { return _max; }
void setMax(float max) { _max = max; };
float getStep() const { return _step; }
void setStep(float step) { _step = step; };
signals:
void valueChanged();
protected:
void emitValueChanged() override { emit valueChanged(); }
int _min { std::numeric_limits<int>::min() };
int _max { std::numeric_limits<int>::max() };
int _step { 1 };
};
class StringPreference : public TypedPreference<QString> {
Q_OBJECT
Q_PROPERTY(QString value READ getValue WRITE setValue NOTIFY valueChanged)