Skip to content

Commit 6c99df4

Browse files
committed
asap hop list is transmitted with assimilate pdu
1 parent 4cc94ef commit 6c99df4

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/net/sharksystem/asap/protocol/AssimilationPDU_Impl.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class AssimilationPDU_Impl extends PDU_Impl implements ASAP_AssimilationPDU_1_0
1818

1919
private byte[] data = null;
2020
private boolean dataNoLongerOnStream = false;
21+
private List<ASAPHop> asapHopList;
2122

2223
// PDU: CMD | FLAGS | PEER | RECIPIENT | FORMAT | CHANNEL | ERA | OFFSETS | LENGTH | DATA
2324

@@ -32,6 +33,7 @@ public AssimilationPDU_Impl(int flagsInt, boolean encrypted, InputStream is) thr
3233
if(this.channelSet()) { this.readChannel(is); }
3334
if(this.eraSet()) { this.readEra(is); }
3435
if(this.offsetsSet()) { this.readOffsets(is); }
36+
this.readASAPHops(is);
3537

3638
this.dataLength = ASAPSerialization.readLongParameter(is);
3739

@@ -47,6 +49,10 @@ private void readOffsets(InputStream is) throws IOException, ASAPException {
4749
this.offsets = string2list(ASAPSerialization.readCharSequenceParameter(is));
4850
}
4951

52+
private void readASAPHops(InputStream is) throws IOException, ASAPException {
53+
this.asapHopList = ASAPSerialization.readASAPHopList(is);
54+
}
55+
5056
private void readRecipientPeer(InputStream is) throws IOException, ASAPException {
5157
this.recipientPeer = ASAPSerialization.readCharSequenceParameter(is);
5258
}
@@ -78,6 +84,7 @@ static void sendPDUWithoutCmd(CharSequence peer, CharSequence recipient, CharSeq
7884
ASAPSerialization.writeCharSequenceParameter(channel, os); // opt
7985
ASAPSerialization.writeNonNegativeIntegerParameter(era, os); // opt
8086
ASAPSerialization.writeCharSequenceParameter(list2string(offsets), os); // opt
87+
ASAPSerialization.writeASAPHopList(asapHops, os); // mand - can be null (length == 0)
8188
ASAPSerialization.writeLongParameter(length, os); // mand
8289

8390
// stream data

0 commit comments

Comments
 (0)