import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.commons.lang3.BooleanUtils;
import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
+import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
import org.opendaylight.lispflowmapping.lisp.util.NumberUtil;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.IpAddressBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.IpAddressBinaryBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRegister;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MessageType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItem;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItemBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItemKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapregisternotification.MapRegisterBuilder;
/**
}
ByteBuffer registerBuffer = ByteBuffer.allocate(size);
- registerBuffer.put((byte) ((byte) (MessageType.MapRegister.getIntValue() << 4) |
- ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isProxyMapReply()), Flags.PROXY) |
- ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isXtrSiteIdPresent()), Flags.XTRSITEID)));
+ registerBuffer.put((byte) ((byte) (MessageType.MapRegister.getIntValue() << 4)
+ | ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isProxyMapReply()), Flags.PROXY)
+ | ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isXtrSiteIdPresent()), Flags.XTRSITEID)));
registerBuffer.position(registerBuffer.position() + Length.RES);
- registerBuffer.put(ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isWantMapNotify()), Flags.WANT_MAP_REPLY));
+ registerBuffer.put((byte)
+ (ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isMergeEnabled()), Flags.MERGE_ENABLED)
+ | ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isWantMapNotify()), Flags.WANT_MAP_NOTIFY)));
registerBuffer.put((byte) mapRegister.getMappingRecordItem().size());
registerBuffer.putLong(NumberUtil.asLong(mapRegister.getNonce()));
registerBuffer.putShort(NumberUtil.asShort(mapRegister.getKeyId()));
}
if (mapRegister.isXtrSiteIdPresent() != null && mapRegister.isXtrSiteIdPresent()) {
- registerBuffer.put(mapRegister.getXtrId());
- registerBuffer.put(mapRegister.getSiteId());
+ registerBuffer.put(mapRegister.getXtrId().getValue());
+ registerBuffer.put(mapRegister.getSiteId().getValue());
}
registerBuffer.clear();
return registerBuffer;
}
+ @SuppressWarnings("checkstyle:IllegalCatch")
public MapRegister deserialize(ByteBuffer registerBuffer, InetAddress sourceRloc) {
try {
+ final byte typeAndFlags = registerBuffer.get();
+ final int type = typeAndFlags >> 4;
+ if (MessageType.forValue(type) != MessageType.MapRegister) {
+ throw new LispSerializationException("Expected Map-Register packet (type 3), but was type " + type);
+ }
+
MapRegisterBuilder builder = new MapRegisterBuilder();
builder.setMappingRecordItem(new ArrayList<MappingRecordItem>());
- byte typeAndFlags = registerBuffer.get();
boolean xtrSiteIdPresent = ByteUtil.extractBit(typeAndFlags, Flags.XTRSITEID);
builder.setProxyMapReply(ByteUtil.extractBit(typeAndFlags, Flags.PROXY));
builder.setXtrSiteIdPresent(xtrSiteIdPresent);
registerBuffer.position(registerBuffer.position() + Length.RES);
- builder.setWantMapNotify(ByteUtil.extractBit(registerBuffer.get(), Flags.WANT_MAP_REPLY));
+ byte mergeAndMapReply = registerBuffer.get();
+ builder.setWantMapNotify(ByteUtil.extractBit(mergeAndMapReply, Flags.WANT_MAP_NOTIFY));
+ builder.setMergeEnabled(ByteUtil.extractBit(mergeAndMapReply, Flags.MERGE_ENABLED));
byte recordCount = (byte) ByteUtil.getUnsignedByte(registerBuffer);
builder.setNonce(registerBuffer.getLong());
builder.setKeyId(registerBuffer.getShort());
for (int i = 0; i < recordCount; i++) {
mrbs.add(MappingRecordSerializer.getInstance().deserializeToBuilder(registerBuffer));
}
- byte[] xtrId = new byte[Length.XTRID_SIZE];
- registerBuffer.get(xtrId);
- byte[] siteId = new byte[Length.SITEID_SIZE];
- registerBuffer.get(siteId);
+ byte[] xtrIdBuf = new byte[Length.XTRID_SIZE];
+ registerBuffer.get(xtrIdBuf);
+ XtrId xtrId = new XtrId(xtrIdBuf);
+ byte[] siteIdBuf = new byte[Length.SITEID_SIZE];
+ registerBuffer.get(siteIdBuf);
+ SiteId siteId = new SiteId(siteIdBuf);
builder.setXtrId(xtrId);
builder.setSiteId(siteId);
+ int idx = 0;
for (MappingRecordBuilder mrb : mrbs) {
mrb.setXtrId(xtrId);
mrb.setSiteId(siteId);
- mrb.setSourceRloc(getSourceRloc(sourceRloc));
- builder.getMappingRecordItem().add(new MappingRecordItemBuilder().setMappingRecord(
- mrb.build()).build());
+ mrb.setSourceRloc(LispAddressUtil.addressBinaryFromInet(sourceRloc));
+ builder.getMappingRecordItem().add(new MappingRecordItemBuilder()
+ .withKey(new MappingRecordItemKey(Integer.toString(idx)))
+ .setMappingRecord(mrb.build()).build());
+ idx++;
}
} else {
for (int i = 0; i < recordCount; i++) {
- builder.getMappingRecordItem().add(new MappingRecordItemBuilder().setMappingRecord(
- MappingRecordSerializer.getInstance().deserialize(registerBuffer)).build());
+ builder.getMappingRecordItem().add(new MappingRecordItemBuilder()
+ .withKey(new MappingRecordItemKey(Integer.toString(i)))
+ .setMappingRecord(MappingRecordSerializer.getInstance().deserialize(registerBuffer))
+ .build());
}
}
registerBuffer.get(mapRegisterBytes);
return builder.build();
} catch (RuntimeException re) {
- throw new LispSerializationException("Couldn't deserialize Map-Register (len=" + registerBuffer.capacity() + ")", re);
+ throw new LispSerializationException("Couldn't deserialize Map-Register (len="
+ + registerBuffer.capacity() + ")", re);
}
-
- }
-
- private static IpAddressBinary getSourceRloc(InetAddress sourceRloc) {
- byte[] srcRloc;
- if (sourceRloc == null) {
- srcRloc = InetAddress.getLoopbackAddress().getAddress();
- } else {
- srcRloc = sourceRloc.getAddress();
- }
-
- return IpAddressBinaryBuilder.getDefaultInstance(srcRloc);
}
private interface Flags {
byte PROXY = 0x08;
byte XTRSITEID = 0x02;
- byte WANT_MAP_REPLY = 0x01;
+ byte MERGE_ENABLED = 0x04;
+ byte WANT_MAP_NOTIFY = 0x01;
}
public interface Length {
Code Review / lispflowmapping.git / blobdiff