diff --git a/src/main/java/com/github/manevolent/ts3j/protocol/packet/statistics/PacketStatistics.java b/src/main/java/com/github/manevolent/ts3j/protocol/packet/statistics/PacketStatistics.java index 7ef5291..8c71e1c 100644 --- a/src/main/java/com/github/manevolent/ts3j/protocol/packet/statistics/PacketStatistics.java +++ b/src/main/java/com/github/manevolent/ts3j/protocol/packet/statistics/PacketStatistics.java @@ -61,7 +61,7 @@ public class PacketStatistics { } public int getSentPacketsLastMinute() { - long now = System.nanoTime() - 1_000_000_000L; + long now = System.nanoTime() - 60_000_000_000L; synchronized (sentPacketList) { return (int) sentPacketList.stream() @@ -124,6 +124,16 @@ public class PacketStatistics { } } + /** Average bytes per second sent over the last minute, as TeamSpeak reports a minute's bandwidth. */ + public int getSentBandwidthLastMinute() { + return getSentBytesLastMinute() / 60; + } + + /** Average bytes per second received over the last minute. */ + public int getReceivedBandwidthLastMinute() { + return getReceivedBytesLastMinute() / 60; + } + public int getReceivedBytesLastMinute() { long now = System.nanoTime() - 60_000_000_000L; diff --git a/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java b/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java index b8e0fca..7911e9e 100644 --- a/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java +++ b/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java @@ -150,11 +150,11 @@ public class LocalTeamspeakClientSocket response.add(new CommandSingleParameter("connection_bandwidth_sent_last_second_" + name, Integer.toString(stats.getSentBytesLastSecond()))); response.add(new CommandSingleParameter("connection_bandwidth_sent_last_minute_" + name, - Integer.toString(stats.getSentBytesLastMinute()))); + Integer.toString(stats.getSentBandwidthLastMinute()))); response.add(new CommandSingleParameter("connection_bandwidth_received_last_second_" + name, Integer.toString(stats.getReceivedBytesLastSecond()))); response.add(new CommandSingleParameter("connection_bandwidth_received_last_minute_" + name, - Integer.toString(stats.getReceivedBytesLastMinute()))); + Integer.toString(stats.getReceivedBandwidthLastMinute()))); } response.add(new CommandSingleParameter("connection_server2client_packetloss_total", Integer.toString(0)));