Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Notifications: correct IP address formatting

Browse Source
This commit is contained in:
Stéphane L 2017-09-08 00:23:17 +02:00
parent 3b0cf02574
commit c3346f9192
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Utils.cpp
View File

@ -386,10 +386,12 @@ void Utils::SysTrayNotify(QString &text,
} }
QString Utils::FormatIPAddress(QHostAddress &addr) { QString Utils::FormatIPAddress(QHostAddress &addr) {
if (addr.protocol() == QAbstractSocket::IPv4Protocol) QRegExp v4regex("(::ffff:)(((\\d).){3})", Qt::CaseInsensitive);
QString v4addr = addr.toString().replace("::fff:", ""); QString addrString = addr.toString();
if (addrString.contains(v4regex)) {
return addr.toString(); addrString = QHostAddress(addr.toIPv4Address()).toString();
}
return addrString;
} }
const char* Utils::GetRecordingFolder() { const char* Utils::GetRecordingFolder() {

4
WSServer.cpp
View File

@ -103,7 +103,7 @@ void WSServer::onNewConnection() {
QString msg = QString(obs_module_text("OBSWebsocket.ConnectNotify.ClientIP")) QString msg = QString(obs_module_text("OBSWebsocket.ConnectNotify.ClientIP"))
+ QString(" ") + QString(" ")
+ clientAddr.toString(); + Utils::FormatIPAddress(clientAddr);
Utils::SysTrayNotify(msg, Utils::SysTrayNotify(msg,
QSystemTrayIcon::Information, QSystemTrayIcon::Information,
@ -138,7 +138,7 @@ void WSServer::onSocketDisconnected() {
QString msg = QString(obs_module_text("OBSWebsocket.ConnectNotify.ClientIP")) QString msg = QString(obs_module_text("OBSWebsocket.ConnectNotify.ClientIP"))
+ QString(" ") + QString(" ")
+ clientAddr.toString(); + Utils::FormatIPAddress(clientAddr);
Utils::SysTrayNotify(msg, Utils::SysTrayNotify(msg,
QSystemTrayIcon::Information, QSystemTrayIcon::Information,