feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Implement port gatherer on macOS

Browse Source 
Change-Id: I054612716872cdb90f2a3fb5d31c20e19962ebaf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Filipe Azevedo
2017-08-28 15:13:09 +02:00
parent 3dd1d11f6e
commit 69b75895fa
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/libs/utils/stringutils.cpp
View File

@@ -306,6 +306,37 @@ QTCREATOR_UTILS_EXPORT int parseUsedPortFromNetstatOutput(const QByteArray &line
const int len = spacePos - firstDigitPos;
base = 10;
portString = trimmed.mid(firstDigitPos, len);
} else if (trimmed.startsWith("tcp") || trimmed.startsWith("udp")) {
// macOS. Expected output is something like
//
// Active Internet connections (including servers)
// Proto Recv-Q Send-Q Local Address Foreign Address (state)
// tcp4 0 0 192.168.1.12.55687 88.198.14.66.443 ESTABLISHED
// tcp6 0 0 2a01:e34:ee42:d0.55684 2a02:26f0:ff::5c.443 ESTABLISHED
// [...]
// tcp4 0 0 *.631 *.* LISTEN
// tcp6 0 0 *.631 *.* LISTEN
// [...]
// udp4 0 0 192.168.79.1.123 *.*
// udp4 0 0 192.168.8.1.123 *.*
int firstDigitPos = -1;
int spacePos = -1;
if (trimmed[3] == '6') {
// IPV6
firstDigitPos = trimmed.indexOf('.') + 1;
spacePos = trimmed.indexOf(' ', firstDigitPos);
} else {
// IPV4
firstDigitPos = trimmed.indexOf('.') + 1;
spacePos = trimmed.indexOf(' ', firstDigitPos);
firstDigitPos = trimmed.lastIndexOf('.', spacePos) + 1;
}
if (spacePos < 0)
return -1;
base = 10;
portString = trimmed.mid(firstDigitPos, spacePos - firstDigitPos);
if (portString == "*")
return -1;
} else {
// Expected output on Linux something like
//