echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toString() fix (NO_ACK)

Browse Source
This commit is contained in:
zzz
2013-07-10 18:14:18 +00:00
parent 2caa6ad975
commit 732eddd1b9
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/streaming/java/src/net/i2p/client/streaming/Packet.java
View File

@ -61,6 +61,8 @@ import net.i2p.util.Log;
* <p>If the sequenceNum is 0 and the SYN is not set, this is a plain ACK * <p>If the sequenceNum is 0 and the SYN is not set, this is a plain ACK
* packet that should not be ACKed</p> * packet that should not be ACKed</p>
* *
* NOTE: All setters unsynchronized.
*
*/ */
class Packet { class Packet {
private long _sendStreamId; private long _sendStreamId;
@ -209,7 +211,7 @@ class Packet {
* connection packet (where receiveStreamId is the unknown id) or * connection packet (where receiveStreamId is the unknown id) or
* if FLAG_NO_ACK is set. * if FLAG_NO_ACK is set.
* *
* @return The highest packet sequence number received on receiveStreamId * @return The highest packet sequence number received on receiveStreamId, or -1 if FLAG_NO_ACK
*/ */
public long getAckThrough() { public long getAckThrough() {
if (isFlagSet(FLAG_NO_ACK)) if (isFlagSet(FLAG_NO_ACK))
@ -217,6 +219,10 @@ class Packet {
else else
return _ackThrough; return _ackThrough;
} }
/**
* @param id if < 0, sets FLAG_NO_ACK
*/
public void setAckThrough(long id) { public void setAckThrough(long id) {
if (id < 0) if (id < 0)
setFlag(FLAG_NO_ACK); setFlag(FLAG_NO_ACK);
@ -672,7 +678,7 @@ class Packet {
return size; return size;
} }
@Override @Override
public String toString() { public String toString() {
StringBuilder str = formatAsString(); StringBuilder str = formatAsString();
return str.toString(); return str.toString();
@ -689,7 +695,10 @@ class Packet {
// buf.append('\t'); // buf.append('\t');
buf.append(' '); buf.append(' ');
buf.append(toFlagString()); buf.append(toFlagString());
buf.append(" ACK ").append(getAckThrough()); if (isFlagSet(FLAG_NO_ACK))
buf.append(" NO_ACK ");
else
buf.append(" ACK ").append(getAckThrough());
if (_nacks != null) { if (_nacks != null) {
buf.append(" NACK"); buf.append(" NACK");
for (int i = 0; i < _nacks.length; i++) { for (int i = 0; i < _nacks.length; i++) {