mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 04:06:49 +02:00
Code Issues Projects Releases Wiki Activity

Bug fixes of calculating message length for InfoRequest/Reply

Browse Source 
Changes
1. Wrap added InfoReqest processing with try..finally statement
2. InfoRequest serialize bug fix
3. Overide WriteTo() methods of DefaultLispInfoRequest
   and DefaultLispReply

Change-Id: Ifc74619508a004f3fa7c940c30a5905d2cd27963
This commit is contained in:
yoonseon 2016-11-18 14:18:46 -08:00
parent 92e732bfbb
commit 980cd7cf32
7 changed files with 103 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispChannelHandler.java
View File

@ -63,19 +63,17 @@ public class LispChannelHandler extends ChannelInboundHandlerAdapter {
ctx.writeAndFlush(mapNotify);
}
if (msg instanceof LispInfoRequest) {
LispMapServer mapServer = new LispMapServer();
LispInfoReply infoReply = mapServer.processInfoRequest((LispInfoRequest) msg);
ctx.writeAndFlush(infoReply);
}
} finally {
// try to remove the received message form the buffer
ReferenceCountUtil.release(msg);
}
if (msg instanceof LispInfoRequest) {
LispMapServer mapServer = new LispMapServer();
LispInfoReply infoReply = mapServer.processInfoRequest((LispInfoRequest) msg);
// try to remove the received info-request message from buffer
ReferenceCountUtil.release(msg);
ctx.writeAndFlush(infoReply);
}
}
@Override

2
protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispMapServer.java
View File

@ -199,7 +199,7 @@ public class LispMapServer {
requestBuilder.withIsInfoReply(request.isInfoReply());
requestBuilder.withMaskLength(request.getMaskLength());
LispInfoRequest authRequest = requestBuilder.build();
LispInfoRequest authRequest = requestBuilder.build();
return Arrays.equals(authRequest.getAuthData(), request.getAuthData());
}

11
protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReply.java
View File

