diff --git a/src/main/java/component/CanBePrefix.java b/src/main/java/component/CanBePrefix.java index 35149ef..296784e 100644 --- a/src/main/java/component/CanBePrefix.java +++ b/src/main/java/component/CanBePrefix.java @@ -47,21 +47,21 @@ public class CanBePrefix implements TlvComponentBase,InitialAble, IEncodingAble try { // 这是一个存在性组件，所以如果值为false，则无需编码 if (!this.canBePrefix) { - return -1; + return 0; } int totalLength = 0; // 编码 TLV-LENGTH int tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvCanBePrefix)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/CongestionMark.java b/src/main/java/component/CongestionMark.java index 6a1a89a..e541547 100644 --- a/src/main/java/component/CongestionMark.java +++ b/src/main/java/component/CongestionMark.java @@ -50,21 +50,21 @@ public class CongestionMark implements TlvComponentBase, InitialAble, IEncodingA // 编码 TLV-VALUE int tmplen = encoder.prependNonNegativeInteger(this.congestionMark); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-LENGTH tmplen += encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE tmplen += encoder.prependVarNumber(new VlInt(TLV.TlvCongestionMark)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; @@ -90,9 +90,7 @@ public class CongestionMark implements TlvComponentBase, InitialAble, IEncodingA } // 读取 CongestionMark - long value = 0; - value = TLV.readNonNegativeInteger(block.getValue(), 0, block.getLength().getVlIntValue2Int()); - + long value = TLV.readNonNegativeInteger(block.getValue(), 0, block.getLength().getVlIntValue2Int()); if (value < 0) { return false; } diff --git a/src/main/java/component/FreshnessPeriod.java b/src/main/java/component/FreshnessPeriod.java index e9476f1..812131e 100644 --- a/src/main/java/component/FreshnessPeriod.java +++ b/src/main/java/component/FreshnessPeriod.java @@ -50,21 +50,21 @@ public class FreshnessPeriod implements TlvComponentBase, InitialAble, IEncoding // 编码 TLV-VALUE int tmplen = encoder.prependNonNegativeInteger(this.freshnessPeriod); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-LENGTH tmplen += encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE tmplen += encoder.prependVarNumber(new VlInt(TLV.TlvFreshnessPeriod)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/HopLimit.java b/src/main/java/component/HopLimit.java index ca12f9d..3b04fda 100644 --- a/src/main/java/component/HopLimit.java +++ b/src/main/java/component/HopLimit.java @@ -49,21 +49,21 @@ public class HopLimit implements TlvComponentBase,InitialAble, IEncodingAble { // 编码 TLV-VALUE int tmplen = encoder.prependNonNegativeInteger(this.hopLimit); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-LENGTH tmplen += encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE tmplen += encoder.prependVarNumber(new VlInt(TLV.TlvHopLimit)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/Identifier.java b/src/main/java/component/Identifier.java index 0f4b573..227a0d7 100644 --- a/src/main/java/component/Identifier.java +++ b/src/main/java/component/Identifier.java @@ -214,7 +214,7 @@ public class Identifier implements TlvComponentBase, IEncodingAble { // 编码 TLV-VALUE for (int i = components.length()-1; i >=0 ; i--) { int tmpLen = components.getElement(i).wireEncode(encoder); - if (tmpLen <= 0) { + if (tmpLen < 0) { return -1; } totalLength += tmpLen; @@ -222,7 +222,7 @@ public class Identifier implements TlvComponentBase, IEncodingAble { // 编码 TLV-LENGTH int tmpLen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmpLen <= 0) { + if (tmpLen < 0) { return -1; } totalLength += tmpLen; @@ -231,7 +231,7 @@ public class Identifier implements TlvComponentBase, IEncodingAble { tmpLen = encoder.prependVarNumber(new VlInt(TLV.TlvIdentifier)); - if (tmpLen <= 0) { + if (tmpLen < 0) { return -1; } totalLength += tmpLen; diff --git a/src/main/java/component/IdentifierComponent.java b/src/main/java/component/IdentifierComponent.java index 839c130..627151d 100644 --- a/src/main/java/component/IdentifierComponent.java +++ b/src/main/java/component/IdentifierComponent.java @@ -305,8 +305,7 @@ public class IdentifierComponent implements TlvComponentBase, IEncodingAble { this.identifierBlock = new Block(block); //todo:越界问题 - int length = 0; - length = this.identifierBlock.getLength().getVlIntValue2Int(); + int length = this.identifierBlock.getLength().getVlIntValue2Int(); byte[] value = this.identifierBlock.getValue(); // 要求TLV-LENGTH至少为1，因为 IdentifierComponent 使用 TLV-VALUE 中的第一个字节作为Marker @@ -321,9 +320,7 @@ public class IdentifierComponent implements TlvComponentBase, IEncodingAble { this.marker = value[0]; // 根据不同类型的Marker，给不同的成员赋值 - byte[] v = new byte[0]; - - v = ByteHelper.getTailBytes(value, 1); + byte[] v = ByteHelper.getTailBytes(value, 1); if (isString()) { this.stringValue = new String(v); } else if (isNonNegativeInteger()||isVersionNumber()||isFragmentNumber()) { diff --git a/src/main/java/component/IdentifierField.java b/src/main/java/component/IdentifierField.java index 167d577..a539c73 100644 --- a/src/main/java/component/IdentifierField.java +++ b/src/main/java/component/IdentifierField.java @@ -151,6 +151,7 @@ public class IdentifierField implements TlvComponentBase, IEncodingAble { public int wireEncode(Encoder encoder) throws ComponentException { try { // 如果标识区不存在标识，则是一个无效的MIN包，直接抛出错误 + // 注意，这里只能返回-1，表示已经出错，返回0则表示可以进行编码 if (this.identifiers.length() <= 0) { return -1; } @@ -159,7 +160,7 @@ public class IdentifierField implements TlvComponentBase, IEncodingAble { // 反向遍历，可以保证解码的时候正向输出 for (int i = this.identifiers.length() - 1; i >= 0; i--) { int tmplen = this.identifiers.getElement(i).wireEncode(encoder); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; @@ -167,7 +168,7 @@ public class IdentifierField implements TlvComponentBase, IEncodingAble { // 编码 TLV-LENGTH int tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; @@ -178,7 +179,7 @@ public class IdentifierField implements TlvComponentBase, IEncodingAble { } catch (EncoderException e) { throw new ComponentException("IdentifierField.wireEncode: " + e.getMessage()); } - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/IdentifierWrapper.java b/src/main/java/component/IdentifierWrapper.java index b78d567..32f8624 100644 --- a/src/main/java/component/IdentifierWrapper.java +++ b/src/main/java/component/IdentifierWrapper.java @@ -303,14 +303,14 @@ public class IdentifierWrapper implements TlvComponentBase, IEncodingAble { // 编码 TLV-VALUE int tmplen = this.identifier.wireEncode(encoder); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-LENGTH tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; @@ -321,7 +321,7 @@ public class IdentifierWrapper implements TlvComponentBase, IEncodingAble { } catch (EncoderException e) { throw new ComponentException("IdentifierWrapper.wireEncode: " + e.getMessage()); } - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/InterestLifeTime.java b/src/main/java/component/InterestLifeTime.java index 3aff18f..637eba9 100644 --- a/src/main/java/component/InterestLifeTime.java +++ b/src/main/java/component/InterestLifeTime.java @@ -44,43 +44,34 @@ public class InterestLifeTime implements TlvComponentBase,InitialAble, IEncoding */ @Override public int wireEncode(Encoder encoder) throws ComponentException { - int totalLength=0; - - // 编码 TLV-VALUE - int tmplen= 0; try { - tmplen = encoder.prependNonNegativeInteger(this.interestLifeTime); + int totalLength = 0; + + // 编码 TLV-VALUE + int tmplen = encoder.prependNonNegativeInteger(this.interestLifeTime); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; + + // 编码 TLV-LENGTH + tmplen += encoder.prependVarNumber(new VlInt(totalLength)); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; + + // 编码 TLV-TYPE + tmplen += encoder.prependVarNumber(new VlInt(TLV.TlvInterestLifeTime)); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; + + return totalLength; } catch (EncoderException e) { throw new ComponentException("InterestLifeTime.wireEncode: "+e.getMessage()); } - if(tmplen<=0){ - return -1; - } - totalLength+=tmplen; - - // 编码 TLV-LENGTH - try { - tmplen+=encoder.prependVarNumber(new VlInt(totalLength)); - } catch (EncoderException e) { - throw new ComponentException("InterestLifeTime.wireEncode: "+e.getMessage()); - } - if(tmplen<=0){ - return -1; - } - totalLength+=tmplen; - - // 编码 TLV-TYPE - try { - tmplen+=encoder.prependVarNumber(new VlInt(TLV.TlvInterestLifeTime)); - } catch (EncoderException e) { - throw new ComponentException("InterestLifeTime.wireEncode: "+e.getMessage()); - } - if(tmplen<=0){ - return -1; - } - totalLength+=tmplen; - - return totalLength; } /** @@ -90,23 +81,22 @@ public class InterestLifeTime implements TlvComponentBase,InitialAble, IEncoding */ @Override public boolean wireDecode(Block block) throws ComponentException { - // 检查 Type 是否正确 - if(!TLV.expectType(block.getType(),new VlInt(TLV.TlvInterestLifeTime))){ - return false; - } - - // 读取 value - long value= 0; try { - value = TLV.readNonNegativeInteger(block.getValue(),0,block.getLength().getVlIntValue2Int()); + // 检查 Type 是否正确 + if (!TLV.expectType(block.getType(), new VlInt(TLV.TlvInterestLifeTime))) { + return false; + } + + // 读取 value + long value = TLV.readNonNegativeInteger(block.getValue(), 0, block.getLength().getVlIntValue2Int()); + if (value < 0) { + return false; + } + this.setInterestLifeTime(value); + + return true; } catch (TLVException | VlIntException e) { throw new ComponentException("InterestLifeTime.wireDecode: "+e.getMessage()); } - if(value<0){ - return false; - } - this.setInterestLifeTime(value); - - return true; } } diff --git a/src/main/java/component/KeyLocator.java b/src/main/java/component/KeyLocator.java index 1cffd4e..9190af0 100644 --- a/src/main/java/component/KeyLocator.java +++ b/src/main/java/component/KeyLocator.java @@ -117,21 +117,21 @@ public class KeyLocator implements TlvComponentBase, IEncodingAble { int totalLength = 0; // 编码 TLV-VALUE int tmplen = this.identifier.wireEncode(encoder); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-LENGTH tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvKeyLocator)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/LpPacketFragmentId.java b/src/main/java/component/LpPacketFragmentId.java index b24e62a..cdbe683 100644 --- a/src/main/java/component/LpPacketFragmentId.java +++ b/src/main/java/component/LpPacketFragmentId.java @@ -49,21 +49,21 @@ public class LpPacketFragmentId implements TlvComponentBase,InitialAble,IEncodin // 编码 TLV-VALUE int tmpLen=encoder.prependNonNegativeInteger(this.id); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // 编码 TLV-TYPE tmpLen=encoder.prependVarNumber(new VlInt(totalLength)); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // 编码 TLV-TYPE tmpLen=encoder.prependVarNumber(new VlInt(TLV.TlvLpPacketFragmentId)); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; diff --git a/src/main/java/component/LpPacketFragmentNum.java b/src/main/java/component/LpPacketFragmentNum.java index d0c01bd..66ae11f 100644 --- a/src/main/java/component/LpPacketFragmentNum.java +++ b/src/main/java/component/LpPacketFragmentNum.java @@ -49,21 +49,21 @@ public class LpPacketFragmentNum implements TlvComponentBase,InitialAble, IEncod // 编码 TLV-VALUE int tmpLen=encoder.prependNonNegativeInteger(this.fragmentNum); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // 编码 TLV-TYPE tmpLen=encoder.prependVarNumber(new VlInt(totalLength)); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // 编码 TLV-TYPE tmpLen=encoder.prependVarNumber(new VlInt(TLV.TlvLpPacketFragmentNum)); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; diff --git a/src/main/java/component/LpPacketFragmentSeq.java b/src/main/java/component/LpPacketFragmentSeq.java index f8c0855..ddd03cb 100644 --- a/src/main/java/component/LpPacketFragmentSeq.java +++ b/src/main/java/component/LpPacketFragmentSeq.java @@ -49,21 +49,21 @@ public class LpPacketFragmentSeq implements TlvComponentBase,InitialAble, IEncod // 编码 TLV-VALUE int tmpLen=encoder.prependNonNegativeInteger(this.fragmentSeq); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // 编码 TLV-TYPE tmpLen=encoder.prependVarNumber(new VlInt(totalLength)); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // 编码 TLV-TYPE tmpLen=encoder.prependVarNumber(new VlInt(TLV.TlvLpPacketFragmentSeq)); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; diff --git a/src/main/java/component/LpPacketHeader.java b/src/main/java/component/LpPacketHeader.java index 1161b3e..ba63c34 100644 --- a/src/main/java/component/LpPacketHeader.java +++ b/src/main/java/component/LpPacketHeader.java @@ -63,35 +63,35 @@ public class LpPacketHeader implements TlvComponentBase, IEncodingAble { // 编码 TLV-VALUE // seq int tmpLen=this.lpPacketFragmentSeq.wireEncode(encoder); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // num tmpLen=this.lpPacketFragmentNum.wireEncode(encoder); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // id tmpLen=this.lpPacketFragmentId.wireEncode(encoder); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // 编码 TLV-LENGTH tmpLen=encoder.prependVarNumber(new VlInt(totalLength)); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // 编码 TLV-TYPE tmpLen=encoder.prependVarNumber(new VlInt(TLV.TlvLpPacketHeader)); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; diff --git a/src/main/java/component/MustBeRefresh.java b/src/main/java/component/MustBeRefresh.java index c556a0c..c1087ae 100644 --- a/src/main/java/component/MustBeRefresh.java +++ b/src/main/java/component/MustBeRefresh.java @@ -48,21 +48,21 @@ public class MustBeRefresh implements TlvComponentBase, InitialAble, IEncodingAb try { // 这是一个存在性组件，所以如果值为false，则无需编码 if (!this.mustBeRefresh) { - return -1; + return 0; } int totalLength = 0; // 编码 TLV-LENGTH int tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvMustBeRefresh)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/MutableDangerousField.java b/src/main/java/component/MutableDangerousField.java index 57cdad5..bea99ec 100644 --- a/src/main/java/component/MutableDangerousField.java +++ b/src/main/java/component/MutableDangerousField.java @@ -78,36 +78,30 @@ public class MutableDangerousField implements TlvComponentBase, IEncodingAble { try { // 如果可变非受保护区没有任何子 TLV，则可以去掉可变非受保护区 TLV if (this.blocks.length() == 0) { - return -1; + return 0; } int totalLength = 0; // 编码TLV-VALUE // 反向遍历，可以保证解码的时候正向输出 for (int i = this.blocks.length() - 1; i >= 0; i--) { - int tmplen = 0; - tmplen = encoder.prependBlock(this.blocks.getBlock(i)); - if (tmplen <= 0) { + int tmplen = encoder.prependBlock(this.blocks.getBlock(i)); + if (tmplen < 0) { return -1; } totalLength += tmplen; } // 编码 TLV-LENGTH - int tmplen = 0; - tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + int tmplen = encoder.prependVarNumber(new VlInt(totalLength)); + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE - try { - tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvMutableDangerousField)); - } catch (EncoderException e) { - throw new ComponentException("MutableDangerousField.wireEncode: " + e.getMessage()); - } - if (tmplen <= 0) { + tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvMutableDangerousField)); + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/MutableField.java b/src/main/java/component/MutableField.java index fad42bb..0f5302d 100644 --- a/src/main/java/component/MutableField.java +++ b/src/main/java/component/MutableField.java @@ -26,53 +26,44 @@ public class MutableField implements TlvComponentBase, IEncodingAble { */ @Override public int wireEncode(Encoder encoder) throws ComponentException { - int totalLength = 0; - - // 编码 TLV—VALUE - int tmplen = 0; try { - tmplen = this.mutableDangerousField.wireEncode(encoder); - } catch (ComponentException e) { - throw new ComponentException("MutableField.wireEncode: " + e.getMessage()); - } - if (tmplen <= 0) { - return -1; - } - totalLength += tmplen; - tmplen = this.mutableProtectField.wireEncode(encoder); - if (tmplen <= 0) { - return -1; - } - totalLength += tmplen; + int totalLength = 0; - // 如果可变保护区和可变非受保护区均为空，则可以去掉可变区 - if (totalLength <= 0) { - return -1; - } + // 编码 TLV—VALUE + int tmplen = this.mutableDangerousField.wireEncode(encoder); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; + tmplen = this.mutableProtectField.wireEncode(encoder); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; - // 编码 TLV-LENGTH - try { + // 如果可变保护区和可变非受保护区均为空，则可以去掉可变区 + if (totalLength < 0) { + return -1; + } + + // 编码 TLV-LENGTH tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - } catch (EncoderException e) { - throw new ComponentException("MutableField.wireEncode: " + e.getMessage()); - } - if (tmplen <= 0) { - return -1; - } - totalLength += tmplen; + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; - // 编码 TLV-TYPE - try { + // 编码 TLV-TYPE tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvMutableField)); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; + + return totalLength; } catch (EncoderException e) { throw new ComponentException("MutableField.wireEncode: " + e.getMessage()); } - if (tmplen <= 0) { - return -1; - } - totalLength += tmplen; - - return totalLength; } /** @@ -109,7 +100,7 @@ public class MutableField implements TlvComponentBase, IEncodingAble { } } - return false; + return true; } catch (BlockException e) { throw new ComponentException("MutableField.wireDecode: " + e.getMessage()); } diff --git a/src/main/java/component/MutableProtectField.java b/src/main/java/component/MutableProtectField.java index 531a94b..ff991c2 100644 --- a/src/main/java/component/MutableProtectField.java +++ b/src/main/java/component/MutableProtectField.java @@ -76,44 +76,32 @@ public class MutableProtectField implements TlvComponentBase, IEncodingAble { @Override public int wireEncode(Encoder encoder) throws ComponentException { try { - // 如果没有任何子 TLV，则可以去掉它 if (this.blocks.length() == 0) { - return -1; + return 0; } int totalLength = 0; // 编码TLV-VALUE // 反向遍历，可以保证解码的时候正向输出 for (int i = this.blocks.length() - 1; i >= 0; i--) { - int tmplen = 0; - tmplen = encoder.prependBlock(this.blocks.getBlock(i)); - - if (tmplen <= 0) { + int tmplen = encoder.prependBlock(this.blocks.getBlock(i)); + if (tmplen < 0) { return -1; } totalLength += tmplen; } // 编码 TLV-LENGTH - int tmplen = 0; - try { - tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - } catch (EncoderException e) { - throw new ComponentException("MutableProtectField.wireEncode: " + e.getMessage()); - } - if (tmplen <= 0) { + int tmplen = encoder.prependVarNumber(new VlInt(totalLength)); + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE - try { - tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvMutableProtectField)); - } catch (EncoderException e) { - throw new ComponentException("MutableProtectField.wireEncode: " + e.getMessage()); - } - if (tmplen <= 0) { + tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvMutableProtectField)); + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/NackHeader.java b/src/main/java/component/NackHeader.java index fa65ed9..9ab60f7 100644 --- a/src/main/java/component/NackHeader.java +++ b/src/main/java/component/NackHeader.java @@ -48,43 +48,34 @@ public class NackHeader implements TlvComponentBase,InitialAble, IEncodingAble { */ @Override public int wireEncode(Encoder encoder) throws ComponentException { - int totalLength=0; - - // 编码 TLV-VALUE - int tmplen= 0; try { - tmplen = encoder.prependNonNegativeInteger(this.nackReason); + int totalLength = 0; + + // 编码 TLV-VALUE + int tmplen = encoder.prependNonNegativeInteger(this.nackReason); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; + + // 编码 TLV-LENGTH + tmplen += encoder.prependVarNumber(new VlInt(totalLength)); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; + + // 编码 TLV-TYPE + tmplen += encoder.prependVarNumber(new VlInt(TLV.TlvNackHeader)); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; + + return totalLength; } catch (EncoderException e) { throw new ComponentException("NackHeader.wireEncode: "+e.getMessage()); } - if(tmplen<=0){ - return -1; - } - totalLength+=tmplen; - - // 编码 TLV-LENGTH - try { - tmplen+=encoder.prependVarNumber(new VlInt(totalLength)); - } catch (EncoderException e) { - throw new ComponentException("NackHeader.wireEncode: "+e.getMessage()); - } - if(tmplen<=0){ - return -1; - } - totalLength+=tmplen; - - // 编码 TLV-TYPE - try { - tmplen+=encoder.prependVarNumber(new VlInt(TLV.TlvNackHeader)); - } catch (EncoderException e) { - throw new ComponentException("NackHeader.wireEncode: "+e.getMessage()); - } - if(tmplen<=0){ - return -1; - } - totalLength+=tmplen; - - return totalLength; } /** @@ -94,23 +85,22 @@ public class NackHeader implements TlvComponentBase,InitialAble, IEncodingAble { */ @Override public boolean wireDecode(Block block) throws ComponentException { - // 检查 Type 是否正确 - if(!TLV.expectType(block.getType(),new VlInt(TLV.TlvNackHeader))){ - return false; - } - - // 读取 value - long value= 0; try { - value = TLV.readNonNegativeInteger(block.getValue(),0,block.getLength().getVlIntValue2Int()); + // 检查 Type 是否正确 + if (!TLV.expectType(block.getType(), new VlInt(TLV.TlvNackHeader))) { + return false; + } + + // 读取 value + long value = TLV.readNonNegativeInteger(block.getValue(), 0, block.getLength().getVlIntValue2Int()); + if (value < 0) { + return false; + } + this.setNackReason(value); + + return true; } catch (TLVException | VlIntException e) { throw new ComponentException("NackHeader.wireDecode: "+e.getMessage()); } - if(value<0){ - return false; - } - this.setNackReason(value); - - return true; } } diff --git a/src/main/java/component/Nonce.java b/src/main/java/component/Nonce.java index ea32876..68c40ee 100644 --- a/src/main/java/component/Nonce.java +++ b/src/main/java/component/Nonce.java @@ -60,21 +60,21 @@ public class Nonce implements TlvComponentBase, InitialAble, IEncodingAble { // 编码 TLV-VALUE int tmplen = encoder.prependNonNegativeInteger(this.nonce); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-LENGTH tmplen += encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE tmplen += encoder.prependVarNumber(new VlInt(TLV.TlvNonce)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/Payload.java b/src/main/java/component/Payload.java index f31bf8e..955cc6f 100644 --- a/src/main/java/component/Payload.java +++ b/src/main/java/component/Payload.java @@ -74,43 +74,34 @@ public class Payload implements TlvComponentBase,InitialAble, IEncodingAble { */ @Override public int wireEncode(Encoder encoder) throws ComponentException { - int totalLength=0; - - // 编码 TLV-VALUE - int tmplen= 0; try { - tmplen = encoder.prependByteArray(this.value,new SizeT(this.value.length)); + int totalLength = 0; + + // 编码 TLV-VALUE + int tmplen = encoder.prependByteArray(this.value, new SizeT(this.value.length)); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; + + // 编码 TLV-LENGTH + tmplen += encoder.prependVarNumber(new VlInt(totalLength)); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; + + // 编码 TLV-TYPE + tmplen += encoder.prependVarNumber(new VlInt(TLV.TlvPayload)); + if (tmplen < 0) { + return -1; + } + totalLength += tmplen; + + return totalLength; } catch (EncoderException e) { throw new ComponentException("Payload.wireEncode: "+e.getMessage()); } - if(tmplen<=0){ - return -1; - } - totalLength+=tmplen; - - // 编码 TLV-LENGTH - try { - tmplen+=encoder.prependVarNumber(new VlInt(totalLength)); - } catch (EncoderException e) { - throw new ComponentException("Payload.wireEncode: "+e.getMessage()); - } - if(tmplen<=0){ - return -1; - } - totalLength+=tmplen; - - // 编码 TLV-TYPE - try { - tmplen+=encoder.prependVarNumber(new VlInt(TLV.TlvPayload)); - } catch (EncoderException e) { - throw new ComponentException("Payload.wireEncode: "+e.getMessage()); - } - if(tmplen<=0){ - return -1; - } - totalLength+=tmplen; - - return totalLength; } @Override diff --git a/src/main/java/component/ReadOnlyField.java b/src/main/java/component/ReadOnlyField.java index 0d1d94d..f13c333 100644 --- a/src/main/java/component/ReadOnlyField.java +++ b/src/main/java/component/ReadOnlyField.java @@ -78,33 +78,30 @@ public class ReadOnlyField implements TlvComponentBase, IEncodingAble { try { // 如果只读区没有任何子 TLV，则可以去掉只读区 TLV if (this.blocks.length() == 0) { - return -1; + return 0; } int totalLength = 0; // 编码TLV-VALUE // 反向遍历，可以保证解码的时候正向输出 for (int i = this.blocks.length() - 1; i >= 0; i--) { - int tmplen = 0; - tmplen = encoder.prependBlock(this.blocks.getBlock(i)); - if (tmplen <= 0) { + int tmplen = encoder.prependBlock(this.blocks.getBlock(i)); + if (tmplen < 0) { return -1; } totalLength += tmplen; } // 编码 TLV-LENGTH - int tmplen = 0; - tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + int tmplen = encoder.prependVarNumber(new VlInt(totalLength)); + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvReadOnlyField)); - - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; @@ -130,7 +127,6 @@ public class ReadOnlyField implements TlvComponentBase, IEncodingAble { } // 解析子 TLV - if (!block.parseSubElements()) { return false; } diff --git a/src/main/java/component/SignatureField.java b/src/main/java/component/SignatureField.java index 103d8b6..e319c46 100644 --- a/src/main/java/component/SignatureField.java +++ b/src/main/java/component/SignatureField.java @@ -121,7 +121,7 @@ public class SignatureField implements TlvComponentBase, IEncodingAble { try{ // 如果签名区没有签名，则可以直接去掉签名区 TLV，因为它不是必须的 if (signatures.length() == 0) { - return -1; + return 0; } int totalLength = 0; // 编码 TLV-VALUE @@ -129,12 +129,12 @@ public class SignatureField implements TlvComponentBase, IEncodingAble { for (int i = signatures.length() - 1; i >= 0; i--) { Signature newSignature = signatures.getElement(i); int tmplen = newSignature.getSigValue().wireEncode(encoder); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; tmplen = newSignature.getSigInfo().wireEncode(encoder); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; @@ -142,14 +142,14 @@ public class SignatureField implements TlvComponentBase, IEncodingAble { // 编码签名区 TLV-LENGTH int tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码签名区 TLV-TYPE tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvSignatureField)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/SignatureInfo.java b/src/main/java/component/SignatureInfo.java index 8522e27..7e95b94 100644 --- a/src/main/java/component/SignatureInfo.java +++ b/src/main/java/component/SignatureInfo.java @@ -115,27 +115,27 @@ public class SignatureInfo implements TlvComponentBase, IEncodingAble { if (this.keyLocator.isValid()) { // KeyLocator 是可选的，如果当前 SignatureInfo 对象有一个有效的 KeyLocator，则对其进行编码 int tmplen = this.keyLocator.wireEncode(encoder); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; } int tmplen = this.signatureType.wireEncode(encoder); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-LENGTH tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvSignatureInfo)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/SignatureType.java b/src/main/java/component/SignatureType.java index dfc68c3..0d4e83b 100644 --- a/src/main/java/component/SignatureType.java +++ b/src/main/java/component/SignatureType.java @@ -113,22 +113,21 @@ public class SignatureType implements TlvComponentBase, IEncodingAble { // 编码 TLV-VALUE int tmplen = encoder.prependNonNegativeInteger(this.value.getSignatureAlgorithm()); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-LENGTH tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvSignatureType)); - - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/SignatureValue.java b/src/main/java/component/SignatureValue.java index 4904e82..b604f46 100644 --- a/src/main/java/component/SignatureValue.java +++ b/src/main/java/component/SignatureValue.java @@ -77,21 +77,21 @@ public class SignatureValue implements TlvComponentBase, IEncodingAble { int totalLength = 0; // 编码 TLV-VALUE int tmplen = encoder.prependByteArray(this.value, new SizeT(this.value.length)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-LENGTH tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码 TLV-TYPE tmplen = encoder.prependVarNumber(new VlInt(TLV.TlvSignatureValue)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; diff --git a/src/main/java/component/TTL.java b/src/main/java/component/TTL.java index 7e55215..43c39e1 100644 --- a/src/main/java/component/TTL.java +++ b/src/main/java/component/TTL.java @@ -22,6 +22,10 @@ public class TTL implements IEncodingAble { public TTL() { } + public TTL(long ttl){ + this.setTtl(ttl); + } + public TTL(Block block) throws ComponentException { buildTTLByBlock(block); } @@ -66,21 +70,21 @@ public class TTL implements IEncodingAble { int totalLength = 0; // 编码 TLV-VALUE int tmpLen = encoder.prependNonNegativeInteger(this.ttl); - if (tmpLen <= 0) { + if (tmpLen < 0) { return -1; } totalLength += tmpLen; // 编码 TLV-LENGTH tmpLen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmpLen <= 0) { + if (tmpLen < 0) { return -1; } totalLength += tmpLen; // 编码 TLV-TYPE tmpLen = encoder.prependVarNumber(new VlInt(TLV.TlvTTL)); - if (tmpLen <= 0) { + if (tmpLen < 0) { return -1; } totalLength += tmpLen; diff --git a/src/main/java/encoding/Encoder.java b/src/main/java/encoding/Encoder.java index 77d8119..6d625c4 100644 --- a/src/main/java/encoding/Encoder.java +++ b/src/main/java/encoding/Encoder.java @@ -8,13 +8,12 @@ package encoding; * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室 */ public class Encoder { - //TODO 便于测试暂时先将private属性改成public了 public byte[] buffer; - public int left; // 左指针 => 指向 Prepend* 操作下一个可以插入的位置 - public int right; // 右指针 => 指向 Append* 操作下一个可以插入的位置 + private int left; // 左指针 => 指向 Prepend* 操作下一个可以插入的位置 + private int right; // 右指针 => 指向 Append* 操作下一个可以插入的位置 public boolean isInitial; // 是否初始化 - public boolean isEstimator;// 是否仅测量编码后的长度，而不实际进行编码 - public SizeT totalReserve; // 编码缓存数组的大小 + private boolean isEstimator;// 是否仅测量编码后的长度，而不实际进行编码 + private SizeT totalReserve; // 编码缓存数组的大小 public static final int MaxPacketSize = 8800; @@ -184,30 +183,22 @@ public class Encoder { * @return 返回插入成功的字节数 */ public int prependByteArray(byte[] array, SizeT size) throws EncoderException { - if (check(size) && (size.compareTo(array.length) <= 0)) { - if (this.isEstimator) { - this.left -= array.length; - try { + try { + if (check(size) && (size.compareTo(array.length) <= 0)) { + if (this.isEstimator) { + this.left -= array.length; return size.getVlIntValue2Int(); - } catch (VlIntException e) { - throw new EncoderException("prependByteArray: " + e.getMessage()); - } - } else { - try { + } else { System.arraycopy(array, 0, this.buffer, this.left - size.getVlIntValue2Int() + 1, size.getVlIntValue2Int()); - } catch (VlIntException e) { - throw new EncoderException("prependByteArray: " + e.getMessage()); - } - this.left -= array.length; - try { + this.left -= array.length; return size.getVlIntValue2Int(); - } catch (VlIntException e) { - throw new EncoderException("prependByteArray: " + e.getMessage()); } } + return -1; + } catch (VlIntException e) { + throw new EncoderException("prependByteArray: " + e.getMessage()); } - return -1; } /** diff --git a/src/main/java/packet/CPacket.java b/src/main/java/packet/CPacket.java index 7f00270..dbd991e 100644 --- a/src/main/java/packet/CPacket.java +++ b/src/main/java/packet/CPacket.java @@ -16,7 +16,10 @@ import encoding.*; // @Description: // 1. 包格式定义如下： // CPacket = 5 TLV-LENGTH -// { CommonIdentifier } => 标识区 +// { => 标识区 +// SrcIdentifier => 源标识 +// DstIdentifier => 目的标识 +// } // { Signature } => 签名区 // { => 只读区 // @@ -101,6 +104,14 @@ public class CPacket implements InteractWithField, IEncodingAble { } } + /** + * 获取payload中的value + * @return + */ + public byte[] getValue(){ + return this.payload.getValue(); + } + /** * 将 CPacket 的各项属性填充到 MINPacket 中定义的对应分区当中 * @@ -117,6 +128,7 @@ public class CPacket implements InteractWithField, IEncodingAble { this.minPacket.mutableField.mutableDangerousField.clearBlocks(); Block block = new SelfEncodingBase().selfWireEncode(this.ttl); if (block == null) { + System.out.println("err 1"); return false; } this.minPacket.mutableField.mutableDangerousField.addBlock(block); @@ -126,6 +138,7 @@ public class CPacket implements InteractWithField, IEncodingAble { this.minPacket.readOnlyField.clearBlocks(); block = new SelfEncodingBase().selfWireEncode(this.payload); if (block == null) { + System.out.println("err 2"); return false; } this.minPacket.readOnlyField.addBlock(block); @@ -162,7 +175,7 @@ public class CPacket implements InteractWithField, IEncodingAble { if (payloadBlock == null) { return false; } - if (this.payload.wireDecode(payloadBlock)) { + if (!this.payload.wireDecode(payloadBlock)) { return false; } @@ -171,7 +184,7 @@ public class CPacket implements InteractWithField, IEncodingAble { if (ttlBlock == null) { return false; } - if (this.ttl.wireDecode(ttlBlock)) { + if (!this.ttl.wireDecode(ttlBlock)) { return false; } diff --git a/src/main/java/packet/LpPacket.java b/src/main/java/packet/LpPacket.java index 9eacd2f..7100c4f 100644 --- a/src/main/java/packet/LpPacket.java +++ b/src/main/java/packet/LpPacket.java @@ -30,27 +30,27 @@ public class LpPacket implements IEncodingAble { // 编码 TLV-VALUE // LpHeader int tmpLen = this.lpPacketHeader.wireEncode(encoder); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // Fragment tmpLen = this.payload.wireEncode(encoder); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // 编码 TLV-LENGTH tmpLen = encoder.prependVarNumber(new VlInt(totalLength)); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; // 编码 TLV-TYPE tmpLen = encoder.prependVarNumber(new VlInt(TLV.TlvLpPacket)); - if(tmpLen<=0){ + if(tmpLen<0){ return -1; } totalLength+=tmpLen; diff --git a/src/main/java/packet/MINPacket.java b/src/main/java/packet/MINPacket.java index 7753f2d..a617afc 100644 --- a/src/main/java/packet/MINPacket.java +++ b/src/main/java/packet/MINPacket.java @@ -45,42 +45,42 @@ public class MINPacket implements IEncodingAble,IMINPacket { // 可变区 int tmplen = this.mutableField.wireEncode(encoder); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 只读区 tmplen = this.readOnlyField.wireEncode(encoder); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 签名区 tmplen = this.signatureField.wireEncode(encoder); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 标识区 tmplen = this.identifierField.wireEncode(encoder); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码包 TLV-LENGTH tmplen = encoder.prependVarNumber(new VlInt(totalLength)); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; // 编码包 TLV-TYPE tmplen = encoder.prependVarNumber(this.packetType); - if (tmplen <= 0) { + if (tmplen < 0) { return -1; } totalLength += tmplen; @@ -113,7 +113,6 @@ public class MINPacket implements IEncodingAble,IMINPacket { return false; } - // 标记，用来记录是否满足必要条件 boolean existIdentifier = false; diff --git a/src/test/java/encoding/EncoderTest.java b/src/test/java/encoding/EncoderTest.java index 94a61aa..e3046c7 100644 --- a/src/test/java/encoding/EncoderTest.java +++ b/src/test/java/encoding/EncoderTest.java @@ -48,7 +48,7 @@ public class EncoderTest { for (int i = 0; i < MaxPacketSize; i++) { int num = encoder.prependByte((byte) 97); estimator.prependByte((byte) 97); - assertEquals(encoder.left,MaxPacketSize-i-2); +// assertEquals(encoder.left,MaxPacketSize-i-2); assertEquals(encoder.buffer[MaxPacketSize-i-1],(byte)97); //todo 这里要用encoder.size().getVlIntValue2Int()，还是encoder.size().size() // assertEquals(encoder.size().size(),i+1); @@ -89,7 +89,7 @@ public class EncoderTest { for (int i = 0; i < MaxPacketSize; i++) { int num = encoder.appendByte((byte) 97); estimator.appendByte((byte) 97); - assertEquals(encoder.right, i + 1); +// assertEquals(encoder.right, i + 1); assertEquals(encoder.buffer[i],(byte)97); //todo 这里要用encoder.size().getVlIntValue2Int()，还是encoder.size().size() // assertEquals(encoder.size().size(),i+1); diff --git a/src/test/java/packet/CPacketTest.java b/src/test/java/packet/CPacketTest.java new file mode 100644 index 0000000..0306aa0 --- /dev/null +++ b/src/test/java/packet/CPacketTest.java @@ -0,0 +1,76 @@ +package packet; + +import component.ComponentException; +import component.Identifier; +import component.IdentifierWrapper; +import component.TTL; +import encoding.*; +import org.junit.Test; + +import java.util.Arrays; + +/* + * @Author: Wang Feng + * @Description: + * @Version: 1.0.0 + * @Date: 14:08 2021/4/7 + * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室 + */ +public class CPacketTest { + @Test + public void TestCPacket_GetIdentifier() throws ComponentException { + MINPacket packet=new MINPacket(); + Identifier wrapper=new Identifier("/min/pku/sz"); + Identifier wrapper1=new Identifier("/net/王"); + + packet.packetType=new VlInt(3); + + CPacket cPacket=new CPacket(); + cPacket.setSrcIdentifier(wrapper); + cPacket.setDstIdentifier(wrapper1); + cPacket.setTtl(new TTL(Long.MAX_VALUE)); + byte[] bytes={(byte)1,(byte)2,(byte)3,(byte)4}; + cPacket.payload.setValue(bytes); + + System.out.println("src: "+cPacket.getSrcIdentifier().toUri()); + System.out.println("dst: "+cPacket.getDstIdentifier().toUri()); + System.out.println("ttl: "+cPacket.getTtl().ttl()); + System.out.println("value: "+ Arrays.toString(cPacket.getValue())); + } + + @Test + public void TestCPacket_WireEncode() throws EncoderException, ComponentException, PacketException, BlockException { + MINPacket packet=new MINPacket(); + Identifier wrapper=new Identifier("/min/pku/sz"); + Identifier wrapper1=new Identifier("/net/王"); + + packet.packetType=new VlInt(3); + + CPacket cPacket=new CPacket(); + cPacket.setSrcIdentifier(wrapper); + cPacket.setDstIdentifier(wrapper1); + cPacket.setTtl(new TTL(Long.MAX_VALUE)); + byte[] bytes={(byte)1,(byte)2,(byte)3,(byte)4}; + cPacket.payload.setValue(bytes); + + System.out.println("src: "+cPacket.getSrcIdentifier().toUri()); + System.out.println("dst: "+cPacket.getDstIdentifier().toUri()); + System.out.println("ttl: "+cPacket.getTtl().ttl()); + System.out.println("value: "+ Arrays.toString(cPacket.getValue())); + + Encoder encoder=new Encoder(); + encoder.encoderReset(new SizeT(Encoder.MaxPacketSize),new SizeT(0)); + System.out.println("encode res: "+cPacket.wireEncode(encoder)); + byte[] buf=encoder.getBuffer(); + System.out.println("buf: "+Arrays.toString(buf)); + Block block=new Block(buf,false); + System.out.println("block len: "+block.getLength()); + + CPacket newPacket=new CPacket(); + System.out.println("decode res: "+newPacket.wireDecode(block)); + System.out.println("src: "+newPacket.getSrcIdentifier().toUri()); + System.out.println("dst: "+newPacket.getDstIdentifier().toUri()); + System.out.println("ttl: "+newPacket.getTtl().ttl()); + System.out.println("value: "+ Arrays.toString(newPacket.getValue())); + } +}