SecT0uch
/
Kore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix calculation of packet number and sizes, that was causing packets with payloads of size 0 not to be sent, as well as packets with payloads of sizes multiple of MAX_PAYLOAD_SIZE to send empty packets.

This commit is contained in:
Synced Synapse 2015-06-17 22:27:13 +01:00
parent 9d13a71e8a
commit 5cdca246cd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/xbmc/kore/eventclient/Packet.java
View File

@ -17,6 +17,7 @@
*/
package org.xbmc.kore.eventclient;
import java.io.IOException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
@ -179,7 +180,8 @@ public abstract class Packet {
*/
public int getNumPackets()
{
return (int)((payload.length + (MAX_PAYLOAD_SIZE - 1)) / MAX_PAYLOAD_SIZE);
// return (payload.length + (MAX_PAYLOAD_SIZE - 1)) / MAX_PAYLOAD_SIZE;
return 1 + Math.max(payload.length - 1, 0) / MAX_PAYLOAD_SIZE;
}
/**
@ -218,15 +220,14 @@ public abstract class Packet {
*/
private byte[] getUDPMessage(int seq)
{
int maxseq = (int)((payload.length + (MAX_PAYLOAD_SIZE - 1)) / MAX_PAYLOAD_SIZE);
int maxseq = getNumPackets();
if(seq > maxseq)
return null;
short actpayloadsize;
if(seq == maxseq)
actpayloadsize = (short)(payload.length%MAX_PAYLOAD_SIZE);
actpayloadsize = (short)((payload.length - 1) % MAX_PAYLOAD_SIZE + 1);
else
actpayloadsize = (short)MAX_PAYLOAD_SIZE;
@ -248,7 +249,6 @@ public abstract class Packet {
{
int maxseq = getNumPackets();
DatagramSocket s = new DatagramSocket();
// For each Packet in Sequence...
for(int seq=1;seq<=maxseq;seq++)
{