@ -43,6 +43,12 @@ public final class DefaultLispInfoReply extends DefaultLispInfo implements LispI
private final LispNatLcafAddress natLcafAddress;
static final InfoReplyWriter WRITER;
static {
WRITER = new InfoReplyWriter();
}
/**
* A private constructor that protects object instantiation from external.
*
@ -68,6 +74,11 @@ public final class DefaultLispInfoReply extends DefaultLispInfo implements LispI
return natLcafAddress;
}
@Override
public void writeTo(ByteBuf byteBuf) throws LispWriterException {
WRITER.writeTo(byteBuf, this);
}
@Override
public String toString() {
return toStringHelper(this)

63
protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoRequest.java
View File

@ -24,6 +24,7 @@ import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
import org.onosproject.lisp.msg.types.LispAfiAddress;
import org.onosproject.lisp.msg.types.LispNoAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -35,9 +36,17 @@ import static org.onosproject.lisp.msg.authentication.LispAuthenticationKeyEnum.
/**
* Default LISP info request message class.
*/
public class DefaultLispInfoRequest extends DefaultLispInfo implements LispInfoRequest {
public class DefaultLispInfoRequest extends DefaultLispInfo
implements LispInfoRequest {
private static final Logger log = LoggerFactory.getLogger(DefaultLispInfoRequest.class);
private static final Logger log =
LoggerFactory.getLogger(DefaultLispInfoRequest.class);
static final InfoRequestWriter WRITER;
static {
WRITER = new InfoRequestWriter();
}
/**
* A private constructor that protects object instantiation from external.
@ -51,10 +60,13 @@ public class DefaultLispInfoRequest extends DefaultLispInfo implements LispInfoR
* @param maskLength EID prefix mask length
* @param eidPrefix EID prefix
*/
protected DefaultLispInfoRequest(boolean infoReply, long nonce, short keyId, short authDataLength,
byte[] authData, int ttl, byte maskLength,
protected DefaultLispInfoRequest(boolean infoReply, long nonce, short keyId,
short authDataLength, byte[] authData,
int ttl, byte maskLength,
LispAfiAddress eidPrefix) {
super(infoReply, nonce, keyId, authDataLength, authData, ttl, maskLength, eidPrefix);
super(infoReply, nonce, keyId, authDataLength, authData, ttl,
maskLength, eidPrefix);
}
@Override
@ -95,7 +107,13 @@ public class DefaultLispInfoRequest extends DefaultLispInfo implements LispInfoR
eidPrefix) + Arrays.hashCode(authData);
}
public static final class DefaultInfoRequestBuilder implements InfoRequestBuilder {
@Override
public void writeTo(ByteBuf byteBuf) throws LispWriterException {
WRITER.writeTo(byteBuf, this);
}
public static final class DefaultInfoRequestBuilder
implements InfoRequestBuilder {
private boolean infoReply;
private long nonce;
@ -174,17 +192,21 @@ public class DefaultLispInfoRequest extends DefaultLispInfo implements LispInfoR
// if authentication data is not specified, we will calculate it
if (authData == null) {
LispAuthenticationFactory factory = LispAuthenticationFactory.getInstance();
LispAuthenticationFactory factory =
LispAuthenticationFactory.getInstance();
authDataLength = LispAuthenticationKeyEnum.valueOf(keyId).getHashLength();
authDataLength =
LispAuthenticationKeyEnum.valueOf(keyId).getHashLength();
byte[] tmpAuthData = new byte[authDataLength];
Arrays.fill(tmpAuthData, (byte) 0);
authData = tmpAuthData;
ByteBuf byteBuf = Unpooled.buffer();
try {
new DefaultLispInfoRequest(infoReply, nonce, keyId, authDataLength,
authData, ttl, maskLength, eidPrefix).writeTo(byteBuf);
new DefaultLispInfoRequest(infoReply, nonce, keyId,
authDataLength, authData, ttl,
maskLength, eidPrefix)
.writeTo(byteBuf);
} catch (LispWriterException e) {
log.warn("Failed to serialize info request", e);
}
@ -196,7 +218,8 @@ public class DefaultLispInfoRequest extends DefaultLispInfo implements LispInfoR
log.warn("Must specify authentication key");
}
authData = factory.createAuthenticationData(valueOf(keyId), authKey, bytes);
authData = factory
.createAuthenticationData(valueOf(keyId), authKey, bytes);
}
return new DefaultLispInfoRequest(infoReply, nonce, keyId,
@ -207,10 +230,12 @@ public class DefaultLispInfoRequest extends DefaultLispInfo implements LispInfoR
/**
* A LISP message reader for InfoRequest message.
*/
public static class InfoRequestReader implements LispMessageReader<LispInfoRequest> {
public static class InfoRequestReader
implements LispMessageReader<LispInfoRequest> {
@Override
public LispInfoRequest readFrom(ByteBuf byteBuf) throws LispParseError, LispReaderException {
public LispInfoRequest readFrom(ByteBuf byteBuf)
throws LispParseError, LispReaderException {
LispInfo lispInfo = DefaultLispInfo.deserialize(byteBuf);
@ -229,11 +254,19 @@ public class DefaultLispInfoRequest extends DefaultLispInfo implements LispInfoR
/**
* A LISP message writer for InfoRequest message.
*/
public static final class InfoRequestWriter implements LispMessageWriter<LispInfoRequest> {
public static final class InfoRequestWriter
implements LispMessageWriter<LispInfoRequest> {
@Override
public void writeTo(ByteBuf byteBuf, LispInfoRequest message) throws LispWriterException {
public void writeTo(ByteBuf byteBuf, LispInfoRequest message)
throws LispWriterException {
DefaultLispInfo.serialize(byteBuf, message);
//Fill AFI=0, no address
new LispAfiAddress.AfiAddressWriter()
.writeTo(byteBuf, new LispNoAddress());
}
}
}

47
protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispLcafAddress.java
View File

@ -240,7 +240,8 @@ public class LispLcafAddress extends LispAfiAddress {
* @param byteBuf netty byte buffer
*/
public static void updateLength(int lcafIndex, ByteBuf byteBuf) {
byteBuf.setByte(lcafIndex + LENGTH_FIELD_INDEX, byteBuf.writerIndex() - COMMON_HEADER_SIZE);
byteBuf.setByte(lcafIndex + LENGTH_FIELD_INDEX,
byteBuf.writerIndex() - COMMON_HEADER_SIZE - lcafIndex);
}
/**
@ -361,40 +362,48 @@ public class LispLcafAddress extends LispAfiAddress {
* @return LispLcafAddress instance
*/
public LispLcafAddress build() {
return new LispLcafAddress(LispCanonicalAddressFormatEnum.valueOf(lcafType),
reserved1, reserved2, flag, length);
return new LispLcafAddress(LispCanonicalAddressFormatEnum
.valueOf(lcafType),
reserved1, reserved2, flag, length);
}
}
/**
* LISP LCAF reader class.
*/
public static class LcafAddressReader implements LispAddressReader<LispLcafAddress> {
public static class LcafAddressReader
implements LispAddressReader<LispLcafAddress> {
private static final int LCAF_TYPE_FIELD_INDEX = 4;
@Override
public LispLcafAddress readFrom(ByteBuf byteBuf) throws LispParseError, LispReaderException {
public LispLcafAddress readFrom(ByteBuf byteBuf)
throws LispParseError, LispReaderException {
int index = byteBuf.readerIndex();
// LCAF type -> 8 bits
byte lcafType = (byte) byteBuf.getUnsignedByte(index + LCAF_TYPE_FIELD_INDEX);
byte lcafType = (byte) byteBuf
.getUnsignedByte(index + LCAF_TYPE_FIELD_INDEX);
if (lcafType == APPLICATION_DATA.getLispCode()) {
return new LispAppDataLcafAddress.AppDataLcafAddressReader().readFrom(byteBuf);
return new LispAppDataLcafAddress
.AppDataLcafAddressReader().readFrom(byteBuf);
}
if (lcafType == LIST.getLispCode()) {
return new LispListLcafAddress.ListLcafAddressReader().readFrom(byteBuf);
return new LispListLcafAddress
.ListLcafAddressReader().readFrom(byteBuf);
}
if (lcafType == SEGMENT.getLispCode()) {
return new LispSegmentLcafAddress.SegmentLcafAddressReader().readFrom(byteBuf);
return new LispSegmentLcafAddress
.SegmentLcafAddressReader().readFrom(byteBuf);
}
if (lcafType == SOURCE_DEST.getLispCode()) {
return new LispSourceDestLcafAddress.SourceDestLcafAddressReader().readFrom(byteBuf);
return new LispSourceDestLcafAddress
.SourceDestLcafAddressReader().readFrom(byteBuf);
}
if (lcafType == TRAFFIC_ENGINEERING.getLispCode()) {
@ -410,26 +419,28 @@ public class LispLcafAddress extends LispAfiAddress {
/**
* LISP LCAF address writer class.
*/
public static class LcafAddressWriter implements LispAddressWriter<LispLcafAddress> {
public static class LcafAddressWriter
implements LispAddressWriter<LispLcafAddress> {
@Override
public void writeTo(ByteBuf byteBuf, LispLcafAddress address) throws LispWriterException {
public void writeTo(ByteBuf byteBuf, LispLcafAddress address)
throws LispWriterException {
switch (address.getType()) {
case APPLICATION_DATA:
new LispAppDataLcafAddress.AppDataLcafAddressWriter().writeTo(byteBuf,
(LispAppDataLcafAddress) address);
new LispAppDataLcafAddress.AppDataLcafAddressWriter()
.writeTo(byteBuf, (LispAppDataLcafAddress) address);
break;
case LIST:
new LispListLcafAddress.ListLcafAddressWriter().writeTo(byteBuf,
(LispListLcafAddress) address);
break;
case SEGMENT:
new LispSegmentLcafAddress.SegmentLcafAddressWriter().writeTo(byteBuf,
(LispSegmentLcafAddress) address);
new LispSegmentLcafAddress.SegmentLcafAddressWriter()
.writeTo(byteBuf, (LispSegmentLcafAddress) address);
break;
case SOURCE_DEST:
new LispSourceDestLcafAddress.SourceDestLcafAddressWriter().writeTo(byteBuf,
(LispSourceDestLcafAddress) address);
new LispSourceDestLcafAddress.SourceDestLcafAddressWriter()
.writeTo(byteBuf, (LispSourceDestLcafAddress) address);
break;
case TRAFFIC_ENGINEERING:
new LispTeLcafAddress.TeLcafAddressWriter().writeTo(byteBuf,

4
protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispNatLcafAddress.java
View File

@ -162,7 +162,8 @@ public final class LispNatLcafAddress extends LispLcafAddress {
Objects.equals(this.etrUdpPortNumber, other.etrUdpPortNumber) &&
Objects.equals(this.globalEtrRlocAddress, other.globalEtrRlocAddress) &&
Objects.equals(this.msRlocAddress, other.msRlocAddress) &&
Objects.equals(this.privateEtrRlocAddress, other.privateEtrRlocAddress);
Objects.equals(this.privateEtrRlocAddress, other.privateEtrRlocAddress) &&
Objects.equals(this.rtrRlocAddresses, other.rtrRlocAddresses);
}
return false;
}
@ -175,6 +176,7 @@ public final class LispNatLcafAddress extends LispLcafAddress {
.add("global ETR RLOC address", globalEtrRlocAddress)
.add("Map Server RLOC address", msRlocAddress)
.add("private ETR RLOC address", privateEtrRlocAddress)
.add("RTR RLOC addresses", rtrRlocAddresses)
.toString();
}

6
protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/protocols/DefaultLispInfoReplyTest.java
View File

@ -72,7 +72,7 @@ public final class DefaultLispInfoReplyTest {
.withNonce(1L)
.withKeyId((short) 1)
.withAuthKey(AUTH_KEY)
.withIsInfoReply(false)
.withIsInfoReply(true)
.withMaskLength((byte) 1)
.withEidPrefix(address1)
.withNatLcafAddress(natLcafAddress1).build();
@ -83,7 +83,7 @@ public final class DefaultLispInfoReplyTest {
.withNonce(1L)
.withKeyId((short) 1)
.withAuthKey(AUTH_KEY)
.withIsInfoReply(false)
.withIsInfoReply(true)
.withMaskLength((byte) 1)
.withEidPrefix(address1)
.withNatLcafAddress(natLcafAddress1).build();
@ -145,7 +145,7 @@ public final class DefaultLispInfoReplyTest {
.withPrivateEtrRlocAddress(privateEtrRlocAddress1)
.build();
assertThat(reply.isInfoReply(), is(false));
assertThat(reply.isInfoReply(), is(true));
assertThat(reply.getNonce(), is(1L));
assertThat(reply.getKeyId(), is((short) 1));
assertThat(reply.getMaskLength(), is((byte) 1));