diff options
author | Simon Rettberg | 2016-11-15 12:13:40 +0100 |
---|---|---|
committer | Simon Rettberg | 2016-11-15 12:13:40 +0100 |
commit | eaebc23452813a8709d2bbb4d17fddb1b4f29d91 (patch) | |
tree | 956155fc2fc5b58498a4c494cc59b7adc68bc76a /src/server/net/discoverylistener.cpp | |
parent | [server] Rewrite positioning logic of connection frames (diff) | |
download | pvs2-eaebc23452813a8709d2bbb4d17fddb1b4f29d91.tar.gz pvs2-eaebc23452813a8709d2bbb4d17fddb1b4f29d91.tar.xz pvs2-eaebc23452813a8709d2bbb4d17fddb1b4f29d91.zip |
Increase compiler warnings, fix a lot of those instances
- Add explicit casts
- Comment out unused params
- Remove ignored const return types
Diffstat (limited to 'src/server/net/discoverylistener.cpp')
-rw-r--r-- | src/server/net/discoverylistener.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/server/net/discoverylistener.cpp b/src/server/net/discoverylistener.cpp index e8d286d..e37c81e 100644 --- a/src/server/net/discoverylistener.cpp +++ b/src/server/net/discoverylistener.cpp @@ -79,14 +79,14 @@ static quint16 hash(const QHostAddress& host) } else { // Durr? len = 2; - data[0] = (quint16)qrand(); - data[1] = (quint16)qrand(); + data[0] = (quint8)qrand(); + data[1] = (quint8)qrand(); } quint16 result = 0; quint16 mod = seed1; for (quint8 i = 0; i < len; ++i) { - result = ((result << 1) + data[i]) ^ mod; // because of the shift this algo is not suitable for len(input) > 8 - mod += seed2 + data[i]; + result = (quint16)(((result << 1) + data[i]) ^ mod); // because of the shift this algo is not suitable for len(input) > 8 + mod = (quint16)(mod + seed2 + data[i]); } return result; } @@ -99,15 +99,16 @@ static quint16 hash(const QHostAddress& host) * @brief Decrease packet counters per source IP in our "spam protection" table. * @param event */ -void DiscoveryListener::timerEvent(QTimerEvent* event) +void DiscoveryListener::timerEvent(QTimerEvent* /* event */ ) { for (int i = 0; i < SPAM_MODERATE_AT_ONCE; ++i) { if (++_counterResetPos >= SD_PACKET_TABLE_SIZE) _counterResetPos = 0; - if (_packetCounter[_counterResetPos] > 10) - _packetCounter[_counterResetPos] -= 10; - else if (_packetCounter[_counterResetPos] != 0) + if (_packetCounter[_counterResetPos] > 10) { + _packetCounter[_counterResetPos] = (quint8)(_packetCounter[_counterResetPos] - 10); + } else if (_packetCounter[_counterResetPos] != 0) { _packetCounter[_counterResetPos] = 0; + } } } |